surgio 2.23.0 → 2.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/misc/deprecation.d.ts +2 -1
- package/build/misc/deprecation.js +4 -3
- package/build/provider/CustomProvider.js +8 -3
- package/build/types.d.ts +8 -4
- package/build/utils/index.d.ts +4 -1
- package/build/utils/index.js +20 -4
- package/build/utils/quantumult.js +5 -1
- package/build/utils/surge.js +75 -83
- package/package.json +2 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare const DEP005 = "surgioConfig.surgeConfig.shadowsocksFormat: \"custom\" \u5DF2\u4E0D\u63A8\u8350\u4F7F\u7528\uFF0C\u8BF7\u6539\u4E3A \"ss\"";
|
|
2
2
|
export declare const DEP006 = "surgioConfig.surgeConfig.v2ray: \"external\" \u5DF2\u4E0D\u63A8\u8350\u4F7F\u7528\uFF0C\u8BF7\u6539\u4E3A \"native\"";
|
|
3
|
-
export declare const DEP007 = "patchYamlArray \u5DF2\u4E0D\u63A8\u8350\u4F7F\u7528\uFF0C\u8BF7\u6539\u4E3A
|
|
3
|
+
export declare const DEP007 = "patchYamlArray \u5DF2\u4E0D\u63A8\u8350\u4F7F\u7528\uFF0C\u8BF7\u6539\u4E3A Clash \u89C4\u5219\u683C\u5F0F\u5904\u7406\u5668\uFF0C\u8BE6\u60C5\u8BF7\u9605\u8BFB https://url.royli.dev/xr9mj";
|
|
4
4
|
export declare const DEP008 = "surgioConfig.clashConfig.ssrFormat: \"legacy\" \u4F1A\u5728\u540E\u7EED\u7248\u672C\u4E2D\u79FB\u51FA\uFF0C\u8BF7\u4F7F\u7528\u539F\u7248 Clash \u5BA2\u6237\u7AEF";
|
|
5
5
|
export declare const DEP009 = "proxyGroupModifier \u4F1A\u5728\u540E\u7EED\u7248\u672C\u4E2D\u79FB\u51FA\uFF0C\u8BE6\u60C5\u8BF7\u9605\u8BFB https://url.royli.dev/YyKh1";
|
|
6
|
+
export declare const DEP010 = "Quantumult \u76F8\u5173\u65B9\u6CD5\u4F1A\u5728\u4E0B\u4E2A\u5927\u7248\u672C\u4E2D\u79FB\u51FA\uFF0C\u8BF7\u4F7F\u7528\u5176\u5B83\u5BA2\u6237\u7AEF";
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEP009 = exports.DEP008 = exports.DEP007 = exports.DEP006 = exports.DEP005 = void 0;
|
|
3
|
+
exports.DEP010 = exports.DEP009 = exports.DEP008 = exports.DEP007 = exports.DEP006 = exports.DEP005 = void 0;
|
|
4
4
|
exports.DEP005 = 'surgioConfig.surgeConfig.shadowsocksFormat: "custom" 已不推荐使用,请改为 "ss"';
|
|
5
5
|
exports.DEP006 = 'surgioConfig.surgeConfig.v2ray: "external" 已不推荐使用,请改为 "native"';
|
|
6
|
-
exports.DEP007 = 'patchYamlArray 已不推荐使用,请改为
|
|
6
|
+
exports.DEP007 = 'patchYamlArray 已不推荐使用,请改为 Clash 规则格式处理器,详情请阅读 https://url.royli.dev/xr9mj';
|
|
7
7
|
exports.DEP008 = 'surgioConfig.clashConfig.ssrFormat: "legacy" 会在后续版本中移出,请使用原版 Clash 客户端';
|
|
8
8
|
exports.DEP009 = 'proxyGroupModifier 会在后续版本中移出,详情请阅读 https://url.royli.dev/YyKh1';
|
|
9
|
-
|
|
9
|
+
exports.DEP010 = 'Quantumult 相关方法会在下个大版本中移出,请使用其它客户端';
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcmVjYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvbWlzYy9kZXByZWNhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLE1BQU0sR0FDakIsc0VBQXNFLENBQUM7QUFDNUQsUUFBQSxNQUFNLEdBQ2pCLGdFQUFnRSxDQUFDO0FBQ3RELFFBQUEsTUFBTSxHQUNqQiwyRUFBMkUsQ0FBQztBQUNqRSxRQUFBLE1BQU0sR0FDakIsd0VBQXdFLENBQUM7QUFDOUQsUUFBQSxNQUFNLEdBQ2pCLGdFQUFnRSxDQUFDO0FBQ3RELFFBQUEsTUFBTSxHQUNqQixvQ0FBb0MsQ0FBQyJ9
|
|
@@ -17,22 +17,27 @@ class CustomProvider extends Provider_1.default {
|
|
|
17
17
|
enable: joi_1.default.boolean().strict(),
|
|
18
18
|
tfo: joi_1.default.boolean().strict(),
|
|
19
19
|
mptcp: joi_1.default.boolean().strict(),
|
|
20
|
+
shadowTls: joi_1.default.object({
|
|
21
|
+
password: joi_1.default.string().required(),
|
|
22
|
+
sni: joi_1.default.string(),
|
|
23
|
+
}),
|
|
20
24
|
binPath: joi_1.default.string(),
|
|
21
25
|
localPort: joi_1.default.number(),
|
|
22
26
|
underlyingProxy: joi_1.default.string(),
|
|
23
27
|
skipCertVerify: joi_1.default.boolean().strict(),
|
|
24
28
|
sni: joi_1.default.string(),
|
|
25
29
|
alpn: joi_1.default.array().items(joi_1.default.string()),
|
|
30
|
+
serverCertFingerprintSha256: joi_1.default.string(),
|
|
26
31
|
}).unknown();
|
|
27
32
|
const schema = joi_1.default.object({
|
|
28
33
|
nodeList: joi_1.default.array().items(nodeSchema).required(),
|
|
29
34
|
}).unknown();
|
|
30
|
-
const { error } = schema.validate(config);
|
|
35
|
+
const { error, value } = schema.validate(config);
|
|
31
36
|
// istanbul ignore next
|
|
32
37
|
if (error) {
|
|
33
38
|
throw error;
|
|
34
39
|
}
|
|
35
|
-
this.nodeList =
|
|
40
|
+
this.nodeList = value.nodeList;
|
|
36
41
|
}
|
|
37
42
|
async getNodeList() {
|
|
38
43
|
const udpRelayCheckSchema = joi_1.default.object({
|
|
@@ -58,4 +63,4 @@ class CustomProvider extends Provider_1.default {
|
|
|
58
63
|
}
|
|
59
64
|
}
|
|
60
65
|
exports.default = CustomProvider;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvQ3VzdG9tUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFDdEIsb0NBSWtCO0FBQ2xCLDBEQUFrQztBQUVsQyxNQUFxQixjQUFlLFNBQVEsa0JBQVE7SUFHbEQsWUFBWSxJQUFZLEVBQUUsTUFBNEI7UUFDcEQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLFVBQVUsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzVCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsb0JBQVksQ0FBQyxDQUFDO2lCQUM3QyxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxNQUFNLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM5QixHQUFHLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMzQixLQUFLLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM3QixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sQ0FBQztnQkFDcEIsUUFBUSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7Z0JBQ2pDLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2FBQ2xCLENBQUM7WUFDRixPQUFPLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUNyQixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUN2QixlQUFlLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUM3QixjQUFjLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUN0QyxHQUFHLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtZQUNqQixJQUFJLEVBQUUsYUFBRyxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssQ0FBQyxhQUFHLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDckMsMkJBQTJCLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTtTQUMxQyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixNQUFNLE1BQU0sR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3hCLFFBQVEsRUFBRSxhQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDLFFBQVEsRUFBRTtTQUNuRCxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFFYixNQUFNLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFakQsdUJBQXVCO1FBQ3ZCLElBQUksS0FBSyxFQUFFO1lBQ1QsTUFBTSxLQUFLLENBQUM7U0FDYjtRQUVELElBQUksQ0FBQyxRQUFRLEdBQUcsS0FBSyxDQUFDLFFBQVEsQ0FBQztJQUNqQyxDQUFDO0lBRU0sS0FBSyxDQUFDLFdBQVc7UUFDdEIsTUFBTSxtQkFBbUIsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQ3JDLFdBQVcsRUFBRSxhQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxFQUFFO1NBQ2pDLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUViLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNoQyxNQUFNLEVBQUUsS0FBSyxFQUFFLGtCQUFrQixFQUFFLEdBQUcsbUJBQW1CLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3pFLE1BQU0sYUFBYSxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUM7WUFFcEMsdUJBQXVCO1lBQ3ZCLElBQUksa0JBQWtCLEVBQUU7Z0JBQ3RCLE1BQU0sa0JBQWtCLENBQUM7YUFDMUI7WUFFRCxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7Z0JBQzVCLElBQUksSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFO29CQUNiLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRTt3QkFDdEQsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQzt3QkFDMUMsT0FBTyxHQUFHLENBQUM7b0JBQ2IsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO2lCQUNSO1lBQ0gsQ0FBQyxDQUFDLENBQUM7WUFFSCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBbEVELGlDQWtFQyJ9
|
package/build/types.d.ts
CHANGED
|
@@ -174,9 +174,6 @@ export interface HttpsNodeConfig extends TlsNodeConfig {
|
|
|
174
174
|
readonly type: NodeTypeEnum.HTTPS;
|
|
175
175
|
readonly username: string;
|
|
176
176
|
readonly password: string;
|
|
177
|
-
readonly tls13?: boolean;
|
|
178
|
-
readonly skipCertVerify?: boolean;
|
|
179
|
-
readonly sni?: string;
|
|
180
177
|
}
|
|
181
178
|
export interface ShadowsocksNodeConfig extends SimpleNodeConfig {
|
|
182
179
|
readonly type: NodeTypeEnum.Shadowsocks;
|
|
@@ -198,9 +195,10 @@ export interface SnellNodeConfig extends SimpleNodeConfig {
|
|
|
198
195
|
readonly hostname: string;
|
|
199
196
|
readonly port: number | string;
|
|
200
197
|
readonly psk: string;
|
|
201
|
-
readonly obfs
|
|
198
|
+
readonly obfs?: string;
|
|
202
199
|
readonly 'obfs-host'?: string;
|
|
203
200
|
readonly version?: string;
|
|
201
|
+
readonly reuse?: boolean;
|
|
204
202
|
}
|
|
205
203
|
export interface ShadowsocksrNodeConfig extends SimpleNodeConfig {
|
|
206
204
|
readonly type: NodeTypeEnum.Shadowsocksr;
|
|
@@ -229,6 +227,7 @@ export interface VmessNodeConfig extends SimpleNodeConfig {
|
|
|
229
227
|
readonly tls13?: boolean;
|
|
230
228
|
readonly skipCertVerify?: boolean;
|
|
231
229
|
readonly wsHeaders?: Record<string, string>;
|
|
230
|
+
readonly serverCertFingerprintSha256?: string;
|
|
232
231
|
}
|
|
233
232
|
export interface TrojanNodeConfig extends TlsNodeConfig {
|
|
234
233
|
readonly type: NodeTypeEnum.Trojan;
|
|
@@ -261,6 +260,10 @@ export interface SimpleNodeConfig {
|
|
|
261
260
|
enable?: boolean;
|
|
262
261
|
tfo?: boolean;
|
|
263
262
|
mptcp?: boolean;
|
|
263
|
+
shadowTls?: {
|
|
264
|
+
password: string;
|
|
265
|
+
sni?: string;
|
|
266
|
+
};
|
|
264
267
|
binPath?: string;
|
|
265
268
|
localPort?: number;
|
|
266
269
|
surgeConfig?: CommandConfig['surgeConfig'];
|
|
@@ -279,6 +282,7 @@ export interface TlsNodeConfig extends SimpleNodeConfig {
|
|
|
279
282
|
readonly skipCertVerify?: boolean;
|
|
280
283
|
readonly sni?: string;
|
|
281
284
|
readonly alpn?: ReadonlyArray<string>;
|
|
285
|
+
readonly serverCertFingerprintSha256?: string;
|
|
282
286
|
}
|
|
283
287
|
export interface PlainObject {
|
|
284
288
|
readonly [name: string]: any;
|
package/build/utils/index.d.ts
CHANGED
|
@@ -33,7 +33,10 @@ export declare const generateClashProxyGroup: (ruleName: string, ruleType: 'sele
|
|
|
33
33
|
readonly interval?: number | undefined;
|
|
34
34
|
};
|
|
35
35
|
export declare const toYaml: (obj: JsonObject) => string;
|
|
36
|
-
export declare const
|
|
36
|
+
export declare const changeCase: (str: string, format: 'camelCase' | 'snakeCase' | 'kebabCase') => string;
|
|
37
|
+
export declare const pickAndFormatStringList: (obj: Record<string, any>, keyList: readonly string[], options?: {
|
|
38
|
+
keyFormat?: 'camelCase' | 'snakeCase' | 'kebabCase';
|
|
39
|
+
}) => readonly string[];
|
|
37
40
|
export declare const decodeStringList: <T = Record<string, string | boolean>>(stringList: ReadonlyArray<string>) => T;
|
|
38
41
|
export declare const normalizeClashProxyGroupConfig: (nodeList: ReadonlyArray<PossibleNodeConfigType>, customFilters: PlainObjectOf<NodeNameFilterType | SortedNodeNameFilterType>, proxyGroupModifier: ProxyGroupModifier, options?: {
|
|
39
42
|
readonly proxyTestUrl?: string;
|
package/build/utils/index.js
CHANGED
|
@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.isGFWFree = exports.isFlyIO = exports.isAWS = exports.isAWSLambda = exports.isNetlify = exports.isRailway = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.msToSeconds = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.normalizeClashProxyGroupConfig = exports.decodeStringList = exports.pickAndFormatStringList = exports.toYaml = exports.generateClashProxyGroup = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.toMD5 = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getMellowNodes = exports.getUrl = exports.getDownloadUrl = void 0;
|
|
20
|
+
exports.isGFWFree = exports.isFlyIO = exports.isAWS = exports.isAWSLambda = exports.isNetlify = exports.isRailway = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.msToSeconds = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.normalizeClashProxyGroupConfig = exports.decodeStringList = exports.pickAndFormatStringList = exports.changeCase = exports.toYaml = exports.generateClashProxyGroup = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.toMD5 = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getMellowNodes = exports.getUrl = exports.getDownloadUrl = void 0;
|
|
21
21
|
const logger_1 = require("@surgio/logger");
|
|
22
22
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
23
23
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -29,6 +29,7 @@ const urlsafe_base64_1 = __importDefault(require("urlsafe-base64"));
|
|
|
29
29
|
const yaml_1 = __importDefault(require("yaml"));
|
|
30
30
|
const net_1 = __importDefault(require("net"));
|
|
31
31
|
const crypto_1 = __importDefault(require("crypto"));
|
|
32
|
+
const change_case_1 = require("change-case");
|
|
32
33
|
const types_1 = require("../types");
|
|
33
34
|
const constant_1 = require("../constant");
|
|
34
35
|
const env_flag_1 = require("./env-flag");
|
|
@@ -304,11 +305,26 @@ const generateClashProxyGroup = (ruleName, ruleType, nodeNameList, options) => {
|
|
|
304
305
|
exports.generateClashProxyGroup = generateClashProxyGroup;
|
|
305
306
|
const toYaml = (obj) => yaml_1.default.stringify(obj);
|
|
306
307
|
exports.toYaml = toYaml;
|
|
307
|
-
|
|
308
|
+
// istanbul ignore next
|
|
309
|
+
const changeCase = (str, format) => {
|
|
310
|
+
switch (format) {
|
|
311
|
+
case 'camelCase':
|
|
312
|
+
return (0, change_case_1.camelCase)(str);
|
|
313
|
+
case 'snakeCase':
|
|
314
|
+
return (0, change_case_1.snakeCase)(str);
|
|
315
|
+
case 'kebabCase':
|
|
316
|
+
return (0, change_case_1.paramCase)(str);
|
|
317
|
+
}
|
|
318
|
+
};
|
|
319
|
+
exports.changeCase = changeCase;
|
|
320
|
+
const pickAndFormatStringList = (obj, keyList, options = {}) => {
|
|
308
321
|
const result = [];
|
|
309
322
|
keyList.forEach((key) => {
|
|
310
323
|
if (obj.hasOwnProperty(key)) {
|
|
311
|
-
|
|
324
|
+
const propeertyKey = options.keyFormat
|
|
325
|
+
? (0, exports.changeCase)(key, options.keyFormat)
|
|
326
|
+
: key;
|
|
327
|
+
result.push(`${propeertyKey}=${obj[key]}`);
|
|
312
328
|
}
|
|
313
329
|
});
|
|
314
330
|
return result;
|
|
@@ -487,4 +503,4 @@ const isGFWFree = () => (0, env_flag_1.getIsGFWFree)() ||
|
|
|
487
503
|
(0, exports.isNetlify)() ||
|
|
488
504
|
(0, exports.isFlyIO)();
|
|
489
505
|
exports.isGFWFree = isGFWFree;
|
|
490
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"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"}
|
|
506
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,2CAA8C;AAC9C,wDAA0B;AAC1B,oDAAuB;AACvB,4CAAoB;AACpB,+BAA4B;AAC5B,gEAAuC;AAEvC,6BAA2C;AAC3C,oEAA2C;AAC3C,gDAAwB;AACxB,8CAAsB;AACtB,oDAA4B;AAC5B,6CAA8D;AAE9D,oCAYkB;AAClB,0CAA0D;AAC1D,yCAA0C;AAC1C,qCAAuD;AACvD,mCAAyC;AAEzC,0CAAwB;AACxB,8CAA4B;AAC5B,0CAAwB;AACxB,+CAA6B;AAE7B,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;AAElD,MAAM,cAAc,GAAG,CAC5B,OAAO,GAAG,GAAG,EACb,YAAoB,EACpB,MAAM,GAAG,IAAI,EACb,WAAoB,EACZ,EAAE;IACV,IAAI,eAAgC,CAAC;IACrC,IAAI,IAAY,CAAC;IAEjB,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC9B,eAAe,GAAG,IAAI,qBAAe,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACnC;SAAM;QACL,eAAe,GAAG,IAAI,qBAAe,EAAE,CAAC;QACxC,IAAI,GAAG,YAAY,CAAC;KACrB;IAED,IAAI,WAAW,EAAE;QACf,eAAe,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KAClD;IACD,IAAI,CAAC,MAAM,EAAE;QACX,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAChC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;IAEzC,OAAO,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AACxD,CAAC,CAAC;AA3BW,QAAA,cAAc,kBA2BzB;AAEK,MAAM,MAAM,GAAG,CACpB,OAAe,EACf,IAAY,EACZ,WAAoB,EACZ,EAAE;IACV,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/B,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,IAAI,WAAW,EAAE;QACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;KACnD;IACD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC,CAAC;AAXW,QAAA,MAAM,UAWjB;AAEK,MAAM,cAAc,GAAG,UAC5B,IAA4D,EAC5D,MAAkD;IAElD,uBAAuB;IACvB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,6BAAkB,CAAC,CAAC;KACrC;IAED,MAAM,MAAM,GAAG,IAAA,oBAAW,EAAC,IAAI,EAAE,MAAM,CAAC;SACrC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;gBACvB,MAAM,GAAG,GAAG,IAAA,sBAAc,EAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC3D,OAAO;oBACL,UAAU,CAAC,QAAQ;oBACnB,QAAQ;oBACR,GAAG,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC;iBAC5C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACd;YAED,KAAK,oBAAY,CAAC,WAAW,CAAC,CAAC;gBAC7B,MAAM,GAAG,GAAG,IAAA,2BAAmB,EAAC,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC9C,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC3D;YAED,uBAAuB;YACvB;gBACE,MAAM,CAAC,IAAI,CACT,kBAAmB,UAAkB,CAAC,IAAI,WACvC,UAAkB,CAAC,QACtB,OAAO,CACR,CAAC;gBACF,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE5B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAvCW,QAAA,cAAc,kBAuCzB;AAEF,uBAAuB;AAChB,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CACrD,wBAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;AADpC,QAAA,eAAe,mBACqB;AAEjD,uBAAuB;AAChB,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAU,EAAE;IACvD,IAAI,wBAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC/B,OAAO,wBAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC7C;IACD,OAAO,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AALW,QAAA,iBAAiB,qBAK5B;AAEF,uBAAuB;AAChB,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AADjC,QAAA,QAAQ,YACyB;AAE9C,uBAAuB;AAChB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAU,EAAE,CAChD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AADjC,QAAA,UAAU,cACuB;AAE9C,uBAAuB;AAChB,MAAM,KAAK,GAAG,CAAC,GAAW,EAAU,EAAE,CAC3C,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AADxC,QAAA,KAAK,SACmC;AAErD;;GAEG;AACI,MAAM,mBAAmB,GAAG,CACjC,IAA0C,EAC1C,SAAS,GAAG,QAAQ,EACZ,EAAE;IACV,MAAM,MAAM,GAAuB,IAAI;SACpC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,uBAAuB;QACvB,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QAED,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,oBAAY,CAAC,WAAW,CAAC,CAAC;gBAC7B,MAAM,MAAM,GAAG,gBAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;gBACvC,MAAM,KAAK,mCAIN,CAAC,MAAM,CAAC,IAAI;oBACb,CAAC,CAAC;wBACE,MAAM,EAAE,GAAG,kBAAkB,CAC3B,mBAAmB,MAAM,CAAC,IAAI,cAAc,MAAM,CAAC,WAAW,CAAC,EAAE,CAClE,EAAE;qBACJ;oBACH,CAAC,CAAC,IAAI,CAAC,GACN,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACjE,CAAC;gBAEF,OAAO;oBACL,OAAO;oBACP,IAAA,uBAAe,EAAC,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACtD,GAAG;oBACH,MAAM,CAAC,QAAQ;oBACf,GAAG;oBACH,MAAM,CAAC,IAAI;oBACX,IAAI;oBACJ,sBAAW,CAAC,SAAS,CAAC,KAAK,EAAE;wBAC3B,MAAM,EAAE,KAAK;wBACb,IAAI,EAAE,KAAK;qBACZ,CAAC;oBACF,GAAG;oBACH,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC;iBACpC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACZ;YAED,uBAAuB;YACvB;gBACE,MAAM,CAAC,IAAI,CACT,0BAA0B,UAAU,CAAC,IAAI,UAAU,UAAU,CAAC,QAAQ,OAAO,CAC9E,CAAC;gBACF,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE5B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAxDW,QAAA,mBAAmB,uBAwD9B;AAEK,MAAM,oBAAoB,GAAG,CAClC,IAA2C,EAC3C,SAAiB,EACT,EAAE;IACV,MAAM,MAAM,GAAsC,IAAI;SACnD,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,uBAAuB;QACvB,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE;YAC/B,OAAO,KAAK,CAAC,CAAC;SACf;QAED,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,oBAAY,CAAC,YAAY,CAAC,CAAC;gBAC9B,MAAM,OAAO,GAAG;oBACd,UAAU,CAAC,QAAQ;oBACnB,UAAU,CAAC,IAAI;oBACf,UAAU,CAAC,QAAQ;oBACnB,UAAU,CAAC,MAAM;oBACjB,UAAU,CAAC,IAAI;oBACf,IAAA,uBAAe,EAAC,UAAU,CAAC,QAAQ,CAAC;iBACrC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACZ,MAAM,KAAK,GAAG;oBACZ,SAAS,EAAE,IAAA,uBAAe,EAAC,UAAU,CAAC,SAAS,CAAC;oBAChD,UAAU,EAAE,IAAA,uBAAe,EAAC,UAAU,CAAC,UAAU,CAAC;oBAClD,OAAO,EAAE,IAAA,uBAAe,EAAC,UAAU,CAAC,QAAQ,CAAC;oBAC7C,KAAK,EAAE,IAAA,uBAAe,EAAC,SAAS,CAAC;oBACjC,OAAO,EAAE,CAAC;oBACV,GAAG,EAAE,CAAC;iBACP,CAAC;gBAEF,OAAO,CACL,QAAQ;oBACR,IAAA,uBAAe,EACb;wBACE,OAAO;wBACP,IAAI;wBACJ,sBAAW,CAAC,SAAS,CAAC,KAAK,EAAE;4BAC3B,MAAM,EAAE,KAAK;yBACd,CAAC;qBACH,CAAC,IAAI,CAAC,EAAE,CAAC,CACX,CACF,CAAC;aACH;YAED,uBAAuB;YACvB;gBACE,MAAM,CAAC,IAAI,CACT,2BAA2B,UAAU,CAAC,IAAI,UAAU,UAAU,CAAC,QAAQ,OAAO,CAC/E,CAAC;gBACF,OAAO,KAAK,CAAC,CAAC;SACjB;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAExC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAvDW,QAAA,oBAAoB,wBAuD/B;AAEK,MAAM,cAAc,GAAG,CAC5B,IAAoC,EAC5B,EAAE;IACV,MAAM,MAAM,GAA0B,IAAI;SACvC,GAAG,CAAC,CAAC,UAAU,EAAsB,EAAE;QACtC,uBAAuB;QACvB,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE;YAC/B,OAAO,KAAK,CAAC,CAAC;SACf;QAED,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;gBACvB,MAAM,IAAI,GAAG;oBACX,CAAC,EAAE,GAAG;oBACN,EAAE,EAAE,UAAU,CAAC,QAAQ;oBACvB,GAAG,EAAE,UAAU,CAAC,QAAQ;oBACxB,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE;oBAC1B,EAAE,EAAE,UAAU,CAAC,IAAI;oBACnB,GAAG,EAAE,UAAU,CAAC,OAAO;oBACvB,GAAG,EAAE,UAAU,CAAC,OAAO;oBACvB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;iBACjC,CAAC;gBAEF,OAAO,UAAU,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;aACpD;YAED,uBAAuB;YACvB;gBACE,MAAM,CAAC,IAAI,CACT,oBAAoB,UAAU,CAAC,IAAI,UAAU,UAAU,CAAC,QAAQ,OAAO,CACxE,CAAC;gBACF,OAAO,KAAK,CAAC,CAAC;SACjB;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAExD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAxCW,QAAA,cAAc,kBAwCzB;AAEF,uBAAuB;AAChB,MAAM,uBAAuB,GAAG,CACrC,IAA0C,EAClC,EAAE;IACV,MAAM,KAAK,GAAuB,IAAI;SACnC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,uBAAuB;QACvB,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QAED,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,oBAAY,CAAC,WAAW,CAAC,CAAC;gBAC7B,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;gBACpE,uBACE,OAAO,EAAE,UAAU,CAAC,QAAQ,EAC5B,MAAM,EAAE,UAAU,CAAC,QAAQ,EAC3B,WAAW,EAAE,UAAU,CAAC,IAAI,EAC5B,MAAM,EAAE,UAAU,CAAC,MAAM,EACzB,cAAc,EAAE,IAAA,uBAAe,EAAC,UAAU,CAAC,QAAQ,CAAC,EACpD,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAC7B,YAAY,EAAE,KAAK,EACnB,YAAY,EAAE,KAAK,EACnB,MAAM,EAAE,IAAI,IACT,CAAC,OAAO;oBACT,CAAC,CAAC;wBACE,MAAM,EAAE,YAAY;wBACpB,aAAa,EAAE,QAAQ,UAAU,CAAC,IAAI,cAAc,UAAU,CAAC,WAAW,CAAC,EAAE;qBAC9E;oBACH,CAAC,CAAC,IAAI,CAAC,EACT;aACH;YAED,uBAAuB;YACvB;gBACE,MAAM,CAAC,IAAI,CACT,0BAA0B,UAAU,CAAC,IAAI,UAAU,UAAU,CAAC,QAAQ,OAAO,CAC9E,CAAC;gBACF,OAAO,SAAS,CAAC;SACpB;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAExC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC;AA3CW,QAAA,uBAAuB,2BA2ClC;AAEK,MAAM,YAAY,GAAG,UAC1B,IAAqC,EACrC,MAAsD,EACtD,SAAkB;IAElB,uBAAuB;IACvB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,6BAAkB,CAAC,CAAC;KACrC;IAED,OAAO,IAAA,oBAAW,EAAC,IAAI,EAAE,MAAM,CAAC;SAC7B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC5B,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;AAC7B,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB;AAEK,MAAM,uBAAuB,GAAG,CACrC,QAAgB,EAChB,QAA6D,EAC7D,YAA6C,EAC7C,OAKC,EAOD,EAAE;IACF,IAAI,OAAO,CAAC;IAEZ,IAAI,OAAO,CAAC,eAAe,EAAE;QAC3B,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACxD,OAAO,GAAI,EAAe,CAAC,MAAM,CAC/B,OAAO,CAAC,eAAe,EACvB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CACnC,CAAC;SACH;aAAM;YACL,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;SACnC;KACF;SAAM;QACL,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KAC9C;IAED,uBACE,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,QAAQ,EACd,OAAO,IACJ,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC7D,CAAC,CAAC;YACE,GAAG,EAAE,OAAO,CAAC,YAAY;YACzB,QAAQ,EAAE,OAAO,CAAC,iBAAiB;SACpC;QACH,CAAC,CAAC,IAAI,CAAC,EACT;AACJ,CAAC,CAAC;AA7CW,QAAA,uBAAuB,2BA6ClC;AAEK,MAAM,MAAM,GAAG,CAAC,GAAe,EAAU,EAAE,CAAC,cAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAA1D,QAAA,MAAM,UAAoD;AAEvE,uBAAuB;AAChB,MAAM,UAAU,GAAG,CACxB,GAAW,EACX,MAA+C,EACvC,EAAE;IACV,QAAQ,MAAM,EAAE;QACd,KAAK,WAAW;YACd,OAAO,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;QACxB,KAAK,WAAW;YACd,OAAO,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;QACxB,KAAK,WAAW;YACd,OAAO,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;KACzB;AACH,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB;AAEK,MAAM,uBAAuB,GAAG,CACrC,GAAwB,EACxB,OAA0B,EAC1B,UAEI,EAAE,EACa,EAAE;IACrB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAC3B,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;gBACpC,CAAC,CAAC,IAAA,kBAAU,EAAC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC;gBACpC,CAAC,CAAC,GAAG,CAAC;YAER,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SAC5C;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAnBW,QAAA,uBAAuB,2BAmBlC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,UAAiC,EAC9B,EAAE;IACL,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE;gBACT,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;aACnD;SACF;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAW,CAAC;AACrB,CAAC,CAAC;AAfW,QAAA,gBAAgB,oBAe3B;AAEK,MAAM,8BAA8B,GAAG,CAC5C,QAA+C,EAC/C,aAA2E,EAC3E,kBAAsC,EACtC,UAGI,EAAE,EACc,EAAE;IACtB,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE/D,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC7B,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE;YACjC,uBAAuB;YACvB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAA,uBAAc,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;gBAChD,MAAM,IAAI,KAAK,CACb,OAAO,IAAI,CAAC,MAAM,4BAA4B,CAC/C,CAAC;aACH;YAED,OAAO,IAAA,+BAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE;gBAC7D,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,eAAe,EAAE,IAAI,CAAC,OAAO;gBAC7B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;aAC7C,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,IAAA,+BAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE;gBAC7D,eAAe,EAAE,IAAI,CAAC,OAAO;gBAC7B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;aAC7C,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAlCW,QAAA,8BAA8B,kCAkCzC;AAEK,MAAM,kBAAkB,GAAG,CAAC,MAAc,YAAE,CAAC,OAAO,EAAE,EAAU,EAAE;IACvE,IAAI,OAAO,CAAC;IAEZ,IAAI;QACF,kBAAE,CAAC,UAAU,CAAC,GAAG,EAAE,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,GAAG,GAAG,CAAC;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,2CAA2C;QAC3C,uBAAuB;QACvB,OAAO,GAAG,MAAM,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAClD,kBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAfW,QAAA,kBAAkB,sBAe7B;AAEK,MAAM,iBAAiB,GAAG,CAC/B,SAAiB,EACjB,UAA2B,EACf,EAAE;IACd,MAAM,MAAM,GAAQ;QAClB,GAAG,EAAE;YACH,QAAQ,EAAE,SAAS;SACpB;QACD,OAAO,EAAE;YACP,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC;YACvB,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;aACf;SACF;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,KAAK,EAAE;oBACL;wBACE,OAAO,EAAE,UAAU,CAAC,QAAQ;wBAC5B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;wBAC7B,KAAK,EAAE;4BACL;gCACE,EAAE,EAAE,UAAU,CAAC,IAAI;gCACnB,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;gCACnC,QAAQ,EAAE,UAAU,CAAC,MAAM;gCAC3B,KAAK,EAAE,CAAC;6BACT;yBACF;qBACF;iBACF;aACF;YACD,cAAc,EAAE;gBACd,QAAQ,EAAE,MAAM;aACjB;SACF;KACF,CAAC;IAEF,IAAI,UAAU,CAAC,GAAG,EAAE;QAClB,MAAM,CAAC,QAAQ,CAAC,cAAc,mCACzB,MAAM,CAAC,QAAQ,CAAC,cAAc,KACjC,QAAQ,EAAE,KAAK,EACf,WAAW,gCACT,UAAU,EAAE,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,QAAQ,IAC/C,CAAC,OAAO,UAAU,CAAC,cAAc,KAAK,SAAS;gBAChD,CAAC,CAAC;oBACE,aAAa,EAAE,UAAU,CAAC,cAAc;iBACzC;gBACH,CAAC,CAAC,IAAI,CAAC,GACN,CAAC,OAAO,UAAU,CAAC,KAAK,KAAK,SAAS;gBACvC,CAAC,CAAC;oBACE,oBAAoB,EAAE,CAAC,UAAU,CAAC,KAAK;iBACxC;gBACH,CAAC,CAAC,IAAI,CAAC,IAEZ,CAAC;KACH;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,EAAE;QAC/B,MAAM,CAAC,QAAQ,CAAC,cAAc,mCACzB,MAAM,CAAC,QAAQ,CAAC,cAAc,KACjC,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,UAAU,EAAE;gBACV,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,YAAY,EAAE,kBAAO;iBACtB;aACF,GACF,CAAC;KACH;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA3EW,QAAA,iBAAiB,qBA2E5B;AAEK,MAAM,mBAAmB,GAAG,CACjC,OAA+B,EACP,EAAE;IAC1B,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAVW,QAAA,mBAAmB,uBAU9B;AAEK,MAAM,WAAW,GAAG,CAAC,EAAU,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;AAA5D,QAAA,WAAW,eAAiD;AAEzE,uBAAuB;AAChB,MAAM,IAAI,GAAG,CAAC,GAAW,EAAW,EAAE,CAC3C,aAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,aAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AADxB,QAAA,IAAI,QACoB;AAErC,uBAAuB;AAChB,MAAM,KAAK,GAAG,GAAY,EAAE,CACjC,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,WAAW;IAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,WAAW,CAAC;AAFtC,QAAA,KAAK,SAEiC;AAEnD,uBAAuB;AAChB,MAAM,QAAQ,GAAG,GAAY,EAAE,CAAC,IAAA,aAAK,GAAE,CAAC;AAAlC,QAAA,QAAQ,YAA0B;AAE/C,uBAAuB;AAChB,MAAM,QAAQ,GAAG,GAAY,EAAE,CAAC,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC;AAAlE,QAAA,QAAQ,YAA0D;AAE/E,uBAAuB;AAChB,MAAM,eAAe,GAAG,GAAY,EAAE,CAC3C,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,WAAW,CAAC;AADvC,QAAA,eAAe,mBACwB;AAEpD,uBAAuB;AAChB,MAAM,UAAU,GAAG,GAAY,EAAE,CACtC,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,WAAW,CAAC;AADlC,QAAA,UAAU,cACwB;AAE/C,uBAAuB;AAChB,MAAM,SAAS,GAAG,GAAY,EAAE,CACrC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,WAAW,CAAC;AAD3C,QAAA,SAAS,aACkC;AAExD,uBAAuB;AAChB,MAAM,SAAS,GAAG,GAAY,EAAE,CACrC,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,KAAK,WAAW,CAAC;AADhC,QAAA,SAAS,aACuB;AAE7C,uBAAuB;AAChB,MAAM,WAAW,GAAG,GAAY,EAAE,CACvC,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,WAAW,CAAC;AADjD,QAAA,WAAW,eACsC;AAE9D,uBAAuB;AAChB,MAAM,KAAK,GAAG,GAAY,EAAE,CACjC,IAAA,mBAAW,GAAE;IACb,OAAO,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,WAAW;IACpD,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,WAAW,CAAC;AAHnC,QAAA,KAAK,SAG8B;AAEhD,uBAAuB;AAChB,MAAM,OAAO,GAAG,GAAY,EAAE,CACnC,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,WAAW,CAAC;AADnC,QAAA,OAAO,WAC4B;AAEzC,MAAM,SAAS,GAAG,GAAY,EAAE,CACrC,IAAA,uBAAY,GAAE;IACd,IAAA,aAAK,GAAE;IACP,IAAA,mBAAW,GAAE;IACb,IAAA,gBAAQ,GAAE;IACV,IAAA,gBAAQ,GAAE;IACV,IAAA,uBAAe,GAAE;IACjB,IAAA,kBAAU,GAAE;IACZ,IAAA,iBAAS,GAAE;IACX,IAAA,iBAAS,GAAE;IACX,IAAA,eAAO,GAAE,CAAC;AAVC,QAAA,SAAS,aAUV"}
|
|
@@ -6,12 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.getQuantumultXNodes = exports.getQuantumultNodes = void 0;
|
|
7
7
|
const logger_1 = require("@surgio/logger");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const util_1 = require("util");
|
|
10
|
+
const deprecation_1 = require("../misc/deprecation");
|
|
9
11
|
const constant_1 = require("../constant");
|
|
10
12
|
const types_1 = require("../types");
|
|
11
13
|
const filter_1 = require("./filter");
|
|
12
14
|
const index_1 = require("./index");
|
|
13
15
|
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:quantumult' });
|
|
16
|
+
const showDEP010 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP010, 'DEP010');
|
|
14
17
|
const getQuantumultNodes = function (list, groupName = 'Surgio', filter) {
|
|
18
|
+
showDEP010();
|
|
15
19
|
// istanbul ignore next
|
|
16
20
|
if (arguments.length === 3 && typeof filter === 'undefined') {
|
|
17
21
|
throw new Error(constant_1.ERR_INVALID_FILTER);
|
|
@@ -286,4 +290,4 @@ const getQuantumultXNodes = function (list, filter) {
|
|
|
286
290
|
return result.join('\n');
|
|
287
291
|
};
|
|
288
292
|
exports.getQuantumultXNodes = getQuantumultXNodes;
|
|
289
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quantumult.js","sourceRoot":"","sources":["../../lib/utils/quantumult.ts"],"names":[],"mappings":"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"}
|
|
293
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quantumult.js","sourceRoot":"","sources":["../../lib/utils/quantumult.ts"],"names":[],"mappings":"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"}
|
package/build/utils/surge.js
CHANGED
|
@@ -54,13 +54,12 @@ const getSurgeNodes = function (list, filter) {
|
|
|
54
54
|
'obfs-host',
|
|
55
55
|
'tfo',
|
|
56
56
|
'mptcp',
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
:
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
: []),
|
|
57
|
+
'testUrl',
|
|
58
|
+
'underlyingProxy',
|
|
59
|
+
], {
|
|
60
|
+
keyFormat: 'kebabCase',
|
|
61
|
+
}),
|
|
62
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
64
63
|
].join(', '),
|
|
65
64
|
].join(' = ');
|
|
66
65
|
}
|
|
@@ -80,13 +79,12 @@ const getSurgeNodes = function (list, filter) {
|
|
|
80
79
|
'obfs-host',
|
|
81
80
|
'tfo',
|
|
82
81
|
'mptcp',
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
:
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
: []),
|
|
82
|
+
'testUrl',
|
|
83
|
+
'underlyingProxy',
|
|
84
|
+
], {
|
|
85
|
+
keyFormat: 'kebabCase',
|
|
86
|
+
}),
|
|
87
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
90
88
|
].join(', '),
|
|
91
89
|
].join(' = ');
|
|
92
90
|
}
|
|
@@ -100,21 +98,19 @@ const getSurgeNodes = function (list, filter) {
|
|
|
100
98
|
config.port,
|
|
101
99
|
config.username,
|
|
102
100
|
config.password,
|
|
103
|
-
...(typeof config.skipCertVerify === 'boolean'
|
|
104
|
-
? [`skip-cert-verify=${config.skipCertVerify}`]
|
|
105
|
-
: []),
|
|
106
|
-
...(typeof config.underlyingProxy === 'string'
|
|
107
|
-
? [`underlying-proxy=${config.underlyingProxy}`]
|
|
108
|
-
: []),
|
|
109
|
-
...(typeof config.testUrl === 'string'
|
|
110
|
-
? [`test-url=${config.testUrl}`]
|
|
111
|
-
: []),
|
|
112
101
|
...(0, index_1.pickAndFormatStringList)(config, [
|
|
113
102
|
'sni',
|
|
114
103
|
'tfo',
|
|
115
104
|
'mptcp',
|
|
116
105
|
'tls13',
|
|
117
|
-
|
|
106
|
+
'testUrl',
|
|
107
|
+
'skipCertVerify',
|
|
108
|
+
'underlyingProxy',
|
|
109
|
+
'serverCertFingerprintSha256',
|
|
110
|
+
], {
|
|
111
|
+
keyFormat: 'kebabCase',
|
|
112
|
+
}),
|
|
113
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
118
114
|
].join(', '),
|
|
119
115
|
].join(' = ');
|
|
120
116
|
}
|
|
@@ -128,13 +124,10 @@ const getSurgeNodes = function (list, filter) {
|
|
|
128
124
|
config.port,
|
|
129
125
|
config.username,
|
|
130
126
|
config.password,
|
|
131
|
-
...(
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
...(
|
|
135
|
-
? [`test-url=${config.testUrl}`]
|
|
136
|
-
: []),
|
|
137
|
-
...(0, index_1.pickAndFormatStringList)(config, ['tfo', 'mptcp']),
|
|
127
|
+
...(0, index_1.pickAndFormatStringList)(config, ['tfo', 'mptcp', 'underlyingProxy', 'testUrl'], {
|
|
128
|
+
keyFormat: 'kebabCase',
|
|
129
|
+
}),
|
|
130
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
138
131
|
].join(', '),
|
|
139
132
|
].join(' = ');
|
|
140
133
|
}
|
|
@@ -146,20 +139,20 @@ const getSurgeNodes = function (list, filter) {
|
|
|
146
139
|
'snell',
|
|
147
140
|
config.hostname,
|
|
148
141
|
config.port,
|
|
149
|
-
...(typeof config.underlyingProxy === 'string'
|
|
150
|
-
? [`underlying-proxy=${config.underlyingProxy}`]
|
|
151
|
-
: []),
|
|
152
|
-
...(typeof config.testUrl === 'string'
|
|
153
|
-
? [`test-url=${config.testUrl}`]
|
|
154
|
-
: []),
|
|
155
142
|
...(0, index_1.pickAndFormatStringList)(config, [
|
|
156
143
|
'psk',
|
|
157
144
|
'obfs',
|
|
158
145
|
'obfs-host',
|
|
159
146
|
'version',
|
|
147
|
+
'reuse',
|
|
160
148
|
'tfo',
|
|
161
149
|
'mptcp',
|
|
162
|
-
|
|
150
|
+
'testUrl',
|
|
151
|
+
'underlyingProxy',
|
|
152
|
+
], {
|
|
153
|
+
keyFormat: 'kebabCase',
|
|
154
|
+
}),
|
|
155
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
163
156
|
].join(', '),
|
|
164
157
|
].join(' = ');
|
|
165
158
|
}
|
|
@@ -230,30 +223,20 @@ const getSurgeNodes = function (list, filter) {
|
|
|
230
223
|
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'])))));
|
|
231
224
|
}
|
|
232
225
|
if (config.tls) {
|
|
233
|
-
configList.push('tls=true', ...(
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
? [`skip-cert-verify=${config.skipCertVerify}`]
|
|
237
|
-
: []), ...(config.host ? [`sni=${config.host}`] : []));
|
|
238
|
-
}
|
|
239
|
-
if (typeof config.tfo === 'boolean') {
|
|
240
|
-
configList.push(`tfo=${config.tfo}`);
|
|
241
|
-
}
|
|
242
|
-
if (typeof config.mptcp === 'boolean') {
|
|
243
|
-
configList.push(`mptcp=${config.mptcp}`);
|
|
244
|
-
}
|
|
245
|
-
if (config['underlyingProxy']) {
|
|
246
|
-
configList.push(`underlying-proxy=${config['underlyingProxy']}`);
|
|
247
|
-
}
|
|
248
|
-
if (config['testUrl']) {
|
|
249
|
-
configList.push(`test-url=${config['testUrl']}`);
|
|
226
|
+
configList.push('tls=true', ...(0, index_1.pickAndFormatStringList)(config, ['tls13', 'skipCertVerify', 'serverCertFingerprintSha256'], {
|
|
227
|
+
keyFormat: 'kebabCase',
|
|
228
|
+
}), ...(config.host ? [`sni=${config.host}`] : []));
|
|
250
229
|
}
|
|
230
|
+
configList.push(...(0, index_1.pickAndFormatStringList)(config, ['tfo', 'mptcp', 'underlyingProxy', 'testUrl'], {
|
|
231
|
+
keyFormat: 'kebabCase',
|
|
232
|
+
}));
|
|
251
233
|
if ((_d = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _d === void 0 ? void 0 : _d.vmessAEAD) {
|
|
252
234
|
configList.push('vmess-aead=true');
|
|
253
235
|
}
|
|
254
236
|
else {
|
|
255
237
|
configList.push('vmess-aead=false');
|
|
256
238
|
}
|
|
239
|
+
configList.push(...parseShadowTlsConfig(nodeConfig));
|
|
257
240
|
return [config.nodeName, configList.join(', ')].join(' = ');
|
|
258
241
|
}
|
|
259
242
|
else {
|
|
@@ -302,16 +285,14 @@ const getSurgeNodes = function (list, filter) {
|
|
|
302
285
|
'mptcp',
|
|
303
286
|
'sni',
|
|
304
287
|
'tls13',
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
...(
|
|
313
|
-
? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
|
|
314
|
-
: []),
|
|
288
|
+
'testUrl',
|
|
289
|
+
'underlyingProxy',
|
|
290
|
+
'skipCertVerify',
|
|
291
|
+
'serverCertFingerprintSha256',
|
|
292
|
+
], {
|
|
293
|
+
keyFormat: 'kebabCase',
|
|
294
|
+
}),
|
|
295
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
315
296
|
];
|
|
316
297
|
if (nodeConfig.network === 'ws') {
|
|
317
298
|
configList.push('ws=true');
|
|
@@ -328,12 +309,6 @@ const getSurgeNodes = function (list, filter) {
|
|
|
328
309
|
nodeConfig.tls === true ? 'socks5-tls' : 'socks5',
|
|
329
310
|
nodeConfig.hostname,
|
|
330
311
|
nodeConfig.port,
|
|
331
|
-
...(typeof nodeConfig.underlyingProxy === 'string'
|
|
332
|
-
? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
|
|
333
|
-
: []),
|
|
334
|
-
...(typeof nodeConfig.testUrl === 'string'
|
|
335
|
-
? [`test-url=${nodeConfig.testUrl}`]
|
|
336
|
-
: []),
|
|
337
312
|
...(0, index_1.pickAndFormatStringList)(nodeConfig, [
|
|
338
313
|
'username',
|
|
339
314
|
'password',
|
|
@@ -341,7 +316,14 @@ const getSurgeNodes = function (list, filter) {
|
|
|
341
316
|
'tfo',
|
|
342
317
|
'mptcp',
|
|
343
318
|
'tls13',
|
|
344
|
-
|
|
319
|
+
'udpRelay',
|
|
320
|
+
'testUrl',
|
|
321
|
+
'underlyingProxy',
|
|
322
|
+
'serverCertFingerprintSha256',
|
|
323
|
+
], {
|
|
324
|
+
keyFormat: 'kebabCase',
|
|
325
|
+
}),
|
|
326
|
+
...parseShadowTlsConfig(nodeConfig),
|
|
345
327
|
];
|
|
346
328
|
if (nodeConfig.tls === true) {
|
|
347
329
|
config.push(...(typeof nodeConfig.skipCertVerify === 'boolean'
|
|
@@ -357,19 +339,19 @@ const getSurgeNodes = function (list, filter) {
|
|
|
357
339
|
'tuic',
|
|
358
340
|
nodeConfig.hostname,
|
|
359
341
|
nodeConfig.port,
|
|
360
|
-
...(0, index_1.pickAndFormatStringList)(nodeConfig, [
|
|
342
|
+
...(0, index_1.pickAndFormatStringList)(nodeConfig, [
|
|
343
|
+
'token',
|
|
344
|
+
'sni',
|
|
345
|
+
'underlyingProxy',
|
|
346
|
+
'testUrl',
|
|
347
|
+
'skipCertVerify',
|
|
348
|
+
'serverCertFingerprintSha256',
|
|
349
|
+
], {
|
|
350
|
+
keyFormat: 'kebabCase',
|
|
351
|
+
}),
|
|
361
352
|
...(Array.isArray(nodeConfig.alpn)
|
|
362
353
|
? [`alpn=${nodeConfig.alpn.join(',')}`]
|
|
363
354
|
: []),
|
|
364
|
-
...(typeof nodeConfig.underlyingProxy === 'string'
|
|
365
|
-
? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
|
|
366
|
-
: []),
|
|
367
|
-
...(typeof nodeConfig.testUrl === 'string'
|
|
368
|
-
? [`test-url=${nodeConfig.testUrl}`]
|
|
369
|
-
: []),
|
|
370
|
-
...(typeof nodeConfig.skipCertVerify === 'boolean'
|
|
371
|
-
? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
|
|
372
|
-
: []),
|
|
373
355
|
];
|
|
374
356
|
return [nodeConfig.nodeName, config.join(', ')].join(' = ');
|
|
375
357
|
}
|
|
@@ -383,4 +365,14 @@ const getSurgeNodes = function (list, filter) {
|
|
|
383
365
|
return result.join('\n');
|
|
384
366
|
};
|
|
385
367
|
exports.getSurgeNodes = getSurgeNodes;
|
|
386
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"surge.js","sourceRoot":"","sources":["../../lib/utils/surge.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA8C;AAC9C,wDAA0B;AAC1B,oDAAuB;AACvB,4CAAoB;AACpB,+BAA4B;AAE5B,0CAA0D;AAC1D,oCAWkB;AAClB,mCAKiB;AACjB,qCAAuC;AAEvC,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;AAExD,MAAM,qBAAqB,GAAG,CACnC,SAAiC,EACzB,EAAE;IACV,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SAC1B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,SAAS,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;SAC1D,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAEF;;GAEG;AACI,MAAM,aAAa,GAAG,UAC3B,IAA2C,EAC3C,MAAkD;IAElD,uBAAuB;IACvB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,6BAAkB,CAAC,CAAC;KACrC;IAED,MAAM,MAAM,GAAa,IAAA,oBAAW,EAAC,IAAI,EAAE,MAAM,CAAC;SAC/C,GAAG,CAAC,CAAC,UAAU,EAAsB,EAAE;;QACtC,QAAQ,UAAU,CAAC,IAAI,EAAE;YACvB,KAAK,oBAAY,CAAC,WAAW,CAAC,CAAC;gBAC7B,MAAM,MAAM,GAAG,UAAmC,CAAC;gBAEnD,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;oBACtD,MAAM,CAAC,IAAI,CACT,kDACE,UAAW,CAAC,QACd,OAAO,CACR,CAAC;oBACF,OAAO,KAAK,CAAC,CAAC;iBACf;gBAED,iCAAiC;gBACjC,IAAI,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,0CAAE,iBAAiB,MAAK,IAAI,EAAE;oBACvD,OAAO;wBACL,MAAM,CAAC,QAAQ;wBACf;4BACE,IAAI;4BACJ,MAAM,CAAC,QAAQ;4BACf,MAAM,CAAC,IAAI;4BACX,iBAAiB,GAAG,MAAM,CAAC,MAAM;4BACjC,GAAG,IAAA,+BAAuB,EAAC,MAAM,EAAE;gCACjC,UAAU;gCACV,WAAW;gCACX,MAAM;gCACN,WAAW;gCACX,KAAK;gCACL,OAAO;6BACR,CAAC;4BACF,GAAG,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gCACpC,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC;gCAChC,CAAC,CAAC,EAAE,CAAC;4BACP,GAAG,CAAC,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ;gCAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,eAAe,EAAE,CAAC;gCAChD,CAAC,CAAC,EAAE,CAAC;yBACR,CAAC,IAAI,CAAC,IAAI,CAAC;qBACb,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACf;gBAED,sBAAsB;gBACtB,OAAO;oBACL,MAAM,CAAC,QAAQ;oBACf;wBACE,QAAQ;wBACR,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,IAAI;wBACX,MAAM,CAAC,MAAM;wBACb,MAAM,CAAC,QAAQ;wBACf,gFAAgF;wBAChF,GAAG,IAAA,+BAAuB,EAAC,MAAM,EAAE;4BACjC,WAAW;4BACX,MAAM;4BACN,WAAW;4BACX,KAAK;4BACL,OAAO;yBACR,CAAC;wBACF,GAAG,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;4BACpC,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC;4BAChC,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,CAAC,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ;4BAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,eAAe,EAAE,CAAC;4BAChD,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACf;YAED,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;gBACvB,MAAM,MAAM,GAAG,UAA6B,CAAC;gBAE7C,OAAO;oBACL,MAAM,CAAC,QAAQ;oBACf;wBACE,OAAO;wBACP,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,IAAI;wBACX,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,QAAQ;wBACf,GAAG,CAAC,OAAO,MAAM,CAAC,cAAc,KAAK,SAAS;4BAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,cAAc,EAAE,CAAC;4BAC/C,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,CAAC,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ;4BAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,eAAe,EAAE,CAAC;4BAChD,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;4BACpC,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC;4BAChC,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,IAAA,+BAAuB,EAAC,MAAM,EAAE;4BACjC,KAAK;4BACL,KAAK;4BACL,OAAO;4BACP,OAAO;yBACR,CAAC;qBACH,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACf;YAED,KAAK,oBAAY,CAAC,IAAI,CAAC,CAAC;gBACtB,MAAM,MAAM,GAAG,UAA4B,CAAC;gBAE5C,OAAO;oBACL,MAAM,CAAC,QAAQ;oBACf;wBACE,MAAM;wBACN,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,IAAI;wBACX,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,QAAQ;wBACf,GAAG,CAAC,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ;4BAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,eAAe,EAAE,CAAC;4BAChD,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;4BACpC,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC;4BAChC,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,IAAA,+BAAuB,EAAC,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;qBACrD,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACf;YAED,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;gBACvB,MAAM,MAAM,GAAG,UAA6B,CAAC;gBAE7C,OAAO;oBACL,MAAM,CAAC,QAAQ;oBACf;wBACE,OAAO;wBACP,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,IAAI;wBACX,GAAG,CAAC,OAAO,MAAM,CAAC,eAAe,KAAK,QAAQ;4BAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,eAAe,EAAE,CAAC;4BAChD,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;4BACpC,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,EAAE,CAAC;4BAChC,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,IAAA,+BAAuB,EAAC,MAAM,EAAE;4BACjC,KAAK;4BACL,MAAM;4BACN,WAAW;4BACX,SAAS;4BACT,KAAK;4BACL,OAAO;yBACR,CAAC;qBACH,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACf;YAED,KAAK,oBAAY,CAAC,YAAY,CAAC,CAAC;gBAC9B,MAAM,MAAM,GAAG,UAAoC,CAAC;gBAEpD,uBAAuB;gBACvB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;iBACH;gBAED,MAAM,IAAI,GAAG;oBACX,IAAI;oBACJ,MAAM,CAAC,QAAQ;oBACf,IAAI;oBACJ,GAAG,MAAM,CAAC,IAAI,EAAE;oBAChB,IAAI;oBACJ,MAAM,CAAC,MAAM;oBACb,IAAI;oBACJ,MAAM,CAAC,IAAI;oBACX,IAAI;oBACJ,MAAM,CAAC,QAAQ;oBACf,IAAI;oBACJ,MAAM,CAAC,QAAQ;oBACf,IAAI;oBACJ,GAAG,MAAM,CAAC,SAAS,EAAE;oBACrB,IAAI;oBACJ,WAAW;iBACZ,CAAC;gBAEF,IAAI,MAAM,CAAC,UAAU,EAAE;oBACrB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;iBACpC;gBACD,IAAI,MAAM,CAAC,SAAS,EAAE;oBACpB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;iBACnC;gBAED,MAAM,YAAY,GAAG;oBACnB,UAAU;oBACV,UAAU,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;oBAC1C,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;oBACrD,gBAAgB,MAAM,CAAC,SAAS,EAAE;iBACnC,CAAC;gBAEF,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE;oBAC1B,MAAM,IAAI,KAAK,CACb,kCAAkC,MAAA,MAAM,CAAC,QAAQ,0CAAE,IAAI,8CAA8C,CACtG,CAAC;iBACH;gBAED,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;oBACjD,YAAY,CAAC,IAAI,CACf,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC,CAC1D,CAAC;iBACH;gBAED,IAAI,IAAA,YAAI,EAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBACzB,YAAY,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACrD;gBAED,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC/D;YAED,KAAK,oBAAY,CAAC,KAAK,CAAC,CAAC;gBACvB,MAAM,MAAM,GAAG,UAA6B,CAAC;gBAE7C,IAAI,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,0CAAE,KAAK,MAAK,QAAQ,EAAE;oBAC/C,2BAA2B;oBAE3B,MAAM,UAAU,GAAG;wBACjB,OAAO;wBACP,MAAM,CAAC,QAAQ;wBACf,MAAM,CAAC,IAAI;wBACX,YAAY,MAAM,CAAC,IAAI,EAAE;qBAC1B,CAAC;oBAEF,IACE,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EACjE;wBACA,UAAU,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;qBACpD;oBAED,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE;wBAC3B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3B,UAAU,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;wBAC1C,UAAU,CAAC,IAAI,CACb,aAAa;4BACX,IAAI,CAAC,SAAS,CACZ,IAAA,6BAAqB,kBACnB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,QAAQ,EACpC,YAAY,EAAE,kBAAO,IAClB,gBAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,EACrC,CACH,CACJ,CAAC;qBACH;oBAED,IAAI,MAAM,CAAC,GAAG,EAAE;wBACd,UAAU,CAAC,IAAI,CACb,UAAU,EACV,GAAG,CAAC,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS;4BACnC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,KAAK,EAAE,CAAC;4BAC3B,CAAC,CAAC,EAAE,CAAC,EACP,GAAG,CAAC,OAAO,MAAM,CAAC,cAAc,KAAK,SAAS;4BAC5C,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,cAAc,EAAE,CAAC;4BAC/C,CAAC,CAAC,EAAE,CAAC,EACP,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/C,CAAC;qBACH;oBAED,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE;wBACnC,UAAU,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;qBACtC;oBAED,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;wBACrC,UAAU,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;qBAC1C;oBAED,IAAI,MAAM,CAAC,iBAAiB,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,oBAAoB,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;qBAClE;oBAED,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;wBACrB,UAAU,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;qBAClD;oBAED,IAAI,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,0CAAE,SAAS,EAAE;wBACtC,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;qBACpC;yBAAM;wBACL,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;qBACrC;oBAED,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC7D;qBAAM;oBACL,0BAA0B;oBAE1B,uBAAuB;oBACvB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wBACnB,MAAM,IAAI,KAAK,CACb,oDAAoD,CACrD,CAAC;qBACH;oBAED,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE;wBAC1B,MAAM,IAAI,KAAK,CACb,oCAAoC,MAAA,MAAM,CAAC,QAAQ,0CAAE,IAAI,8CAA8C,CACxG,CAAC;qBACH;oBAED,MAAM,YAAY,GAAG,SAAS,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,OAAO,CAAC;oBACxF,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,IAAA,0BAAkB,GAAE,EAAE,YAAY,CAAC,CAAC;oBAC9D,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAChC,MAAM,CAAC,SAAmB,EAC1B,UAAU,CACX,CAAC;oBACF,MAAM,IAAI,GAAG;wBACX,UAAU;wBACV,YAAY,CAAC,OAAO,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC;qBAC5C,CAAC;oBACF,MAAM,YAAY,GAAG;wBACnB,UAAU;wBACV,UAAU,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;wBAC1C,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;wBACrD,gBAAgB,MAAM,CAAC,SAAS,EAAE;qBACnC,CAAC;oBAEF,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;wBACjD,YAAY,CAAC,IAAI,CACf,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC,CAC1D,CAAC;qBACH;oBAED,IAAI,IAAA,YAAI,EAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;wBACzB,YAAY,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;qBACrD;oBAED,uBAAuB;oBACvB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;wBACnC,kBAAE,CAAC,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;qBAC1C;oBAED,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC/D;aACF;YAED,KAAK,oBAAY,CAAC,MAAM,CAAC,CAAC;gBACxB,MAAM,UAAU,GAAa;oBAC3B,QAAQ;oBACR,UAAU,CAAC,QAAQ;oBACnB,GAAG,UAAU,CAAC,IAAI,EAAE;oBACpB,YAAY,UAAU,CAAC,QAAQ,EAAE;oBACjC,GAAG,IAAA,+BAAuB,EAAC,UAAU,EAAE;wBACrC,KAAK;wBACL,OAAO;wBACP,KAAK;wBACL,OAAO;qBACR,CAAC;oBACF,GAAG,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;wBACxC,CAAC,CAAC,CAAC,YAAY,UAAU,CAAC,OAAO,EAAE,CAAC;wBACpC,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,UAAU,CAAC,eAAe,KAAK,QAAQ;wBAChD,CAAC,CAAC,CAAC,oBAAoB,UAAU,CAAC,eAAe,EAAE,CAAC;wBACpD,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,UAAU,CAAC,cAAc,KAAK,SAAS;wBAChD,CAAC,CAAC,CAAC,oBAAoB,UAAU,CAAC,cAAc,EAAE,CAAC;wBACnD,CAAC,CAAC,EAAE,CAAC;iBACR,CAAC;gBAEF,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,EAAE;oBAC/B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC3B,UAAU,CAAC,IAAI,CAAC,WAAW,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;oBAEhD,IAAI,UAAU,CAAC,SAAS,EAAE;wBACxB,UAAU,CAAC,IAAI,CACb,aAAa;4BACX,IAAI,CAAC,SAAS,CAAC,IAAA,6BAAqB,EAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAC9D,CAAC;qBACH;iBACF;gBAED,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACjE;YAED,KAAK,oBAAY,CAAC,MAAM,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAG;oBACb,UAAU,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ;oBACjD,UAAU,CAAC,QAAQ;oBACnB,UAAU,CAAC,IAAI;oBACf,GAAG,CAAC,OAAO,UAAU,CAAC,eAAe,KAAK,QAAQ;wBAChD,CAAC,CAAC,CAAC,oBAAoB,UAAU,CAAC,eAAe,EAAE,CAAC;wBACpD,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;wBACxC,CAAC,CAAC,CAAC,YAAY,UAAU,CAAC,OAAO,EAAE,CAAC;wBACpC,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,IAAA,+BAAuB,EAAC,UAAU,EAAE;wBACrC,UAAU;wBACV,UAAU;wBACV,KAAK;wBACL,KAAK;wBACL,OAAO;wBACP,OAAO;qBACR,CAAC;iBACH,CAAC;gBAEF,IAAI,UAAU,CAAC,GAAG,KAAK,IAAI,EAAE;oBAC3B,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,OAAO,UAAU,CAAC,cAAc,KAAK,SAAS;wBAChD,CAAC,CAAC,CAAC,oBAAoB,UAAU,CAAC,cAAc,EAAE,CAAC;wBACnD,CAAC,CAAC,EAAE,CAAC,EACP,GAAG,CAAC,OAAO,UAAU,CAAC,UAAU,KAAK,QAAQ;wBAC3C,CAAC,CAAC,CAAC,eAAe,UAAU,CAAC,UAAU,EAAE,CAAC;wBAC1C,CAAC,CAAC,EAAE,CAAC,CACR,CAAC;iBACH;gBAED,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC7D;YAED,KAAK,oBAAY,CAAC,IAAI,CAAC,CAAC;gBACtB,MAAM,MAAM,GAAG;oBACb,MAAM;oBACN,UAAU,CAAC,QAAQ;oBACnB,UAAU,CAAC,IAAI;oBACf,GAAG,IAAA,+BAAuB,EAAC,UAAU,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBACxD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;wBAChC,CAAC,CAAC,CAAC,QAAQ,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;wBACvC,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,UAAU,CAAC,eAAe,KAAK,QAAQ;wBAChD,CAAC,CAAC,CAAC,oBAAoB,UAAU,CAAC,eAAe,EAAE,CAAC;wBACpD,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;wBACxC,CAAC,CAAC,CAAC,YAAY,UAAU,CAAC,OAAO,EAAE,CAAC;wBACpC,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,CAAC,OAAO,UAAU,CAAC,cAAc,KAAK,SAAS;wBAChD,CAAC,CAAC,CAAC,oBAAoB,UAAU,CAAC,cAAc,EAAE,CAAC;wBACnD,CAAC,CAAC,EAAE,CAAC;iBACR,CAAC;gBAEF,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC7D;YAED,uBAAuB;YACvB;gBACE,MAAM,CAAC,IAAI,CACT,iBAAkB,UAAkB,CAAC,IAAI,WACtC,UAAkB,CAAC,QACtB,OAAO,CACR,CAAC;gBACF,OAAO,KAAK,CAAC,CAAC;SACjB;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAExD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC;AAlcW,QAAA,aAAa,iBAkcxB"}
|
|
368
|
+
function parseShadowTlsConfig(config) {
|
|
369
|
+
const result = [];
|
|
370
|
+
if (config.shadowTls) {
|
|
371
|
+
result.push(`shadow-tls-password=${config.shadowTls.password}`);
|
|
372
|
+
if (config.shadowTls.sni) {
|
|
373
|
+
result.push(`shadow-tls-sni=${config.shadowTls.sni}`);
|
|
374
|
+
}
|
|
375
|
+
}
|
|
376
|
+
return result;
|
|
377
|
+
}
|
|
378
|
+
//# 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
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "surgio",
|
|
3
3
|
"description": "Generating rules for Surge, Clash, Quantumult like a PRO",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.24.0",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"typings": "build/index.d.ts",
|
|
7
7
|
"bin": {
|
|
@@ -45,6 +45,7 @@
|
|
|
45
45
|
"bluebird": "^3.7.2",
|
|
46
46
|
"bytes": "^3.1.2",
|
|
47
47
|
"chalk": "^4.1.2",
|
|
48
|
+
"change-case": "^4.1.2",
|
|
48
49
|
"check-node-version": "^4.2.1",
|
|
49
50
|
"common-bin": "^2.9.2",
|
|
50
51
|
"cross-env": "^7.0.3",
|