feat: sub-store.json 初始化时, 支持读取 Base64 内容

backend/package.json

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

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

@@ -134,6 +134,18 @@ export default function Clash_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
+                if (proxy.network === 'ws') {
+                    const wsPath = proxy['ws-opts']?.path;
+                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
+                    // eslint-disable-next-line no-unused-vars
+                    const [_, path = '', ed = ''] = reg.exec(wsPath);
+                    proxy['ws-opts'].path = path;
+                    if (ed !== '') {
+                        proxy['ws-opts']['early-data-header-name'] =
+                            'Sec-WebSocket-Protocol';
+                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
+                    }
+                }
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
                         proxy['plugin-opts']['skip-cert-verify'] =

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

@@ -198,6 +198,18 @@ export default function ClashMeta_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
+                if (proxy.network === 'ws') {
+                    const wsPath = proxy['ws-opts']?.path;
+                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
+                    // eslint-disable-next-line no-unused-vars
+                    const [_, path = '', ed = ''] = reg.exec(wsPath);
+                    proxy['ws-opts'].path = path;
+                    if (ed !== '') {
+                        proxy['ws-opts']['early-data-header-name'] =
+                            'Sec-WebSocket-Protocol';
+                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
+                    }
+                }
 
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {

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

@@ -166,6 +166,18 @@ export default function Shadowrocket_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
+                if (proxy.network === 'ws') {
+                    const wsPath = proxy['ws-opts']?.path;
+                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
+                    // eslint-disable-next-line no-unused-vars
+                    const [_, path = '', ed = ''] = reg.exec(wsPath);
+                    proxy['ws-opts'].path = path;
+                    if (ed !== '') {
+                        proxy['ws-opts']['early-data-header-name'] =
+                            'Sec-WebSocket-Protocol';
+                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
+                    }
+                }
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
                         proxy['plugin-opts']['skip-cert-verify'] =

backend/src/core/proxy-utils/producers/sing-box.js

@@ -71,7 +71,14 @@ const smuxParser = (smux, proxy) => {
 const wsParser = (proxy, parsedProxy) => {
     const transport = { type: 'ws', headers: {} };
     if (proxy['ws-opts']) {
-        const { path: wsPath = '', headers: wsHeaders = {} } = proxy['ws-opts'];
+        const {
+            path: wsPath = '',
+            headers: wsHeaders = {},
+            'max-early-data': max_early_data,
+            'early-data-header-name': early_data_header_name,
+        } = proxy['ws-opts'];
+        transport.early_data_header_name = early_data_header_name;
+        transport.max_early_data = parseInt(max_early_data, 10);
         if (wsPath !== '') transport.path = `${wsPath}`;
         if (Object.keys(wsHeaders).length > 0) {
             const headers = {};

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

@@ -238,6 +238,18 @@ export default function Stash_Producer() {
                         proxy['h2-opts'].headers.host = [host];
                     }
                 }
+                if (proxy.network === 'ws') {
+                    const wsPath = proxy['ws-opts']?.path;
+                    const reg = /^(.*?)(?:\?ed=(\d+))?$/;
+                    // eslint-disable-next-line no-unused-vars
+                    const [_, path = '', ed = ''] = reg.exec(wsPath);
+                    proxy['ws-opts'].path = path;
+                    if (ed !== '') {
+                        proxy['ws-opts']['early-data-header-name'] =
+                            'Sec-WebSocket-Protocol';
+                        proxy['ws-opts']['max-early-data'] = parseInt(ed, 10);
+                    }
+                }
                 if (proxy['plugin-opts']?.tls) {
                     if (isPresent(proxy, 'skip-cert-verify')) {
                         proxy['plugin-opts']['skip-cert-verify'] =

backend/src/restful/miscs.js

@@ -41,10 +41,30 @@ export default function register($app) {
                 );
         })
         .post((req, res) => {
-            const { content } = req.body;
-            $.write(content, '#sub-store');
+            let { content } = req.body;
+            try {
+                content = JSON.parse(Base64.decode(content));
+                if (Object.keys(content.settings).length === 0) {
+                    throw new Error('备份文件应该至少包含 settings 字段');
+                }
+            } catch (err) {
+                try {
+                    content = JSON.parse(content);
+                    if (Object.keys(content.settings).length === 0) {
+                        throw new Error('备份文件应该至少包含 settings 字段');
+                    }
+                } catch (err) {
+                    $.error(
+                        `备份文件校验失败, 无法还原\nReason: ${
+                            err.message ?? err
+                        }`,
+                    );
+                    throw new Error('备份文件校验失败, 无法还原');
+                }
+            }
+            $.write(JSON.stringify(content, null, `  `), '#sub-store');
             if ($.env.isNode) {
-                $.cache = JSON.parse(content);
+                $.cache = content;
                 $.persistCache();
             }
             migrate();
@@ -128,14 +148,14 @@ async function gistBackupAction(action, keep, encode) {
                 content = $.read('#sub-store');
                 content = content ? JSON.parse(content) : {};
                 if ($.env.isNode) content = JSON.parse(JSON.stringify($.cache));
-                if (encode === 'base64') {
-                    content = Base64.encode(
-                        JSON.stringify(content, null, `  `),
-                    );
-                } else {
+                if (encode === 'plaintext') {
                     content.settings.gistToken =
                         '恢复后请重新设置 GitHub Token';
                     content = JSON.stringify(content, null, `  `);
+                } else {
+                    content = Base64.encode(
+                        JSON.stringify(content, null, `  `),
+                    );
                 }
 
                 $.info(`下载备份, 与本地内容对比...`);
@@ -156,11 +176,11 @@ async function gistBackupAction(action, keep, encode) {
             content = $.read('#sub-store');
             content = content ? JSON.parse(content) : {};
             if ($.env.isNode) content = JSON.parse(JSON.stringify($.cache));
-            if (encode) {
-                content = Base64.encode(JSON.stringify(content, null, `  `));
-            } else {
+            if (encode === 'plaintext') {
                 content.settings.gistToken = '恢复后请重新设置 GitHub Token';
                 content = JSON.stringify(content, null, `  `);
+            } else {
+                content = Base64.encode(JSON.stringify(content, null, `  `));
             }
             $.info(`上传备份中...`);
             try {

backend/src/vendor/open-api.js

@@ -9,6 +9,7 @@ const isShadowRocket = 'undefined' !== typeof $rocket;
 const isEgern = 'object' == typeof egern;
 const isLanceX = 'undefined' != typeof $native;
 const isGUIforCores = typeof $Plugins !== 'undefined';
+import { Base64 } from 'js-base64';
 
 function isPlainObject(obj) {
     return (
@@ -120,13 +121,23 @@ export class OpenAPI {
             if (this.node.fs.existsSync(fpath)) {
                 try {
                     this.cache = JSON.parse(
-                        this.node.fs.readFileSync(`${fpath}`),
+                        this.node.fs.readFileSync(`${fpath}`, 'utf-8'),
                     );
                 } catch (e) {
-                    this.node.fs.copyFileSync(fpath, backupPath);
-                    this.error(
-                        `Failed to parse ${fpath}: ${e.message}. Backup created at ${backupPath}`,
-                    );
+                    try {
+                        const str = Base64.decode(
+                            this.node.fs.readFileSync(`${fpath}`, 'utf-8'),
+                        );
+                        this.cache = JSON.parse(str);
+                        this.node.fs.writeFileSync(fpath, str, {
+                            flag: 'w',
+                        });
+                    } catch (e) {
+                        this.node.fs.copyFileSync(fpath, backupPath);
+                        this.error(
+                            `Failed to parse ${fpath}: ${e.message}. Backup created at ${backupPath}`,
+                        );
+                    }
                 }
             }
             if (!isPlainObject(this.cache)) {