refactor: refactor WebSocket options handling in surge and surfboard …

…utils
surgioproject · Mar 5, 2024 · 84aff5d · 84aff5d
1 parent a5f59e9
commit 84aff5d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/src/utils/__tests__/surge.test.ts b/src/utils/__tests__/surge.test.ts
@@ -64,13 +64,12 @@ test('getSurgeNodes', async (t) => {
       method: 'auto',
       network: 'ws',
       nodeName: '测试 3',
-      path: '/',
       port: 8080,
       tls: false,
-      host: '',
       uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
-      binPath: '/usr/local/bin/v2ray',
-      localPort: 61101,
+      wsOpts: {
+        path: '/',
+      },
     },
     {
       type: NodeTypeEnum.Vmess,
@@ -79,13 +78,12 @@ test('getSurgeNodes', async (t) => {
       method: 'auto',
       network: 'ws',
       nodeName: '测试 4',
-      path: '/',
       port: 8080,
       tls: true,
-      host: '',
       uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
-      binPath: '/usr/local/bin/v2ray',
-      localPort: 61101,
+      wsOpts: {
+        path: '/',
+      },
     },
     {
       type: NodeTypeEnum.Vmess,
@@ -94,13 +92,9 @@ test('getSurgeNodes', async (t) => {
       method: 'aes-128-gcm',
       network: 'tcp',
       nodeName: '测试 5',
-      path: '/',
       port: 8080,
       tls: false,
-      host: '',
       uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
-      binPath: '/usr/local/bin/v2ray',
-      localPort: 61101,
     },
     {
       nodeName: 'Test Node 4',
@@ -148,17 +142,16 @@ test('getSurgeNodes', async (t) => {
       method: 'auto',
       network: 'ws',
       nodeName: '测试 6',
-      path: '/',
       port: 8080,
       tls: true,
       tls13: true,
       skipCertVerify: true,
-      host: '',
       uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
-      binPath: '/usr/local/bin/v2ray',
-      localPort: 61101,
       tfo: true,
       mptcp: true,
+      wsOpts: {
+        path: '/',
+      },
     },
     {
       type: NodeTypeEnum.Vmess,
@@ -167,18 +160,17 @@ test('getSurgeNodes', async (t) => {
       method: 'auto',
       network: 'ws',
       nodeName: '测试 7',
-      path: '/',
       port: 8080,
       tls: true,
       tls13: true,
       skipCertVerify: true,
-      host: '',
       uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
-      binPath: '/usr/local/bin/v2ray',
-      localPort: 61101,
       tfo: true,
       mptcp: true,
       underlyingProxy: 'another-proxy',
+      wsOpts: {
+        path: '/',
+      },
     },
   ]
   const txt1 = surge.getSurgeNodes(nodeList).split('\n')

diff --git a/src/utils/surfboard.ts b/src/utils/surfboard.ts
@@ -141,9 +141,7 @@ function nodeListMapper(
       if (nodeConfig.network === 'ws') {
         result.push('ws=true')
 
-        if (nodeConfig.wsOpts) {
-          result.push(`ws-path=${nodeConfig.wsOpts.path}`)
-        }
+        result.push(`ws-path=${nodeConfig.wsOpts?.path || '/'}`)
 
         result.push(
           'ws-headers=' +

diff --git a/src/utils/surge.ts b/src/utils/surge.ts
@@ -318,18 +318,16 @@ function nodeListMapper(
       if (nodeConfig.network === 'ws') {
         result.push('ws=true')
 
-        if (nodeConfig.wsOpts) {
-          result.push(`ws-path=${nodeConfig.wsOpts.path}`)
-          result.push(
-            'ws-headers=' +
-              JSON.stringify(
-                getSurgeExtendHeaders({
-                  'user-agent': OBFS_UA,
-                  ...nodeConfig.wsOpts.headers,
-                }),
-              ),
-          )
-        }
+        result.push(`ws-path=${nodeConfig.wsOpts?.path || '/'}`)
+        result.push(
+          'ws-headers=' +
+            JSON.stringify(
+              getSurgeExtendHeaders({
+                'user-agent': OBFS_UA,
+                ...nodeConfig.wsOpts?.headers,
+              }),
+            ),
+        )
       }
 
       if (nodeConfig.tls) {