feat: Node.js 版的通知支持第三方推送服务. 环境变量名 SUB_STORE_BARK. 支持 Bark/PushPlus 等服务. 形如: https://api.day.app/XXXXXXXXX/[推送标题]/[推送内容]?group=SubStore&autoCopy=1&isArchive=1&sound=shake&level=timeSensitive 或 http://www.pushplus.plus/send?token=XXXXXXXXX&title=[推送标题]&content=[推送内容]&channel=wechat 的 URL, [推送标题] 和 [推送内容] 会被自动替换

backend/package.json

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

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

@@ -332,14 +332,11 @@ function URI_VLESS() {
     const parse = (line) => {
         line = line.split('vless://')[1];
         // eslint-disable-next-line no-unused-vars
-        let [__, uuid, server, port, ___, addons = '', name] =
-            /^(.*?)@(.*?):(\d+)\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
+        let [__, uuid, server, port, addons, name] =
+            /^(.*?)@(.*?):(\d+)\/?\?(.*?)(?:#(.*?))$/.exec(line);
         port = parseInt(`${port}`, 10);
         uuid = decodeURIComponent(uuid);
-        if (name != null) {
-            name = decodeURIComponent(name);
-        }
-        name = name ?? `VLESS ${server}:${port}`;
+        name = decodeURIComponent(name) ?? `VLESS ${server}:${port}`;
         const proxy = {
             type: 'vless',
             name,
@@ -417,17 +414,14 @@ function URI_Hysteria2() {
     const parse = (line) => {
         line = line.split(/(hysteria2|hy2):\/\//)[2];
         // eslint-disable-next-line no-unused-vars
-        let [__, password, server, ___, port, ____, addons = '', name] =
-            /^(.*?)@(.*?)(:(\d+))?\/?(\?(.*?))?(?:#(.*?))?$/.exec(line);
+        let [__, password, server, ___, port, addons, name] =
+            /^(.*?)@(.*?)(:(\d+))?\/?\?(.*?)(?:#(.*?))$/.exec(line);
         port = parseInt(`${port}`, 10);
         if (isNaN(port)) {
             port = 443;
         }
         password = decodeURIComponent(password);
-        if (name != null) {
-            name = decodeURIComponent(name);
-        }
-        name = name ?? `Hysteria2 ${server}:${port}`;
+        name = decodeURIComponent(name) ?? `Hysteria2 ${server}:${port}`;
 
         const proxy = {
             type: 'hysteria2',

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

@@ -316,20 +316,11 @@ function ScriptOperator(script, targetPlatform, $arguments, source) {
             await (async function () {
                 const operator = createDynamicFunction(
                     'operator',
-                    `async function operator(input = []) {
-                        let proxies
-                        if (Array.isArray(input)) {
-                            proxies = input
-                            return proxies.map(($server = {}) => {
-                                ${script}
-                                return $server
-                            })
-                        } else {
-                            let $content = input
-                            ${script}
-                            return $content
-                        }
-                        
+                    `async function operator(proxies = []) {
+                        return proxies.map(($server = {}) => {
+                          ${script}
+                          return $server
+                        })
                       }`,
                     $arguments,
                 );
@@ -698,10 +689,7 @@ async function ApplyOperator(operator, objs) {
         );
         let funcErr = '';
         let funcErrMsg = `${err.message ?? err}`;
-        if (
-            funcErrMsg.includes('$server is not defined') ||
-            funcErrMsg.includes('$content is not defined')
-        ) {
+        if (funcErrMsg.includes('$server is not defined')) {
             funcErr = '';
         } else {
             funcErr = `执行 function operator 失败 ${funcErrMsg}; `;

backend/src/restful/file.js

@@ -3,7 +3,6 @@ import { FILES_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
-import { ProxyUtils } from '@/core/proxy-utils';
 
 export default function register($app) {
     if (!$.read(FILES_KEY)) $.write([], FILES_KEY);
@@ -13,10 +12,7 @@ export default function register($app) {
         .patch(updateFile)
         .delete(deleteFile);
 
-    $app.route('/api/wholeFile/:name').get(getWholeFile);
-
     $app.route('/api/files').get(getAllFiles).post(createFile).put(replaceFile);
-    $app.route('/api/wholeFiles').get(getAllWholeFiles);
 }
 
 // file API
@@ -41,35 +37,13 @@ function createFile(req, res) {
     success(res, file, 201);
 }
 
-async function getFile(req, res) {
+function getFile(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
     const allFiles = $.read(FILES_KEY);
     const file = findByName(allFiles, name);
     if (file) {
-        let content = file.content ?? '';
-        content = await ProxyUtils.process(content, file.process || []);
-        res.set('Content-Type', 'text/plain; charset=utf-8').send(
-            content ?? '',
-        );
-    } else {
-        failed(
-            res,
-            new ResourceNotFoundError(
-                `FILE_NOT_FOUND`,
-                `File ${name} does not exist`,
-                404,
-            ),
-        );
-    }
-}
-function getWholeFile(req, res) {
-    let { name } = req.params;
-    name = decodeURIComponent(name);
-    const allFiles = $.read(FILES_KEY);
-    const file = findByName(allFiles, name);
-    if (file) {
-        success(res, file);
+        res.status(200).json(file.content);
     } else {
         failed(
             res,
@@ -128,11 +102,6 @@ function getAllFiles(req, res) {
     );
 }
 
-function getAllWholeFiles(req, res) {
-    const allFiles = $.read(FILES_KEY);
-    success(res, allFiles);
-}
-
 function replaceFile(req, res) {
     const allFiles = req.body;
     $.write(allFiles, FILES_KEY);

backend/src/restful/module.js

@@ -47,9 +47,7 @@ function getModule(req, res) {
     const allModules = $.read(MODULES_KEY);
     const module = findByName(allModules, name);
     if (module) {
-        res.set('Content-Type', 'text/plain; charset=utf-8').send(
-            module.content,
-        );
+        res.status(200).json(module.content);
     } else {
         failed(
             res,

backend/src/restful/preview.js

@@ -9,28 +9,6 @@ import $ from '@/core/app';
 export default function register($app) {
     $app.post('/api/preview/sub', compareSub);
     $app.post('/api/preview/collection', compareCollection);
-    $app.post('/api/preview/file', previewFile);
-}
-
-async function previewFile(req, res) {
-    try {
-        let { content = '', process = [] } = req.body;
-
-        const processed = await ProxyUtils.process(content, process || []);
-
-        // produce
-        success(res, { original: content, processed });
-    } catch (err) {
-        $.error(err.message ?? err);
-        failed(
-            res,
-            new InternalServerError(
-                `INTERNAL_SERVER_ERROR`,
-                `Failed to preview file`,
-                `Reason: ${err.message ?? err}`,
-            ),
-        );
-    }
 }
 
 async function compareSub(req, res) {

backend/src/restful/sort.js

@@ -1,9 +1,4 @@
-import {
-    ARTIFACTS_KEY,
-    COLLECTIONS_KEY,
-    SUBS_KEY,
-    FILES_KEY,
-} from '@/constants';
+import { ARTIFACTS_KEY, COLLECTIONS_KEY, SUBS_KEY } from '@/constants';
 import $ from '@/core/app';
 import { success } from '@/restful/response';
 
@@ -11,7 +6,6 @@ export default function register($app) {
     $app.post('/api/sort/subs', sortSubs);
     $app.post('/api/sort/collections', sortCollections);
     $app.post('/api/sort/artifacts', sortArtifacts);
-    $app.post('/api/sort/files', sortFiles);
 }
 
 function sortSubs(req, res) {
@@ -39,11 +33,3 @@ function sortArtifacts(req, res) {
     $.write(allArtifacts, ARTIFACTS_KEY);
     success(res, allArtifacts);
 }
-
-function sortFiles(req, res) {
-    const orders = req.body;
-    const allFiles = $.read(FILES_KEY);
-    allFiles.sort((a, b) => orders.indexOf(a.name) - orders.indexOf(b.name));
-    $.write(allFiles, FILES_KEY);
-    success(res, allFiles);
-}

backend/src/restful/sync.js

@@ -4,7 +4,6 @@ import {
     COLLECTIONS_KEY,
     RULES_KEY,
     SUBS_KEY,
-    FILES_KEY,
 } from '@/constants';
 import { failed, success } from '@/restful/response';
 import { InternalServerError, ResourceNotFoundError } from '@/restful/errors';
@@ -328,13 +327,6 @@ async function produceArtifact({
         ]);
         // produce output
         return RuleUtils.produce(rules, platform);
-    } else if (type === 'file') {
-        const allFiles = $.read(FILES_KEY);
-        const file = findByName(allFiles, name);
-        if (!file) throw new Error(`找不到文件 ${name}`);
-        let content = file.content ?? '';
-        content = await ProxyUtils.process(content, file.process || []);
-        return content ?? '';
     }
 }
 
@@ -394,12 +386,10 @@ async function syncAllArtifacts(_, res) {
 async function syncArtifact(req, res) {
     let { name } = req.params;
     name = decodeURIComponent(name);
-    $.info(`开始同步远程配置 ${name}...`);
     const allArtifacts = $.read(ARTIFACTS_KEY);
     const artifact = findByName(allArtifacts, name);
 
     if (!artifact) {
-        $.error(`找不到远程配置 ${name}`);
         failed(
             res,
             new ResourceNotFoundError(
@@ -438,7 +428,6 @@ async function syncArtifact(req, res) {
         $.write(allArtifacts, ARTIFACTS_KEY);
         success(res, artifact);
     } catch (err) {
-        $.error(`远程配置 ${artifact.name} 发生错误: ${err}`);
         failed(
             res,
             new InternalServerError(

backend/src/utils/download.js

@@ -7,7 +7,7 @@ import $ from '@/core/app';
 
 const tasks = new Map();
 
-export default async function download(url, ua, timeout) {
+export default async function download(url, ua) {
     let $arguments = {};
     const rawArgs = url.split('#');
     if (rawArgs.length > 1) {
@@ -45,19 +45,17 @@ export default async function download(url, ua, timeout) {
     }
 
     const { isNode } = ENV();
-    const { defaultUserAgent, defaultTimeout } = $.read(SETTINGS_KEY);
-    const userAgent = ua || defaultUserAgent || 'clash.meta';
-    const requestTimeout = timeout || defaultTimeout;
-    const id = hex_md5(userAgent + url);
+    const { defaultUserAgent } = $.read(SETTINGS_KEY);
+    ua = ua || defaultUserAgent || 'clash.meta';
+    const id = hex_md5(ua + url);
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);
     }
 
     const http = HTTP({
         headers: {
-            'User-Agent': userAgent,
+            'User-Agent': ua,
         },
-        timeout: requestTimeout,
     });
 
     const result = new Promise((resolve, reject) => {
@@ -66,9 +64,7 @@ export default async function download(url, ua, timeout) {
         if (!$arguments?.noCache && cached) {
             resolve(cached);
         } else {
-            $.info(
-                `Downloading...\nUser-Agent: ${userAgent}\nTimeout: ${requestTimeout}\nURL: ${url}`,
-            );
+            $.info(`Downloading...\nUser-Agent: ${ua}\nURL: ${url}`);
             http.get(url)
                 .then((resp) => {
                     const body = resp.body;

backend/src/utils/flow.js

@@ -1,14 +1,6 @@
-import { SETTINGS_KEY } from '@/constants';
 import { HTTP } from '@/vendor/open-api';
-import $ from '@/core/app';
 
-export async function getFlowHeaders(url, ua, timeout) {
-    const { defaultFlowUserAgent, defaultTimeout } = $.read(SETTINGS_KEY);
-    const userAgent =
-        ua ||
-        defaultFlowUserAgent ||
-        'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)';
-    const requestTimeout = timeout || defaultTimeout;
+export async function getFlowHeaders(url) {
     const http = HTTP();
     const { headers } = await http.get({
         url: url
@@ -16,9 +8,8 @@ export async function getFlowHeaders(url, ua, timeout) {
             .map((i) => i.trim())
             .filter((i) => i.length)[0],
         headers: {
-            'User-Agent': userAgent,
+            'User-Agent': 'Quantumult%20X/1.0.30 (iPhone14,2; iOS 15.6)',
         },
-        timeout: requestTimeout,
     });
     const subkey = Object.keys(headers).filter((k) =>
         /SUBSCRIPTION-USERINFO/i.test(k),