fix: 由于 mellow 对 shadowsocks 支持有限，忽略该类型节点

surgioproject · Nov 13, 2019 · 8ae0561 · 8ae0561
1 parent b646199
commit 8ae0561
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -566,7 +566,7 @@ export const getClashNodes = (
 };
 
 export const getMellowNodes = (
- list: ReadonlyArray<ShadowsocksNodeConfig|VmessNodeConfig>,
+ list: ReadonlyArray<VmessNodeConfig>,
  filter?: NodeFilterType
 ): string => {
  const result = list
@@ -575,11 +575,6 @@ export const getMellowNodes = (
  if (nodeConfig.enable === false) { return null; }
 
  switch (nodeConfig.type) {
- case NodeTypeEnum.Shadowsocks: {
- const uri = getShadowsocksNodes([nodeConfig]);
- return [nodeConfig.nodeName, 'ss', uri.trim()].join(', ');
- }
-
  case NodeTypeEnum.Vmess: {
  const uri = formatVmessUri(nodeConfig);
  return [nodeConfig.nodeName, 'vmess1', uri.trim().replace('vmess://', 'vmess1://')].join(', ');

diff --git a/test/cli.test.ts b/test/cli.test.ts
@@ -14,7 +14,6 @@ test('cli works', async t => {
  cwd: resolve('plain'),
  execArgv: ['--require', require.resolve('./stub-axios.js')],
  })
- .debug()
  .end();
 
  t.is(code, 0);

diff --git a/test/snapshots/cli.test.ts.md b/test/snapshots/cli.test.ts.md
@@ -43,15 +43,5 @@ Generated by [AVA](https://ava.li).
  ----␊
  测试中文 = external, exec = "/usr/local/bin/ssr-local", args = "-s", args = "127.0.0.1", args = "-p", args = "1234", args = "-m", args = "aes-128-cfb", args = "-o", args = "tls1.2_ticket_auth", args = "-O", args = "auth_aes128_md5", args = "-k", args = "aaabbb", args = "-l", args = "61107", args = "-b", args = "127.0.0.1", args = "-g", args = "breakwa11.moe", local-port = 61107, addresses = 127.0.0.1␊
  ----␊
- 🇺🇸US 1, ss, ss://[email protected]:443/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dgateway-carry.icloud.com&group=Surgio#%F0%9F%87%BA%F0%9F%87%B8US%201␊
- 🇺🇸US 2, ss, ss://[email protected]:443/?group=Surgio#%F0%9F%87%BA%F0%9F%87%B8US%202␊
- 🇺🇲 US, ss, ss://[email protected]:443/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dgateway-carry.icloud.com&group=Surgio#%F0%9F%87%BA%F0%9F%87%B2%20US␊
- 🇺🇸US 1, ss, ss://[email protected]:443/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dgateway-carry.icloud.com&group=Surgio#%F0%9F%87%BA%F0%9F%87%B8US%201␊
- 🇺🇸US 2, ss, ss://[email protected]:444/?group=Surgio#%F0%9F%87%BA%F0%9F%87%B8US%202␊
- 🇺🇸US 3, ss, ss://[email protected]:445/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dwww.bing.com&group=Surgio#%F0%9F%87%BA%F0%9F%87%B8US%203␊
- 🇺🇸US 4, ss, ss://[email protected]:80/?plugin=obfs-local%3Bobfs%3Dhttp%3Bobfs-host%3Dwww.bing.com&group=Surgio#%F0%9F%87%BA%F0%9F%87%B8US%204␊
- 测试 1, vmess1, vmess1://[email protected]:8080/network=ws&tls=false␊
- 测试 2, vmess1, vmess1://[email protected]:8080/network=tcp&tls=false␊
- ss1, ss, ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@server:443/?group=Surgio#ss1␊
- ss2, ss, ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@server:443/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dwww.bing.com&group=Surgio#ss2␊
- ss4, ss, ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@server:443/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dexample.com&group=Surgio#ss4`
+ 测试 1, vmess1, vmess1://[email protected]:8080/?network=ws&tls=false␊
+ 测试 2, vmess1, vmess1://[email protected]:8080/?network=tcp&tls=false`
diff --git a/test/snapshots/cli.test.ts.snap b/test/snapshots/cli.test.ts.snap