chore: 日志

feat: 支持通过.env配置环境变量，后端支持设置前置路由

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.18.5",
+  "version": "2.18.7",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and Shadowrocket.",
   "main": "src/main.js",
   "scripts": {
@@ -27,6 +27,7 @@
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
     "buffer": "^6.0.3",
+    "dotenv": "^16.4.7",
     "connect-history-api-fallback": "^2.0.0",
     "cron": "^3.1.6",
     "dns-packet": "^5.6.1",

backend/src/main.js

@@ -11,6 +11,7 @@
  * @documentation: https://www.notion.so/Sub-Store-6259586994d34c11a4ced5c406264b46
  */
 import { version } from '../package.json';
+import $ from '@/core/app';
 console.log(
     `
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
@@ -18,7 +19,10 @@ console.log(
 ┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅┅
 `,
 );
-
+if ($.env.isNode) {
+    const dotenv = eval(`require("dotenv")`);
+    dotenv.config();
+}
 import migrate from '@/utils/migration';
 import serve from '@/restful';
 

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

@@ -89,8 +89,10 @@ 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);
@@ -111,6 +113,13 @@ 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/index.js

@@ -29,6 +29,29 @@ export default function serve() {
         host = eval('process.env.SUB_STORE_BACKEND_API_HOST') || '::';
     }
     const $app = express({ substore: $, port, host });
+    if ($.env.isNode) {
+        const be_prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX');
+        const fe_be_path = eval('process.env.SUB_STORE_FRONTEND_BACKEND_PATH');
+        if (be_prefix) {
+            if (!fe_be_path.startsWith('/')) {
+                throw new Error(
+                    'SUB_STORE_FRONTEND_BACKEND_PATH should start with /',
+                );
+            }
+            $.info(
+                `[BACKEND PREFIX] ${host}:${port}${fe_be_path} -> ${host}:${port}`,
+            );
+            $app.use((req, res, next) => {
+                if (req.path.startsWith(fe_be_path)) {
+                    const newPath = req.url.replace(fe_be_path, '') || '/';
+                    req.url = newPath;
+                    next();
+                } else {
+                    res.status(403).send();
+                }
+            });
+        }
+    }
     // register routes
     registerCollectionRoutes($app);
     registerSubscriptionRoutes($app);
@@ -200,6 +223,9 @@ export default function serve() {
             let be_download_rewrite = '';
             let be_api_rewrite = '';
             let be_share_rewrite = `${be_share}:type/:name`;
+            let prefix = eval('process.env.SUB_STORE_BACKEND_PREFIX')
+                ? fe_be_path
+                : '';
             if (fe_be_path) {
                 if (!fe_be_path.startsWith('/')) {
                     throw new Error(
@@ -216,7 +242,7 @@ export default function serve() {
                 app.use(
                     be_share_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}`,
+                        target: `http://127.0.0.1:${port}${prefix}`,
                         changeOrigin: true,
                         pathRewrite: async (path, req) => {
                             if (req.method.toLowerCase() !== 'get')
@@ -237,7 +263,7 @@ export default function serve() {
                 app.use(
                     be_api_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${be_api}`,
+                        target: `http://127.0.0.1:${port}${prefix}${be_api}`,
                         pathRewrite: async (path) => {
                             return path.includes('?')
                                 ? `${path}&share=true`
@@ -248,7 +274,7 @@ export default function serve() {
                 app.use(
                     be_download_rewrite,
                     createProxyMiddleware({
-                        target: `http://127.0.0.1:${port}${be_download}`,
+                        target: `http://127.0.0.1:${port}${prefix}${be_download}`,
                         changeOrigin: true,
                     }),
                 );
@@ -269,10 +295,10 @@ export default function serve() {
                 $.info(`[FRONTEND] ${fe_address}:${fe_port}`);
                 if (fe_be_path) {
                     $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_api_rewrite} -> http://127.0.0.1:${port}${be_api}`,
+                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_api_rewrite} -> ${host}:${port}${prefix}${be_api}`,
                     );
                     $.info(
-                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> http://127.0.0.1:${port}${be_download}`,
+                        `[FRONTEND -> BACKEND] ${fe_address}:${fe_port}${be_download_rewrite} -> ${host}:${port}${prefix}${be_download}`,
                     );
                     $.info(
                         `[SHARE BACKEND] ${fe_address}:${fe_port}${be_share_rewrite}`,

backend/src/restful/settings.js

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

backend/src/restful/sync.js

@@ -556,8 +556,10 @@ 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);
@@ -578,6 +580,13 @@ 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');
+            return Promise.reject(`找不到 Sub-Store Gist (${this.key})`);
         }
     }
 }