From 9ac5e136a616e4b1e382f18c11ccfa2aea12cd1c Mon Sep 17 00:00:00 2001 From: xream Date: Sun, 2 Feb 2025 18:39:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E6=B5=81=E9=87=8F=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5,=20=E5=A2=9E=E5=BC=BA=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/package.json | 2 +- backend/src/restful/download.js | 10 ++++++++-- backend/src/restful/file.js | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/backend/package.json b/backend/package.json index bacee49..3ce700f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "sub-store", - "version": "2.16.22", + "version": "2.16.23", "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 index 2059881..6f1cfa3 100644 --- a/backend/src/restful/download.js +++ b/backend/src/restful/download.js @@ -293,7 +293,10 @@ async function downloadSubscription(req, res) { } res.set( 'subscription-userinfo', - [subUserInfo, flowInfo].filter((i) => i).join('; '), + [subUserInfo, flowInfo] + .filter((i) => i) + .join('; ') + .replace(/\s*;\s*;\s*/g, ';'), ); } @@ -551,7 +554,10 @@ async function downloadCollection(req, res) { .filter((i) => i) .join('; '); if (subUserInfo) { - res.set('subscription-userinfo', subUserInfo); + res.set( + 'subscription-userinfo', + subUserInfo.replace(/\s*;\s*;\s*/g, ';'), + ); } if (platform === 'JSON') { if (resultFormat === 'nezha') { diff --git a/backend/src/restful/file.js b/backend/src/restful/file.js index cdac66c..210d9ff 100644 --- a/backend/src/restful/file.js +++ b/backend/src/restful/file.js @@ -146,7 +146,10 @@ async function getFile(req, res) { proxy || file.proxy, ); if (flowInfo) { - res.set('subscription-userinfo', flowInfo); + res.set( + 'subscription-userinfo', + flowInfo.replace(/\s*;\s*;\s*/g, ';'), + ); } } } catch (err) {