chore: 处理订阅输出哪吒探针兼容响应的 Uptime 字段

backend/package.json

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

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

@@ -550,13 +550,25 @@ function ResolveDomainOperator({ provider, type: _type, filter, cache }) {
                                 results[p.server],
                             );
                             if (server && port) {
+                                p._domain = p.server;
                                 p.server = server;
                                 p.port = port;
                                 p.resolved = true;
+                                p._IPv4 = p.server;
+                                if (!isIP(p._IP)) {
+                                    p._IP = p.server;
+                                }
+                            } else {
+                                p.resolved = false;
                             }
                         } else {
+                            p._domain = p.server;
                             p.server = results[p.server];
                             p.resolved = true;
+                            p[`_${type}`] = p.server;
+                            if (!isIP(p._IP)) {
+                                p._IP = p.server;
+                            }
                         }
                     } else {
                         p.resolved = false;

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

@@ -153,7 +153,7 @@ export default function Clash_Producer() {
                 delete proxy.id;
                 delete proxy.resolved;
                 for (const key in proxy) {
-                    if (proxy[key] == null) {
+                    if (proxy[key] == null || /^_/i.test(key)) {
                         delete proxy[key];
                     }
                 }

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

@@ -168,7 +168,7 @@ export default function ClashMeta_Producer() {
                 delete proxy.id;
                 delete proxy.resolved;
                 for (const key in proxy) {
-                    if (proxy[key] == null) {
+                    if (proxy[key] == null || /^_/i.test(key)) {
                         delete proxy[key];
                     }
                 }

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

@@ -171,7 +171,7 @@ export default function ShadowRocket_Producer() {
                 delete proxy.id;
                 delete proxy.resolved;
                 for (const key in proxy) {
-                    if (proxy[key] == null) {
+                    if (proxy[key] == null || /^_/i.test(key)) {
                         delete proxy[key];
                     }
                 }

backend/src/core/proxy-utils/producers/sing-box.js

@@ -622,7 +622,7 @@ const wireguardParser = (proxy = {}) => {
         throw 'invalid port';
     if (proxy['fast-open']) parsedProxy.udp_fragment = true;
     if (typeof proxy.reserved === 'string') {
-        parsedProxy.reserved.push(proxy.reserved);
+        parsedProxy.reserved = proxy.reserved;
     } else if (Array.isArray(proxy.reserved)) {
         for (const r of proxy.reserved) parsedProxy.reserved.push(r);
     } else {

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

@@ -260,7 +260,7 @@ export default function Stash_Producer() {
                 delete proxy.id;
                 delete proxy.resolved;
                 for (const key in proxy) {
-                    if (proxy[key] == null) {
+                    if (proxy[key] == null || /^_/i.test(key)) {
                         delete proxy[key];
                     }
                 }

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

@@ -11,7 +11,7 @@ export default function URI_Producer() {
         delete proxy.id;
         delete proxy.resolved;
         for (const key in proxy) {
-            if (proxy[key] == null) {
+            if (proxy[key] == null || /^_/i.test(key)) {
                 delete proxy[key];
             }
         }

backend/src/restful/download.js

@@ -1,7 +1,4 @@
-import {
-    getUserAgentFromHeaders,
-    getPlatformFromUserAgent,
-} from '@/utils/user-agent';
+import { getPlatformFromHeaders } from '@/utils/user-agent';
 import { COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
 import { findByName } from '@/utils/database';
 import { getFlowHeaders } from '@/utils/flow';
@@ -9,25 +6,39 @@ import $ from '@/core/app';
 import { failed } from '@/restful/response';
 import { InternalServerError, ResourceNotFoundError } from '@/restful/errors';
 import { produceArtifact } from '@/restful/sync';
+// eslint-disable-next-line no-unused-vars
+import { isIPv4, isIPv6 } from '@/utils';
+import { getISO } from '@/utils/geo';
+import env from '@/utils/env';
 
 export default function register($app) {
     $app.get('/download/collection/:name', downloadCollection);
     $app.get('/download/:name', downloadSubscription);
+    $app.get(
+        '/download/collection/:name/api/v1/server/details',
+        async (req, res) => {
+            req.query.platform = 'JSON';
+            req.query.produceType = 'internal';
+            req.query.resultFormat = 'nezha';
+            await downloadCollection(req, res);
+        },
+    );
+    $app.get('/download/:name/api/v1/server/details', async (req, res) => {
+        req.query.platform = 'JSON';
+        req.query.produceType = 'internal';
+        req.query.resultFormat = 'nezha';
+        await downloadSubscription(req, res);
+    });
 }
 
 async function downloadSubscription(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
 
-    const userAgent = getUserAgentFromHeaders(req.headers);
-
     const platform =
-        req.query.target || getPlatformFromUserAgent(userAgent) || 'JSON';
-
-    $.info(
-        `正在下载订阅：${name}\ntarget: ${platform}\n来源 User-Agent: ${userAgent.UA}`,
-    );
+        req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
+    $.info(`正在下载订阅：${name}`);
     let {
         url,
         ua,
@@ -36,6 +47,7 @@ async function downloadSubscription(req, res) {
         ignoreFailedRemoteSub,
         produceType,
         includeUnsupportedProxy,
+        resultFormat,
     } = req.query;
     if (url) {
         url = decodeURIComponent(url);
@@ -70,7 +82,7 @@ async function downloadSubscription(req, res) {
     const sub = findByName(allSubs, name);
     if (sub) {
         try {
-            const output = await produceArtifact({
+            let output = await produceArtifact({
                 type: 'subscription',
                 name,
                 platform,
@@ -141,6 +153,9 @@ async function downloadSubscription(req, res) {
             }
 
             if (platform === 'JSON') {
+                if (resultFormat === 'nezha') {
+                    output = nezhaTransform(output);
+                }
                 res.set('Content-Type', 'application/json;charset=utf-8').send(
                     output,
                 );
@@ -180,20 +195,20 @@ async function downloadCollection(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
 
-    const userAgent = getUserAgentFromHeaders(req.headers);
-
     const platform =
-        req.query.target || getPlatformFromUserAgent(userAgent) || 'JSON';
+        req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     const allCols = $.read(COLLECTIONS_KEY);
     const collection = findByName(allCols, name);
 
-    $.info(
-        `正在下载组合订阅：${name}\ntarget: ${platform}\n来源 User-Agent: ${userAgent.UA}`,
-    );
+    $.info(`正在下载组合订阅：${name}`);
 
-    let { ignoreFailedRemoteSub, produceType, includeUnsupportedProxy } =
-        req.query;
+    let {
+        ignoreFailedRemoteSub,
+        produceType,
+        includeUnsupportedProxy,
+        resultFormat,
+    } = req.query;
 
     if (ignoreFailedRemoteSub != null && ignoreFailedRemoteSub !== '') {
         ignoreFailedRemoteSub = decodeURIComponent(ignoreFailedRemoteSub);
@@ -211,7 +226,7 @@ async function downloadCollection(req, res) {
 
     if (collection) {
         try {
-            const output = await produceArtifact({
+            let output = await produceArtifact({
                 type: 'collection',
                 name,
                 platform,
@@ -283,6 +298,9 @@ async function downloadCollection(req, res) {
             }
 
             if (platform === 'JSON') {
+                if (resultFormat === 'nezha') {
+                    output = nezhaTransform(output);
+                }
                 res.set('Content-Type', 'application/json;charset=utf-8').send(
                     output,
                 );
@@ -319,3 +337,66 @@ async function downloadCollection(req, res) {
         );
     }
 }
+
+function nezhaTransform(output) {
+    const result = {
+        code: 0,
+        message: 'success',
+        result: [],
+    };
+    output.map((proxy, index) => {
+        // 如果节点上有数据 就取节点上的数据
+        let CountryCode = proxy._geo?.countryCode || proxy._geo?.country;
+        // 简单判断下
+        if (!/^[a-z]{2}$/i.test(CountryCode)) {
+            CountryCode = getISO(proxy.name);
+        }
+        // 简单判断下
+        if (/^[a-z]{2}$/i.test(CountryCode)) {
+            // 如果节点上有数据 就取节点上的数据
+            let time = proxy._unavailable ? 0 : Date.now();
+            result.result.push({
+                id: index,
+                name: proxy.name,
+                tag: `${proxy._tag ?? ''}`,
+                last_active: time,
+                // 暂时不用处理 现在 VPings App 端的接口支持域名查询
+                // 其他场景使用 自己在 Sub-Store 加一步域名解析
+                valid_ip: proxy._IP || proxy.server,
+                ipv4: proxy._IPv4 || proxy.server,
+                ipv6: proxy._IPv6 || (isIPv6(proxy.server) ? proxy.server : ''),
+                host: {
+                    Platform: 'Sub-Store',
+                    PlatformVersion: env.version,
+                    CPU: [],
+                    MemTotal: 1024,
+                    DiskTotal: 1024,
+                    SwapTotal: 1024,
+                    Arch: '',
+                    Virtualization: '',
+                    BootTime: time,
+                    CountryCode, // 目前需要
+                    Version: '',
+                },
+                status: {
+                    CPU: 0,
+                    MemUsed: 0,
+                    SwapUsed: 0,
+                    DiskUsed: 0,
+                    NetInTransfer: 0,
+                    NetOutTransfer: 0,
+                    NetInSpeed: 0,
+                    NetOutSpeed: 0,
+                    Uptime: parseInt(proxy._uptime ?? index, 10),
+                    Load1: 0,
+                    Load5: 0,
+                    Load15: 0,
+                    TcpConnCount: 0,
+                    UdpConnCount: 0,
+                    ProcessCount: 0,
+                },
+            });
+        }
+    });
+    return JSON.stringify(result, null, 2);
+}

config/README.md

@@ -13,15 +13,13 @@ Telegram 频道: [`https://t.me/cool_scripts` ](https://t.me/cool_scripts)
 
 ### 2. Surge
 
-0. 最新 Surge iOS TestFlight 版本 可使用 Beta 版(支持最新 Surge iOS TestFlight 版本的分类和参数设置): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule)
+0. 最新 Surge iOS TestFlight 版本 可使用 Beta 版(支持最新 Surge iOS TestFlight 版本的特性): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Beta.sgmodule)
 
-1. 官方默认版模块(目前不带 ability 参数, 不保证以后不会改动): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule)
+1. 官方默认版模块(支持 App 内使用编辑参数): [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge.sgmodule)
 
-2. 固定带 ability 参数版本,可能会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)
+2. 经典版, 不支持编辑参数, 固定带 ability 参数版本, 使用 jsc 引擎时, 可能会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 请使用此带 ability 参数版本: [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-ability.sgmodule)
 
-> 最新 Surge iOS TestFlight 版本应该没有内存问题了 可以大胆尝试带 ability 参数版本
-
-3. 固定不带 ability 参数版本： [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule)
+3. 经典版, 不支持编辑参数, 固定不带 ability 参数版本： [`https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule`](https://raw.githubusercontent.com/sub-store-org/Sub-Store/master/config/Surge-Noability.sgmodule)
 
 
 ### 3. QX

config/Surge-Beta.sgmodule

@@ -1,15 +1,15 @@
 #!name=Sub-Store(β)
-#!desc=支持最新 Surge iOS TestFlight 版本的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *
+#!desc=支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *
 #!category=订阅管理
-#!arguments=ability:http-client-policy,cronexp:55 23 * * *,sync:"Sub-Store Sync"
-#!arguments-desc="\n1️⃣ ability\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n⚠️ Surge 上时候可能会爆内存\n不需要使用的时候应该关闭\n填写任意其他值关闭\n\n2️⃣ cronexp\n同步配置定时任务\n默认为每天 23 点 55 分\n\n3️⃣ sync\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务"
+#!arguments=ability:http-client-policy,cronexp:55 23 * * *,sync:"Sub-Store Sync",timeout:120,engine:auto
+#!arguments-desc=\n1️⃣ ability\n\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n填写任意其他值关闭\n\n2️⃣ cronexp\n\n同步配置定时任务\n默认为每天 23 点 55 分\n\n3️⃣ sync\n\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务\n\n4️⃣ timeout\n\n超时, 单位为秒\n\n5️⃣ engine\n\n默认为自动使用 webview 引擎, 可设为指定 jsc, 但 jsc 容易爆内存
 
 [MITM]
 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 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={{{timeout}}},ability="{{{ability}}}",engine={{{engine}}}
 
-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 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={{{timeout}}},engine={{{engine}}}
 
-{{{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
+{{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js,engine={{{engine}}}

config/Surge-ability.sgmodule

@@ -1,5 +1,5 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 可能会爆内存, 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 23 点 55 分
+#!desc=高级订阅管理工具 @Peng-YM  带 ability 参数版本, 使用 jsc 引擎时, 可能会爆内存, 如果不需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用不带 ability 参数版本. 定时任务默认为每天 23 点 55 分
 #!category=订阅管理
 
 [MITM]

config/Surge.sgmodule

@@ -1,12 +1,15 @@
 #!name=Sub-Store
-#!desc=高级订阅管理工具 @Peng-YM  无 ability 参数版本,不会爆内存, 如果需要使用指定节点功能 例如[加旗帜脚本或者cname脚本] 可以用带 ability 参数. 定时任务默认为每天 23 点 55 分
+#!desc=支持 Surge 正式版的参数设置功能. 测落地功能 ability: http-client-policy, 同步配置的定时 cronexp: 55 23 * * *
 #!category=订阅管理
+#!arguments=ability:http-client-policy,cronexp:55 23 * * *,sync:"Sub-Store Sync",timeout:120,engine:auto
+#!arguments-desc=\n1️⃣ ability\n\n默认已开启测落地能力\n需要配合脚本操作\n如 https://raw.githubusercontent.com/Keywos/rule/main/cname.js\n填写任意其他值关闭\n\n2️⃣ cronexp\n\n同步配置定时任务\n默认为每天 23 点 55 分\n\n3️⃣ sync\n\n自定义定时任务名\n便于在脚本编辑器中选择\n若设为 # 可取消定时任务\n\n4️⃣ timeout\n\n超时, 单位为秒\n\n5️⃣ engine\n\n默认为自动使用 webview 引擎, 可设为指定 jsc, 但 jsc 容易爆内存
 
 [MITM]
 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,timeout=120
+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={{{timeout}}},ability="{{{ability}}}",engine={{{engine}}}
 
-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
+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={{{timeout}}},engine={{{engine}}}
+
+{{{sync}}}=type=cron,cronexp="{{{cronexp}}}",wake-system=1,timeout={{{timeout}}},script-path=https://github.com/sub-store-org/Sub-Store/releases/latest/download/cron-sync-artifacts.min.js,engine={{{engine}}}

scripts/demo.js

@@ -9,7 +9,8 @@ function operator(proxies = [], targetPlatform, context) {
   // 可在预览界面点击节点查看 JSON 结构 或查看 `target=JSON` 的通用订阅
   // 1. `no-resolve` 为不解析域名
   // 2. 域名解析后 会多一个 `resolved` 字段
-  // 3. 节点字段 `exec` 为 `ssr-local` 路径, 默认 `/usr/local/bin/ssr-local`; 端口从 10000 开始递增(暂不支持配置)
+  // 3. 域名解析后会有`_IPv4`, `_IPv6`, `_IP`(若有多个步骤, 只取第一次成功的 v4 或 v6 数据), `_domain` 字段
+  // 4. 节点字段 `exec` 为 `ssr-local` 路径, 默认 `/usr/local/bin/ssr-local`; 端口从 10000 开始递增(暂不支持配置)
 
   // $arguments 为传入的脚本参数