fix: 修复 sing-box 和 mihomo 的 ip-version

fix: 修复 sing-box shadowsocks+shadow-tls
feat: 节点本地内容支持 JSON5
2025-08-10 00:52:40 +00:00 · 2025-07-10 12:32:11 +08:00 · 2025-07-10 08:00:39 +08:00 · 2025-07-10 01:37:16 +08:00 · 2025-07-10 01:28:15 +08:00 · 2025-07-08 21:59:16 +08:00
11 changed files with 103 additions and 11 deletions
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.19.64",
+  "version": "2.19.73",
  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
  "main": "src/main.js",
  "scripts": {
--- a/backend/src/core/proxy-utils/parsers/index.js
+++ b/backend/src/core/proxy-utils/parsers/index.js
@@ -12,6 +12,7 @@ import getLoonParser from './peggy/loon';
 import getQXParser from './peggy/qx';
 import getTrojanURIParser from './peggy/trojan-uri';
 import $ from '@/core/app';
+import JSON5 from 'json5';

 import { Base64 } from 'js-base64';

@@ -1130,14 +1131,14 @@ function Clash_All() {
    const name = 'Clash Parser';
    const test = (line) => {
        try {
-            JSON.parse(line);
+            JSON5.parse(line);
        } catch (e) {
            return false;
        }
        return true;
    };
    const parse = (line) => {
-        const proxy = JSON.parse(line);
+        const proxy = JSON5.parse(line);
        if (
            ![
                'anytls',
--- a/backend/src/core/proxy-utils/processors/index.js
+++ b/backend/src/core/proxy-utils/processors/index.js
@@ -623,9 +623,11 @@ const DOMAIN_RESOLVERS = {
        const cached = resourceCache.get(id);
        if (!noCache && cached) return cached;
        const resp = await $.http.get({
-            url: `http://223.6.6.6/resolve?edns_client_subnet=${edns}/24&name=${encodeURIComponent(
-                domain,
-            )}&type=${type === 'IPv6' ? 'AAAA' : 'A'}&short=1`,
+            url: `http://223.6.6.6/resolve?edns_client_subnet=${edns}/${
+                isIPv4(edns) ? 24 : 56
+            }&name=${encodeURIComponent(domain)}&type=${
+                type === 'IPv6' ? 'AAAA' : 'A'
+            }&short=1`,
            headers: {
                accept: 'application/dns-json',
            },
--- a/backend/src/core/proxy-utils/producers/clash.js
+++ b/backend/src/core/proxy-utils/producers/clash.js
@@ -41,7 +41,7 @@ export default function Clash_Producer() {
                            'chacha20-ietf-poly1305',
                            'xchacha20-ietf-poly1305',
                        ].includes(proxy.cipher)) ||
-                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
+                    (proxy.type === 'snell' && proxy.version >= 4) ||
                    (proxy.type === 'vless' &&
                        (typeof proxy.flow !== 'undefined' ||
                            proxy['reality-opts']))
--- a/backend/src/core/proxy-utils/producers/clashmeta.js
+++ b/backend/src/core/proxy-utils/producers/clashmeta.js
@@ -1,12 +1,20 @@
 import { isPresent } from '@/core/proxy-utils/producers/utils';

+const ipVersions = {
+    dual: 'dual',
+    'v4-only': 'ipv4',
+    'v6-only': 'ipv6',
+    'prefer-v4': 'ipv4-prefer',
+    'prefer-v6': 'ipv6-prefer',
+};
+
 export default function ClashMeta_Producer() {
    const type = 'ALL';
    const produce = (proxies, type, opts = {}) => {
        const list = proxies
            .filter((proxy) => {
                if (opts['include-unsupported-proxy']) return true;
-                if (proxy.type === 'snell' && String(proxy.version) === '4') {
+                if (proxy.type === 'snell' && proxy.version >= 4) {
                    return false;
                } else if (['juicity'].includes(proxy.type)) {
                    return false;
@@ -242,6 +250,11 @@ export default function ClashMeta_Producer() {
                    delete proxy[`${proxy.network}-opts`]['_grpc-type'];
                    delete proxy[`${proxy.network}-opts`]['_grpc-authority'];
                }
+
+                if (proxy['ip-version']) {
+                    proxy['ip-version'] =
+                        ipVersions[proxy['ip-version']] || proxy['ip-version'];
+                }
                return proxy;
            });

--- a/backend/src/core/proxy-utils/producers/egern.js
+++ b/backend/src/core/proxy-utils/producers/egern.js
@@ -377,6 +377,23 @@ export default function Egern_Producer() {
                delete proxy.id;
                delete proxy.resolved;
                delete proxy['no-resolve'];
+
+                if (proxy.transport) {
+                    for (const key in proxy.transport) {
+                        if (
+                            Object.keys(proxy.transport[key]).length === 0 ||
+                            Object.values(proxy.transport[key]).every(
+                                (v) => v == null,
+                            )
+                        ) {
+                            delete proxy.transport[key];
+                        }
+                    }
+                    if (Object.keys(proxy.transport).length === 0) {
+                        delete proxy.transport;
+                    }
+                }
+
                if (type !== 'internal') {
                    for (const key in proxy) {
                        if (proxy[key] == null || /^_/i.test(key)) {
--- a/backend/src/core/proxy-utils/producers/shadowrocket.js
+++ b/backend/src/core/proxy-utils/producers/shadowrocket.js
@@ -7,7 +7,7 @@ export default function Shadowrocket_Producer() {
        const list = proxies
            .filter((proxy) => {
                if (opts['include-unsupported-proxy']) return true;
-                if (proxy.type === 'snell' && String(proxy.version) === '4') {
+                if (proxy.type === 'snell' && proxy.version >= 4) {
                    return false;
                } else if (['mieru'].includes(proxy.type)) {
                    return false;
--- a/backend/src/core/proxy-utils/producers/sing-box.js
+++ b/backend/src/core/proxy-utils/producers/sing-box.js
@@ -2,6 +2,26 @@ import ClashMeta_Producer from './clashmeta';
 import $ from '@/core/app';
 import { isIPv4, isIPv6 } from '@/utils';

+const ipVersions = {
+    ipv4: 'ipv4_only',
+    ipv6: 'ipv6_only',
+    'v4-only': 'ipv4_only',
+    'v6-only': 'ipv6_only',
+    'ipv4-prefer': 'prefer_ipv4',
+    'ipv6-prefer': 'prefer_ipv6',
+    'prefer-v4': 'prefer_ipv4',
+    'prefer-v6': 'prefer_ipv6',
+};
+
+const ipVersionParser = (proxy, parsedProxy) => {
+    const strategy = ipVersions[proxy['ip-version']];
+    if (proxy._dns_server && strategy) {
+        parsedProxy.domain_resolver = {
+            server: proxy._dns_server,
+            strategy,
+        };
+    }
+};
 const detourParser = (proxy, parsedProxy) => {
    parsedProxy.detour = proxy['dialer-proxy'] || proxy.detour;
 };
@@ -278,6 +298,7 @@ const sshParser = (proxy = {}) => {
    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

@@ -305,6 +326,7 @@ const httpParser = (proxy = {}) => {
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
    tlsParser(proxy, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

@@ -327,6 +349,7 @@ const socks5Parser = (proxy = {}) => {
    networkParser(proxy, parsedProxy);
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

@@ -338,6 +361,17 @@ const shadowTLSParser = (proxy = {}) => {
        password: proxy.password,
        detour: `${proxy.name}_shadowtls`,
    };
+    if (proxy.uot) ssPart.udp_over_tcp = true;
+    if (proxy['udp-over-tcp']) {
+        ssPart.udp_over_tcp = {
+            enabled: true,
+            version:
+                !proxy['udp-over-tcp-version'] ||
+                proxy['udp-over-tcp-version'] === 1
+                    ? 1
+                    : 2,
+        };
+    }
    const stPart = {
        tag: `${proxy.name}_shadowtls`,
        type: 'shadowtls',
@@ -360,6 +394,7 @@ const shadowTLSParser = (proxy = {}) => {
    tfoParser(proxy, stPart);
    detourParser(proxy, stPart);
    smuxParser(proxy.smux, ssPart);
+    ipVersionParser(proxy, stPart);
    return { type: 'ss-with-st', ssPart, stPart };
 };
 const ssParser = (proxy = {}) => {
@@ -389,6 +424,7 @@ const ssParser = (proxy = {}) => {
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    if (proxy.plugin) {
        const optArr = [];
        if (proxy.plugin === 'obfs') {
@@ -467,6 +503,7 @@ const ssrParser = (proxy = {}) => {
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

@@ -505,6 +542,7 @@ const vmessParser = (proxy = {}) => {
    detourParser(proxy, parsedProxy);
    tlsParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

@@ -521,7 +559,8 @@ const vlessParser = (proxy = {}) => {
        throw 'invalid port';
    if (proxy.xudp) parsedProxy.packet_encoding = 'xudp';
    if (proxy['fast-open']) parsedProxy.udp_fragment = true;
-    if (proxy.flow === 'xtls-rprx-vision') parsedProxy.flow = proxy.flow;
+    // if (['xtls-rprx-vision', ''].includes(proxy.flow)) parsedProxy.flow = proxy.flow;
+    if (proxy.flow != null) parsedProxy.flow = proxy.flow;
    if (proxy.network === 'ws') wsParser(proxy, parsedProxy);
    if (proxy.network === 'grpc') grpcParser(proxy, parsedProxy);
    networkParser(proxy, parsedProxy);
@@ -529,6 +568,7 @@ const vlessParser = (proxy = {}) => {
    detourParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
    tlsParser(proxy, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };
 const trojanParser = (proxy = {}) => {
@@ -550,6 +590,7 @@ const trojanParser = (proxy = {}) => {
    detourParser(proxy, parsedProxy);
    tlsParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };
 const hysteriaParser = (proxy = {}) => {
@@ -599,6 +640,7 @@ const hysteriaParser = (proxy = {}) => {
    detourParser(proxy, parsedProxy);
    tfoParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };
 const hysteria2Parser = (proxy = {}) => {
@@ -632,6 +674,7 @@ const hysteria2Parser = (proxy = {}) => {
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };
 const tuic5Parser = (proxy = {}) => {
@@ -663,6 +706,7 @@ const tuic5Parser = (proxy = {}) => {
    detourParser(proxy, parsedProxy);
    tlsParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };
 const anytlsParser = (proxy = {}) => {
@@ -685,6 +729,7 @@ const anytlsParser = (proxy = {}) => {
        );
    detourParser(proxy, parsedProxy);
    tlsParser(proxy, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

@@ -742,6 +787,7 @@ const wireguardParser = (proxy = {}) => {
    tfoParser(proxy, parsedProxy);
    detourParser(proxy, parsedProxy);
    smuxParser(proxy.smux, parsedProxy);
+    ipVersionParser(proxy, parsedProxy);
    return parsedProxy;
 };

--- a/backend/src/core/proxy-utils/producers/stash.js
+++ b/backend/src/core/proxy-utils/producers/stash.js
@@ -43,7 +43,7 @@ export default function Stash_Producer() {
                            '2022-blake3-aes-128-gcm',
                            '2022-blake3-aes-256-gcm',
                        ].includes(proxy.cipher)) ||
-                    (proxy.type === 'snell' && String(proxy.version) === '4') ||
+                    (proxy.type === 'snell' && proxy.version >= 4) ||
                    (proxy.type === 'vless' &&
                        proxy['reality-opts'] &&
                        !['xtls-rprx-vision'].includes(proxy.flow))
--- a/backend/src/vendor/open-api.js
+++ b/backend/src/vendor/open-api.js
@@ -484,6 +484,7 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                        url: options.url,
                        headers: options.headers,
                        body: options.body,
+                        autoTransformBody: false,
                        options: {
                            Proxy: options.proxy,
                            Timeout: options.timeout
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -151,6 +151,18 @@ function operator(proxies = [], targetPlatform, context) {
  // });
  // $server.sni = sni

+  // 示例: 从 config 文件中读取配置项并进行节点操作
+  // config 的本地内容为
+  // {
+  //   "reuse": false
+  // }
+  // 脚本操作为
+  // const config = (ProxyUtils.JSON5 || JSON).parse(await produceArtifact({
+  //     type: 'file',
+  //     name: 'config' // 文件名
+  // }))
+  // $server.reuse = config.reuse
+
  // 1. Surge 输出 WireGuard 完整配置

  // let proxies = await produceArtifact({
Author	SHA1	Message	Date
xream	17b12711b4	fix: 修复 sing-box 和 mihomo 的 ip-version	2025-07-10 12:32:11 +08:00
xream	c266635ba1	fix: 修复 sing-box shadowsocks+shadow-tls Some checks failed build / build (push) Has been cancelled Details	2025-07-10 08:00:39 +08:00
xream	f34eac9568	feat: 节点本地内容支持 JSON5	2025-07-10 01:37:16 +08:00
xream	aa5b51a3cc	feat: 放宽 sing-box VLESS flow 逻辑	2025-07-10 01:28:15 +08:00
xream	b8897dd94a	fix: 修复 Egern transport 兼容性 Some checks failed build / build (push) Has been cancelled Details	2025-07-08 21:59:16 +08:00
xream	71958e6bb1	doc: demo.js	2025-07-08 09:43:31 +08:00
xream	fa5f88ae85	fix: 修复 snell 版本过滤范围 Some checks failed build / build (push) Has been cancelled Details	2025-07-01 20:56:55 +08:00
xream	212aa7730d	fix: 修复阿里 httpdns edns Some checks failed build / build (push) Has been cancelled Details	2025-06-25 19:36:08 +08:00
xream	4c5c9baa3e	release: bump version Some checks failed build / build (push) Has been cancelled Details	2025-06-23 21:37:50 +08:00
xream	25dcbdc4dd	Merge pull request #460 from Ayideyia/master 适配下游客户端API	2025-06-23 21:37:24 +08:00
啊伊的伊阿	282780b791	适配下游客户端API	2025-06-23 21:33:49 +08:00