fix: vmess cipher

src/__tests__/__snapshots__/index.test.ts.md

@@ -18,6 +18,7 @@ Generated by [AVA](https://avajs.dev).
       hkFilter: Function hkFilter {},
       httpFilter: Function httpFilter {},
       httpsFilter: Function httpsFilter {},
+      hysteria2Filter: Function hysteria2Filter {},
       isAWS: Function isAWS {},
       isAWSLambda: Function isAWSLambda {},
       isClash: Function isClash {},
@@ -61,6 +62,7 @@ Generated by [AVA](https://avajs.dev).
       useSortedKeywords: Function useSortedKeywords {},
       v2rayFilter: Function v2rayFilter {},
       validateFilter: Function validateFilter {},
+      vlessFilter: Function vlessFilter {},
       vmessFilter: Function vmessFilter {},
       wireguardFilter: Function wireguardFilter {},
       youtubePremiumFilter: Function {},

src/filters/filters.ts

@@ -51,6 +51,9 @@ export const chinaBackFilter: NodeFilterType = (item) => {
     '中国上海',
     '中国北京',
     '中国徐州',
+    '中国广州',
+    '中国东莞',
+    '中国中山',
     '中国深圳',
     '中国枣庄',
     '中国郑州',

src/utils/__tests__/loon.test.ts

@@ -68,7 +68,7 @@ test('getLoonNodes', (t) => {
         },
       },
     ]),
-    '测试 = vmess,1.1.1.1,443,method=chacha20-ietf-poly1305,"1386f85e-657b-4d6e-9d56-78badb75e1fd",transport=ws,path=/test,over-tls=true',
+    '测试 = vmess,1.1.1.1,443,method=chacha20-poly1305,"1386f85e-657b-4d6e-9d56-78badb75e1fd",transport=ws,path=/test,over-tls=true',
   )
   t.is(
     getLoonNodes([

src/utils/__tests__/quantumult.test.ts

@@ -100,15 +100,15 @@ test('getQuantumultXNodes', (t) => {
 
   t.is(
     schemeList[0],
-    'vmess=1.1.1.1:8080, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, obfs=ws, obfs-uri=/, obfs-host=example.com, tag=测试 1',
+    'vmess=1.1.1.1:8080, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, obfs=ws, obfs-uri=/, obfs-host=example.com, tag=测试 1',
   )
   t.is(
     schemeList[1],
-    'vmess=1.1.1.1:8080, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, tag=测试 2',
+    'vmess=1.1.1.1:8080, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, tag=测试 2',
   )
   t.is(
     schemeList[2],
-    'vmess=1.1.1.1:8080, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, obfs=ws, obfs-uri=/, tag=测试 3',
+    'vmess=1.1.1.1:8080, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, obfs=ws, obfs-uri=/, tag=测试 3',
   )
   t.is(
     schemeList[3],
@@ -124,7 +124,7 @@ test('getQuantumultXNodes', (t) => {
   )
   t.is(
     schemeList[6],
-    'vmess=1.1.1.1:443, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, obfs=over-tls, tls-verification=true, tag=测试 4',
+    'vmess=1.1.1.1:443, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, obfs=over-tls, tls-verification=true, tag=测试 4',
   )
 
   t.is(
@@ -143,7 +143,7 @@ test('getQuantumultXNodes', (t) => {
         uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
       },
     ]),
-    'vmess=1.1.1.1:443, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, obfs=over-tls, tls-verification=true, tls13=true, tag=测试',
+    'vmess=1.1.1.1:443, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, obfs=over-tls, tls-verification=true, tls13=true, tag=测试',
   )
 
   t.is(
@@ -165,7 +165,7 @@ test('getQuantumultXNodes', (t) => {
         },
       },
     ]),
-    'vmess=1.1.1.1:443, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, aead=true, obfs=over-tls, tls-verification=true, tls13=true, tag=测试',
+    'vmess=1.1.1.1:443, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, aead=true, obfs=over-tls, tls-verification=true, tls13=true, tag=测试',
   )
   t.is(
     quantumult.getQuantumultXNodes([
@@ -294,8 +294,27 @@ test('getQuantumultXNodes', (t) => {
         testUrl: 'http://example.com',
       },
     ]),
-    'vmess=1.1.1.1:443, method=chacha20-ietf-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, aead=true, obfs=over-tls, tls-verification=true, tls13=true, server_check_url=http://example.com, tag=测试',
+    'vmess=1.1.1.1:443, method=chacha20-poly1305, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, aead=true, obfs=over-tls, tls-verification=true, tls13=true, server_check_url=http://example.com, tag=测试',
   )
+
+  t.is(
+    quantumult.getQuantumultXNodes([
+      {
+        type: NodeTypeEnum.Vless,
+        hostname: '1.1.1.1',
+        network: 'tcp',
+        nodeName: '测试',
+        method: 'none',
+        port: 443,
+        tls13: true,
+        udpRelay: true,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+        testUrl: 'http://example.com',
+      },
+    ]),
+    'vless=1.1.1.1:443, method=none, password=1386f85e-657b-4d6e-9d56-78badb75e1fd, udp-relay=true, obfs=over-tls, tls-verification=true, tls13=true, server_check_url=http://example.com, tag=测试',
+  )
+
   t.is(
     quantumult.getQuantumultXNodes([
       {

src/utils/loon.ts

@@ -116,7 +116,7 @@ export const getLoonNodes = function (
             nodeConfig.hostname,
             nodeConfig.port,
             nodeConfig.method === 'auto'
-              ? `method=chacha20-ietf-poly1305`
+              ? `method=chacha20-poly1305`
               : `method=${nodeConfig.method}`,
             JSON.stringify(nodeConfig.uuid),
             `transport=${nodeConfig.network}`,

src/utils/quantumult.ts

@@ -60,7 +60,7 @@ function nodeListMapper(
         `${nodeConfig.hostname}:${nodeConfig.port}`,
         // method 为 auto 时 qx 会无法识别
         nodeConfig.method === 'auto'
-          ? `method=chacha20-ietf-poly1305`
+          ? `method=chacha20-poly1305`
           : `method=${nodeConfig.method}`,
         `password=${nodeConfig.uuid}`,
         ...(nodeConfig.udpRelay ? ['udp-relay=true'] : []),

src/utils/surge.ts

@@ -307,12 +307,12 @@ function nodeListMapper(
         `username=${nodeConfig.uuid}`,
       ]
 
-      if (
-        ['chacha20-ietf-poly1305', 'aes-128-gcm', 'chacha20-poly1305'].includes(
-          nodeConfig.method,
-        )
-      ) {
-        result.push(`encrypt-method=${nodeConfig.method}`)
+      if (['chacha20-poly1305', 'aes-128-gcm'].includes(nodeConfig.method)) {
+        if (nodeConfig.method === 'chacha20-poly1305') {
+          result.push(`encrypt-method=chacha20-ietf-poly1305`)
+        } else {
+          result.push(`encrypt-method=${nodeConfig.method}`)
+        }
       }
 
       if (nodeConfig.network === 'ws') {

src/validators/vmess.ts

@@ -18,7 +18,6 @@ export const VmessNetworkValidator = z.union([
 export const VmessMethodValidator = z.union([
   z.literal('none'),
   z.literal('aes-128-gcm'),
-  z.literal('chacha20-ietf-poly1305'),
   z.literal('chacha20-poly1305'),
   z.literal('auto'),
 ])