feat: 订阅刷新按钮逻辑调整为无缓存刷新订阅和流量

backend/package.json

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

backend/src/products/sub-store-0.js

@@ -21,6 +21,7 @@ import registerSettingRoutes from '@/restful/settings';
 import registerMiscRoutes from '@/restful/miscs';
 import registerSortRoutes from '@/restful/sort';
 import registerFileRoutes from '@/restful/file';
+import registerTokenRoutes from '@/restful/token';
 import registerModuleRoutes from '@/restful/module';
 
 migrate();
@@ -32,6 +33,7 @@ function serve() {
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
+    registerTokenRoutes($app);
     registerFileRoutes($app);
     registerModuleRoutes($app);
     registerArtifactRoutes($app);

backend/src/restful/download.js

@@ -75,6 +75,7 @@ async function downloadSubscription(req, res) {
         includeUnsupportedProxy,
         resultFormat,
         proxy,
+        noCache,
     } = req.query;
     let $options = {};
     if (req.query.$options) {
@@ -131,6 +132,10 @@ async function downloadSubscription(req, res) {
         $.info(`手动指定了 target 为 SurgeMac, 将使用 Mihomo External`);
     }
 
+    if (noCache) {
+        $.info(`指定不使用缓存: ${noCache}`);
+    }
+
     const allSubs = $.read(SUBS_KEY);
     const sub = findByName(allSubs, name);
     if (sub) {
@@ -151,6 +156,7 @@ async function downloadSubscription(req, res) {
                 },
                 $options,
                 proxy,
+                noCache,
             });
 
             if (
@@ -283,6 +289,7 @@ async function downloadCollection(req, res) {
         includeUnsupportedProxy,
         resultFormat,
         proxy,
+        noCache,
     } = req.query;
 
     let $options = {};
@@ -325,6 +332,9 @@ async function downloadCollection(req, res) {
     if (useMihomoExternal) {
         $.info(`手动指定了 target 为 SurgeMac, 将使用 Mihomo External`);
     }
+    if (noCache) {
+        $.info(`指定不使用缓存: ${noCache}`);
+    }
 
     if (collection) {
         try {
@@ -340,6 +350,7 @@ async function downloadCollection(req, res) {
                 },
                 $options,
                 proxy,
+                noCache,
             });
 
             // forward flow header from the first subscription in this collection

backend/src/restful/index.js

@@ -10,6 +10,7 @@ import registerSubscriptionRoutes from './subscriptions';
 import registerCollectionRoutes from './collections';
 import registerArtifactRoutes from './artifacts';
 import registerFileRoutes from './file';
+import registerTokenRoutes from './token';
 import registerModuleRoutes from './module';
 import registerSyncRoutes from './sync';
 import registerDownloadRoutes from './download';
@@ -37,6 +38,7 @@ export default function serve() {
     registerSettingRoutes($app);
     registerArtifactRoutes($app);
     registerFileRoutes($app);
+    registerTokenRoutes($app);
     registerModuleRoutes($app);
     registerSyncRoutes($app);
     registerNodeInfoRoutes($app);

backend/src/restful/miscs.js

@@ -9,10 +9,6 @@ import {
     GIST_BACKUP_FILE_NAME,
     GIST_BACKUP_KEY,
     SETTINGS_KEY,
-    TOKENS_KEY,
-    FILES_KEY,
-    COLLECTIONS_KEY,
-    SUBS_KEY,
 } from '@/constants';
 import { InternalServerError, RequestInvalidError } from '@/restful/errors';
 import Gist from '@/utils/gist';
@@ -24,7 +20,6 @@ export default function register($app) {
     $app.get('/api/utils/env', getEnv); // get runtime environment
     $app.get('/api/utils/backup', gistBackup); // gist backup actions
     $app.get('/api/utils/refresh', refresh);
-    $app.post('/api/token', signToken);
 
     // Storage management
     $app.route('/api/storage')
@@ -76,145 +71,6 @@ function getEnv(req, res) {
     success(res, env);
 }
 
-async function signToken(req, res) {
-    if (!ENV().isNode) {
-        return failed(
-            res,
-            new RequestInvalidError(
-                'INVALID_ENV',
-                `This endpoint is only available in Node.js environment`,
-            ),
-        );
-    }
-    try {
-        const { payload, options } = req.body;
-        const ms = eval(`require("ms")`);
-        let token = payload?.token;
-        if (token != null) {
-            if (typeof token !== 'string' || token.length < 1) {
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_CUSTOM_TOKEN',
-                        `Invalid custom token: ${token}`,
-                    ),
-                );
-            }
-            const tokens = $.read(TOKENS_KEY) || [];
-            if (tokens.find((t) => t.token === token)) {
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'DUPLICATE_TOKEN',
-                        `Token ${token} already exists`,
-                    ),
-                );
-            }
-        }
-        const type = payload?.type;
-        const name = payload?.name;
-        if (!type || !name)
-            return failed(
-                res,
-                new RequestInvalidError(
-                    'INVALID_PAYLOAD',
-                    `payload type and name are required`,
-                ),
-            );
-        if (type === 'col') {
-            const collections = $.read(COLLECTIONS_KEY) || [];
-            const collection = collections.find((c) => c.name === name);
-            if (!collection)
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_COLLECTION',
-                        `collection ${name} not found`,
-                    ),
-                );
-        } else if (type === 'file') {
-            const files = $.read(FILES_KEY) || [];
-            const file = files.find((f) => f.name === name);
-            if (!file)
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_FILE',
-                        `file ${name} not found`,
-                    ),
-                );
-        } else if (type === 'sub') {
-            const subs = $.read(SUBS_KEY) || [];
-            const sub = subs.find((s) => s.name === name);
-            if (!sub)
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_SUB',
-                        `sub ${name} not found`,
-                    ),
-                );
-        } else {
-            return failed(
-                res,
-                new RequestInvalidError(
-                    'INVALID_TYPE',
-                    `type ${name} not supported`,
-                ),
-            );
-        }
-        let expiresIn = options?.expiresIn;
-        if (options?.expiresIn != null) {
-            expiresIn = ms(options.expiresIn);
-            if (expiresIn == null || isNaN(expiresIn) || expiresIn <= 0) {
-                return failed(
-                    res,
-                    new RequestInvalidError(
-                        'INVALID_EXPIRES_IN',
-                        `Invalid expiresIn option: ${options.expiresIn}`,
-                    ),
-                );
-            }
-        }
-        const secret = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
-        const nanoid = eval(`require("nanoid")`);
-        const tokens = $.read(TOKENS_KEY) || [];
-        // const now = Date.now();
-        // for (const key in tokens) {
-        //     const token = tokens[key];
-        //     if (token.exp != null || token.exp < now) {
-        //         delete tokens[key];
-        //     }
-        // }
-        if (!token) {
-            do {
-                token = nanoid.customAlphabet(nanoid.urlAlphabet)();
-            } while (tokens.find((t) => t.token === token));
-        }
-        tokens.push({
-            ...payload,
-            token,
-            createdAt: Date.now(),
-            expiresIn: expiresIn > 0 ? options?.expiresIn : undefined,
-            exp: expiresIn > 0 ? Date.now() + expiresIn : undefined,
-        });
-
-        $.write(tokens, TOKENS_KEY);
-        return success(res, {
-            token,
-            secret,
-        });
-    } catch (e) {
-        return failed(
-            res,
-            new InternalServerError(
-                'TOKEN_SIGN_FAILED',
-                `Failed to sign token`,
-                `Reason: ${e.message ?? e}`,
-            ),
-        );
-    }
-}
 async function refresh(_, res) {
     // 1. get GitHub avatar and artifact store
     await updateAvatar();

backend/src/restful/sync.js

@@ -39,6 +39,7 @@ async function produceArtifact({
     awaitCustomCache,
     $options,
     proxy,
+    noCache,
 }) {
     platform = platform || 'JSON';
 
@@ -72,6 +73,7 @@ async function produceArtifact({
                                 proxy || sub.proxy,
                                 undefined,
                                 awaitCustomCache,
+                                noCache,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -119,6 +121,7 @@ async function produceArtifact({
                                 proxy || sub.proxy,
                                 undefined,
                                 awaitCustomCache,
+                                noCache,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -237,6 +240,9 @@ async function produceArtifact({
                                             proxy ||
                                                 sub.proxy ||
                                                 collection.proxy,
+                                            undefined,
+                                            undefined,
+                                            noCache,
                                         );
                                     } catch (err) {
                                         errors[url] = err;
@@ -410,6 +416,9 @@ async function produceArtifact({
                                 ua || file.ua,
                                 undefined,
                                 file.proxy || proxy,
+                                undefined,
+                                undefined,
+                                noCache,
                             );
                         } catch (err) {
                             errors[url] = err;
@@ -458,6 +467,9 @@ async function produceArtifact({
                                 ua || file.ua,
                                 undefined,
                                 file.proxy || proxy,
+                                undefined,
+                                undefined,
+                                noCache,
                             );
                         } catch (err) {
                             errors[url] = err;

backend/src/restful/token.js

@@ -0,0 +1,181 @@
+import { deleteByName } from '@/utils/database';
+import { ENV } from '@/vendor/open-api';
+import { TOKENS_KEY, SUBS_KEY, FILES_KEY, COLLECTIONS_KEY } from '@/constants';
+import { failed, success } from '@/restful/response';
+import $ from '@/core/app';
+import { RequestInvalidError, InternalServerError } from '@/restful/errors';
+
+export default function register($app) {
+    if (!$.read(TOKENS_KEY)) $.write([], TOKENS_KEY);
+
+    $app.post('/api/token', signToken);
+
+    $app.route('/api/token/:token').delete(deleteToken);
+
+    $app.route('/api/tokens').get(getAllTokens);
+}
+
+function deleteToken(req, res) {
+    let { token } = req.params;
+    token = decodeURIComponent(token);
+    $.info(`正在删除：${token}`);
+    let allTokens = $.read(TOKENS_KEY);
+    deleteByName(allTokens, token, 'token');
+    $.write(allTokens, TOKENS_KEY);
+    success(res);
+}
+
+function getAllTokens(req, res) {
+    const { type, name } = req.query;
+    const allTokens = $.read(TOKENS_KEY) || [];
+    success(
+        res,
+        type || name
+            ? allTokens.filter(
+                  (item) =>
+                      (type ? item.type === type : true) &&
+                      (name ? item.name === name : true),
+              )
+            : allTokens,
+    );
+}
+
+async function signToken(req, res) {
+    if (!ENV().isNode) {
+        return failed(
+            res,
+            new RequestInvalidError(
+                'INVALID_ENV',
+                `This endpoint is only available in Node.js environment`,
+            ),
+        );
+    }
+    try {
+        const { payload, options } = req.body;
+        const ms = eval(`require("ms")`);
+        let token = payload?.token;
+        if (token != null) {
+            if (typeof token !== 'string' || token.length < 1) {
+                return failed(
+                    res,
+                    new RequestInvalidError(
+                        'INVALID_CUSTOM_TOKEN',
+                        `Invalid custom token: ${token}`,
+                    ),
+                );
+            }
+            const tokens = $.read(TOKENS_KEY) || [];
+            if (tokens.find((t) => t.token === token)) {
+                return failed(
+                    res,
+                    new RequestInvalidError(
+                        'DUPLICATE_TOKEN',
+                        `Token ${token} already exists`,
+                    ),
+                );
+            }
+        }
+        const type = payload?.type;
+        const name = payload?.name;
+        if (!type || !name)
+            return failed(
+                res,
+                new RequestInvalidError(
+                    'INVALID_PAYLOAD',
+                    `payload type and name are required`,
+                ),
+            );
+        if (type === 'col') {
+            const collections = $.read(COLLECTIONS_KEY) || [];
+            const collection = collections.find((c) => c.name === name);
+            if (!collection)
+                return failed(
+                    res,
+                    new RequestInvalidError(
+                        'INVALID_COLLECTION',
+                        `collection ${name} not found`,
+                    ),
+                );
+        } else if (type === 'file') {
+            const files = $.read(FILES_KEY) || [];
+            const file = files.find((f) => f.name === name);
+            if (!file)
+                return failed(
+                    res,
+                    new RequestInvalidError(
+                        'INVALID_FILE',
+                        `file ${name} not found`,
+                    ),
+                );
+        } else if (type === 'sub') {
+            const subs = $.read(SUBS_KEY) || [];
+            const sub = subs.find((s) => s.name === name);
+            if (!sub)
+                return failed(
+                    res,
+                    new RequestInvalidError(
+                        'INVALID_SUB',
+                        `sub ${name} not found`,
+                    ),
+                );
+        } else {
+            return failed(
+                res,
+                new RequestInvalidError(
+                    'INVALID_TYPE',
+                    `type ${name} not supported`,
+                ),
+            );
+        }
+        let expiresIn = options?.expiresIn;
+        if (options?.expiresIn != null) {
+            expiresIn = ms(options.expiresIn);
+            if (expiresIn == null || isNaN(expiresIn) || expiresIn <= 0) {
+                return failed(
+                    res,
+                    new RequestInvalidError(
+                        'INVALID_EXPIRES_IN',
+                        `Invalid expiresIn option: ${options.expiresIn}`,
+                    ),
+                );
+            }
+        }
+        // const secret = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
+        const nanoid = eval(`require("nanoid")`);
+        const tokens = $.read(TOKENS_KEY) || [];
+        // const now = Date.now();
+        // for (const key in tokens) {
+        //     const token = tokens[key];
+        //     if (token.exp != null || token.exp < now) {
+        //         delete tokens[key];
+        //     }
+        // }
+        if (!token) {
+            do {
+                token = nanoid.customAlphabet(nanoid.urlAlphabet)();
+            } while (tokens.find((t) => t.token === token));
+        }
+        tokens.push({
+            ...payload,
+            token,
+            createdAt: Date.now(),
+            expiresIn: expiresIn > 0 ? options?.expiresIn : undefined,
+            exp: expiresIn > 0 ? Date.now() + expiresIn : undefined,
+        });
+
+        $.write(tokens, TOKENS_KEY);
+        return success(res, {
+            token,
+            // secret,
+        });
+    } catch (e) {
+        return failed(
+            res,
+            new InternalServerError(
+                'TOKEN_SIGN_FAILED',
+                `Failed to sign token`,
+                `Reason: ${e.message ?? e}`,
+            ),
+        );
+    }
+}

backend/src/utils/database.js

@@ -1,17 +1,17 @@
-export function findByName(list, name) {
-    return list.find((item) => item.name === name);
+export function findByName(list, name, field = 'name') {
+    return list.find((item) => item[field] === name);
 }
 
-export function findIndexByName(list, name) {
-    return list.findIndex((item) => item.name === name);
+export function findIndexByName(list, name, field = 'name') {
+    return list.findIndex((item) => item[field] === name);
 }
 
-export function deleteByName(list, name) {
-    const idx = findIndexByName(list, name);
+export function deleteByName(list, name, field = 'name') {
+    const idx = findIndexByName(list, name, field);
     list.splice(idx, 1);
 }
 
-export function updateByName(list, name, newItem) {
-    const idx = findIndexByName(list, name);
+export function updateByName(list, name, newItem, field = 'name') {
+    const idx = findIndexByName(list, name, field);
     list[idx] = newItem;
 }

backend/src/utils/download.js

@@ -21,6 +21,7 @@ export default async function download(
     customProxy,
     skipCustomCache,
     awaitCustomCache,
+    noCache,
 ) {
     let $arguments = {};
     let url = rawUrl.replace(/#noFlow$/, '');
@@ -65,7 +66,7 @@ export default async function download(
     if (customCacheKey && !skipCustomCache) {
         const customCached = $.read(customCacheKey);
         const cached = resourceCache.get(id);
-        if (!$arguments?.noCache && cached) {
+        if (!noCache && !$arguments?.noCache && cached) {
             $.info(
                 `乐观缓存: URL ${url}\n存在有效的常规缓存\n使用常规缓存以避免重复请求`,
             );
@@ -149,7 +150,7 @@ export default async function download(
 
     // try to find in app cache
     const cached = resourceCache.get(id);
-    if (!$arguments?.noCache && cached) {
+    if (!noCache && !$arguments?.noCache && cached) {
         $.info(`使用缓存: ${url}`);
         result = cached;
         if (customCacheKey) {