Merge branch 'shadowsocks-gui-datatypes'

1 files changed, 27 insertions, 2 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 6b29ddd764..ff1720be06 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -160,7 +160,8 @@ export interface IRelayListHostname {
   ipv4AddrIn: string;
   includeInCountry: boolean;
   weight: number;
-  tunnels: IRelayTunnels;
+  tunnels?: IRelayTunnels;
+  bridges?: IRelayBridges;
 }
 
 export interface IRelayTunnels {
@@ -168,6 +169,10 @@ export interface IRelayTunnels {
   wireguard: IWireguardTunnelData[];
 }
 
+export interface IRelayBridges {
+  shadowsocks: IShadowsocksEndpointData[];
+}
+
 export interface IOpenVpnTunnelData {
   port: number;
   protocol: RelayProtocol;
@@ -182,10 +187,16 @@ export interface IWireguardTunnelData {
   publicKey: string;
 }
 
+export interface IShadowsocksEndpointData {
+  port: number;
+  cipher: string;
+  password: string;
+  protocol: RelayProtocol;
+}
+
 export interface ITunnelOptions {
   openvpn: {
     mssfix?: number;
-    proxy?: ProxySettings;
   };
   wireguard: {
     mtu?: number;
@@ -233,8 +244,22 @@ export interface ISettings {
   blockWhenDisconnected: boolean;
   relaySettings: RelaySettings;
   tunnelOptions: ITunnelOptions;
+  bridgeSettings: BridgeSettings;
+  bridgeState: BridgeState;
 }
 
+export type BridgeState = 'auto' | 'on' | 'off';
+
+export interface IBridgeConstraints {
+  location:
+    | 'any'
+    | {
+        only: RelayLocation;
+      };
+}
+
+export type BridgeSettings = ProxySettings | IBridgeConstraints;
+
 export interface ISocketAddress {
   host: string;
   port: number;