feat: 日志中增加上传配置的响应

.github/workflows/main.yml

@@ -1,5 +1,6 @@
 name: build
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

backend/package.json

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

backend/src/core/proxy-utils/parsers/peggy/loon.js

@@ -44,7 +44,7 @@ shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -169,6 +169,11 @@ ssr_protocol_param = comma "protocol-param" equals param:$[^=,]+ { proxy["protoc
 
 vmess_alterId = comma "alterId" equals alterId:$[0-9]+ { proxy.alterId = parseInt(alterId); } 
 
+udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
+shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
+shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
+
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
 tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }

backend/src/core/proxy-utils/parsers/peggy/loon.peg

@@ -42,7 +42,7 @@ shadowsocksr = tag equals "shadowsocksr"i address method password (ssr_protocol/
     // handle ssr obfs
     proxy.obfs = obfs.type;
 }
-shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/others)* {
+shadowsocks = tag equals "shadowsocks"i address method password (obfs_typev obfs_hostv)? (obfs_ss/obfs_host/obfs_uri/fast_open/udp_relay/udp_port/shadow_tls_version/shadow_tls_sni/shadow_tls_password/others)* {
     proxy.type = "ss";
     // handle ss obfs
     if (obfs.type == "http" || obfs.type === "tls") {
@@ -167,6 +167,11 @@ ssr_protocol_param = comma "protocol-param" equals param:$[^=,]+ { proxy["protoc
 
 vmess_alterId = comma "alterId" equals alterId:$[0-9]+ { proxy.alterId = parseInt(alterId); } 
 
+udp_port = comma "udp-port" equals match:$[0-9]+ { proxy["udp-port"] = parseInt(match.trim()); }
+shadow_tls_version = comma "shadow-tls-version" equals match:$[0-9]+ { proxy["shadow-tls-version"] = parseInt(match.trim()); }
+shadow_tls_sni = comma "shadow-tls-sni" equals match:[^,]+ { proxy["shadow-tls-sni"] = match.join(""); }
+shadow_tls_password = comma "shadow-tls-password" equals match:[^,]+ { proxy["shadow-tls-password"] = match.join(""); }
+
 over_tls = comma "over-tls" equals flag:bool { proxy.tls = flag; }
 tls_host = comma sni:("tls-name"/"sni") equals host:domain { proxy.sni = host; }
 tls_verification = comma "skip-cert-verify" equals flag:bool { proxy["skip-cert-verify"] = flag; }

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

@@ -1,5 +1,6 @@
 import { safeLoad } from '@/utils/yaml';
 import { Base64 } from 'js-base64';
+import $ from '@/core/app';
 
 function HTML() {
     const name = 'HTML';
@@ -35,8 +36,15 @@ function Base64Encoded() {
         );
     };
     const parse = function (raw) {
-        raw = Base64.decode(raw);
-        return raw;
+        const decoded = Base64.decode(raw);
+        if (!/^\w+:\/\/\w+/m.test(decoded)) {
+            $.error(
+                `Base64 Pre-processor error: decoded line does not start with protocol`,
+            );
+            return raw;
+        }
+
+        return decoded;
     };
     return { name, test, parse };
 }
@@ -48,7 +56,7 @@ function Clash() {
         const content = safeLoad(raw);
         return content.proxies && Array.isArray(content.proxies);
     };
-    const parse = function (raw) {
+    const parse = function (raw, includeProxies) {
         // Clash YAML format
 
         // 防止 VLESS节点 reality-opts 选项中的 short-id 被解析成 Infinity
@@ -56,35 +64,40 @@ function Clash() {
         const afterReplace = raw.replace(
             /short-id:([ ]*[^,\n}]*)/g,
             (matched, value) => {
-            const afterTrim = value.trim();
-        
-            // 为空
-            if (!afterTrim || afterTrim === '') {
-                return 'short-id: ""'
-            }
-        
-            // 是否被引号包裹
-            if (/^(['"]).*\1$/.test(afterTrim)) {
-                return `short-id: ${afterTrim}`;
-            } else {
-                return `short-id: "${afterTrim}"`
-            }
-            }
+                const afterTrim = value.trim();
+
+                // 为空
+                if (!afterTrim || afterTrim === '') {
+                    return 'short-id: ""';
+                }
+
+                // 是否被引号包裹
+                if (/^(['"]).*\1$/.test(afterTrim)) {
+                    return `short-id: ${afterTrim}`;
+                } else {
+                    return `short-id: "${afterTrim}"`;
+                }
+            },
         );
 
         const {
             proxies,
             'global-client-fingerprint': globalClientFingerprint,
         } = safeLoad(afterReplace);
-        return proxies
-            .map((p) => {
-                // https://github.com/MetaCubeX/mihomo/blob/Alpha/docs/config.yaml#L73C1-L73C26
-                if (globalClientFingerprint && !p['client-fingerprint']) {
-                    p['client-fingerprint'] = globalClientFingerprint;
-                }
-                return JSON.stringify(p);
-            })
-            .join('\n');
+        return (
+            (includeProxies ? 'proxies:\n' : '') +
+            proxies
+                .map((p) => {
+                    // https://github.com/MetaCubeX/mihomo/blob/Alpha/docs/config.yaml#L73C1-L73C26
+                    if (globalClientFingerprint && !p['client-fingerprint']) {
+                        p['client-fingerprint'] = globalClientFingerprint;
+                    }
+                    return `${includeProxies ? '  - ' : ''}${JSON.stringify(
+                        p,
+                    )}\n`;
+                })
+                .join('')
+        );
     };
     return { name, test, parse };
 }

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

@@ -10,6 +10,7 @@ import { hex_md5 } from '@/vendor/md5';
 import { ProxyUtils } from '@/core/proxy-utils';
 import { produceArtifact } from '@/restful/sync';
 import { SETTINGS_KEY } from '@/constants';
+import YAML from '@/utils/yaml';
 
 import env from '@/utils/env';
 import {
@@ -21,6 +22,46 @@ import {
     getRmainingDays,
 } from '@/utils/flow';
 
+function isObject(item) {
+    return item && typeof item === 'object' && !Array.isArray(item);
+}
+function trimWrap(str) {
+    if (str.startsWith('<') && str.endsWith('>')) {
+        return str.slice(1, -1);
+    }
+    return str;
+}
+function deepMerge(target, _other) {
+    const other = typeof _other === 'string' ? JSON.parse(_other) : _other;
+    for (const key in other) {
+        if (isObject(other[key])) {
+            if (key.endsWith('!')) {
+                const k = trimWrap(key.slice(0, -1));
+                target[k] = other[key];
+            } else {
+                const k = trimWrap(key);
+                if (!target[k]) Object.assign(target, { [k]: {} });
+                deepMerge(target[k], other[k]);
+            }
+        } else if (Array.isArray(other[key])) {
+            if (key.startsWith('+')) {
+                const k = trimWrap(key.slice(1));
+                if (!target[k]) Object.assign(target, { [k]: [] });
+                target[k] = [...other[key], ...target[k]];
+            } else if (key.endsWith('+')) {
+                const k = trimWrap(key.slice(0, -1));
+                if (!target[k]) Object.assign(target, { [k]: [] });
+                target[k] = [...target[k], ...other[key]];
+            } else {
+                const k = trimWrap(key);
+                Object.assign(target, { [k]: other[key] });
+            }
+        } else {
+            Object.assign(target, { [key]: other[key] });
+        }
+    }
+    return target;
+}
 /**
  The rule "(name CONTAINS "🇨🇳") AND (port IN [80, 443])" can be expressed as follows:
  {
@@ -321,6 +362,33 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
         name: 'Script Operator',
         func: async (proxies) => {
             let output = proxies;
+            if (output?.$file?.type === 'mihomoProfile') {
+                try {
+                    let patch = YAML.safeLoad(script);
+                    if (typeof patch !== 'object') patch = {};
+                    output.$content = ProxyUtils.yaml.safeDump(
+                        deepMerge(
+                            {
+                                proxies: await produceArtifact({
+                                    type:
+                                        output?.$file?.sourceType ||
+                                        'collection',
+                                    name: output?.$file?.sourceName,
+                                    platform: 'mihomo',
+                                    produceType: 'internal',
+                                    produceOpts: {
+                                        'delete-underscore-fields': true,
+                                    },
+                                }),
+                            },
+                            patch,
+                        ),
+                    );
+                    return output;
+                } catch (e) {
+                    // console.log(e);
+                }
+            }
             await (async function () {
                 const operator = createDynamicFunction(
                     'operator',
@@ -339,9 +407,27 @@ function ScriptOperator(script, targetPlatform, $arguments, source, $options) {
                     'operator',
                     `async function operator(input = []) {
                         if (input && (input.$files || input.$content)) {
-                            let { $content, $files, $options } = input
-                            ${script}
-                            return { $content, $files, $options }
+                            let { $content, $files, $options, $file } = input
+                            if($file.type === 'mihomoProfile') {
+                                ${script}
+                                if(typeof main === 'function') {
+                                    const config = {
+                                        proxies: await produceArtifact({
+                                            type: $file.sourceType || 'collection',
+                                            name: $file.sourceName,
+                                            platform: 'mihomo',
+                                            produceType: 'internal',
+                                            produceOpts: {
+                                                'delete-underscore-fields': true
+                                            }
+                                        }),
+                                    }
+                                    $content = ProxyUtils.yaml.safeDump(await main(config))
+                                }
+                            } else {
+                                ${script}
+                            }
+                            return { $content, $files, $options, $file }
                         } else {
                             let proxies = input
                             let list = []

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

@@ -180,7 +180,7 @@ export default function ClashMeta_Producer() {
                 delete proxy.id;
                 delete proxy.resolved;
                 delete proxy['no-resolve'];
-                if (type !== 'internal') {
+                if (type !== 'internal' || opts['delete-underscore-fields']) {
                     for (const key in proxy) {
                         if (proxy[key] == null || /^_/i.test(key)) {
                             delete proxy[key];

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

@@ -20,20 +20,37 @@ function JSON_Producer() {
 }
 
 export default {
+    qx: QX_Producer(),
     QX: QX_Producer(),
     QuantumultX: QX_Producer(),
+    surge: Surge_Producer(),
     Surge: Surge_Producer(),
     SurgeMac: SurgeMac_Producer(),
     Loon: Loon_Producer(),
     Clash: Clash_Producer(),
+    meta: ClashMeta_Producer(),
+    clashmeta: ClashMeta_Producer(),
+    'clash.meta': ClashMeta_Producer(),
+    'Clash.Meta': ClashMeta_Producer(),
     ClashMeta: ClashMeta_Producer(),
+    mihomo: ClashMeta_Producer(),
+    Mihomo: ClashMeta_Producer(),
+    uri: URI_Producer(),
     URI: URI_Producer(),
+    v2: V2Ray_Producer(),
+    v2ray: V2Ray_Producer(),
     V2Ray: V2Ray_Producer(),
+    json: JSON_Producer(),
     JSON: JSON_Producer(),
+    stash: Stash_Producer(),
     Stash: Stash_Producer(),
+    shadowrocket: Shadowrocket_Producer(),
     Shadowrocket: Shadowrocket_Producer(),
     ShadowRocket: Shadowrocket_Producer(),
+    surfboard: Surfboard_Producer(),
     Surfboard: Surfboard_Producer(),
+    singbox: singbox_Producer(),
     'sing-box': singbox_Producer(),
+    egern: Egern_Producer(),
     Egern: Egern_Producer(),
 };

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

@@ -32,7 +32,7 @@ export default function Loon_Producer() {
     return { produce };
 }
 
-function shadowsocks(proxy) {
+function shadowsocks(proxy, includeUnsupportedProxy) {
     const result = new Result(proxy);
     if (
         ![
@@ -66,6 +66,8 @@ function shadowsocks(proxy) {
         `${proxy.name}=shadowsocks,${proxy.server},${proxy.port},${proxy.cipher},"${proxy.password}"`,
     );
 
+    let isShadowTLS;
+
     // obfs
     if (isPresent(proxy, 'plugin')) {
         if (proxy.plugin === 'obfs') {
@@ -78,11 +80,52 @@ function shadowsocks(proxy) {
                 `,obfs-uri=${proxy['plugin-opts'].path}`,
                 'plugin-opts.path',
             );
-        } else {
+        } else if (!['shadow-tls'].includes(proxy.plugin)) {
             throw new Error(`plugin ${proxy.plugin} is not supported`);
         }
     }
 
+    // shadow-tls
+    if (isPresent(proxy, 'shadow-tls-password')) {
+        result.append(`,shadow-tls-password=${proxy['shadow-tls-password']}`);
+
+        result.appendIfPresent(
+            `,shadow-tls-version=${proxy['shadow-tls-version']}`,
+            'shadow-tls-version',
+        );
+        result.appendIfPresent(
+            `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
+            'shadow-tls-sni',
+        );
+        // udp-port
+        result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
+        isShadowTLS = true;
+    } else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
+        const password = proxy['plugin-opts'].password;
+        const host = proxy['plugin-opts'].host;
+        const version = proxy['plugin-opts'].version;
+        if (password) {
+            result.append(`,shadow-tls-password=${password}`);
+            if (host) {
+                result.append(`,shadow-tls-sni=${host}`);
+            }
+            if (version) {
+                if (version < 2) {
+                    throw new Error(
+                        `shadow-tls version ${version} is not supported`,
+                    );
+                }
+                result.append(`,shadow-tls-version=${version}`);
+            }
+            // udp-port
+            result.appendIfPresent(
+                `,udp-port=${proxy['udp-port']}`,
+                'udp-port',
+            );
+            isShadowTLS = true;
+        }
+    }
+
     // tfo
     result.appendIfPresent(`,fast-open=${proxy.tfo}`, 'tfo');
 
@@ -91,6 +134,12 @@ function shadowsocks(proxy) {
         result.append(`,udp=true`);
     }
 
+    if (!includeUnsupportedProxy && isShadowTLS) {
+        throw new Error(
+            `shadow-tls is not supported(请使用 includeUnsupportedProxy 参数)`,
+        );
+    }
+
     return result.toString();
 }
 

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

@@ -127,8 +127,6 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
 
     // udp
     result.appendIfPresent(`,udp-relay=${proxy.udp}`, 'udp');
-    // udp-port
-    result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
 
     // test-url
     result.appendIfPresent(`,test-url=${proxy['test-url']}`, 'test-url');
@@ -160,6 +158,8 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
             `,shadow-tls-sni=${proxy['shadow-tls-sni']}`,
             'shadow-tls-sni',
         );
+        // udp-port
+        result.appendIfPresent(`,udp-port=${proxy['udp-port']}`, 'udp-port');
     } else if (['shadow-tls'].includes(proxy.plugin) && proxy['plugin-opts']) {
         const password = proxy['plugin-opts'].password;
         const host = proxy['plugin-opts'].host;
@@ -177,6 +177,11 @@ function shadowsocks(proxy, includeUnsupportedProxy) {
                 }
                 result.append(`,shadow-tls-version=${version}`);
             }
+            // udp-port
+            result.appendIfPresent(
+                `,udp-port=${proxy['udp-port']}`,
+                'udp-port',
+            );
         }
     }
 

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

@@ -174,6 +174,14 @@ async function doSync() {
 
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
+        delete body.history;
+        delete body.forks;
+        delete body.owner;
+        Object.values(body.files).forEach((file) => {
+            delete file.content;
+        });
+        $.info('上传配置响应:');
+        $.info(JSON.stringify(body, null, 2));
 
         for (const artifact of allArtifacts) {
             if (artifact.sync) {

backend/src/restful/preview.js

@@ -67,7 +67,7 @@ async function previewFile(req, res) {
         const processed =
             Array.isArray(file.process) && file.process.length > 0
                 ? await ProxyUtils.process(
-                      { $files: files, $content: filesContent },
+                      { $files: files, $content: filesContent, $file: file },
                       file.process,
                   )
                 : { $content: filesContent, $files: files };

backend/src/restful/sync.js

@@ -512,7 +512,12 @@ async function produceArtifact({
         const processed =
             Array.isArray(file.process) && file.process.length > 0
                 ? await ProxyUtils.process(
-                      { $files: files, $content: filesContent, $options },
+                      {
+                          $files: files,
+                          $content: filesContent,
+                          $options,
+                          $file: file,
+                      },
                       file.process,
                   )
                 : { $content: filesContent, $files: files, $options };
@@ -620,6 +625,15 @@ async function syncArtifacts() {
         const resp = await syncToGist(files);
         const body = JSON.parse(resp.body);
 
+        delete body.history;
+        delete body.forks;
+        delete body.owner;
+        Object.values(body.files).forEach((file) => {
+            delete file.content;
+        });
+        $.info('上传配置响应:');
+        $.info(JSON.stringify(body, null, 2));
+
         for (const artifact of allArtifacts) {
             if (artifact.sync) {
                 artifact.updated = new Date().getTime();
@@ -738,6 +752,16 @@ async function syncArtifact(req, res) {
         });
         artifact.updated = new Date().getTime();
         const body = JSON.parse(resp.body);
+
+        delete body.history;
+        delete body.forks;
+        delete body.owner;
+        Object.values(body.files).forEach((file) => {
+            delete file.content;
+        });
+        $.info('上传配置响应:');
+        $.info(JSON.stringify(body, null, 2));
+
         let files = body.files;
         let isGitLab;
         if (Array.isArray(files)) {

backend/src/utils/download.js

@@ -207,7 +207,7 @@ export default async function download(
             if (preprocess) {
                 try {
                     if (clashPreprocessor.test(body)) {
-                        body = clashPreprocessor.parse(body);
+                        body = clashPreprocessor.parse(body, true);
                     }
                 } catch (e) {
                     $.error(`Clash Pre-processor error: ${e}`);

backend/src/utils/gist.js

@@ -114,15 +114,17 @@ export default class Gist {
                 return;
             });
         } else {
-            return this.http.get('/gists').then((response) => {
-                const gists = JSON.parse(response.body);
-                for (let g of gists) {
-                    if (g.description === this.key) {
-                        return g;
+            return this.http
+                .get('/gists?per_page=100&page=1')
+                .then((response) => {
+                    const gists = JSON.parse(response.body);
+                    for (let g of gists) {
+                        if (g.description === this.key) {
+                            return g;
+                        }
                     }
-                }
-                return;
-            });
+                    return;
+                });
         }
     }