feat: Node 版后端支持挂载前端文件夹, 环境变量 SUB_STORE_FRONTEND_PATH, SUB_STORE_FRONTEND_HOST, SUB_STORE_FRONTEND_PORT

.github/workflows/main.yml

@@ -45,18 +45,14 @@ jobs:
           cd backend
           SUBSTORE_RELEASE=`node --eval="process.stdout.write(require('./package.json').version)"`
           echo "release_tag=$SUBSTORE_RELEASE" >> $GITHUB_OUTPUT
-      - name: Prepare release
-        run: |
-          cd backend
-          pnpm i -D conventional-changelog-cli
-          pnpm run changelog
       - name: Release
         uses: softprops/action-gh-release@v1
+        if: ${{ success() }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          body_path: ./backend/CHANGELOG.md
           tag_name: ${{ steps.tag.outputs.release_tag }}
+          generate_release_notes: true
           files: |
             ./backend/sub-store.min.js
             ./backend/dist/sub-store-0.min.js

backend/bundle.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const fs = require('fs');
-
 const path = require('path');
+const { build } = require('esbuild');
 
 let content = fs.readFileSync(path.join(__dirname, 'sub-store.min.js'), {
     encoding: 'utf8',
@@ -14,10 +14,12 @@ fs.writeFileSync(path.join(__dirname, 'dist/sub-store.no-bundle.js'), content, {
     encoding: 'utf8',
 });
 
-const { build } = require('estrella');
 build({
-    entry: 'dist/sub-store.no-bundle.js',
-    outfile: 'dist/sub-store.bundle.js',
+    entryPoints: ['dist/sub-store.no-bundle.js'],
     bundle: true,
+    minify: true,
+    sourcemap: true,
     platform: 'node',
+    format: 'cjs',
+    outfile: 'dist/sub-store.bundle.js',
 });

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.14.116",
+  "version": "2.14.119",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {
@@ -9,14 +9,14 @@
     "serve": "node sub-store.min.js",
     "start": "nodemon -w src -w package.json --exec babel-node src/main.js",
     "build": "gulp",
-    "bundle": "node bundle.js",
-    "changelog": "conventional-changelog -p cli -i CHANGELOG.md -s"
+    "bundle": "node bundle.js"
   },
   "author": "Peng-YM",
   "license": "GPL-3.0",
   "dependencies": {
     "automerge": "1.0.1-preview.7",
     "body-parser": "^1.19.0",
+    "connect-history-api-fallback": "^2.0.0",
     "express": "^4.17.1",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
@@ -38,6 +38,7 @@
     "browser-pack-flat": "^3.4.2",
     "browserify": "^17.0.0",
     "chai": "^4.3.6",
+    "esbuild": "^0.19.8",
     "eslint": "^8.16.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",

backend/src/core/proxy-utils/producers/uri.js

@@ -258,11 +258,11 @@ export default function URI_Producer() {
                 if (proxy.tfo) {
                     hysteria2params.push(`fastopen=1`);
                 }
-                result = `hysteria2://${proxy.password}@${proxy.server}:${
-                    proxy.port
-                }?${hysteria2params.join('&')}#${encodeURIComponent(
-                    proxy.name,
-                )}`;
+                result = `hysteria2://${encodeURIComponent(proxy.password)}@${
+                    proxy.server
+                }:${proxy.port}?${hysteria2params.join(
+                    '&',
+                )}#${encodeURIComponent(proxy.name)}`;
                 break;
         }
         return result;

backend/src/restful/index.js

@@ -37,4 +37,46 @@ export default function serve() {
     registerMiscRoutes($app);
 
     $app.start();
+
+    if ($.env.isNode) {
+        const path = eval(`require("path")`);
+        const fs = eval(`require("fs")`);
+        const fe_port = eval('process.env.SUB_STORE_FRONTEND_PORT') || 3001;
+        const fe_host =
+            eval('process.env.SUB_STORE_FRONTEND_HOST') || host || '::';
+        const fe_path = eval('process.env.SUB_STORE_FRONTEND_PATH');
+        const fe_abs_path = path.resolve(
+            fe_path || path.join(__dirname, 'frontend'),
+        );
+        if (fe_path) {
+            try {
+                fs.accessSync(path.join(fe_abs_path, 'index.html'));
+            } catch (e) {
+                throw new Error(
+                    `[FRONTEND] index.html file not found in ${fe_abs_path}`,
+                );
+            }
+
+            const express_ = eval(`require("express")`);
+            const history = eval(`require("connect-history-api-fallback")`);
+
+            const app = express_();
+
+            const staticFileMiddleware = express_.static(fe_path);
+
+            app.use(staticFileMiddleware);
+            app.use(
+                history({
+                    disableDotRule: true,
+                    verbose: true,
+                }),
+            );
+            app.use(staticFileMiddleware);
+
+            const listener = app.listen(fe_port, fe_host, () => {
+                const { address, port } = listener.address();
+                $.info(`[FRONTEND] ${address}:${port}`);
+            });
+        }
+    }
 }

backend/src/vendor/express.js

@@ -32,7 +32,7 @@ export default function express({ substore: $, port, host }) {
         app.start = () => {
             const listener = app.listen(port, host, () => {
                 const { address, port } = listener.address();
-                $.info(`Express started on ${address}:${port}`);
+                $.info(`[BACKEND] ${address}:${port}`);
             });
         };
         return app;

package.json

@@ -0,0 +1,5 @@
+{
+	"dependencies": {
+		"connect-history-api-fallback": "^2.0.0"
+	}
+}

pnpm-lock.yaml

@@ -0,0 +1,19 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+dependencies:
+  connect-history-api-fallback:
+    specifier: ^2.0.0
+    version: registry.npmmirror.com/connect-history-api-fallback@2.0.0
+
+packages:
+
+  registry.npmmirror.com/connect-history-api-fallback@2.0.0:
+    resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==, registry: http://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz}
+    name: connect-history-api-fallback
+    version: 2.0.0
+    engines: {node: '>=0.8'}
+    dev: false