feat: 流量单位显示由 EB 提升到 YB

chore: 调整部分日志
feat: 处理传入 httpClient 的 timeout 参数
2025-08-10 00:52:40 +00:00 · 2024-03-25 03:50:47 +08:00 · 2024-03-25 02:47:06 +08:00 · 2024-03-24 07:28:16 +08:00 · 2024-03-21 20:07:24 +08:00 · 2024-03-21 02:37:21 +08:00
13 changed files with 91 additions and 39 deletions
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sub-store",
-  "version": "2.14.258",
+  "version": "2.14.265",
  "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
  "main": "src/main.js",
  "scripts": {
--- a/backend/src/core/proxy-utils/index.js
+++ b/backend/src/core/proxy-utils/index.js
@@ -159,7 +159,7 @@ async function processFn(proxies, operators = [], targetPlatform, source) {
            continue;
        }

-        $.info(
+        $.log(
            `Applying "${item.type}" with arguments:\n >>> ${
                JSON.stringify(item.args, null, 2) || 'None'
            }`,
@@ -199,7 +199,7 @@ function produce(proxies, targetPlatform, type, opts = {}) {
        return proxy;
    });

-    $.info(`Producing proxies for target: ${targetPlatform}`);
+    $.log(`Producing proxies for target: ${targetPlatform}`);
    if (typeof producer.type === 'undefined' || producer.type === 'SINGLE') {
        let localPort = 10000;
        const list = proxies
--- a/backend/src/core/proxy-utils/parsers/index.js
+++ b/backend/src/core/proxy-utils/parsers/index.js
@@ -547,6 +547,7 @@ function URI_Hysteria2() {
            proxy.obfs = params.obfs;
        }

+        proxy.ports = params.mport;
        proxy['obfs-password'] = params['obfs-password'];
        proxy['skip-cert-verify'] = /(TRUE)|1/i.test(params.insecure);
        proxy.tfo = /(TRUE)|1/i.test(params.fastopen);
--- a/backend/src/core/proxy-utils/producers/uri.js
+++ b/backend/src/core/proxy-utils/producers/uri.js
@@ -274,6 +274,9 @@ export default function URI_Producer() {
                        `sni=${encodeURIComponent(proxy.sni)}`,
                    );
                }
+                if (proxy.ports) {
+                    hysteria2params.push(`mport=${proxy.ports}`);
+                }
                if (proxy['tls-fingerprint']) {
                    hysteria2params.push(
                        `pinSHA256=${encodeURIComponent(
--- a/backend/src/restful/miscs.js
+++ b/backend/src/restful/miscs.js
@@ -3,6 +3,8 @@ import { ENV } from '@/vendor/open-api';
 import { failed, success } from '@/restful/response';
 import { updateArtifactStore, updateAvatar } from '@/restful/settings';
 import resourceCache from '@/utils/resource-cache';
+import scriptResourceCache from '@/utils/script-resource-cache';
+import headersResourceCache from '@/utils/headers-resource-cache';
 import {
    GIST_BACKUP_FILE_NAME,
    GIST_BACKUP_KEY,
@@ -73,6 +75,8 @@ async function refresh(_, res) {

    // 2. clear resource cache
    resourceCache.revokeAll();
+    scriptResourceCache.revokeAll();
+    headersResourceCache.revokeAll();
    success(res);
 }

@@ -153,11 +157,14 @@ async function gistBackup(req, res) {
            }
            success(res);
        } catch (err) {
+            $.error(
+                `Failed to ${action} gist data.\nReason: ${err.message ?? err}`,
+            );
            failed(
                res,
                new InternalServerError(
                    'BACKUP_FAILED',
-                    `Failed to ${action} data to gist!`,
+                    `Failed to ${action} gist data!`,
                    `Reason: ${err.message ?? err}`,
                ),
            );
--- a/backend/src/utils/flow.js
+++ b/backend/src/utils/flow.js
@@ -138,10 +138,10 @@ export function parseFlowHeaders(flowHeaders) {
    return { expires, total, usage: { upload, download } };
 }
 export function flowTransfer(flow, unit = 'B') {
-    const unitList = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'];
+    const unitList = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
    let unitIndex = unitList.indexOf(unit);

-    return flow < 1024
+    return flow < 1024 || unitIndex === unitList.length - 1
        ? { value: flow.toFixed(1), unit: unit }
        : flowTransfer(flow / 1024, unitList[++unitIndex]);
 }
--- a/backend/src/vendor/open-api.js
+++ b/backend/src/vendor/open-api.js
@@ -323,36 +323,46 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                const request = isNode
                    ? eval("require('request')")
                    : $httpClient;
-                request[method.toLowerCase()](
-                    JSON.parse(JSON.stringify(options)),
-                    (err, response, body) => {
-                        // if (err) {
-                        //     console.log(err);
-                        // } else {
-                        //     console.log({
-                        //         statusCode:
-                        //             response.status || response.statusCode,
-                        //         headers: response.headers,
-                        //         body,
-                        //     });
-                        // }
+                const opts = JSON.parse(JSON.stringify(options));
+                if (!isNode && opts.timeout) {
+                    opts.timeout++;
+                    let unit = 'ms';
+                    // 这些客户端单位为 s
+                    if (isSurge || isStash || isShadowRocket) {
+                        opts.timeout = Math.ceil(opts.timeout / 1000);
+                        unit = 's';
+                    }
+                    // Loon 为 ms
+                    // console.log(`[httpClient timeout] ${opts.timeout}${unit}`);
+                }
+                request[method.toLowerCase()](opts, (err, response, body) => {
+                    // if (err) {
+                    //     console.log(err);
+                    // } else {
+                    //     console.log({
+                    //         statusCode:
+                    //             response.status || response.statusCode,
+                    //         headers: response.headers,
+                    //         body,
+                    //     });
+                    // }

-                        if (err) reject(err);
-                        else
-                            resolve({
-                                statusCode:
-                                    response.status || response.statusCode,
-                                headers: response.headers,
-                                body,
-                            });
-                    },
-                );
+                    if (err) reject(err);
+                    else
+                        resolve({
+                            statusCode: response.status || response.statusCode,
+                            headers: response.headers,
+                            body,
+                        });
+                });
            });
        }

        let timeoutid;
+
        const timer = timeout
            ? new Promise((_, reject) => {
+                  //   console.log(`[request timeout] ${timeout}ms`);
                  timeoutid = setTimeout(() => {
                      events.onTimeout();
                      return reject(
--- a/config/Loon.plugin
+++ b/config/Loon.plugin
@@ -17,4 +17,4 @@ hostname=sub.store
 http-request ^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))) script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js, requires-body=true, timeout=120, tag=Sub-Store Core
 http-request ^https?:\/\/sub\.store script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js, requires-body=true, timeout=120, tag=Sub-Store Simple

-cron "55 23 * * *" script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, tag=Sub-Store Sync
+cron "55 23 * * *" script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js, timeout=120, tag=Sub-Store Sync
--- a/config/Surge-Beta.sgmodule
+++ b/config/Surge-Beta.sgmodule
@@ -10,6 +10,6 @@ hostname = %APPEND% sub.store
 [Script]
 Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120,ability="{{{ability}}}"

-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
+Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true,timeout=120

 {{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
--- a/config/Surge-Noability.sgmodule
+++ b/config/Surge-Noability.sgmodule
@@ -8,6 +8,6 @@ hostname = %APPEND% sub.store
 [Script]
 # 主程序 已经去掉 Sub-Store Core 的参数 [,ability=http-client-policy] 不会爆内存，这个参数在 Surge 非常占用内存； 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 则可以使用此脚本
 Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
+Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true,timeout=120

 Sub-Store Sync=type=cron,cronexp=55 23 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
--- a/config/Surge-ability.sgmodule
+++ b/config/Surge-ability.sgmodule
@@ -7,6 +7,6 @@ hostname = %APPEND% sub.store

 [Script]
 Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120,ability=http-client-policy
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
+Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true,timeout=120

 Sub-Store Sync=type=cron,cronexp=55 23 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
--- a/config/Surge.sgmodule
+++ b/config/Surge.sgmodule
@@ -7,6 +7,6 @@ hostname = %APPEND% sub.store

 [Script]
 Sub-Store Core=type=http-request,pattern=^https?:\/\/sub\.store\/((download)|api\/(preview|sync|(utils\/node-info))),script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-1.min.js,requires-body=true,timeout=120
-Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true
+Sub-Store Simple=type=http-request,pattern=^https?:\/\/sub\.store,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/sub-store-0.min.js,requires-body=true,timeout=120

 Sub-Store Sync=type=cron,cronexp=55 23 * * *,wake-system=1,timeout=120,script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -22,6 +22,9 @@ function operator(proxies = [], targetPlatform, context) {
  
  // scriptResourceCache 缓存
  // 可参考 https://t.me/zhetengsha/1003
+  // const cache = scriptResourceCache
+  // cache.set(id, data)
+  // cache.get(id)

  // ProxyUtils 为节点处理工具
  // 可参考 https://t.me/zhetengsha/1066
@@ -35,6 +38,13 @@ function operator(proxies = [], targetPlatform, context) {
  //     yaml, // yaml 解析和生成
  // }

+  // 示例: 从 sni 文件中读取内容并进行节点操作
+  // const sni = await produceArtifact({
+  //     type: 'file',
+  //     name: 'sni' // 文件名
+  // });
+  // $server.sni = sni
+
  // 1. Surge 输出 WireGuard 完整配置

  // let proxies = await produceArtifact({
@@ -49,7 +59,10 @@ function operator(proxies = [], targetPlatform, context) {
  
  // 2. sing-box

-  // 但是一般不需要这样用, 可参考 1. https://t.me/zhetengsha/1111 和 2. https://t.me/zhetengsha/1070
+  // 但是一般不需要这样用, 可参考
+  // 1. https://t.me/zhetengsha/1111
+  // 2. https://t.me/zhetengsha/1070
+  // 3. https://t.me/zhetengsha/1241

  // let singboxProxies = await produceArtifact({
  //     type: 'subscription', // type: 'subscription' 或 'collection'
@@ -63,24 +76,42 @@ function operator(proxies = [], targetPlatform, context) {

  // 3. clash.meta

-  // 但是一般不需要这样用, 可参考 1. https://t.me/zhetengsha/1111 和 2. https://t.me/zhetengsha/1070
+  // 但是一般不需要这样用, 可参考
+  // 1. https://t.me/zhetengsha/1111
+  // 2. https://t.me/zhetengsha/1070
+  // 3. https://t.me/zhetengsha/1234

  // let clashMetaProxies = await produceArtifact({
  //     type: 'subscription',
  //     name: 'sub',
  //     platform: 'ClashMeta',
  //     produceType: 'internal' // 'internal' produces an Array, otherwise produces a String( ProxyUtils.yaml.safeLoad('YAML String').proxies )
-  // }))
+  // })

  // // YAML
+  // ProxyUtils.yaml.load('YAML String')
+  // ProxyUtils.yaml.safeLoad('YAML String')
  // $content = ProxyUtils.yaml.safeDump({})
+  // $content = ProxyUtils.yaml.dump({})
+
+  // 一个往文件里插入本地节点的例子:
+  // const yaml = ProxyUtils.yaml.safeLoad($content ?? $files[0])
+  // let clashMetaProxies = await produceArtifact({
+  //     type: 'collection',
+  //     name: '机场',
+  //     platform: 'ClashMeta',
+  //     produceType: 'internal'
+  // })
+  // yaml.proxies.unshift(...clashMetaProxies)
+  // $content = ProxyUtils.yaml.dump(yaml)


  // { $content, $files } will be passed to the next operator 
  // $content is the final content of the file
+
  // flowUtils 为机场订阅流量信息处理工具
-  // 可参考 https://t.me/zhetengsha/948
-  // https://github.com/sub-store-org/Sub-Store/blob/31b6dd0507a9286d6ab834ec94ad3050f6bdc86b/backend/src/utils/download.js#L104
+  // 可参考: 
+  // 1. https://t.me/zhetengsha/948

  // context 为传入的上下文
  // 有三种情况, 按需判断
Author	SHA1	Message	Date
xream	efbc6ecd84	feat: 流量单位显示由 EB 提升到 YB	2024-03-25 03:50:47 +08:00
xream	c27c589024	chore: 调整部分日志	2024-03-25 02:47:06 +08:00
xream	0efed4f1a0	feat: 处理传入 httpClient 的 timeout 参数	2024-03-24 07:28:16 +08:00
xream	e3a514d1fb	feat: hysteria2 支持 `mport`, clash.meta(mihomo) 支持 `ports`	2024-03-21 20:07:24 +08:00
xream	64478c7a27	feat: 刷新时清除所有缓存	2024-03-21 02:37:21 +08:00
xream	dc8f19f350	doc: demo.js	2024-03-21 01:52:42 +08:00
xream	b4ccfc7e07	chore: Sub-Store Simple 脚本增加脚本超时(默认 120) 可能会影响某些逻辑待观察	2024-03-19 23:48:26 +08:00
xream	3f1940630a	chore: 增加 gist 错误日志	2024-03-19 21:30:52 +08:00
xream	5a0bdb1276	doc: demo.js	2024-03-18 20:24:18 +08:00