fix: Surge Wireguard 节点某些配置不生效的问题

surgioproject · Jul 8, 2023 · 30df8f9 · 30df8f9
1 parent 9aa3e64
commit 30df8f9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/docs/guide/upgrade-guide-v3.md b/docs/guide/upgrade-guide-v3.md
@@ -2,6 +2,12 @@
 
 在 v3.0.0 中对原有的一些接口和行为进行了修改，你可能要花一些时间来解决这些问题。相信我，会很快。
 
+:::warning 注意
+- 请不要在 package.json 中直接更改版本号
+- 请不要修改完直接提交代码
+- 请确认在本地运行 `npx surgio generate` 后没有报错再提交代码
+:::
+
 **目录**
 
 [[toc]]

diff --git a/src/utils/__tests__/surge.test.ts b/src/utils/__tests__/surge.test.ts
@@ -469,7 +469,9 @@ test('getSurgeNodes', async (t) => {
       '测试 Snell = snell, example.com, 443, psk=psk, shadow-tls-password=password, shadow-tls-sni=sni.example.com',
     ].join('\n'),
   )
+})
 
+test('getSurgeNodes - Wireguard', (t) => {
   t.is(
     surge.getSurgeNodes([
       {
@@ -485,8 +487,26 @@ test('getSurgeNodes', async (t) => {
           },
         ],
       },
+      {
+        type: NodeTypeEnum.Wireguard,
+        nodeName: 'wg node',
+        privateKey: 'privateKey',
+        selfIp: '10.0.0.1',
+        mtu: 1420,
+        peers: [
+          {
+            endpoint: 'wg.example.com:51820',
+            publicKey: 'publicKey',
+          },
+        ],
+        underlyingProxy: 'UnderlyingProxy',
+        testUrl: 'http://www.google.com',
+      },
     ]),
-    ['wg node = wireguard, section-name = wg node'].join('\n'),
+    [
+      'wg node = wireguard, section-name = wg node',
+      'wg node = wireguard, section-name = wg node, underlying-proxy=UnderlyingProxy, test-url=http://www.google.com',
+    ].join('\n'),
   )
 })
 

diff --git a/src/utils/surge.ts b/src/utils/surge.ts
@@ -549,10 +549,16 @@ function nodeListMapper(
       return [
         nodeConfig.nodeName,
         [
-          nodeConfig.nodeName,
-          ' = wireguard, section-name = ',
-          nodeConfig.nodeName,
-        ].join(''),
+          `${nodeConfig.nodeName} = wireguard`,
+          `section-name = ${nodeConfig.nodeName}`,
+          ...pickAndFormatStringList(
+            nodeConfig,
+            ['underlyingProxy', 'testUrl'],
+            {
+              keyFormat: 'kebabCase',
+            },
+          ),
+        ].join(', '),
       ]
 
     // istanbul ignore next