fix: 修复 TUIC URI

README.md

@@ -32,7 +32,7 @@ Core functionalities:
 
   example: `socks5+tls://user:pass@ip:port#name`
 
-- [x] URI(SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
+- [x] URI(SOCKS, SS, SSR, VMess, VLESS, Trojan, Hysteria, Hysteria 2, TUIC v5, WireGuard)
 - [x] Clash Proxies YAML
 - [x] Clash Proxy JSON(single line)
 - [x] QX (SS, SSR, VMess, Trojan, HTTP, SOCKS5, VLESS)

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.16.32",
+  "version": "2.16.45",
   "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

@@ -76,7 +76,46 @@ function URI_PROXY() {
     };
     return { name, test, parse };
 }
+function URI_SOCKS() {
+    const name = 'URI SOCKS Parser';
+    const test = (line) => {
+        return /^socks:\/\//.test(line);
+    };
+    const parse = (line) => {
+        // parse url
+        // eslint-disable-next-line no-unused-vars
+        let [__, type, auth, server, port, query, name] = line.match(
+            /^(socks)?:\/\/(?:(.*)@)?(.*?)(?::(\d+?))?(\?.*?)?(?:#(.*?))?$/,
+        );
+        if (port) {
+            port = parseInt(port, 10);
+        } else {
+            $.error(`port is not present in line: ${line}`);
+            throw new Error(`port is not present in line: ${line}`);
+        }
+        let username, password;
+        if (auth) {
+            const parsed = Base64.decode(decodeURIComponent(auth)).split(':');
+            username = parsed[0];
+            password = parsed[1];
+        }
 
+        const proxy = {
+            name:
+                name != null
+                    ? decodeURIComponent(name)
+                    : `${type} ${server}:${port}`,
+            type: 'socks5',
+            server,
+            port,
+            username,
+            password,
+        };
+
+        return proxy;
+    };
+    return { name, test, parse };
+}
 // Parse SS URI format (only supports new SIP002, legacy format is depreciated).
 // reference: https://github.com/shadowsocks/shadowsocks-org/wiki/SIP002-URI-Scheme
 function URI_SS() {
@@ -113,6 +152,7 @@ function URI_SS() {
                 query = parsed[2];
             }
             content = Base64.decode(content);
+
             if (query) {
                 if (/(&|\?)v2ray-plugin=/.test(query)) {
                     const parsed = query.match(/(&|\?)v2ray-plugin=(.*?)(&|$)/);
@@ -126,8 +166,11 @@ function URI_SS() {
                 }
                 content = `${content}${query}`;
             }
-            userInfoStr = content.split('@')[0];
-            serverAndPortArray = content.match(/@([^/]*)(\/|$)/);
+            userInfoStr = content.match(/(^.*)@/)?.[1];
+            serverAndPortArray = content.match(/@([^/@]*)(\/|$)/);
+        } else if (content.includes('?')) {
+            const parsed = content.match(/(\?.*)$/);
+            query = parsed[1];
         }
 
         const serverAndPort = serverAndPortArray[1];
@@ -796,8 +839,11 @@ function URI_TUIC() {
     const parse = (line) => {
         line = line.split(/tuic:\/\//)[1];
         // eslint-disable-next-line no-unused-vars
-        let [__, uuid, password, server, ___, port, ____, addons = '', name] =
-            /^(.*?):(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
+        let [__, auth, server, port, addons = '', name] =
+            /^(.*?)@(.*?)(?::(\d+))?\/?(?:\?(.*?))?(?:#(.*?))?$/.exec(line);
+        auth = decodeURIComponent(auth);
+        let [uuid, ...passwordParts] = auth.split(':');
+        let password = passwordParts.join(':');
         port = parseInt(`${port}`, 10);
         if (isNaN(port)) {
             port = 443;
@@ -819,12 +865,14 @@ function URI_TUIC() {
 
         for (const addon of addons.split('&')) {
             let [key, value] = addon.split('=');
-            key = key.replace(/_/, '-');
+            key = key.replace(/_/g, '-');
             value = decodeURIComponent(value);
             if (['alpn'].includes(key)) {
                 proxy[key] = value ? value.split(',') : undefined;
             } else if (['allow-insecure'].includes(key)) {
                 proxy['skip-cert-verify'] = /(TRUE)|1/i.test(value);
+            } else if (['fast-open'].includes(key)) {
+                proxy.tfo = true;
             } else if (['disable-sni', 'reduce-rtt'].includes(key)) {
                 proxy[key] = /(TRUE)|1/i.test(value);
             } else {
@@ -1464,6 +1512,7 @@ function isIP(ip) {
 
 export default [
     URI_PROXY(),
+    URI_SOCKS(),
     URI_SS(),
     URI_SSR(),
     URI_VMess(),

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

@@ -16,6 +16,7 @@ function Base64Encoded() {
     const keys = [
         'dm1lc3M', // vmess
         'c3NyOi8v', // ssr://
+        'c29ja3M6Ly', // socks://
         'dHJvamFu', // trojan
         'c3M6Ly', // ss:/
         'c3NkOi8v', // ssd://

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

@@ -365,7 +365,9 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
             if (output?.$file?.type === 'mihomoProfile') {
                 try {
                     let patch = YAML.safeLoad(script);
-                    if (typeof patch !== 'object') patch = {};
+                    // if (typeof patch !== 'object') patch = {};
+                    if (typeof patch !== 'object')
+                        throw new Error('patch is not an object');
                     output.$content = ProxyUtils.yaml.safeDump(
                         deepMerge(
                             {

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,9 +226,27 @@ export default function Egern_Producer() {
                                 skip_tls_verify: proxy['skip-cert-verify'],
                             },
                         };
-                    } else if (proxy.network === 'tcp' || !proxy.network) {
+                    } else if (proxy.network === 'h2') {
                         proxy.transport = {
-                            [proxy.tls ? 'tls' : 'tcp']: {
+                            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.tls
+                    ) {
+                        proxy.transport = {
+                            tls: {
                                 sni: proxy.tls ? proxy.sni : undefined,
                                 skip_tls_verify: proxy.tls
                                     ? proxy['skip-cert-verify']

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

@@ -27,6 +27,11 @@ export default function URI_Producer() {
             proxy.server = `[${proxy.server}]`;
         }
         switch (proxy.type) {
+            case 'socks5':
+                result = `socks://${encodeURIComponent(
+                    Base64.encode(`${proxy.username}:${proxy.password}`),
+                )}@${proxy.server}:${proxy.port}#${proxy.name}`;
+                break;
             case 'ss':
                 const userinfo = `${proxy.cipher}:${proxy.password}`;
                 result = `ss://${
@@ -516,10 +521,13 @@ export default function URI_Producer() {
                                 ['disable-sni', 'reduce-rtt'].includes(key) &&
                                 proxy[key]
                             ) {
-                                tuicParams.push(`${i}=1`);
+                                tuicParams.push(`${i.replace(/-/g, '_')}=1`);
                             } else if (proxy[key]) {
                                 tuicParams.push(
-                                    `${i}=${encodeURIComponent(proxy[key])}`,
+                                    `${i.replace(
+                                        /-/g,
+                                        '_',
+                                    )}=${encodeURIComponent(proxy[key])}`,
                                 );
                             }
                         }

backend/src/restful/collections.js

@@ -59,7 +59,18 @@ function getCollection(req, res) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_collection_${name}_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                day: 'numeric',
+                                month: 'numeric',
+                                hour: 'numeric',
+                                minute: 'numeric',
+                                second: 'numeric',
+                            })
+                            .replace(/\D/g, '')}.json`,
+                    )}"`,
                 )
                 .send(JSON.stringify(collection));
         } else {

backend/src/restful/file.js

@@ -209,7 +209,18 @@ function getWholeFile(req, res) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_file_${name}_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                day: 'numeric',
+                                month: 'numeric',
+                                hour: 'numeric',
+                                minute: 'numeric',
+                                second: 'numeric',
+                            })
+                            .replace(/\D/g, '')}.json`,
+                    )}"`,
                 )
                 .send(JSON.stringify(file));
         } else {

backend/src/restful/miscs.js

@@ -27,7 +27,18 @@ export default function register($app) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    'attachment; filename="sub-store.json"',
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_data_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                day: 'numeric',
+                                month: 'numeric',
+                                hour: 'numeric',
+                                minute: 'numeric',
+                                second: 'numeric',
+                            })
+                            .replace(/\D/g, '')}.json`,
+                    )}"`,
                 )
                 .send(
                     $.env.isNode

backend/src/restful/preview.js

@@ -15,46 +15,48 @@ export default function register($app) {
 async function previewFile(req, res) {
     try {
         const file = req.body;
-        let content;
-        if (
-            file.source === 'local' &&
-            !['localFirst', 'remoteFirst'].includes(file.mergeSources)
-        ) {
-            content = file.content;
-        } else {
-            const errors = {};
-            content = await Promise.all(
-                file.url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(url, file.ua);
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-
+        let content = '';
+        if (file.type !== 'mihomoProfile') {
             if (
-                !file.ignoreFailedRemoteFile &&
-                Object.keys(errors).length > 0
+                file.source === 'local' &&
+                !['localFirst', 'remoteFirst'].includes(file.mergeSources)
             ) {
-                throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
+                content = file.content;
+            } else {
+                const errors = {};
+                content = await Promise.all(
+                    file.url
+                        .split(/[\r\n]+/)
+                        .map((i) => i.trim())
+                        .filter((i) => i.length)
+                        .map(async (url) => {
+                            try {
+                                return await download(url, file.ua);
+                            } catch (err) {
+                                errors[url] = err;
+                                $.error(
+                                    `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
+                                );
+                                return '';
+                            }
+                        }),
                 );
-            }
-            if (file.mergeSources === 'localFirst') {
-                content.unshift(file.content);
-            } else if (file.mergeSources === 'remoteFirst') {
-                content.push(file.content);
+
+                if (
+                    !file.ignoreFailedRemoteFile &&
+                    Object.keys(errors).length > 0
+                ) {
+                    throw new Error(
+                        `文件 ${file.name} 的远程文件 ${Object.keys(
+                            errors,
+                        ).join(', ')} 发生错误, 请查看日志`,
+                    );
+                }
+                if (file.mergeSources === 'localFirst') {
+                    content.unshift(file.content);
+                } else if (file.mergeSources === 'remoteFirst') {
+                    content.push(file.content);
+                }
             }
         }
         // parse proxies

backend/src/restful/subscriptions.js

@@ -264,7 +264,18 @@ function getSubscription(req, res) {
             res.set('content-type', 'application/json')
                 .set(
                     'content-disposition',
-                    `attachment; filename="${encodeURIComponent(name)}.json"`,
+                    `attachment; filename="${encodeURIComponent(
+                        `sub-store_subscription_${name}_${new Date()
+                            .toLocaleString('zh-CN', {
+                                year: 'numeric',
+                                day: 'numeric',
+                                month: 'numeric',
+                                hour: 'numeric',
+                                minute: 'numeric',
+                                second: 'numeric',
+                            })
+                            .replace(/\D/g, '')}.json`,
+                    )}"`,
                 )
                 .send(JSON.stringify(sub));
         } else {

backend/src/restful/sync.js

@@ -410,105 +410,117 @@ async function produceArtifact({
         const allFiles = $.read(FILES_KEY);
         const file = findByName(allFiles, name);
         if (!file) throw new Error(`找不到文件 ${name}`);
-        let raw;
-        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
-            raw = content;
-        } else if (url) {
-            const errors = {};
-            raw = await Promise.all(
-                url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(
-                                url,
-                                ua || file.ua,
-                                undefined,
-                                file.proxy || proxy,
-                                undefined,
-                                undefined,
-                                noCache,
-                            );
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
+        let raw = '';
+        console.log(file);
+        if (file.type !== 'mihomoProfile') {
             if (
-                ignoreFailedRemoteFile != null &&
-                ignoreFailedRemoteFile !== ''
+                content &&
+                !['localFirst', 'remoteFirst'].includes(mergeSources)
             ) {
-                fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
-            }
-            if (!fileIgnoreFailedRemoteFile && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
+                raw = content;
+            } else if (url) {
+                const errors = {};
+                raw = await Promise.all(
+                    url
+                        .split(/[\r\n]+/)
+                        .map((i) => i.trim())
+                        .filter((i) => i.length)
+                        .map(async (url) => {
+                            try {
+                                return await download(
+                                    url,
+                                    ua || file.ua,
+                                    undefined,
+                                    file.proxy || proxy,
+                                    undefined,
+                                    undefined,
+                                    noCache,
+                                );
+                            } catch (err) {
+                                errors[url] = err;
+                                $.error(
+                                    `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
+                                );
+                                return '';
+                            }
+                        }),
                 );
-            }
-            if (mergeSources === 'localFirst') {
-                raw.unshift(content);
-            } else if (mergeSources === 'remoteFirst') {
-                raw.push(content);
-            }
-        } else if (
-            file.source === 'local' &&
-            !['localFirst', 'remoteFirst'].includes(file.mergeSources)
-        ) {
-            raw = file.content;
-        } else {
-            const errors = {};
-            raw = await Promise.all(
-                file.url
-                    .split(/[\r\n]+/)
-                    .map((i) => i.trim())
-                    .filter((i) => i.length)
-                    .map(async (url) => {
-                        try {
-                            return await download(
-                                url,
-                                ua || file.ua,
-                                undefined,
-                                file.proxy || proxy,
-                                undefined,
-                                undefined,
-                                noCache,
-                            );
-                        } catch (err) {
-                            errors[url] = err;
-                            $.error(
-                                `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
-                            );
-                            return '';
-                        }
-                    }),
-            );
-            let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
-            if (
-                ignoreFailedRemoteFile != null &&
-                ignoreFailedRemoteFile !== ''
+                let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
+                if (
+                    ignoreFailedRemoteFile != null &&
+                    ignoreFailedRemoteFile !== ''
+                ) {
+                    fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
+                }
+                if (
+                    !fileIgnoreFailedRemoteFile &&
+                    Object.keys(errors).length > 0
+                ) {
+                    throw new Error(
+                        `文件 ${file.name} 的远程文件 ${Object.keys(
+                            errors,
+                        ).join(', ')} 发生错误, 请查看日志`,
+                    );
+                }
+                if (mergeSources === 'localFirst') {
+                    raw.unshift(content);
+                } else if (mergeSources === 'remoteFirst') {
+                    raw.push(content);
+                }
+            } else if (
+                file.source === 'local' &&
+                !['localFirst', 'remoteFirst'].includes(file.mergeSources)
             ) {
-                fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
-            }
-            if (!fileIgnoreFailedRemoteFile && Object.keys(errors).length > 0) {
-                throw new Error(
-                    `文件 ${file.name} 的远程文件 ${Object.keys(errors).join(
-                        ', ',
-                    )} 发生错误, 请查看日志`,
+                raw = file.content;
+            } else {
+                const errors = {};
+                raw = await Promise.all(
+                    file.url
+                        .split(/[\r\n]+/)
+                        .map((i) => i.trim())
+                        .filter((i) => i.length)
+                        .map(async (url) => {
+                            try {
+                                return await download(
+                                    url,
+                                    ua || file.ua,
+                                    undefined,
+                                    file.proxy || proxy,
+                                    undefined,
+                                    undefined,
+                                    noCache,
+                                );
+                            } catch (err) {
+                                errors[url] = err;
+                                $.error(
+                                    `文件 ${file.name} 的远程文件 ${url} 发生错误: ${err}`,
+                                );
+                                return '';
+                            }
+                        }),
                 );
-            }
-            if (file.mergeSources === 'localFirst') {
-                raw.unshift(file.content);
-            } else if (file.mergeSources === 'remoteFirst') {
-                raw.push(file.content);
+                let fileIgnoreFailedRemoteFile = file.ignoreFailedRemoteFile;
+                if (
+                    ignoreFailedRemoteFile != null &&
+                    ignoreFailedRemoteFile !== ''
+                ) {
+                    fileIgnoreFailedRemoteFile = ignoreFailedRemoteFile;
+                }
+                if (
+                    !fileIgnoreFailedRemoteFile &&
+                    Object.keys(errors).length > 0
+                ) {
+                    throw new Error(
+                        `文件 ${file.name} 的远程文件 ${Object.keys(
+                            errors,
+                        ).join(', ')} 发生错误, 请查看日志`,
+                    );
+                }
+                if (file.mergeSources === 'localFirst') {
+                    raw.unshift(file.content);
+                } else if (file.mergeSources === 'remoteFirst') {
+                    raw.push(file.content);
+                }
             }
         }
         const files = (Array.isArray(raw) ? raw : [raw]).flat();

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}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/.test(
+            uuid,
+        )
+    );
+}
+
 export {
+    isValidUUID,
     ipAddress,
     isIPv4,
     isIPv6,