feat: mihomo snell 强制去除 udp 字段, 防止内核报错

backend/package.json

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

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

@@ -529,9 +529,6 @@ function URI_VLESS() {
             if (params.sid) {
                 opts['short-id'] = params.sid;
             }
-            if (params.spx) {
-                opts['_spider-x'] = params.spx;
-            }
             if (Object.keys(opts).length > 0) {
                 // proxy[`${params.security}-opts`] = opts;
                 proxy[`${params.security}-opts`] = opts;
@@ -599,12 +596,8 @@ function URI_VLESS() {
                 // mKCP 的伪装头部类型。当前可选值有 none / srtp / utp / wechat-video / dtls / wireguard。省略时默认值为 none，即不使用伪装头部，但不可以为空字符串。
                 proxy.headerType = params.headerType || 'none';
             }
-
-            if (params.mode) {
-                proxy._mode = params.mode;
-            }
             if (params.extra) {
-                proxy._extra = params.extra;
+                proxy.extra = params.extra;
             }
         }
 

backend/src/core/proxy-utils/parsers/peggy/trojan-uri.js

@@ -80,9 +80,6 @@ port = digits:[0-9]+ {
 }
 
 params = "?" head:param tail:("&"@param)* {
-  for (const [key, value] of Object.entries(params)) {
-    params[key] = decodeURIComponent(value);
-  }
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
   proxy['client-fingerprint'] = params.fp;
@@ -118,27 +115,6 @@ params = "?" head:param tail:("&"@param)* {
         $set(proxy, proxy.network+"-opts.v2ray-http-upgrade-fast-open", true); 
       }
     }
-    if (['reality'].includes(params.security)) {
-      const opts = {};
-      if (params.pbk) {
-        opts['public-key'] = params.pbk;
-      }
-      if (params.sid) {
-        opts['short-id'] = params.sid;
-      }
-      if (params.spx) {
-        opts['_spider-x'] = params.spx;
-      }
-      if (params.mode) {
-        proxy._mode = params.mode;
-      }
-      if (params.extra) {
-        proxy._extra = params.extra;
-      }
-      if (Object.keys(opts).length > 0) {
-        $set(proxy, params.security+"-opts", opts); 
-      }
-    }
   }
 
   proxy.udp = toBool(params["udp"]);

backend/src/core/proxy-utils/parsers/peggy/trojan-uri.peg

@@ -78,9 +78,6 @@ port = digits:[0-9]+ {
 }
 
 params = "?" head:param tail:("&"@param)* {
-  for (const [key, value] of Object.entries(params)) {
-    params[key] = decodeURIComponent(value);
-  }
   proxy["skip-cert-verify"] = toBool(params["allowInsecure"]);
   proxy.sni = params["sni"] || params["peer"];
   proxy['client-fingerprint'] = params.fp;
@@ -116,27 +113,6 @@ params = "?" head:param tail:("&"@param)* {
         $set(proxy, proxy.network+"-opts.v2ray-http-upgrade-fast-open", true); 
       }
     }
-    if (['reality'].includes(params.security)) {
-      const opts = {};
-      if (params.pbk) {
-        opts['public-key'] = params.pbk;
-      }
-      if (params.sid) {
-        opts['short-id'] = params.sid;
-      }
-      if (params.spx) {
-        opts['_spider-x'] = params.spx;
-      }
-      if (params.mode) {
-        proxy._mode = params.mode;
-      }
-      if (params.extra) {
-        proxy._extra = params.extra;
-      }
-      if (Object.keys(opts).length > 0) {
-        $set(proxy, params.security+"-opts", opts); 
-      }
-    }
   }
 
   proxy.udp = toBool(params["udp"]);

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

