feat: change mellow format

close #91
surgioproject · Jun 28, 2020 · 95182a4 · 95182a4
1 parent 641b81e
commit 95182a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -645,7 +645,7 @@ export const getMellowNodes = function(
     .map(nodeConfig => {
       switch (nodeConfig.type) {
         case NodeTypeEnum.Vmess: {
-          const uri = formatVmessUri(nodeConfig);
+          const uri = formatVmessUri(nodeConfig, { isMellow: true });
           return [nodeConfig.nodeName, 'vmess1', uri.trim().replace('vmess://', 'vmess1://')].join(', ');
         }
 

diff --git a/lib/utils/v2ray.ts b/lib/utils/v2ray.ts
@@ -2,7 +2,7 @@ import { VmessNodeConfig } from "../types";
 import queryString from 'query-string';
 
 // https://github.com/v2ray/v2ray-core/issues/1569
-export const formatVmessUri = (nodeConfig: VmessNodeConfig): string => {
+export const formatVmessUri = (nodeConfig: VmessNodeConfig, options?: { readonly isMellow: boolean }): string => {
   const uri: string[] = [
     nodeConfig.uuid,
     '@',
@@ -27,7 +27,11 @@ export const formatVmessUri = (nodeConfig: VmessNodeConfig): string => {
       });
     }
     if (nodeConfig.host) {
-      queries[`ws.headers.host`] = nodeConfig.host;
+      if (options?.isMellow) {
+        queries[`ws.host`] = nodeConfig.host;
+      } else {
+        queries[`ws.headers.host`] = nodeConfig.host;
+      }
     }
   }
 

diff --git a/test/utils/snapshots/index.test.ts.md b/test/utils/snapshots/index.test.ts.md
@@ -8,8 +8,8 @@ Generated by [AVA](https://avajs.dev).
 
 > Snapshot 1
 
-    `Test Node 3, vmess1, vmess1://1386f85e-657b-4d6e-9d56-78badb75e1fd@1.1.1.1:8080/?network=ws&tls=false&ws.headers.host=example.com␊
-    Test Node 3, vmess1, vmess1://1386f85e-657b-4d6e-9d56-78badb75e1fd@1.1.1.1:8080/?network=ws&tls=true&tls.allowInsecure=true&ws.headers.foo=bar&ws.headers.host=example.com␊
+    `Test Node 3, vmess1, vmess1://1386f85e-657b-4d6e-9d56-78badb75e1fd@1.1.1.1:8080/?network=ws&tls=false&ws.host=example.com␊
+    Test Node 3, vmess1, vmess1://1386f85e-657b-4d6e-9d56-78badb75e1fd@1.1.1.1:8080/?network=ws&tls=true&tls.allowInsecure=true&ws.headers.foo=bar&ws.host=example.com␊
     Test Node 4, vmess1, vmess1://1386f85e-657b-4d6e-9d56-78badb75e1fd@1.1.1.1:8080/?network=tcp&tls=false␊
     Test Node 5, vmess1, vmess1://1386f85e-657b-4d6e-9d56-78badb75e1fd@1.1.1.1:8080/?network=tcp&tls=true␊
     🇭🇰HK(Example), ss, ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@example.com:8443/?plugin=obfs-local%3Bobfs%3Dtls%3Bobfs-host%3Dgateway.icloud.com&group=Surgio#%F0%9F%87%AD%F0%9F%87%B0HK(Example)`

diff --git a/test/utils/snapshots/index.test.ts.snap b/test/utils/snapshots/index.test.ts.snap