feat: 在模板中输出 proxyTestUrl

surgioproject · Nov 20, 2019 · b95cd8b · b95cd8b
1 parent 345790e
commit b95cd8b
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 147 deletions.
diff --git a/lib/command/generate.ts b/lib/command/generate.ts
@@ -37,6 +37,7 @@ class GenerateCommand extends Command {
     return '生成规则';
   }
 
+  // istanbul ignore next
   public errorHandler(err): void {
     errorHandler.call(this, err);
   }

diff --git a/lib/generate.ts b/lib/generate.ts
@@ -226,6 +226,7 @@ export async function generate(
   await Bluebird.map(providerList, providerMapper, { concurrency: NETWORK_CONCURRENCY });
 
   const renderContext = {
+    proxyTestUrl: config.proxyTestUrl,
     downloadUrl: getDownloadUrl(config.urlBase, artifactName, true, gatewayHasToken ? gatewayConfig.accessToken : undefined),
     nodes: nodeList,
     names: nodeNameList,

diff --git a/test/cli.test.ts b/test/cli.test.ts
@@ -9,14 +9,19 @@ const cli = path.join(__dirname, '../bin/surgio.js');
 const fixture = path.join(__dirname, './fixture');
 const resolve = p => path.join(fixture, p);
 
-test('cli works', async t => {
-  const { code } = await coffee.fork(cli, ['generate'], {
+test.only('cli works', async t => {
+  await coffee.fork(cli, ['generate', '-h'], {
     cwd: resolve('plain'),
-    execArgv: ['--require', require.resolve('./stub-axios.js')],
   })
+    .expect('code', 0)
     .end();
 
-  t.is(code, 0);
+  await coffee.fork(cli, ['generate'], {
+    cwd: resolve('plain'),
+    execArgv: ['--require', require.resolve('./stub-axios.js')],
+  })
+    .expect('code', 0)
+    .end();
 
   const confString1 = fs.readFileSync(resolve('plain/dist/ss_json.conf'), {
     encoding: 'utf8',

diff --git a/test/fixture/plain/template/template-functions.tpl b/test/fixture/plain/template/template-functions.tpl
@@ -9,3 +9,7 @@
 {{ getMellowNodes(nodeList) }}
 ----
 {{ clashProxyConfig | yaml }}
+----
+{{ proxyTestUrl }}
+----
+{{ downloadUrl }}
diff --git a/test/snapshots/cli.test.ts.md b/test/snapshots/cli.test.ts.md
@@ -4,149 +4,6 @@ The actual snapshot is saved in `cli.test.ts.snap`.
 
 Generated by [AVA](https://ava.li).
 
-## custom filter
-
-> Snapshot 1
-
-    `🇺🇸US 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, obfs=tls, obfs-host=gateway-carry.icloud.com␊
-    🇺🇸US 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module␊
-    ----␊
-    🇺🇸US 1, 🇺🇸US 2␊
-    ----␊
-    🇺🇸US 1, 🇺🇸US 2␊
-    ----␊
-    ␊
-    ----␊
-    🇺🇸US 1␊
-    ----␊
-    Proxy:␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇺🇸US 1␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: false␊
-        plugin: obfs␊
-        plugin-opts:␊
-          mode: tls␊
-          host: gateway-carry.icloud.com␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇺🇸US 2␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: false␊
-    Proxy Group:␊
-      - type: select␊
-        name: global filter␊
-        proxies:␊
-          - 🇺🇸US 1␊
-      - type: select␊
-        name: provider filter␊
-        proxies:␊
-          - 🇺🇸US 1␊
-          - 🇺🇸US 2␊
-      - type: select␊
-        name: sort filter␊
-        proxies:␊
-          - 🇺🇸US 2␊
-          - 🇺🇸US 1␊
-    ␊
-    ----␊
-    🇺🇸US 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module␊
-    🇺🇸US 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, obfs=tls, obfs-host=gateway-carry.icloud.com␊
-    ----␊
-    🇺🇸US 2, 🇺🇸US 1␊
-    ----␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, tag=🇺🇸US 1␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, tag=🇺🇸US 2␊
-    ----␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, tag=🇺🇸US 2␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, tag=🇺🇸US 1␊
-    `
-
-> Snapshot 2
-
-    `🇺🇸US 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module␊
-    🇺🇸US 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, obfs=tls, obfs-host=gateway-carry.icloud.com␊
-    🇭🇰 V01 HK 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, udp-relay=true, obfs=tls, obfs-host=gateway-carry.icloud.com, tfo=true␊
-    🇭🇰 V01 HK 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, udp-relay=true, obfs=tls, obfs-host=gateway-carry.icloud.com, tfo=true␊
-    🇺🇲 V03 US = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, udp-relay=true, obfs=tls, obfs-host=gateway-carry.icloud.com, tfo=true␊
-    ----␊
-    Proxy:␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇺🇸US 2␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: false␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇺🇸US 1␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: false␊
-        plugin: obfs␊
-        plugin-opts:␊
-          mode: tls␊
-          host: gateway-carry.icloud.com␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇭🇰 V01 HK 1␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: true␊
-        plugin: obfs␊
-        plugin-opts:␊
-          mode: tls␊
-          host: gateway-carry.icloud.com␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇭🇰 V01 HK 2␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: true␊
-        plugin: obfs␊
-        plugin-opts:␊
-          mode: tls␊
-          host: gateway-carry.icloud.com␊
-      - type: ss␊
-        cipher: chacha20-ietf-poly1305␊
-        name: 🇺🇲 V03 US␊
-        password: password␊
-        port: "443"␊
-        server: us.example.com␊
-        udp: true␊
-        plugin: obfs␊
-        plugin-opts:␊
-          mode: tls␊
-          host: gateway-carry.icloud.com␊
-    Proxy Group:␊
-      - type: select␊
-        name: all␊
-        proxies:␊
-          - 🇺🇸US 2␊
-          - 🇺🇸US 1␊
-          - 🇭🇰 V01 HK 1␊
-          - 🇭🇰 V01 HK 2␊
-          - 🇺🇲 V03 US␊
-    ␊
-    ----␊
-    🇭🇰 V01 HK 1, 🇭🇰 V01 HK 2, 🇺🇸US 2, 🇺🇸US 1, 🇺🇲 V03 US␊
-    ----␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, udp-relay=true, fast-open=true, tag=🇭🇰 V01 HK 1␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, udp-relay=true, fast-open=true, tag=🇭🇰 V01 HK 2␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, tag=🇺🇸US 2␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, tag=🇺🇸US 1␊
-    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, udp-relay=true, fast-open=true, tag=🇺🇲 V03 US␊
-    `
-
 ## cli works
 
 > Snapshot 1
@@ -365,4 +222,151 @@ Generated by [AVA](https://ava.li).
           - ss4␊
           - 测试中文␊
     ␊
+    ----␊
+    http://www.google.com/generate_204␊
+    ----␊
+    https://example.com/template-functions.conf?access_token=abcd␊
+    `
+
+## custom filter
+
+> Snapshot 1
+
+    `🇺🇸US 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, obfs=tls, obfs-host=gateway-carry.icloud.com␊
+    🇺🇸US 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module␊
+    ----␊
+    🇺🇸US 1, 🇺🇸US 2␊
+    ----␊
+    🇺🇸US 1, 🇺🇸US 2␊
+    ----␊
+    ␊
+    ----␊
+    🇺🇸US 1␊
+    ----␊
+    Proxy:␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇺🇸US 1␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: false␊
+        plugin: obfs␊
+        plugin-opts:␊
+          mode: tls␊
+          host: gateway-carry.icloud.com␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇺🇸US 2␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: false␊
+    Proxy Group:␊
+      - type: select␊
+        name: global filter␊
+        proxies:␊
+          - 🇺🇸US 1␊
+      - type: select␊
+        name: provider filter␊
+        proxies:␊
+          - 🇺🇸US 1␊
+          - 🇺🇸US 2␊
+      - type: select␊
+        name: sort filter␊
+        proxies:␊
+          - 🇺🇸US 2␊
+          - 🇺🇸US 1␊
+    ␊
+    ----␊
+    🇺🇸US 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module␊
+    🇺🇸US 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, obfs=tls, obfs-host=gateway-carry.icloud.com␊
+    ----␊
+    🇺🇸US 2, 🇺🇸US 1␊
+    ----␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, tag=🇺🇸US 1␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, tag=🇺🇸US 2␊
+    ----␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, tag=🇺🇸US 2␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, tag=🇺🇸US 1␊
+    `
+
+> Snapshot 2
+
+    `🇺🇸US 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module␊
+    🇺🇸US 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, obfs=tls, obfs-host=gateway-carry.icloud.com␊
+    🇭🇰 V01 HK 1 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, udp-relay=true, obfs=tls, obfs-host=gateway-carry.icloud.com, tfo=true␊
+    🇭🇰 V01 HK 2 = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, udp-relay=true, obfs=tls, obfs-host=gateway-carry.icloud.com, tfo=true␊
+    🇺🇲 V03 US = custom, us.example.com, 443, chacha20-ietf-poly1305, password, https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module, udp-relay=true, obfs=tls, obfs-host=gateway-carry.icloud.com, tfo=true␊
+    ----␊
+    Proxy:␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇺🇸US 2␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: false␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇺🇸US 1␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: false␊
+        plugin: obfs␊
+        plugin-opts:␊
+          mode: tls␊
+          host: gateway-carry.icloud.com␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇭🇰 V01 HK 1␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: true␊
+        plugin: obfs␊
+        plugin-opts:␊
+          mode: tls␊
+          host: gateway-carry.icloud.com␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇭🇰 V01 HK 2␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: true␊
+        plugin: obfs␊
+        plugin-opts:␊
+          mode: tls␊
+          host: gateway-carry.icloud.com␊
+      - type: ss␊
+        cipher: chacha20-ietf-poly1305␊
+        name: 🇺🇲 V03 US␊
+        password: password␊
+        port: "443"␊
+        server: us.example.com␊
+        udp: true␊
+        plugin: obfs␊
+        plugin-opts:␊
+          mode: tls␊
+          host: gateway-carry.icloud.com␊
+    Proxy Group:␊
+      - type: select␊
+        name: all␊
+        proxies:␊
+          - 🇺🇸US 2␊
+          - 🇺🇸US 1␊
+          - 🇭🇰 V01 HK 1␊
+          - 🇭🇰 V01 HK 2␊
+          - 🇺🇲 V03 US␊
+    ␊
+    ----␊
+    🇭🇰 V01 HK 1, 🇭🇰 V01 HK 2, 🇺🇸US 2, 🇺🇸US 1, 🇺🇲 V03 US␊
+    ----␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, udp-relay=true, fast-open=true, tag=🇭🇰 V01 HK 1␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, udp-relay=true, fast-open=true, tag=🇭🇰 V01 HK 2␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, tag=🇺🇸US 2␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, tag=🇺🇸US 1␊
+    shadowsocks=us.example.com:443, method=chacha20-ietf-poly1305, password=password, obfs=tls, obfs-host=gateway-carry.icloud.com, udp-relay=true, fast-open=true, tag=🇺🇲 V03 US␊
     `
diff --git a/test/snapshots/cli.test.ts.snap b/test/snapshots/cli.test.ts.snap