feat: geo 更新

feat: UDP 协议跳过设置 utls
doc: demo.js
2026-03-28 01:13:18 +08:00 · 2024-12-26 03:40:53 +08:00 · 2024-12-24 21:43:23 +08:00 · 2024-12-24 20:49:41 +08:00 · 2024-12-24 15:10:38 +08:00 · 2024-12-24 15:08:28 +08:00
12 changed files with 151 additions and 18 deletions
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Core functionalities:
 - [x] Loon (SS, SSR, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard, VLESS, Hysteria 2)
 - [x] Surge (Direct, SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, TUIC, Snell, Hysteria 2, SSH(Password authentication only), External Proxy Program(only for macOS), WireGuard(Surge to Surge))
 - [x] Surfboard (SS, VMess, Trojan, HTTP, SOCKS5, SOCKS5-TLS, WireGuard(Surfboard to Surfboard))
- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC)
+- [x] Clash.Meta (Direct, SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, Hysteria 2, TUIC, SSH, mieru)
 - [x] Stash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard, Hysteria, TUIC, Juicity, SSH)
 - [x] Clash (SS, SSR, VMess, Trojan, HTTP, SOCKS5, Snell, VLESS, WireGuard)

--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.14.446",
+  "version": "2.14.452",
  "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
@@ -929,6 +929,8 @@ function Clash_All() {
        const proxy = JSON.parse(line);
        if (
            ![
+                'mieru',
+                'juicity',
                'ss',
                'ssr',
                'vmess',
--- a/backend/src/core/proxy-utils/producers/clashmeta.js
+++ b/backend/src/core/proxy-utils/producers/clashmeta.js
@@ -8,6 +8,8 @@ export default function ClashMeta_Producer() {
                if (opts['include-unsupported-proxy']) return true;
                if (proxy.type === 'snell' && String(proxy.version) === '4') {
                    return false;
+                } else if (['juicity'].includes(proxy.type)) {
+                    return false;
                }
                return true;
            })
--- a/backend/src/core/proxy-utils/producers/shadowrocket.js
+++ b/backend/src/core/proxy-utils/producers/shadowrocket.js
@@ -8,6 +8,8 @@ export default function ShadowRocket_Producer() {
                if (opts['include-unsupported-proxy']) return true;
                if (proxy.type === 'snell' && String(proxy.version) === '4') {
                    return false;
+                } else if (['mieru'].includes(proxy.type)) {
+                    return false;
                }
                return true;
            })
--- a/backend/src/core/proxy-utils/producers/sing-box.js
+++ b/backend/src/core/proxy-utils/producers/sing-box.js
@@ -214,7 +214,11 @@ const tlsParser = (proxy, parsedProxy) => {
                proxy['reality-opts']['short-id'];
        parsedProxy.tls.utls = { enabled: true };
    }
-    if (proxy['client-fingerprint'] && proxy['client-fingerprint'] !== '')
+    if (
+        !['hysteria', 'hysteria2', 'tuic'].includes(proxy.type) &&
+        proxy['client-fingerprint'] &&
+        proxy['client-fingerprint'] !== ''
+    )
        parsedProxy.tls.utls = {
            enabled: true,
            fingerprint: proxy['client-fingerprint'],
--- a/backend/src/restful/download.js
+++ b/backend/src/restful/download.js
@@ -213,9 +213,29 @@ async function downloadSubscription(req, res) {
                }
            }
            if (sub.subUserinfo) {
+                let subUserInfo;
+                if (/^https?:\/\//.test(sub.subUserinfo)) {
+                    try {
+                        subUserInfo = await getFlowHeaders(
+                            undefined,
+                            undefined,
+                            undefined,
+                            proxy || sub.proxy,
+                            sub.subUserinfo,
+                        );
+                    } catch (e) {
+                        $.error(
+                            `订阅 ${name} 使用自定义流量链接 ${
+                                sub.subUserinfo
+                            } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
+                        );
+                    }
+                } else {
+                    subUserInfo = sub.subUserinfo;
+                }
                res.set(
                    'subscription-userinfo',
-                    [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),
+                    [subUserInfo, flowInfo].filter((i) => i).join('; '),
                );
            }

@@ -255,7 +275,7 @@ async function downloadSubscription(req, res) {
            );
        }
    } else {
-        $.error(`🌍 Sub-Store 下载订阅失败`, `❌ 未找到订阅：${name}！`);
+        $.error(`🌍 Sub-Store 下载订阅失败\n❌ 未找到订阅：${name}！`);
        failed(
            res,
            new ResourceNotFoundError(
@@ -355,13 +375,12 @@ async function downloadCollection(req, res) {
                proxy,
                noCache,
            });
-
+            let subUserInfoOfSub;
            // forward flow header from the first subscription in this collection
            const allSubs = $.read(SUBS_KEY);
            const subnames = collection.subscriptions;
            if (subnames.length > 0) {
                const sub = findByName(allSubs, subnames[0]);
-                let flowInfo;
                if (
                    sub.source !== 'local' ||
                    ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
@@ -395,16 +414,13 @@ async function downloadCollection(req, res) {
                            }
                        }
                        if (!$arguments.noFlow) {
-                            flowInfo = await getFlowHeaders(
+                            subUserInfoOfSub = await getFlowHeaders(
                                $arguments?.insecure ? `${url}#insecure` : url,
                                $arguments.flowUserAgent,
                                undefined,
                                proxy || sub.proxy || collection.proxy,
                                $arguments.flowUrl,
                            );
-                            if (flowInfo) {
-                                res.set('subscription-userinfo', flowInfo);
-                            }
                        }
                    } catch (err) {
                        $.error(
@@ -415,13 +431,61 @@ async function downloadCollection(req, res) {
                    }
                }
                if (sub.subUserinfo) {
-                    res.set(
-                        'subscription-userinfo',
-                        [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),
-                    );
+                    let subUserInfo;
+                    if (/^https?:\/\//.test(sub.subUserinfo)) {
+                        try {
+                            subUserInfo = await getFlowHeaders(
+                                undefined,
+                                undefined,
+                                undefined,
+                                proxy || sub.proxy,
+                                sub.subUserinfo,
+                            );
+                        } catch (e) {
+                            $.error(
+                                `组合订阅 ${name} 使用自定义流量链接 ${
+                                    sub.subUserinfo
+                                } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
+                            );
+                        }
+                    } else {
+                        subUserInfo = sub.subUserinfo;
+                    }
+                    subUserInfoOfSub = [subUserInfo, subUserInfoOfSub]
+                        .filter((i) => i)
+                        .join('; ');
                }
            }

+            $.info(`组合订阅 ${name} 透传的的流量信息: ${subUserInfoOfSub}`);
+
+            let subUserInfoOfCol;
+            if (/^https?:\/\//.test(collection.subUserinfo)) {
+                try {
+                    subUserInfoOfCol = await getFlowHeaders(
+                        undefined,
+                        undefined,
+                        undefined,
+                        proxy || collection.proxy,
+                        collection.subUserinfo,
+                    );
+                } catch (e) {
+                    $.error(
+                        `组合订阅 ${name} 使用自定义流量链接 ${
+                            collection.subUserinfo
+                        } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
+                    );
+                }
+            } else {
+                subUserInfoOfCol = collection.subUserinfo;
+            }
+            res.set(
+                'subscription-userinfo',
+                [subUserInfoOfCol, subUserInfoOfSub]
+                    .filter((i) => i)
+                    .join('; '),
+            );
+
            if (platform === 'JSON') {
                if (resultFormat === 'nezha') {
                    output = nezhaTransform(output);
--- a/backend/src/restful/file.js
+++ b/backend/src/restful/file.js
@@ -179,7 +179,7 @@ async function getFile(req, res) {
            );
        }
    } else {
-        $.error(`🌍 Sub-Store 下载文件失败`, `❌ 未找到文件：${name}！`);
+        $.error(`🌍 Sub-Store 下载文件失败\n❌ 未找到文件：${name}！`);
        failed(
            res,
            new ResourceNotFoundError(
--- a/backend/src/restful/subscriptions.js
+++ b/backend/src/restful/subscriptions.js
@@ -57,9 +57,29 @@ async function getFlowInfo(req, res) {
        !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
    ) {
        if (sub.subUserinfo) {
+            let subUserInfo;
+            if (/^https?:\/\//.test(sub.subUserinfo)) {
+                try {
+                    subUserInfo = await getFlowHeaders(
+                        undefined,
+                        undefined,
+                        undefined,
+                        sub.proxy,
+                        sub.subUserinfo,
+                    );
+                } catch (e) {
+                    $.error(
+                        `订阅 ${name} 使用自定义流量链接 ${
+                            sub.subUserinfo
+                        } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
+                    );
+                }
+            } else {
+                subUserInfo = sub.subUserinfo;
+            }
            try {
                success(res, {
-                    ...parseFlowHeaders(sub.subUserinfo),
+                    ...parseFlowHeaders(subUserInfo),
                });
            } catch (e) {
                $.error(
@@ -149,9 +169,29 @@ async function getFlowInfo(req, res) {
                startDate: $arguments.startDate,
                cycleDays: $arguments.cycleDays,
            });
+            let subUserInfo;
+            if (/^https?:\/\//.test(sub.subUserinfo)) {
+                try {
+                    subUserInfo = await getFlowHeaders(
+                        undefined,
+                        undefined,
+                        undefined,
+                        sub.proxy,
+                        sub.subUserinfo,
+                    );
+                } catch (e) {
+                    $.error(
+                        `订阅 ${name} 使用自定义流量链接 ${
+                            sub.subUserinfo
+                        } 获取流量信息时发生错误: ${JSON.stringify(e)}`,
+                    );
+                }
+            } else {
+                subUserInfo = sub.subUserinfo;
+            }
            const result = {
                ...parseFlowHeaders(
-                    [sub.subUserinfo, flowHeaders].filter((i) => i).join('; '),
+                    [subUserInfo, flowHeaders].filter((i) => i).join('; '),
                ),
            };
            if (remainingDays != null) {
--- a/backend/src/utils/flow.js
+++ b/backend/src/utils/flow.js
@@ -167,6 +167,9 @@ export async function getFlowHeaders(
                flowInfo = getFlowField(headers);
            }
        }
+        if (flowInfo) {
+            flowInfo = flowInfo.trim();
+        }
        if (flowInfo) {
            headersResourceCache.set(id, flowInfo);
        }
--- a/backend/src/utils/geo.js
+++ b/backend/src/utils/geo.js
@@ -17,6 +17,7 @@ const ISOFlags = {
    '🇧🇪': ['BE', 'BEL'],
    '🇧🇬': ['BG', 'BGR'],
    '🇧🇭': ['BH', 'BHR'],
+    '🇧🇴': ['BO', 'BOL'],
    '🇧🇷': ['BR', 'BRA'],
    '🇧🇾': ['BY', 'BLR'],
    '🇨🇦': ['CA', 'CAN'],
@@ -38,6 +39,7 @@ const ISOFlags = {
    '🇬🇧': ['GB', 'GBR', 'UK'],
    '🇬🇪': ['GE', 'GEO'],
    '🇬🇷': ['GR', 'GRC'],
+    '🇬🇹': ['GT', 'GTM'],
    '🇭🇰': ['HK', 'HKG', 'HKT', 'HKBN', 'HGC', 'WTT', 'CMI'],
    '🇭🇷': ['HR', 'HRV'],
    '🇭🇺': ['HU', 'HUN'],
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -165,6 +165,20 @@ function operator(proxies = [], targetPlatform, context) {

  // 若不存在 `source._collection`, 说明输出结果为单条订阅, 脚本设置在此单条订阅上

+  // 这个历史遗留原因, 是有点复杂. 提供一个例子, 用来取当前脚本所在的组合订阅或单条订阅名称
+
+  // let name = ''
+  // for (const [key, value] of Object.entries(env.source)) {
+  //   if (!key.startsWith('_')) {
+  //     name = value.displayName || value.name
+  //     break
+  //   }
+  // }
+  // if (!name) {
+  //   const collection = env.source._collection
+  //   name = collection.displayName || collection.name
+  // }
+
  // 1. 输出单条订阅 sub-1 时, 该单条订阅中的脚本上下文为:
  // {
  //   "source": {
Author	SHA1	Message	Date
xream	e843aa3702	feat: geo 更新	2024-12-26 03:40:53 +08:00
xream	66464645f2	feat: UDP 协议跳过设置 utls	2024-12-24 21:43:23 +08:00
xream	9ccd6b3816	doc: demo.js	2024-12-24 20:49:41 +08:00
xream	74be1e3d82	doc: README	2024-12-24 15:10:38 +08:00
xream	6d78eb7356	feat: Clash 系输入支持 mieru; 调整 juicity 和 mieru 相关过滤逻辑	2024-12-24 15:08:28 +08:00
xream	38eccca8b4	feat: 组合订阅支持手动设置流量信息. 支持使用链接. 此时使用响应内容	2024-12-24 01:20:38 +08:00
xream	33e5aeceb5	fix: 修复订阅不存在时不打印错误日志的问题	2024-12-23 14:14:10 +08:00
xream	837667edc9	feat: 手动设置流量信息时, 支持使用链接. 此时使用响应内容	2024-12-22 21:57:01 +08:00