surgio 2.14.2 → 2.17.0

package/build/utils/surge.js

@@ -0,0 +1,365 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSurgeNodes = exports.getSurgeExtendHeaders = void 0;
+const logger_1 = require("@surgio/logger");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_1 = __importDefault(require("lodash"));
+const os_1 = __importDefault(require("os"));
+const path_1 = require("path");
+const constant_1 = require("../constant");
+const types_1 = require("../types");
+const index_1 = require("./index");
+const filter_1 = require("./filter");
+const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:surge' });
+const getSurgeExtendHeaders = (wsHeaders) => {
+    return Object.keys(wsHeaders)
+        .map((headerKey) => `${headerKey}:${wsHeaders[headerKey]}`)
+        .join('|');
+};
+exports.getSurgeExtendHeaders = getSurgeExtendHeaders;
+/**
+ * @see https://manual.nssurge.com/policy/proxy.html
+ */
+const getSurgeNodes = function (list, filter) {
+    // istanbul ignore next
+    if (arguments.length === 2 && typeof filter === 'undefined') {
+        throw new Error(constant_1.ERR_INVALID_FILTER);
+    }
+    const result = (0, filter_1.applyFilter)(list, filter)
+        .map((nodeConfig) => {
+        var _a, _b, _c, _d, _e;
+        switch (nodeConfig.type) {
+            case types_1.NodeTypeEnum.Shadowsocks: {
+                const config = nodeConfig;
+                if (config.obfs && ['ws', 'wss'].includes(config.obfs)) {
+                    logger.warn(`不支持为 Surge 生成 v2ray-plugin 的 Shadowsocks 节点，节点 ${nodeConfig.nodeName} 会被省略`);
+                    return void 0;
+                }
+                // Native support for Shadowsocks
+                if (((_a = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _a === void 0 ? void 0 : _a.shadowsocksFormat) === 'ss') {
+                    return [
+                        config.nodeName,
+                        [
+                            'ss',
+                            config.hostname,
+                            config.port,
+                            'encrypt-method=' + config.method,
+                            ...(0, index_1.pickAndFormatStringList)(config, [
+                                'password',
+                                'udp-relay',
+                                'obfs',
+                                'obfs-host',
+                                'tfo',
+                                'mptcp',
+                            ]),
+                            ...(typeof config.testUrl === 'string'
+                                ? [`test-url=${config.testUrl}`]
+                                : []),
+                            ...(typeof config.underlyingProxy === 'string'
+                                ? [`underlying-proxy=${config.underlyingProxy}`]
+                                : []),
+                        ].join(', '),
+                    ].join(' = ');
+                }
+                // Using custom format
+                return [
+                    config.nodeName,
+                    [
+                        'custom',
+                        config.hostname,
+                        config.port,
+                        config.method,
+                        config.password,
+                        'https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module',
+                        ...(0, index_1.pickAndFormatStringList)(config, [
+                            'udp-relay',
+                            'obfs',
+                            'obfs-host',
+                            'tfo',
+                            'mptcp',
+                        ]),
+                        ...(typeof config.testUrl === 'string'
+                            ? [`test-url=${config.testUrl}`]
+                            : []),
+                        ...(typeof config.underlyingProxy === 'string'
+                            ? [`underlying-proxy=${config.underlyingProxy}`]
+                            : []),
+                    ].join(', '),
+                ].join(' = ');
+            }
+            case types_1.NodeTypeEnum.HTTPS: {
+                const config = nodeConfig;
+                return [
+                    config.nodeName,
+                    [
+                        'https',
+                        config.hostname,
+                        config.port,
+                        config.username,
+                        config.password,
+                        ...(typeof config.skipCertVerify === 'boolean'
+                            ? [`skip-cert-verify=${config.skipCertVerify}`]
+                            : []),
+                        ...(typeof config.underlyingProxy === 'string'
+                            ? [`underlying-proxy=${config.underlyingProxy}`]
+                            : []),
+                        ...(typeof config.testUrl === 'string'
+                            ? [`test-url=${config.testUrl}`]
+                            : []),
+                        ...(0, index_1.pickAndFormatStringList)(config, [
+                            'sni',
+                            'tfo',
+                            'mptcp',
+                            'tls13',
+                        ]),
+                    ].join(', '),
+                ].join(' = ');
+            }
+            case types_1.NodeTypeEnum.HTTP: {
+                const config = nodeConfig;
+                return [
+                    config.nodeName,
+                    [
+                        'http',
+                        config.hostname,
+                        config.port,
+                        config.username,
+                        config.password,
+                        ...(typeof config.underlyingProxy === 'string'
+                            ? [`underlying-proxy=${config.underlyingProxy}`]
+                            : []),
+                        ...(typeof config.testUrl === 'string'
+                            ? [`test-url=${config.testUrl}`]
+                            : []),
+                        ...(0, index_1.pickAndFormatStringList)(config, ['tfo', 'mptcp']),
+                    ].join(', '),
+                ].join(' = ');
+            }
+            case types_1.NodeTypeEnum.Snell: {
+                const config = nodeConfig;
+                return [
+                    config.nodeName,
+                    [
+                        'snell',
+                        config.hostname,
+                        config.port,
+                        ...(typeof config.underlyingProxy === 'string'
+                            ? [`underlying-proxy=${config.underlyingProxy}`]
+                            : []),
+                        ...(typeof config.testUrl === 'string'
+                            ? [`test-url=${config.testUrl}`]
+                            : []),
+                        ...(0, index_1.pickAndFormatStringList)(config, [
+                            'psk',
+                            'obfs',
+                            'obfs-host',
+                            'version',
+                            'tfo',
+                            'mptcp',
+                        ]),
+                    ].join(', '),
+                ].join(' = ');
+            }
+            case types_1.NodeTypeEnum.Shadowsocksr: {
+                const config = nodeConfig;
+                // istanbul ignore next
+                if (!config.binPath) {
+                    throw new Error('请按照文档 https://url.royli.dev/vdGh2 添加 Shadowsocksr 二进制文件路径');
+                }
+                const args = [
+                    '-s',
+                    config.hostname,
+                    '-p',
+                    `${config.port}`,
+                    '-m',
+                    config.method,
+                    '-o',
+                    config.obfs,
+                    '-O',
+                    config.protocol,
+                    '-k',
+                    config.password,
+                    '-l',
+                    `${config.localPort}`,
+                    '-b',
+                    '127.0.0.1',
+                ];
+                if (config.protoparam) {
+                    args.push('-G', config.protoparam);
+                }
+                if (config.obfsparam) {
+                    args.push('-g', config.obfsparam);
+                }
+                const configString = [
+                    'external',
+                    `exec = ${JSON.stringify(config.binPath)}`,
+                    ...args.map((arg) => `args = ${JSON.stringify(arg)}`),
+                    `local-port = ${config.localPort}`,
+                ];
+                if (config.localPort === 0) {
+                    throw new Error(`为 Surge 生成 SSR 配置时必须为 Provider ${(_b = config.provider) === null || _b === void 0 ? void 0 : _b.name} 设置 startPort，参考 https://url.royli.dev/bWcpe`);
+                }
+                if (config.hostnameIp && config.hostnameIp.length) {
+                    configString.push(...config.hostnameIp.map((item) => `addresses = ${item}`));
+                }
+                if ((0, index_1.isIp)(config.hostname)) {
+                    configString.push(`addresses = ${config.hostname}`);
+                }
+                return [config.nodeName, configString.join(', ')].join(' = ');
+            }
+            case types_1.NodeTypeEnum.Vmess: {
+                const config = nodeConfig;
+                if (((_c = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _c === void 0 ? void 0 : _c.v2ray) === 'native') {
+                    // Native support for vmess
+                    const configList = [
+                        'vmess',
+                        config.hostname,
+                        config.port,
+                        `username=${config.uuid}`,
+                    ];
+                    if (['chacha20-ietf-poly1305', 'aes-128-gcm'].includes(config.method)) {
+                        configList.push(`encrypt-method=${config.method}`);
+                    }
+                    if (config.network === 'ws') {
+                        configList.push('ws=true');
+                        configList.push(`ws-path=${config.path}`);
+                        configList.push('ws-headers=' +
+                            JSON.stringify((0, exports.getSurgeExtendHeaders)(Object.assign({ host: config.host || config.hostname, 'user-agent': constant_1.OBFS_UA }, lodash_1.default.omit(config.wsHeaders, ['host'])))));
+                    }
+                    if (config.tls) {
+                        configList.push('tls=true', ...(typeof config.tls13 === 'boolean'
+                            ? [`tls13=${config.tls13}`]
+                            : []), ...(typeof config.skipCertVerify === 'boolean'
+                            ? [`skip-cert-verify=${config.skipCertVerify}`]
+                            : []), ...(config.host ? [`sni=${config.host}`] : []));
+                    }
+                    if (typeof config.tfo === 'boolean') {
+                        configList.push(`tfo=${config.tfo}`);
+                    }
+                    if (typeof config.mptcp === 'boolean') {
+                        configList.push(`mptcp=${config.mptcp}`);
+                    }
+                    if (config['underlyingProxy']) {
+                        configList.push(`underlying-proxy=${config['underlyingProxy']}`);
+                    }
+                    if (config['testUrl']) {
+                        configList.push(`test-url=${config['testUrl']}`);
+                    }
+                    if ((_d = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _d === void 0 ? void 0 : _d.vmessAEAD) {
+                        configList.push('vmess-aead=true');
+                    }
+                    else {
+                        configList.push('vmess-aead=false');
+                    }
+                    return [config.nodeName, configList.join(', ')].join(' = ');
+                }
+                else {
+                    // Using external provider
+                    // istanbul ignore next
+                    if (!config.binPath) {
+                        throw new Error('请按照文档 https://url.royli.dev/vdGh2 添加 V2Ray 二进制文件路径');
+                    }
+                    if (config.localPort === 0) {
+                        throw new Error(`为 Surge 生成 Vmess 配置时必须为 Provider ${(_e = config.provider) === null || _e === void 0 ? void 0 : _e.name} 设置 startPort，参考 https://url.royli.dev/bWcpe`);
+                    }
+                    const jsonFileName = `v2ray_${config.localPort}_${config.hostname}_${config.port}.json`;
+                    const jsonFilePath = (0, path_1.join)((0, index_1.ensureConfigFolder)(), jsonFileName);
+                    const jsonFile = (0, index_1.formatV2rayConfig)(config.localPort, nodeConfig);
+                    const args = [
+                        '--config',
+                        jsonFilePath.replace(os_1.default.homedir(), '$HOME'),
+                    ];
+                    const configString = [
+                        'external',
+                        `exec = ${JSON.stringify(config.binPath)}`,
+                        ...args.map((arg) => `args = ${JSON.stringify(arg)}`),
+                        `local-port = ${config.localPort}`,
+                    ];
+                    if (config.hostnameIp && config.hostnameIp.length) {
+                        configString.push(...config.hostnameIp.map((item) => `addresses = ${item}`));
+                    }
+                    if ((0, index_1.isIp)(config.hostname)) {
+                        configString.push(`addresses = ${config.hostname}`);
+                    }
+                    // istanbul ignore next
+                    if (process.env.NODE_ENV !== 'test') {
+                        fs_extra_1.default.writeJSONSync(jsonFilePath, jsonFile);
+                    }
+                    return [config.nodeName, configString.join(', ')].join(' = ');
+                }
+            }
+            case types_1.NodeTypeEnum.Trojan: {
+                const configList = [
+                    'trojan',
+                    nodeConfig.hostname,
+                    `${nodeConfig.port}`,
+                    `password=${nodeConfig.password}`,
+                    ...(0, index_1.pickAndFormatStringList)(nodeConfig, [
+                        'tfo',
+                        'mptcp',
+                        'sni',
+                        'tls13',
+                    ]),
+                    ...(typeof nodeConfig.testUrl === 'string'
+                        ? [`test-url=${nodeConfig.testUrl}`]
+                        : []),
+                    ...(typeof nodeConfig.underlyingProxy === 'string'
+                        ? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
+                        : []),
+                    ...(typeof nodeConfig.skipCertVerify === 'boolean'
+                        ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
+                        : []),
+                ];
+                if (nodeConfig.network === 'ws') {
+                    configList.push('ws=true');
+                    configList.push(`ws-path=${nodeConfig.wsPath}`);
+                    if (nodeConfig.wsHeaders) {
+                        configList.push('ws-headers=' +
+                            JSON.stringify((0, exports.getSurgeExtendHeaders)(nodeConfig.wsHeaders)));
+                    }
+                }
+                return [nodeConfig.nodeName, configList.join(', ')].join(' = ');
+            }
+            case types_1.NodeTypeEnum.Socks5: {
+                const config = [
+                    nodeConfig.tls === true ? 'socks5-tls' : 'socks5',
+                    nodeConfig.hostname,
+                    nodeConfig.port,
+                    ...(typeof nodeConfig.underlyingProxy === 'string'
+                        ? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
+                        : []),
+                    ...(typeof nodeConfig.testUrl === 'string'
+                        ? [`test-url=${nodeConfig.testUrl}`]
+                        : []),
+                    ...(0, index_1.pickAndFormatStringList)(nodeConfig, [
+                        'username',
+                        'password',
+                        'sni',
+                        'tfo',
+                        'mptcp',
+                        'tls13',
+                    ]),
+                ];
+                if (nodeConfig.tls === true) {
+                    config.push(...(typeof nodeConfig.skipCertVerify === 'boolean'
+                        ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
+                        : []), ...(typeof nodeConfig.clientCert === 'string'
+                        ? [`client-cert=${nodeConfig.clientCert}`]
+                        : []));
+                }
+                return [nodeConfig.nodeName, config.join(', ')].join(' = ');
+            }
+            // istanbul ignore next
+            default:
+                logger.warn(`不支持为 Surge 生成 ${nodeConfig.type} 的节点，节点 ${nodeConfig.nodeName} 会被省略`);
+                return void 0;
+        }
+    })
+        .filter((item) => item !== undefined);
+    return result.join('\n');
+};
+exports.getSurgeNodes = getSurgeNodes;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"surge.js","sourceRoot":"","sources":["../../lib/utils/surge.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "surgio",
-  "version": "2.14.2",
+  "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
+  "version": "2.17.0",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {
@@ -64,15 +65,15 @@
     "joi": "^17.1.1",
     "listr": "^0.14.3",
     "lodash": "^4.17.19",
-    "lru-cache": "^6.0.0",
     "merge-stream": "^2.0.0",
     "ms": "^2.1.3",
+    "node-cache": "^5.1.2",
     "node-dir": "^0.1.17",
     "nunjucks": "^3.2.1",
     "ora": "^5.1.0",
     "query-string": "^6.12.1",
     "rimraf": "^3.0.0",
-    "shelljs": "^0.8.3",
+    "shelljs": "^0.8.5",
     "source-map-support": "^0.5.19",
     "update-notifier": "^5.0.0",
     "urlsafe-base64": "^1.0.0",
@@ -91,8 +92,7 @@
     "@types/inquirer": "^7.3.0",
     "@types/listr": "^0.14.2",
     "@types/lodash": "^4.14.174",
-    "@types/lru-cache": "^5.1.0",
-    "@types/node": "^12",
+    "@types/node": "^16",
     "@types/nunjucks": "^3.2.0",
     "@types/sinon": "^10.0.6",
     "@types/urlsafe-base64": "^1.0.28",