Merge branch 'add-custom-port-option'

2 files changed, 47 insertions, 18 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 950cf1a4a3..a6136bc6f3 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -31,14 +31,15 @@ import {
   IObfuscationEndpoint,
   IOpenVpnConstraints,
   IProxyEndpoint,
-  IRelayList,
   IRelayListCity,
   IRelayListCountry,
   IRelayListHostname,
+  IRelayListWithEndpointData,
   ISettings,
   ITunnelOptions,
   ITunnelStateRelayInfo,
   IWireguardConstraints,
+  IWireguardEndpointData,
   LoggedInDeviceState,
   LoggedOutDeviceState,
   ObfuscationSettings,
@@ -258,7 +259,7 @@ export class DaemonRpc {
     }
   }
 
-  public async getRelayLocations(): Promise<IRelayList> {
+  public async getRelayLocations(): Promise<IRelayListWithEndpointData> {
     if (this.isConnected) {
       const response = await this.callEmpty<grpcTypes.RelayList>(this.client.getRelayLocations);
       return convertFromRelayList(response);
@@ -757,13 +758,25 @@ function liftConstraint<T>(constraint: Constraint<T> | undefined): T | undefined
   return undefined;
 }
 
-function convertFromRelayList(relayList: grpcTypes.RelayList): IRelayList {
+function convertFromRelayList(relayList: grpcTypes.RelayList): IRelayListWithEndpointData {
   return {
-    countries: relayList
-      .getCountriesList()
-      .map((country: grpcTypes.RelayListCountry) =>
-        convertFromRelayListCountry(country.toObject()),
-      ),
+    relayList: {
+      countries: relayList
+        .getCountriesList()
+        .map((country: grpcTypes.RelayListCountry) =>
+          convertFromRelayListCountry(country.toObject()),
+        ),
+    },
+    wireguardEndpointData: convertWireguardEndpointData(relayList.getWireguard()!),
+  };
+}
+
+function convertWireguardEndpointData(
+  data: grpcTypes.WireguardEndpointData,
+): IWireguardEndpointData {
+  return {
+    portRanges: data.getPortRangesList().map((range) => [range.getFirst(), range.getLast()]),
+    udp2tcpPorts: data.getUdp2tcpPortsList(),
   };
 }
 
diff --git a/gui/src/main/relay-list.ts b/gui/src/main/relay-list.ts
index b43548e6a1..c7b4a1fff1 100644
--- a/gui/src/main/relay-list.ts
+++ b/gui/src/main/relay-list.ts
@@ -1,12 +1,26 @@
-import { BridgeState, IRelayList, liftConstraint, RelaySettings } from '../shared/daemon-rpc-types';
+import {
+  BridgeState,
+  IRelayList,
+  IRelayListWithEndpointData,
+  liftConstraint,
+  RelaySettings,
+} from '../shared/daemon-rpc-types';
 import { IRelayListPair } from '../shared/ipc-schema';
 import { IpcMainEventChannel } from './ipc-event-channel';
 
 export default class RelayList {
-  private relays: IRelayList = { countries: [] };
+  private relays: IRelayListWithEndpointData = {
+    relayList: {
+      countries: [],
+    },
+    wireguardEndpointData: {
+      portRanges: [],
+      udp2tcpPorts: [],
+    },
+  };
 
   public setRelays(
-    newRelayList: IRelayList,
+    newRelayList: IRelayListWithEndpointData,
     relaySettings: RelaySettings,
     bridgeState: BridgeState,
   ) {
@@ -25,14 +39,18 @@ export default class RelayList {
   }
 
   private processRelays(
-    relayList: IRelayList,
+    relayList: IRelayListWithEndpointData,
     relaySettings: RelaySettings,
     bridgeState: BridgeState,
   ): IRelayListPair {
-    const filteredRelays = this.processRelaysForPresentation(relayList, relaySettings);
-    const filteredBridges = this.processBridgesForPresentation(relayList, bridgeState);
+    const filteredRelays = this.processRelaysForPresentation(relayList.relayList, relaySettings);
+    const filteredBridges = this.processBridgesForPresentation(relayList.relayList, bridgeState);
 
-    return { relays: filteredRelays, bridges: filteredBridges };
+    return {
+      relays: filteredRelays,
+      bridges: filteredBridges,
+      wireguardEndpointData: relayList.wireguardEndpointData,
+    };
   }
 
   private processRelaysForPresentation(
@@ -75,9 +93,7 @@ export default class RelayList {
       }))
       .filter((country) => country.cities.length > 0);
 
-    return {
-      countries: filteredCountries,
-    };
+    return { countries: filteredCountries };
   }
 
   private processBridgesForPresentation(