Merge branch 'add-custom-port-option'

3 files changed, 17 insertions, 1 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index 5893e4def6..6b75ee7d3c 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -119,7 +119,7 @@ export interface IProxyEndpoint {
 export type DaemonEvent =
   | { tunnelState: TunnelState }
   | { settings: ISettings }
-  | { relayList: IRelayList }
+  | { relayList: IRelayListWithEndpointData }
   | { appVersionInfo: IAppVersionInfo }
   | { device: DeviceEvent }
   | { deviceRemoval: Array<IDevice> };
@@ -224,10 +224,20 @@ export type RelaySettingsUpdate =
       customTunnelEndpoint: IRelaySettingsCustom;
     };
 
+export interface IRelayListWithEndpointData {
+  relayList: IRelayList;
+  wireguardEndpointData: IWireguardEndpointData;
+}
+
 export interface IRelayList {
   countries: IRelayListCountry[];
 }
 
+export interface IWireguardEndpointData {
+  portRanges: [number, number][];
+  udp2tcpPorts: number[];
+}
+
 export interface IRelayListCountry {
   name: string;
   code: string;
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 33ac82180e..85c7f2cabc 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -15,6 +15,7 @@ import {
   ILocation,
   IRelayList,
   ISettings,
+  IWireguardEndpointData,
   ObfuscationSettings,
   RelaySettingsUpdate,
   TunnelState,
@@ -45,6 +46,7 @@ export interface ITranslations {
 export interface IRelayListPair {
   relays: IRelayList;
   bridges: IRelayList;
+  wireguardEndpointData: IWireguardEndpointData;
 }
 
 export type LaunchApplicationResult = { success: true } | { error: string };
diff --git a/gui/src/shared/string-helpers.ts b/gui/src/shared/string-helpers.ts
index c69ebddfcf..983a8e8796 100644
--- a/gui/src/shared/string-helpers.ts
+++ b/gui/src/shared/string-helpers.ts
@@ -5,3 +5,7 @@ export function capitalize(inputString: string): string {
 export function capitalizeEveryWord(inputString: string): string {
   return inputString.split(' ').map(capitalize).join(' ');
 }
+
+export function removeNonNumericCharacters(value: string) {
+  return value.replace(/[^0-9]/g, '');
+}