feat: 订阅和文件的远程链接支持使用换行混写三种格式 1. 完整远程链接 2. 类似 /api/file/name 的内部文件调用路径 3. 本地文件的绝对路径

backend/package.json

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

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

@@ -177,7 +177,7 @@ async function processFn(
                 } else if (url?.startsWith('/')) {
                     try {
                         const fs = eval(`require("fs")`);
-                        script = fs.readFileSync(url, 'utf8');
+                        script = fs.readFileSync(url.split('#')[0], 'utf8');
                         // $.info(`Script loaded: >>>\n ${script}`);
                     } catch (err) {
                         $.error(

backend/src/restful/download.js

@@ -259,7 +259,7 @@ async function downloadSubscription(req, res) {
                             }
                         }
                     }
-                    if (!$arguments.noFlow) {
+                    if (!$arguments.noFlow && /^https?/.test(url)) {
                         // forward flow headers
                         flowInfo = await getFlowHeaders(
                             $arguments?.insecure ? `${url}#insecure` : url,
@@ -506,7 +506,7 @@ async function downloadCollection(req, res) {
                                 }
                             }
                         }
-                        if (!$arguments.noFlow) {
+                        if (!$arguments.noFlow && /^https?:/.test(url)) {
                             subUserInfoOfSub = await getFlowHeaders(
                                 $arguments?.insecure ? `${url}#insecure` : url,
                                 $arguments.flowUserAgent,

backend/src/restful/subscriptions.js

@@ -140,7 +140,7 @@ async function getFlowInfo(req, res) {
                 }
             }
         }
-        if ($arguments.noFlow) {
+        if ($arguments.noFlow || !/^https?/.test(url)) {
             failed(
                 res,
                 new RequestInvalidError(

backend/src/utils/download.js

@@ -1,4 +1,4 @@
-import { SETTINGS_KEY } from '@/constants';
+import { SETTINGS_KEY, FILES_KEY, MODULES_KEY } from '@/constants';
 import { HTTP, ENV } from '@/vendor/open-api';
 import { hex_md5 } from '@/vendor/md5';
 import { getPolicyDescriptor } from '@/utils';
@@ -11,6 +11,8 @@ import {
     validCheck,
 } from '@/utils/flow';
 import $ from '@/core/app';
+import { findByName } from '@/utils/database';
+import { produceArtifact } from '@/restful/sync';
 import PROXY_PREPROCESSORS from '@/core/proxy-utils/preprocessors';
 const clashPreprocessor = PROXY_PREPROCESSORS.find(
     (processor) => processor.name === 'Clash Pre-processor',
@@ -130,22 +132,53 @@ export default async function download(
         }
     }
 
-    // const downloadUrlMatch = url.match(/^\/api\/(file|module)\/(.+)/);
+    const downloadUrlMatch = url
-    // if (downloadUrlMatch) {
+        .split('#')[0]
-    //     let type = downloadUrlMatch?.[1];
+        .match(/^\/api\/(file|module)\/(.+)/);
-    //     let name = downloadUrlMatch?.[2];
+    if (downloadUrlMatch) {
-    //     if (name == null) {
+        let type = '';
-    //         throw new Error(`本地 ${type} URL 无效: ${url}`);
+        try {
-    //     }
+            type = downloadUrlMatch?.[1];
-    //     name = decodeURIComponent(name);
+            let name = downloadUrlMatch?.[2];
-    //     const key = type === 'module' ? MODULES_KEY : FILES_KEY;
+            if (name == null) {
-    //     const item = findByName($.read(key), name);
+                throw new Error(`本地 ${type} URL 无效: ${url}`);
-    //     if (!item) {
+            }
-    //         throw new Error(`找不到本地 ${type}: ${name}`);
+            name = decodeURIComponent(name);
-    //     }
+            const key = type === 'module' ? MODULES_KEY : FILES_KEY;
+            const item = findByName($.read(key), name);
+            if (!item) {
+                throw new Error(`找不到 ${type}: ${name}`);
+            }
 
-    //     return item.content;
+            if (type === 'module') {
-    // }
+                return item.content;
+            } else {
+                return await produceArtifact({
+                    type: 'file',
+                    name,
+                });
+            }
+        } catch (err) {
+            $.error(
+                `Error when loading ${type}: ${
+                    url.split('#')[0]
+                }.\n Reason: ${err}`,
+            );
+            throw new Error(`无法加载 ${type}: ${url}`);
+        }
+    } else if (url?.startsWith('/')) {
+        try {
+            const fs = eval(`require("fs")`);
+            return fs.readFileSync(url.split('#')[0], 'utf8');
+        } catch (err) {
+            $.error(
+                `Error when reading local file: ${
+                    url.split('#')[0]
+                }.\n Reason: ${err}`,
+            );
+            throw new Error(`无法从该路径读取文本内容: ${url}`);
+        }
+    }
 
     if (!isNode && tasks.has(id)) {
         return tasks.get(id);

backend/src/utils/flow.js

@@ -49,7 +49,7 @@ export async function getFlowHeaders(
             }
         }
     }
-    if ($arguments?.noFlow) {
+    if ($arguments?.noFlow || !/^https?/.test(url)) {
         return;
     }
     const { isStash, isLoon, isShadowRocket, isQX } = ENV();