feat: 增强 VMess URI 解析兼容性; 修改导出文件名格式

backend/package.json

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

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

@@ -342,7 +342,7 @@ function URI_VMess() {
     };
     const parse = (line) => {
         line = line.split('vmess://')[1];
-        let content = Base64.decode(line.replace(/\?.*?$/, ''));
+        let content = Base64.decode(line.replace(/\?.*$/, ''));
         if (/=\s*vmess/.test(content)) {
             // Quantumult VMess URI format
             const partitions = content.split(',').map((p) => p.trim());

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

@@ -75,8 +75,6 @@ function Clash() {
                 // 是否被引号包裹
                 if (/^(['"]).*\1$/.test(afterTrim)) {
                     return `short-id: ${afterTrim}`;
-                } else if (['null'].includes(afterTrim)) {
-                    return `short-id: ${afterTrim}`;
                 } else {
                     return `short-id: "${afterTrim}"`;
                 }

backend/src/products/cron-sync-artifacts.js

@@ -89,10 +89,8 @@ async function doSync() {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const subNames = [];
-        let enabledCount = 0;
         allArtifacts.map((artifact) => {
             if (artifact.sync && artifact.source) {
-                enabledCount++;
                 if (artifact.type === 'subscription') {
                     const subName = artifact.source;
                     const sub = findByName(allSubs, subName);
@@ -113,13 +111,6 @@ async function doSync() {
             }
         });
 
-        if (enabledCount === 0) {
-            $.info(
-                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
-            );
-            return;
-        }
-
         if (subNames.length > 0) {
             await Promise.all(
                 subNames.map(async (subName) => {

backend/src/restful/settings.js

@@ -134,15 +134,11 @@ export async function updateArtifactStore() {
                 settings.artifactStore = url;
                 settings.artifactStoreStatus = 'VALID';
             } else {
-                $.error(`找不到 Sub-Store Gist (${ARTIFACT_REPOSITORY_KEY})`);
+                $.error(`找不到 Sub-Store Gist`);
                 settings.artifactStoreStatus = 'NOT FOUND';
             }
         } catch (err) {
-            $.error(
-                `查找 Sub-Store Gist (${ARTIFACT_REPOSITORY_KEY}) 时发生错误: ${
-                    err.message ?? err
-                }`,
-            );
+            $.error(`查找 Sub-Store Gist 时发生错误: ${err.message ?? err}`);
             settings.artifactStoreStatus = 'ERROR';
         }
         $.write(settings, SETTINGS_KEY);

backend/src/restful/sync.js

@@ -556,10 +556,8 @@ async function syncArtifacts() {
         const allSubs = $.read(SUBS_KEY);
         const allCols = $.read(COLLECTIONS_KEY);
         const subNames = [];
-        let enabledCount = 0;
         allArtifacts.map((artifact) => {
             if (artifact.sync && artifact.source) {
-                enabledCount++;
                 if (artifact.type === 'subscription') {
                     const subName = artifact.source;
                     const sub = findByName(allSubs, subName);
@@ -580,13 +578,6 @@ async function syncArtifacts() {
             }
         });
 
-        if (enabledCount === 0) {
-            $.info(
-                `需同步的配置: ${enabledCount}, 总数: ${allArtifacts.length}`,
-            );
-            return;
-        }
-
         if (subNames.length > 0) {
             await Promise.all(
                 subNames.map(async (subName) => {

backend/src/utils/gist.js

@@ -280,7 +280,7 @@ export default class Gist {
                 return Promise.reject(err);
             }
         } else {
-            return Promise.reject(`找不到 Sub-Store Gist (${this.key})`);
+            return Promise.reject('找不到 Sub-Store Gist');
         }
     }
 }

backend/src/vendor/open-api.js

@@ -360,12 +360,7 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                 }
                 if (isNode) {
                     const undici = eval("require('undici')");
-                    const {
-                        ProxyAgent,
-                        EnvHttpProxyAgent,
-                        request,
-                        interceptors,
-                    } = undici;
+                    const { ProxyAgent, EnvHttpProxyAgent, request } = undici;
                     const agentOpts = {
                         connect: {
                             rejectUnauthorized:
@@ -392,18 +387,12 @@ export function HTTP(defaultOptions = { baseURL: '' }) {
                         const response = await request(opts.url, {
                             ...opts,
                             method: method.toUpperCase(),
-                            dispatcher: (opts.proxy
+                            dispatcher: opts.proxy
                                 ? new ProxyAgent({
                                       ...agentOpts,
                                       uri: opts.proxy,
                                   })
-                                : new EnvHttpProxyAgent(agentOpts)
-                            ).compose(
-                                interceptors.redirect({
-                                    maxRedirections: 3,
-                                    throwOnMaxRedirects: true,
-                                }),
-                            ),
+                                : new EnvHttpProxyAgent(agentOpts),
                         });
                         resolve({
                             statusCode: response.statusCode,