feat: 调整 Egern VMess 传输层

backend/package.json

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

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

@@ -6,6 +6,7 @@ import {
     isIPv4,
     isIPv6,
     isValidPortNumber,
+    isValidUUID,
     isNotBlank,
     ipAddress,
     getRandomPort,
@@ -21,6 +22,7 @@ import { findByName } from '@/utils/database';
 import { produceArtifact } from '@/restful/sync';
 import { getFlag, removeFlag, getISO, MMDB } from '@/utils/geo';
 import Gist from '@/utils/gist';
+import { isPresent } from './producers/utils';
 
 function preprocess(raw) {
     for (const processor of PROXY_PREPROCESSORS) {
@@ -75,7 +77,16 @@ function parse(raw) {
             $.error(`Failed to parse line: ${line}`);
         }
     }
-    return proxies;
+    return proxies.filter((proxy) => {
+        if (['vless', 'vmess'].includes(proxy.type)) {
+            const isProxyUUIDValid = isValidUUID(proxy.uuid);
+            if (!isProxyUUIDValid) {
+                $.error(`UUID is invalid: ${proxy.name} ${proxy.uuid}`);
+            }
+            return isProxyUUIDValid;
+        }
+        return true;
+    });
 }
 
 async function processFn(
@@ -214,10 +225,22 @@ function produce(proxies, targetPlatform, type, opts = {}) {
     );
 
     // filter unsupported proxies
-    proxies = proxies.filter(
-        (proxy) =>
-            !(proxy.supported && proxy.supported[targetPlatform] === false),
-    );
+    proxies = proxies.filter((proxy) => {
+        // 检查代理是否支持目标平台
+        if (proxy.supported && proxy.supported[targetPlatform] === false) {
+            return false;
+        }
+
+        // 对于 vless 和 vmess 代理,需要额外验证 UUID
+        if (['vless', 'vmess'].includes(proxy.type)) {
+            const isProxyUUIDValid = isValidUUID(proxy.uuid);
+            if (!isProxyUUIDValid)
+                $.error(`UUID is invalid: ${proxy.name} ${proxy.uuid}`);
+            return isProxyUUIDValid;
+        }
+
+        return true;
+    });
 
     proxies = proxies.map((proxy) => {
         proxy._resolved = proxy.resolved;
@@ -572,6 +595,20 @@ function lastParse(proxy) {
     if (!proxy['tls-fingerprint'] && caStr) {
         proxy['tls-fingerprint'] = rs.generateFingerprint(caStr);
     }
+    if (
+        ['shadowsocks'].includes(proxy.type) &&
+        isPresent(proxy, 'shadow-tls-password')
+    ) {
+        proxy.plugin = 'shadow-tls';
+        proxy['plugin-opts'] = {
+            host: proxy['shadow-tls-sni'],
+            password: proxy['shadow-tls-password'],
+            version: proxy['shadow-tls-version'],
+        };
+        delete proxy['shadow-tls-sni'];
+        delete proxy['shadow-tls-password'];
+        delete proxy['shadow-tls-version'];
+    }
     return proxy;
 }
 

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

@@ -128,6 +128,9 @@ function URI_SS() {
             }
             userInfoStr = content.split('@')[0];
             serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
+        } else if (content.includes('?')) {
+            const parsed = content.match(/(\?.*)$/);
+            query = parsed[1];
         }
 
         const serverAndPort = serverAndPortArray[1];

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

@@ -184,6 +184,7 @@ export default function Egern_Producer() {
                         websocket: proxy.websocket,
                     };
                 } else if (proxy.type === 'vmess') {
+                    // Egern：传输层，支持 ws/wss/http1/http2/tls，不配置则为 tcp
                     let security = proxy.cipher;
                     if (
                         security &&
@@ -212,7 +213,7 @@ export default function Egern_Producer() {
                         };
                     } else if (proxy.network === 'http') {
                         proxy.transport = {
-                            http: {
+                            http1: {
                                 method: proxy['http-opts']?.method,
                                 path: proxy['http-opts']?.path,
                                 headers: {
@@ -225,6 +226,21 @@ export default function Egern_Producer() {
                                 skip_tls_verify: proxy['skip-cert-verify'],
                             },
                         };
+                    } else if (proxy.network === 'h2') {
+                        proxy.transport = {
+                            http2: {
+                                method: proxy['h2-opts']?.method,
+                                path: proxy['h2-opts']?.path,
+                                headers: {
+                                    Host: Array.isArray(
+                                        proxy['h2-opts']?.headers?.Host,
+                                    )
+                                        ? proxy['h2-opts']?.headers?.Host[0]
+                                        : proxy['h2-opts']?.headers?.Host,
+                                },
+                                skip_tls_verify: proxy['skip-cert-verify'],
+                            },
+                        };
                     } else if (proxy.network === 'tcp' || !proxy.network) {
                         proxy.transport = {
                             [proxy.tls ? 'tls' : 'tcp']: {

backend/src/utils/index.js

@@ -117,7 +117,17 @@ function numberToString(value) {
         : BigInt(value).toString();
 }
 
+function isValidUUID(uuid) {
+    return (
+        typeof uuid === 'string' &&
+        /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
+            uuid,
+        )
+    );
+}
+
 export {
+    isValidUUID,
     ipAddress,
     isIPv4,
     isIPv6,