Merge branch 'add-bridge-to-tunnel-endpoint'

2 files changed, 16 insertions, 0 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index bd76896569..86ef3dff0a 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -240,6 +240,13 @@ const tunnelStateTransitionSchema = oneOf(
       address: string,
       protocol: enumeration('tcp', 'udp'),
       tunnel_type: enumeration('wireguard', 'openvpn'),
+      proxy: maybe(
+        partialObject({
+          address: string,
+          protocol: enumeration('tcp', 'udp'),
+          proxy_type: enumeration('shadowsocks', 'custom'),
+        }),
+      ),
     }),
   }),
   object({
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index ff1720be06..3225995e75 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -35,10 +35,19 @@ export type TunnelType = 'wireguard' | 'openvpn';
 
 export type RelayProtocol = 'tcp' | 'udp';
 
+export type ProxyType = 'shadowsocks' | 'custom';
+
 export interface ITunnelEndpoint {
   address: string;
   protocol: RelayProtocol;
   tunnel: TunnelType;
+  proxy?: IProxyEndpoint;
+}
+
+export interface IProxyEndpoint {
+  address: string;
+  protocol: RelayProtocol;
+  proxy_type: ProxyType;
 }
 
 export type DaemonEvent =