feat: 组合订阅中的单条订阅也支持透传 User-Agent

sub-store-org · Jan 13, 2025 · 03e320c · 03e320c
1 parent e325b9a
commit 03e320c
Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.16.12",
+  "version": "2.16.13",
   "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
@@ -441,6 +441,7 @@ async function downloadCollection(req, res) {
                 $options,
                 proxy,
                 noCache,
+                ua: reqUA,
             });
             let subUserInfoOfSub;
             // forward flow header from the first subscription in this collection

diff --git a/backend/src/restful/sync.js b/backend/src/restful/sync.js
@@ -216,6 +216,12 @@ async function produceArtifact({
         await Promise.all(
             subnames.map(async (name) => {
                 const sub = findByName(allSubs, name);
+                const passThroughUA = sub.passThroughUA;
+                if (passThroughUA) {
+                    $.info(
+                        `订阅开启了透传 User-Agent, 使用请求的 User-Agent: ${ua}`,
+                    );
+                }
                 try {
                     $.info(`正在处理子订阅：${sub.name}...`);
                     let raw;
@@ -237,7 +243,7 @@ async function produceArtifact({
                                     try {
                                         return await download(
                                             url,
-                                            sub.ua,
+                                            ua || sub.ua,
                                             undefined,
                                             proxy ||
                                                 sub.proxy ||