Merge pull request #320 from AzunyanDaisuki/master

geekdada · web-flow · commit cb98bcdb0430 · 2026-02-28T16:05:23.000+01:00
diff --git a/src/provider/ClashProvider.ts b/src/provider/ClashProvider.ts
@@ -377,13 +377,19 @@ export const parseClashConfig = (
             if (typeof item['client-fingerprint'] === 'string') {
               vmessNode.clientFingerprint = item['client-fingerprint']
             }
+            if (Array.isArray(item.alpn) && item.alpn.length > 0) {
+              vmessNode.alpn = item.alpn
+            }
 
             vmessNode.skipCertVerify = item['skip-cert-verify'] === true
             vmessNode.tls13 = tls13 === true
           }
 
           if (vmessNode.type === NodeTypeEnum.Vless) {
-            vmessNode.flow = item.flow
+            if (typeof item.flow === 'string') {
+              vmessNode.flow = item.flow
+            }
+
             if (typeof item.encryption === 'string') {
               vmessNode.encryption = item.encryption
             }
diff --git a/src/provider/__tests__/ClashProvider.test.ts b/src/provider/__tests__/ClashProvider.test.ts
@@ -357,6 +357,71 @@ foo: bar
 })
 
 test('vmess Configurations', (t) => {
+  t.deepEqual(
+    parseClashConfig([
+      {
+        type: 'vmess',
+        name: 'vmess meta alpn',
+        server: 'server',
+        port: 443,
+        uuid: 'uuid',
+        alterId: 32,
+        cipher: 'auto',
+        network: 'tcp',
+        tls: true,
+        alpn: ['h2', 'http/1.1'],
+      },
+    ]),
+    [
+      {
+        type: NodeTypeEnum.Vmess,
+        nodeName: 'vmess meta alpn',
+        hostname: 'server',
+        port: 443,
+        uuid: 'uuid',
+        alterId: '32',
+        method: 'auto',
+        network: 'tcp',
+        tls: true,
+        alpn: ['h2', 'http/1.1'],
+        udpRelay: false,
+        skipCertVerify: false,
+        tls13: false,
+      },
+    ],
+  )
+
+  t.deepEqual(
+    parseClashConfig([
+      {
+        type: 'vless',
+        name: 'vless alpn',
+        server: 'server',
+        port: 443,
+        uuid: 'uuid',
+        cipher: 'none',
+        network: 'tcp',
+        tls: true,
+        alpn: ['h2'],
+      },
+    ]),
+    [
+      {
+        type: NodeTypeEnum.Vless,
+        nodeName: 'vless alpn',
+        hostname: 'server',
+        port: 443,
+        uuid: 'uuid',
+        method: 'none',
+        network: 'tcp',
+        alpn: ['h2'],
+        udpRelay: false,
+        skipCertVerify: false,
+        tls13: false,
+      },
+    ],
+  )
+
   t.deepEqual(
     parseClashConfig([
       {
diff --git a/src/utils/__tests__/clash.test.ts b/src/utils/__tests__/clash.test.ts
@@ -395,6 +395,116 @@ test('getClashNodes', async (t) => {
       },
     ],
   )
+  t.deepEqual(
+    clash.getClashNodes([
+      {
+        alterId: '64',
+        hostname: '1.1.1.1',
+        method: 'auto',
+        network: 'tcp',
+        nodeName: 'Test Meta VMess ALPN',
+        port: 8080,
+        tls: true,
+        alpn: ['h2', 'http/1.1'],
+        type: NodeTypeEnum.Vmess,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+        clashConfig: {
+          clashCore: 'clash.meta',
+        },
+      },
+      {
+        type: NodeTypeEnum.Vless,
+        nodeName: 'Test Meta VLESS ALPN',
+        hostname: 'server',
+        port: 443,
+        uuid: 'uuid',
+        method: 'none',
+        network: 'tcp',
+        alpn: ['h2'],
+        encryption: 'none',
+        clashConfig: {
+          enableVless: true,
+          clashCore: 'clash.meta',
+        },
+      },
+      {
+        alterId: '64',
+        hostname: '1.1.1.1',
+        method: 'auto',
+        network: 'tcp',
+        nodeName: 'Test Non Meta VMess ALPN',
+        port: 8080,
+        alpn: ['h2'],
+        type: NodeTypeEnum.Vmess,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+      },
+      {
+        alterId: '64',
+        hostname: '1.1.1.1',
+        method: 'auto',
+        network: 'tcp',
+        nodeName: 'Test Meta VMess No ALPN',
+        port: 8080,
+        tls: true,
+        type: NodeTypeEnum.Vmess,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+        clashConfig: {
+          clashCore: 'clash.meta',
+        },
+      },
+    ]),
+    [
+      {
+        alterId: '64',
+        cipher: 'auto',
+        name: 'Test Meta VMess ALPN',
+        network: 'tcp',
+        server: '1.1.1.1',
+        port: 8080,
+        tls: true,
+        alpn: ['h2', 'http/1.1'],
+        type: 'vmess',
+        udp: false,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+      },
+      {
+        type: 'vless',
+        name: 'Test Meta VLESS ALPN',
+        server: 'server',
+        port: 443,
+        uuid: 'uuid',
+        cipher: 'none',
+        udp: false,
+        network: 'tcp',
+        alpn: ['h2'],
+        encryption: 'none',
+        tls: true,
+      },
+      {
+        alterId: '64',
+        cipher: 'auto',
+        name: 'Test Non Meta VMess ALPN',
+        network: 'tcp',
+        server: '1.1.1.1',
+        port: 8080,
+        type: 'vmess',
+        udp: false,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+      },
+      {
+        alterId: '64',
+        cipher: 'auto',
+        name: 'Test Meta VMess No ALPN',
+        network: 'tcp',
+        server: '1.1.1.1',
+        port: 8080,
+        tls: true,
+        type: 'vmess',
+        udp: false,
+        uuid: '1386f85e-657b-4d6e-9d56-78badb75e1fd',
+      },
+    ],
+  )
 
   t.deepEqual(
     clash.getClashNodes([
diff --git a/src/utils/clash.ts b/src/utils/clash.ts
@@ -202,7 +202,10 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
       }
 
       if (nodeConfig.type === NodeTypeEnum.Vless) {
-        vmessNode.flow = nodeConfig.flow
+        if (typeof nodeConfig.flow === 'string') {
+          vmessNode.flow = nodeConfig.flow
+        }
+
         if (typeof nodeConfig.encryption === 'string') {
           vmessNode.encryption = nodeConfig.encryption
         }
@@ -242,6 +245,9 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {
         if (clashConfig.clashCore === 'clash.meta' && nodeConfig.sni) {
           vmessNode.servername = nodeConfig.sni
         }
+        if (clashConfig.clashCore === 'clash.meta' && nodeConfig.alpn) {
+          vmessNode.alpn = nodeConfig.alpn
+        }
         if (nodeConfig.clientFingerprint) {
           vmessNode['client-fingerprint'] = nodeConfig.clientFingerprint
         }

Original file line number	Diff line number	Diff line change
`@@ -377,13 +377,19 @@ export const parseClashConfig = (`
`377`	`377`	`if (typeof item['client-fingerprint'] === 'string') {`
`378`	`378`	`vmessNode.clientFingerprint = item['client-fingerprint']`
`379`	`379`	`}`
	`380`	`+ if (Array.isArray(item.alpn) && item.alpn.length > 0) {`
	`381`	`+ vmessNode.alpn = item.alpn`
	`382`	`+ }`
`380`	`383`
`381`	`384`	`vmessNode.skipCertVerify = item['skip-cert-verify'] === true`
`382`	`385`	`vmessNode.tls13 = tls13 === true`
`383`	`386`	`}`
`384`	`387`
`385`	`388`	`if (vmessNode.type === NodeTypeEnum.Vless) {`
`386`		`- vmessNode.flow = item.flow`
	`389`	`+ if (typeof item.flow === 'string') {`
	`390`	`+ vmessNode.flow = item.flow`
	`391`	`+ }`
	`392`	`+`
`387`	`393`	`if (typeof item.encryption === 'string') {`
`388`	`394`	`vmessNode.encryption = item.encryption`
`389`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,10 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if (nodeConfig.type === NodeTypeEnum.Vless) {`
`205`		`- vmessNode.flow = nodeConfig.flow`
	`205`	`+ if (typeof nodeConfig.flow === 'string') {`
	`206`	`+ vmessNode.flow = nodeConfig.flow`
	`207`	`+ }`
	`208`	`+`
`206`	`209`	`if (typeof nodeConfig.encryption === 'string') {`
`207`	`210`	`vmessNode.encryption = nodeConfig.encryption`
`208`	`211`	`}`
`@@ -242,6 +245,9 @@ function nodeListMapper(nodeConfig: PossibleNodeConfigType) {`
`242`	`245`	`if (clashConfig.clashCore === 'clash.meta' && nodeConfig.sni) {`
`243`	`246`	`vmessNode.servername = nodeConfig.sni`
`244`	`247`	`}`
	`248`	`+ if (clashConfig.clashCore === 'clash.meta' && nodeConfig.alpn) {`
	`249`	`+ vmessNode.alpn = nodeConfig.alpn`
	`250`	`+ }`
`245`	`251`	`if (nodeConfig.clientFingerprint) {`
`246`	`252`	`vmessNode['client-fingerprint'] = nodeConfig.clientFingerprint`
`247`	`253`	`}`