feat: Add port hopping support to Clash and Surge config

surgioproject · Sep 8, 2024 · 8d867cc · 8d867cc
1 parent 04390e7
commit 8d867cc
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 1 deletion.
diff --git a/src/utils/__tests__/clash.test.ts b/src/utils/__tests__/clash.test.ts
@@ -823,12 +823,15 @@ test('getClashNodes', async (t) => {
         clashConfig: {
           enableTuic: true,
           enableShadowTls: false,
+          clashCore: 'stash',
         },
         hostname: '1.1.1.1',
         port: 443,
         token: 'password',
         skipCertVerify: true,
         alpn: ['h3'],
+        portHopping: '5000-6000',
+        portHoppingInterval: 10,
       },
     ]),
     [
@@ -849,6 +852,8 @@ test('getClashNodes', async (t) => {
         'skip-cert-verify': true,
         udp: true,
         alpn: ['h3'],
+        'hop-interval': 10,
+        ports: '5000-6000',
       },
     ],
   )
@@ -935,6 +940,8 @@ test('getClashNodes', async (t) => {
         password: 'password',
         downloadBandwidth: 100,
         uploadBandwidth: 100,
+        portHopping: '5000-6000',
+        portHoppingInterval: 10,
         clashConfig: {
           enableHysteria2: true,
           clashCore: 'stash',
@@ -974,6 +981,8 @@ test('getClashNodes', async (t) => {
         server: 'example.com',
         type: 'hysteria2',
         up: 100,
+        ports: '5000-6000',
+        'hop-interval': 10,
       },
       {
         down: 100,

diff --git a/src/utils/__tests__/surge.test.ts b/src/utils/__tests__/surge.test.ts
@@ -514,6 +514,8 @@ test('getSurgeNodes - Tuic', (t) => {
         port: 443,
         token: 'token',
         serverCertFingerprintSha256: 'sha256',
+        portHopping: '5000-6000',
+        portHoppingInterval: 10,
       },
       {
         type: NodeTypeEnum.Tuic,
@@ -548,7 +550,7 @@ test('getSurgeNodes - Tuic', (t) => {
       },
     ]),
     [
-      '测试 Tuic = tuic, example.com, 443, token=token, server-cert-fingerprint-sha256=sha256',
+      '测试 Tuic = tuic, example.com, 443, token=token, server-cert-fingerprint-sha256=sha256, port-hopping=5000-6000, port-hopping-interval=10',
       '测试 Tuic = tuic, example.com, 443, token=token, alpn=h3',
       '测试 Tuic = tuic, example.com, 443, token=token, skip-cert-verify=true, sni=sni.example.com, alpn=h3',
       '测试 Tuic = tuic-v5, example.com, 443, password=password, uuid=uuid, ecn=true, skip-cert-verify=true, sni=sni.example.com, alpn=h3',

diff --git a/src/utils/clash.ts b/src/utils/clash.ts
@@ -409,6 +409,17 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
               keyFormat: 'kebabCase',
             },
           ),
+          ...(clashConfig.clashCore === 'stash' && nodeConfig.portHopping
+            ? {
+                ports: nodeConfig.portHopping,
+              }
+            : null),
+          ...(clashConfig.clashCore === 'stash' &&
+          nodeConfig.portHoppingInterval
+            ? {
+                'hop-interval': nodeConfig.portHoppingInterval,
+              }
+            : null),
           ...(nodeConfig.alpn ? { alpn: nodeConfig.alpn } : null),
         } as const
       }
@@ -426,6 +437,16 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
             keyFormat: 'kebabCase',
           },
         ),
+        ...(clashConfig.clashCore === 'stash' && nodeConfig.portHopping
+          ? {
+              ports: nodeConfig.portHopping,
+            }
+          : null),
+        ...(clashConfig.clashCore === 'stash' && nodeConfig.portHoppingInterval
+          ? {
+              'hop-interval': nodeConfig.portHoppingInterval,
+            }
+          : null),
         ...(nodeConfig.alpn ? { alpn: nodeConfig.alpn } : null),
       } as const
 
@@ -454,6 +475,20 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
             keyFormat: 'kebabCase',
           },
         ),
+        ...((clashConfig.clashCore === 'stash' ||
+          clashConfig.clashCore === 'clash.meta') &&
+        nodeConfig.portHopping
+          ? {
+              ports: nodeConfig.portHopping,
+            }
+          : null),
+        ...((clashConfig.clashCore === 'stash' ||
+          clashConfig.clashCore === 'clash.meta') &&
+        nodeConfig.portHoppingInterval
+          ? {
+              'hop-interval': nodeConfig.portHoppingInterval,
+            }
+          : null),
         ...(nodeConfig.alpn ? { alpn: nodeConfig.alpn } : null),
       } as const
 

diff --git a/src/utils/surge.ts b/src/utils/surge.ts
@@ -511,6 +511,8 @@ function appendCommonConfig(
         'sni',
         'serverCertFingerprintSha256',
         'blockQuic',
+        'portHopping',
+        'portHoppingInterval',
       ],
       {
         keyFormat: 'kebabCase',

diff --git a/src/validators/common.ts b/src/validators/common.ts
@@ -80,6 +80,8 @@ export const SimpleNodeConfigValidator = z.object({
     .optional(),
 
   // Misc
+  portHopping: z.string().optional(),
+  portHoppingInterval: z.number().optional(),
   underlyingProxy: z.string().optional(),
   testUrl: z.string().optional(),
   testTimeout: z.number().optional(),