@@ -81,7 +81,7 @@ export default function Clash_Producer() {
                     proxy['preshared-key'] =
                         proxy['preshared-key'] ?? proxy['pre-shared-key'];
                     proxy['pre-shared-key'] = proxy['preshared-key'];
-                } else if (proxy.type === 'snell' && proxy.version < 3) {
+                } else if (proxy.type === 'snell') {
                     delete proxy.udp;
                 } else if (proxy.type === 'vless') {
                     if (isPresent(proxy, 'sni')) {

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

@@ -86,7 +86,7 @@ export default function ClashMeta_Producer() {
                     proxy['preshared-key'] =
                         proxy['preshared-key'] ?? proxy['pre-shared-key'];
                     proxy['pre-shared-key'] = proxy['preshared-key'];
-                } else if (proxy.type === 'snell' && proxy.version < 3) {
+                } else if (proxy.type === 'snell') {
                     delete proxy.udp;
                 } else if (proxy.type === 'vless') {
                     if (isPresent(proxy, 'sni')) {

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

@@ -249,7 +249,7 @@ export default function Egern_Producer() {
                         // sni: proxy.sni,
                         // skip_tls_verify: proxy['skip-cert-verify'],
                     };
-                } else if (proxy.type === 'snell' && proxy.version < 3) {
+                } else if (proxy.type === 'snell') {
                     delete proxy.udp;
                 } else if (proxy.type === 'vless') {
                     if (proxy.network === 'ws') {

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

@@ -15,9 +15,9 @@ export default function Loon_Producer() {
     const produce = (proxy, type, opts = {}) => {
         switch (proxy.type) {
             case 'ss':
-                return shadowsocks(proxy);
+                return shadowsocks(proxy, opts['include-unsupported-proxy']);
             case 'ssr':
-                return shadowsocksr(proxy);
+                return shadowsocksr(proxy, opts['include-unsupported-proxy']);
             case 'trojan':
                 return trojan(proxy);
             case 'vmess':
@@ -40,7 +40,7 @@ export default function Loon_Producer() {
     return { produce };
 }
 
-function shadowsocks(proxy) {
+function shadowsocks(proxy, includeUnsupportedProxy) {
     const result = new Result(proxy);
     if (
         ![
@@ -74,6 +74,8 @@ function shadowsocks(proxy) {
         `${proxy.name}=shadowsocks,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
     );
 
+    let isShadowTLS;
+
     // obfs
     if (isPresent(proxy, 'plugin')) {
         if (proxy.plugin === 'obfs') {
@@ -105,6 +107,7 @@ function shadowsocks(proxy) {
         );
         // udp-port
         result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
+        isShadowTLS = true;
     } else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
         const password = proxy['plugin-opts'].password;
         const host = proxy['plugin-opts'].host;
@@ -127,6 +130,7 @@ function shadowsocks(proxy) {
                 `,udp-port=${proxy['udp-port']}`,
                 'udp-port',
             );
+            isShadowTLS = true;
         }
     }
 
@@ -138,6 +142,11 @@ function shadowsocks(proxy) {
         result.append(`,udp=true`);
     }
 
+    if (!includeUnsupportedProxy && isShadowTLS) {
+        throw new Error(
+            `shadow-tls is not supported(请使用 includeUnsupportedProxy 参数)`,
+        );
+    }
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
     result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 
@@ -161,6 +170,8 @@ function shadowsocksr(proxy, includeUnsupportedProxy) {
     result.appendIfPresent(`,obfs=${proxy.obfs}`, 'obfs');
     result.appendIfPresent(`,obfs-param=${proxy['obfs-param']}`, 'obfs-param');
 
+    let isShadowTLS;
+
     // shadow-tls
     if (isPresent(proxy, 'shadow-tls-password')) {
         result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
@@ -175,6 +186,7 @@ function shadowsocksr(proxy, includeUnsupportedProxy) {
         );
         // udp-port
         result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
+        isShadowTLS = true;
     } else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
         const password = proxy['plugin-opts'].password;
         const host = proxy['plugin-opts'].host;
@@ -197,6 +209,7 @@ function shadowsocksr(proxy, includeUnsupportedProxy) {
                 `,udp-port=${proxy['udp-port']}`,
                 'udp-port',
             );
+            isShadowTLS = true;
         }
     }
 
@@ -208,6 +221,11 @@ function shadowsocksr(proxy, includeUnsupportedProxy) {
         result.append(`,udp=true`);
     }
 
+    if (!includeUnsupportedProxy && isShadowTLS) {
+        throw new Error(
+            `shadow-tls is not supported(请使用 includeUnsupportedProxy 参数)`,
+        );
+    }
     const ip_version = ipVersions[proxy['ip-version']] || proxy['ip-version'];
     result.appendIfPresent(`,ip-mode=${ip_version}`, 'ip-version');
 

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

@@ -102,7 +102,7 @@ export default function ShadowRocket_Producer() {
                     proxy['preshared-key'] =
                         proxy['preshared-key'] ?? proxy['pre-shared-key'];
                     proxy['pre-shared-key'] = proxy['preshared-key'];
-                } else if (proxy.type === 'snell' && proxy.version < 3) {
+                } else if (proxy.type === 'snell') {
                     delete proxy.udp;
                 } else if (proxy.type === 'vless') {
                     if (isPresent(proxy, 'sni')) {

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

@@ -187,7 +187,7 @@ export default function Stash_Producer() {
                     proxy['preshared-key'] =
                         proxy['preshared-key'] ?? proxy['pre-shared-key'];
                     proxy['pre-shared-key'] = proxy['preshared-key'];
-                } else if (proxy.type === 'snell' && proxy.version < 3) {
+                } else if (proxy.type === 'snell') {
                     delete proxy.udp;
                 } else if (proxy.type === 'vless') {
                     if (isPresent(proxy, 'sni')) {

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

@@ -149,7 +149,6 @@ export default function URI_Producer() {
                 const isReality = proxy['reality-opts'];
                 let sid = '';
                 let pbk = '';
-                let spx = '';
                 if (isReality) {
                     security = 'reality';
                     const publicKey = proxy['reality-opts']?.['public-key'];
@@ -160,10 +159,6 @@ export default function URI_Producer() {
                     if (shortId) {
                         sid = `&sid=${encodeURIComponent(shortId)}`;
                     }
-                    const spiderX = proxy['reality-opts']?.['_spider-x'];
-                    if (spiderX) {
-                        spx = `&spx=${encodeURIComponent(spiderX)}`;
-                    }
                 } else if (proxy.tls) {
                     security = 'tls';
                 }
@@ -194,12 +189,8 @@ export default function URI_Producer() {
                     flow = `&flow=${encodeURIComponent(proxy.flow)}`;
                 }
                 let extra = '';
-                if (proxy._extra) {
-                    extra = `&extra=${encodeURIComponent(proxy._extra)}`;
-                }
-                let mode = '';
-                if (proxy._mode) {
-                    mode = `&mode=${encodeURIComponent(proxy._mode)}`;
+                if (proxy.extra) {
+                    extra = `&extra=${encodeURIComponent(proxy.extra)}`;
                 }
                 let vlessType = proxy.network;
                 if (
@@ -267,7 +258,7 @@ export default function URI_Producer() {
                     proxy.port
                 }?security=${encodeURIComponent(
                     security,
-                )}${vlessTransport}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${spx}${pbk}${mode}${extra}#${encodeURIComponent(
+                )}${vlessTransport}${alpn}${allowInsecure}${sni}${fp}${flow}${sid}${pbk}${extra}#${encodeURIComponent(
                     proxy.name,
                 )}`;
                 break;
@@ -337,41 +328,11 @@ export default function URI_Producer() {
                             : proxy.alpn.join(','),
                     )}`;
                 }
-                const trojanIsReality = proxy['reality-opts'];
-                let trojanSid = '';
-                let trojanPbk = '';
-                let trojanSpx = '';
-                let trojanSecurity = '';
-                let trojanMode = '';
-                let trojanExtra = '';
-                if (trojanIsReality) {
-                    trojanSecurity = `&security=reality`;
-                    const publicKey = proxy['reality-opts']?.['public-key'];
-                    if (publicKey) {
-                        trojanPbk = `&pbk=${encodeURIComponent(publicKey)}`;
-                    }
-                    const shortId = proxy['reality-opts']?.['short-id'];
-                    if (shortId) {
-                        trojanSid = `&sid=${encodeURIComponent(shortId)}`;
-                    }
-                    const spiderX = proxy['reality-opts']?.['_spider-x'];
-                    if (spiderX) {
-                        trojanSpx = `&spx=${encodeURIComponent(spiderX)}`;
-                    }
-                    if (proxy._extra) {
-                        trojanExtra = `&extra=${encodeURIComponent(
-                            proxy._extra,
-                        )}`;
-                    }
-                    if (proxy._mode) {
-                        trojanMode = `&mode=${encodeURIComponent(proxy._mode)}`;
-                    }
-                }
                 result = `trojan://${proxy.password}@${proxy.server}:${
                     proxy.port
                 }?sni=${encodeURIComponent(proxy.sni || proxy.server)}${
                     proxy['skip-cert-verify'] ? '&allowInsecure=1' : ''
-                }${trojanTransport}${trojanAlpn}${trojanFp}${trojanSecurity}${trojanSid}${trojanPbk}${trojanSpx}${trojanMode}${trojanExtra}#${encodeURIComponent(
+                }${trojanTransport}${trojanAlpn}${trojanFp}#${encodeURIComponent(
                     proxy.name,
                 )}`;
                 break;