feat: 统一 Trojan/VMess/VLESS network 逻辑

Author: xream

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.20.66",
+  "version": "2.20.68",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {

backend/src/core/proxy-utils/index.js

@@ -442,22 +442,20 @@ function lastParse(proxy) {
     // network¶
     // 传输层，支持 ws/grpc，不配置或配置其他值则为 tcp
     if (proxy.type === 'trojan') {
-        if (proxy.network === 'tcp') {
-            delete proxy.network;
-        }
+        proxy.network = proxy.network || 'tcp';
     }
     // network¶
     // 传输层，支持 ws/http/h2/grpc，不配置或配置其他值则为 tcp
     if (['vmess'].includes(proxy.type)) {
+        proxy.network = proxy.network || 'tcp';
+
         proxy.cipher = proxy.cipher || 'none';
         proxy.alterId = proxy.alterId || 0;
     }
     // network¶
     // 传输层，支持 ws/http/h2/grpc，不配置或配置其他值则为 tcp
     if (['vless'].includes(proxy.type)) {
-        if (!proxy.network) {
-            proxy.network = 'tcp';
-        }
+        proxy.network = proxy.network || 'tcp';
     }
     if (
         [

backend/src/core/proxy-utils/producers/qx.js

@@ -242,7 +242,7 @@ function trojan(proxy) {
                 `,obfs-host=${proxy['ws-opts']?.headers?.Host}`,
                 'ws-opts.headers.Host',
             );
-        } else {
+        } else if (!['tcp'].includes(proxy.network)) {
             throw new Error(`network ${proxy.network} is unsupported`);
         }
     }
@@ -326,7 +326,7 @@ function vmess(proxy) {
             else append(`,obfs=ws`);
         } else if (proxy.network === 'http') {
             append(`,obfs=http`);
-        } else {
+        } else if (!['tcp'].includes(proxy.network)) {
             throw new Error(`network ${proxy.network} is unsupported`);
         }
         let transportPath = proxy[`${proxy.network}-opts`]?.path;
@@ -401,7 +401,8 @@ function vmess(proxy) {
     return result.toString();
 }
 function vless(proxy) {
-    if (proxy.encryption && proxy.encryption !== 'none') throw new Error(`VLESS encryption is not supported`);
+    if (proxy.encryption && proxy.encryption !== 'none')
+        throw new Error(`VLESS encryption is not supported`);
     const result = new Result(proxy);
     const append = result.append.bind(result);
     const appendIfPresent = result.appendIfPresent.bind(result);

backend/src/core/proxy-utils/producers/surfboard.js

@@ -219,6 +219,8 @@ function handleTransport(result, proxy) {
                     }
                 }
             }
+        } else if (['tcp'].includes(proxy.network) && proxy['reality-opts']) {
+            throw new Error(`reality is unsupported`);
         } else if (!['tcp'].includes(proxy.network)) {
             throw new Error(`network ${proxy.network} is unsupported`);
         }

backend/src/core/proxy-utils/producers/surge.js

@@ -1226,6 +1226,11 @@ function handleTransport(result, proxy, includeUnsupportedProxy) {
                 $.info(
                     `Include Unsupported Proxy: network ${proxy.network} -> tcp`,
                 );
+            } else if (
+                ['tcp'].includes(proxy.network) &&
+                proxy['reality-opts']
+            ) {
+                throw new Error(`reality is unsupported`);
             } else if (!['tcp'].includes(proxy.network)) {
                 throw new Error(`network ${proxy.network} is unsupported`);
             }