feat: 手动设置的订阅流量信息会附加到订阅自己的流量信息之前

xream · xream · commit f38ec1e257d1 · 2024-11-17T23:38:37.000+08:00
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.420",
+  "version": "2.14.422",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
diff --git a/backend/src/restful/download.js b/backend/src/restful/download.js
@@ -158,7 +158,7 @@ async function downloadSubscription(req, res) {
                 proxy,
                 noCache,
             });
-
+            let flowInfo;
             if (
                 sub.source !== 'local' ||
                 ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
@@ -193,7 +193,7 @@ async function downloadSubscription(req, res) {
                     }
                     if (!$arguments.noFlow) {
                         // forward flow headers
-                        const flowInfo = await getFlowHeaders(
+                        flowInfo = await getFlowHeaders(
                             $arguments?.insecure ? `${url}#insecure` : url,
                             $arguments.flowUserAgent,
                             undefined,
@@ -213,7 +213,10 @@ async function downloadSubscription(req, res) {
                 }
             }
             if (sub.subUserinfo) {
-                res.set('subscription-userinfo', sub.subUserinfo);
+                res.set(
+                    'subscription-userinfo',
+                    [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),
+                );
             }
 
             if (platform === 'JSON') {
@@ -358,6 +361,7 @@ async function downloadCollection(req, res) {
             const subnames = collection.subscriptions;
             if (subnames.length > 0) {
                 const sub = findByName(allSubs, subnames[0]);
+                let flowInfo;
                 if (
                     sub.source !== 'local' ||
                     ['localFirst', 'remoteFirst'].includes(sub.mergeSources)
@@ -391,7 +395,7 @@ async function downloadCollection(req, res) {
                             }
                         }
                         if (!$arguments.noFlow) {
-                            const flowInfo = await getFlowHeaders(
+                            flowInfo = await getFlowHeaders(
                                 $arguments?.insecure ? `${url}#insecure` : url,
                                 $arguments.flowUserAgent,
                                 undefined,
@@ -411,7 +415,10 @@ async function downloadCollection(req, res) {
                     }
                 }
                 if (sub.subUserinfo) {
-                    res.set('subscription-userinfo', sub.subUserinfo);
+                    res.set(
+                        'subscription-userinfo',
+                        [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),
+                    );
                 }
             }
 
diff --git a/backend/src/restful/subscriptions.js b/backend/src/restful/subscriptions.js
@@ -125,66 +125,53 @@ async function getFlowInfo(req, res) {
             );
             return;
         }
-        if (sub.subUserinfo) {
-            try {
-                const remainingDays = getRmainingDays({
-                    resetDay: $arguments.resetDay,
-                    startDate: $arguments.startDate,
-                    cycleDays: $arguments.cycleDays,
-                });
-                const result = {
-                    ...parseFlowHeaders(sub.subUserinfo),
-                };
-                if (remainingDays != null) {
-                    result.remainingDays = remainingDays;
-                }
-                success(res, result);
-            } catch (e) {
-                $.error(
-                    `Failed to parse flow info for local subscription ${name}: ${
-                        e.message ?? e
-                    }`,
-                );
-                failed(
-                    res,
-                    new RequestInvalidError(
-                        'NO_FLOW_INFO',
-                        'N/A',
-                        `Failed to parse flow info`,
-                    ),
-                );
-            }
-        } else {
-            const flowHeaders = await getFlowHeaders(
-                $arguments?.insecure ? `${url}#insecure` : url,
-                $arguments.flowUserAgent,
-                undefined,
-                sub.proxy,
-                $arguments.flowUrl,
+        const flowHeaders = await getFlowHeaders(
+            $arguments?.insecure ? `${url}#insecure` : url,
+            $arguments.flowUserAgent,
+            undefined,
+            sub.proxy,
+            $arguments.flowUrl,
+        );
+        if (!flowHeaders && !sub.subUserinfo) {
+            failed(
+                res,
+                new InternalServerError(
+                    'NO_FLOW_INFO',
+                    'No flow info',
+                    `Failed to fetch flow headers`,
+                ),
             );
-            if (!flowHeaders) {
-                failed(
-                    res,
-                    new InternalServerError(
-                        'NO_FLOW_INFO',
-                        'No flow info',
-                        `Failed to fetch flow headers`,
-                    ),
-                );
-                return;
-            }
+            return;
+        }
+        try {
             const remainingDays = getRmainingDays({
                 resetDay: $arguments.resetDay,
                 startDate: $arguments.startDate,
                 cycleDays: $arguments.cycleDays,
             });
             const result = {
-                ...parseFlowHeaders(flowHeaders),
+                ...parseFlowHeaders(
+                    [sub.subUserinfo, flowHeaders].filter((i) => i).join('; '),
+                ),
             };
             if (remainingDays != null) {
                 result.remainingDays = remainingDays;
             }
             success(res, result);
+        } catch (e) {
+            $.error(
+                `Failed to parse flow info for local subscription ${name}: ${
+                    e.message ?? e
+                }`,
+            );
+            failed(
+                res,
+                new RequestInvalidError(
+                    'NO_FLOW_INFO',
+                    'N/A',
+                    `Failed to parse flow info`,
+                ),
+            );
         }
     } catch (err) {
         failed(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sub-store",`
`3`		`- "version": "2.14.420",`
	`3`	`+ "version": "2.14.422",`
`4`	`4`	`"description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",`
`5`	`5`	`"main": "src/main.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ async function downloadSubscription(req, res) {`
`158`	`158`	`proxy,`
`159`	`159`	`noCache,`
`160`	`160`	`});`
`161`		`-`
	`161`	`+ let flowInfo;`
`162`	`162`	`if (`
`163`	`163`	`sub.source !== 'local' \|\|`
`164`	`164`	`['localFirst', 'remoteFirst'].includes(sub.mergeSources)`
`@@ -193,7 +193,7 @@ async function downloadSubscription(req, res) {`
`193`	`193`	`}`
`194`	`194`	`if (!$arguments.noFlow) {`
`195`	`195`	`// forward flow headers`
`196`		`- const flowInfo = await getFlowHeaders(`
	`196`	`+ flowInfo = await getFlowHeaders(`
`197`	`197`	$arguments?.insecure ? `${url}#insecure` : url,
`198`	`198`	`$arguments.flowUserAgent,`
`199`	`199`	`undefined,`
`@@ -213,7 +213,10 @@ async function downloadSubscription(req, res) {`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`	`if (sub.subUserinfo) {`
`216`		`- res.set('subscription-userinfo', sub.subUserinfo);`
	`216`	`+ res.set(`
	`217`	`+ 'subscription-userinfo',`
	`218`	`+ [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),`
	`219`	`+ );`
`217`	`220`	`}`
`218`	`221`
`219`	`222`	`if (platform === 'JSON') {`
`@@ -358,6 +361,7 @@ async function downloadCollection(req, res) {`
`358`	`361`	`const subnames = collection.subscriptions;`
`359`	`362`	`if (subnames.length > 0) {`
`360`	`363`	`const sub = findByName(allSubs, subnames[0]);`
	`364`	`+ let flowInfo;`
`361`	`365`	`if (`
`362`	`366`	`sub.source !== 'local' \|\|`
`363`	`367`	`['localFirst', 'remoteFirst'].includes(sub.mergeSources)`
`@@ -391,7 +395,7 @@ async function downloadCollection(req, res) {`
`391`	`395`	`}`
`392`	`396`	`}`
`393`	`397`	`if (!$arguments.noFlow) {`
`394`		`- const flowInfo = await getFlowHeaders(`
	`398`	`+ flowInfo = await getFlowHeaders(`
`395`	`399`	$arguments?.insecure ? `${url}#insecure` : url,
`396`	`400`	`$arguments.flowUserAgent,`
`397`	`401`	`undefined,`
`@@ -411,7 +415,10 @@ async function downloadCollection(req, res) {`
`411`	`415`	`}`
`412`	`416`	`}`
`413`	`417`	`if (sub.subUserinfo) {`
`414`		`- res.set('subscription-userinfo', sub.subUserinfo);`
	`418`	`+ res.set(`
	`419`	`+ 'subscription-userinfo',`
	`420`	`+ [sub.subUserinfo, flowInfo].filter((i) => i).join('; '),`
	`421`	`+ );`
`415`	`422`	`}`
`416`	`423`	`}`
`417`	`424`