feat: 支持按顺序合并本地和远程订阅(前端版本 > 2.14.14 可输入)

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
         run: |
           cd backend
           SUBSTORE_RELEASE=`node --eval="process.stdout.write(require('./package.json').version)"`
-          echo "::set-output name=release_tag::$SUBSTORE_RELEASE"
+          echo "release_tag=$SUBSTORE_RELEASE" >> $GITHUB_OUTPUT
       - name: Prepare release
         run: |
           cd backend

backend/package.json

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

backend/src/restful/download.js

@@ -20,18 +20,22 @@ async function downloadSubscription(req, res) {
         req.query.target || getPlatformFromHeaders(req.headers) || 'JSON';
 
     $.info(`正在下载订阅：${name}`);
-    let { url, ua, content } = req.query;
+    let { url, ua, content, mergeSources } = req.query;
     if (url) {
         url = decodeURIComponent(url);
-        $.info(`指定 url: ${url}`);
+        $.info(`指定远程订阅 URL: ${url}`);
     }
     if (ua) {
         ua = decodeURIComponent(ua);
-        $.info(`指定 ua: ${ua}`);
+        $.info(`指定远程订阅 User-Agent: ${ua}`);
     }
     if (content) {
         content = decodeURIComponent(content);
-        $.info(`指定 content: ${content}`);
+        $.info(`指定本地订阅: ${content}`);
+    }
+    if (mergeSources) {
+        mergeSources = decodeURIComponent(mergeSources);
+        $.info(`指定合并来源: ${mergeSources}`);
     }
 
     const allSubs = $.read(SUBS_KEY);
@@ -45,6 +49,7 @@ async function downloadSubscription(req, res) {
                 url,
                 ua,
                 content,
+                mergeSources,
             });
 
             if (sub.source !== 'local' || url) {

backend/src/restful/preview.js

@@ -16,11 +16,20 @@ async function compareSub(req, res) {
         const sub = req.body;
         const target = req.query.target || 'JSON';
         let content;
-        if (sub.source === 'local') {
+        if (
+            sub.source === 'local' &&
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
+        ) {
             content = sub.content;
         } else {
             try {
-                content = await download(sub.url, sub.ua);
+                content = await Promise.all(
+                    sub.url
+                        .split(/[\r\n]+/)
+                        .map((i) => i.trim())
+                        .filter((i) => i.length)
+                        .map((url) => download(url, sub.ua)),
+                );
             } catch (err) {
                 failed(
                     res,
@@ -32,9 +41,16 @@ async function compareSub(req, res) {
                 );
                 return;
             }
+            if (sub.mergeSources === 'localFirst') {
+                content.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                content.push(sub.content);
+            }
         }
         // parse proxies
-        const original = ProxyUtils.parse(content);
+        const original = (Array.isArray(content) ? content : [content])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
 
         // add id
         original.forEach((proxy, i) => {
@@ -77,13 +93,31 @@ async function compareCollection(req, res) {
                 const sub = findByName(allSubs, name);
                 try {
                     let raw;
-                    if (sub.source === 'local') {
+                    if (
+                        sub.source === 'local' &&
+                        !['localFirst', 'remoteFirst'].includes(
+                            sub.mergeSources,
+                        )
+                    ) {
                         raw = sub.content;
                     } else {
-                        raw = await download(sub.url, sub.ua);
+                        raw = await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map((url) => download(url, sub.ua)),
+                        );
+                        if (sub.mergeSources === 'localFirst') {
+                            raw.unshift(sub.content);
+                        } else if (sub.mergeSources === 'remoteFirst') {
+                            raw.push(sub.content);
+                        }
                     }
                     // parse proxies
-                    let currentProxies = ProxyUtils.parse(raw);
+                    let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                        .map((i) => ProxyUtils.parse(i))
+                        .flat();
 
                     currentProxies.forEach((proxy) => {
                         proxy.subName = sub.name;

backend/src/restful/sync.js

@@ -22,24 +22,60 @@ export default function register($app) {
     $app.get('/api/sync/artifact/:name', syncArtifact);
 }
 
-async function produceArtifact({ type, name, platform, url, ua, content }) {
+async function produceArtifact({
+    type,
+    name,
+    platform,
+    url,
+    ua,
+    content,
+    mergeSources,
+}) {
     platform = platform || 'JSON';
 
     if (type === 'subscription') {
         const allSubs = $.read(SUBS_KEY);
         const sub = findByName(allSubs, name);
         let raw;
-        if (url) {
-            raw = await download(url, ua);
-        } else if (content) {
+        if (content && !['localFirst', 'remoteFirst'].includes(mergeSources)) {
             raw = content;
-        } else if (sub.source === 'local') {
+        } else if (url) {
+            raw = await Promise.all(
+                url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map((url) => download(url, ua)),
+            );
+            if (mergeSources === 'localFirst') {
+                raw.unshift(content);
+            } else if (mergeSources === 'remoteFirst') {
+                raw.push(content);
+            }
+        } else if (
+            sub.source === 'local' &&
+            !['localFirst', 'remoteFirst'].includes(sub.mergeSources)
+        ) {
             raw = sub.content;
         } else {
-            raw = await download(sub.url, sub.ua);
+            raw = await Promise.all(
+                sub.url
+                    .split(/[\r\n]+/)
+                    .map((i) => i.trim())
+                    .filter((i) => i.length)
+                    .map((url) => download(url, sub.ua)),
+            );
+            if (sub.mergeSources === 'localFirst') {
+                raw.unshift(sub.content);
+            } else if (sub.mergeSources === 'remoteFirst') {
+                raw.push(sub.content);
+            }
         }
         // parse proxies
-        let proxies = ProxyUtils.parse(raw);
+        let proxies = (Array.isArray(raw) ? raw : [raw])
+            .map((i) => ProxyUtils.parse(i))
+            .flat();
+
         proxies.forEach((proxy) => {
             proxy.subName = sub.name;
         });
@@ -87,13 +123,31 @@ async function produceArtifact({ type, name, platform, url, ua, content }) {
                 try {
                     $.info(`正在处理子订阅：${sub.name}...`);
                     let raw;
-                    if (sub.source === 'local') {
+                    if (
+                        sub.source === 'local' &&
+                        !['localFirst', 'remoteFirst'].includes(
+                            sub.mergeSources,
+                        )
+                    ) {
                         raw = sub.content;
                     } else {
-                        raw = await download(sub.url, sub.ua);
+                        raw = await await Promise.all(
+                            sub.url
+                                .split(/[\r\n]+/)
+                                .map((i) => i.trim())
+                                .filter((i) => i.length)
+                                .map((url) => download(url, sub.ua)),
+                        );
+                        if (sub.mergeSources === 'localFirst') {
+                            raw.unshift(sub.content);
+                        } else if (sub.mergeSources === 'remoteFirst') {
+                            raw.push(sub.content);
+                        }
                     }
                     // parse proxies
-                    let currentProxies = ProxyUtils.parse(raw);
+                    let currentProxies = (Array.isArray(raw) ? raw : [raw])
+                        .map((i) => ProxyUtils.parse(i))
+                        .flat();
 
                     currentProxies.forEach((proxy) => {
                         proxy.subName = sub.name;