surgio 2.18.2 → 2.19.0-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/CHANGELOG.md +32 -0
- package/build/command/check.js +7 -11
- package/build/command/clean-cache.d.ts +1 -1
- package/build/command/clean-cache.js +10 -2
- package/build/command/doctor.js +6 -14
- package/build/command/generate.js +10 -12
- package/build/command/lint.js +1 -1
- package/build/command/new.js +5 -13
- package/build/command/subscriptions.js +5 -10
- package/build/command/upload.js +9 -13
- package/build/constant/constant.d.ts +4 -0
- package/build/constant/constant.js +6 -2
- package/build/generator/template.d.ts +1 -1
- package/build/index.d.ts +7 -1
- package/build/index.js +12 -13
- package/build/misc/flag_cn.d.ts +15 -1
- package/build/misc/flag_cn.js +69 -30
- package/build/provider/ClashProvider.d.ts +1 -1
- package/build/provider/Provider.js +47 -24
- package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +1 -1
- package/build/provider/ShadowsocksSubscribeProvider.d.ts +1 -1
- package/build/provider/ShadowsocksrSubscribeProvider.d.ts +1 -1
- package/build/provider/SsdProvider.d.ts +2 -2
- package/build/redis.d.ts +9 -0
- package/build/redis.js +61 -0
- package/build/types.d.ts +8 -1
- package/build/utils/cache.d.ts +13 -1
- package/build/utils/cache.js +41 -3
- package/build/utils/clash.d.ts +2 -2
- package/build/utils/command.d.ts +2 -0
- package/build/utils/command.js +23 -0
- package/build/utils/config.d.ts +3 -1
- package/build/utils/config.js +41 -3
- package/build/utils/filter.d.ts +4 -4
- package/build/utils/http-client.d.ts +1 -1
- package/build/utils/index.d.ts +8 -5
- package/build/utils/index.js +22 -5
- package/build/utils/linter.d.ts +1 -1
- package/build/utils/loon.d.ts +1 -1
- package/build/utils/patch-proxy.js +2 -7
- package/build/utils/quantumult.d.ts +2 -2
- package/build/utils/remote-snippet.d.ts +1 -1
- package/build/utils/remote-snippet.js +8 -5
- package/build/utils/ss.js +13 -15
- package/build/utils/ssr.js +4 -7
- package/build/utils/surge.d.ts +1 -1
- package/build/utils/tmp-helper.d.ts +21 -7
- package/build/utils/tmp-helper.js +47 -16
- package/build/utils/trojan.js +4 -7
- package/build/utils/v2ray.d.ts +1 -1
- package/build/utils/v2ray.js +6 -8
- package/package.json +10 -20
package/build/utils/config.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.validateConfig = exports.normalizeConfig = exports.loadConfig = void 0;
|
|
6
|
+
exports.validateConfig = exports.normalizeConfig = exports.setConfig = exports.getConfig = exports.loadConfig = void 0;
|
|
7
7
|
const joi_1 = __importDefault(require("joi"));
|
|
8
8
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
@@ -11,12 +11,14 @@ const path_1 = __importDefault(require("path"));
|
|
|
11
11
|
const url_1 = require("url");
|
|
12
12
|
const util_1 = require("util");
|
|
13
13
|
const deprecation_1 = require("../misc/deprecation");
|
|
14
|
+
const redis_1 = __importDefault(require("../redis"));
|
|
14
15
|
const constant_1 = require("../constant");
|
|
15
16
|
const flag_1 = require("./flag");
|
|
16
17
|
const index_1 = require("./index");
|
|
17
18
|
const showDEP005 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP005, 'DEP005');
|
|
18
19
|
const showDEP006 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP006, 'DEP006');
|
|
19
20
|
const showDEP008 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP008, 'DEP008');
|
|
21
|
+
let finalConfig = null;
|
|
20
22
|
const loadConfig = (cwd, configPath, override) => {
|
|
21
23
|
const absPath = path_1.default.resolve(cwd, configPath);
|
|
22
24
|
if (!fs_extra_1.default.existsSync(absPath)) {
|
|
@@ -44,9 +46,30 @@ const loadConfig = (cwd, configPath, override) => {
|
|
|
44
46
|
if (override) {
|
|
45
47
|
return Object.assign(Object.assign({}, (0, exports.normalizeConfig)(cwd, userConfig)), override);
|
|
46
48
|
}
|
|
47
|
-
|
|
49
|
+
finalConfig = (0, exports.normalizeConfig)(cwd, userConfig);
|
|
50
|
+
return finalConfig;
|
|
48
51
|
};
|
|
49
52
|
exports.loadConfig = loadConfig;
|
|
53
|
+
const getConfig = () => {
|
|
54
|
+
if (!finalConfig) {
|
|
55
|
+
throw new Error('请先调用 loadConfig 方法');
|
|
56
|
+
}
|
|
57
|
+
return finalConfig;
|
|
58
|
+
};
|
|
59
|
+
exports.getConfig = getConfig;
|
|
60
|
+
const setConfig = (key, value) => {
|
|
61
|
+
if (!finalConfig) {
|
|
62
|
+
throw new Error('请先调用 loadConfig 方法');
|
|
63
|
+
}
|
|
64
|
+
if (lodash_1.default.isPlainObject(value)) {
|
|
65
|
+
finalConfig[key] = Object.assign(Object.assign({}, finalConfig[key]), value);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
finalConfig[key] = value;
|
|
69
|
+
}
|
|
70
|
+
return finalConfig;
|
|
71
|
+
};
|
|
72
|
+
exports.setConfig = setConfig;
|
|
50
73
|
const normalizeConfig = (cwd, userConfig) => {
|
|
51
74
|
var _a, _b, _c;
|
|
52
75
|
const defaultConfig = {
|
|
@@ -71,6 +94,9 @@ const normalizeConfig = (cwd, userConfig) => {
|
|
|
71
94
|
proxyTestUrl: constant_1.PROXY_TEST_URL,
|
|
72
95
|
proxyTestInterval: constant_1.PROXY_TEST_INTERVAL,
|
|
73
96
|
checkHostname: false,
|
|
97
|
+
cache: {
|
|
98
|
+
type: 'default',
|
|
99
|
+
},
|
|
74
100
|
};
|
|
75
101
|
const config = lodash_1.default.defaultsDeep(userConfig, defaultConfig);
|
|
76
102
|
// istanbul ignore next
|
|
@@ -103,6 +129,12 @@ const normalizeConfig = (cwd, userConfig) => {
|
|
|
103
129
|
if (((_c = config.clashConfig) === null || _c === void 0 ? void 0 : _c.ssrFormat) === 'legacy') {
|
|
104
130
|
showDEP008();
|
|
105
131
|
}
|
|
132
|
+
if (config.cache && config.cache.type === 'redis') {
|
|
133
|
+
if (!config.cache.redisUrl) {
|
|
134
|
+
throw new Error('缓存配置错误,请检查 cache.redisUrl 配置');
|
|
135
|
+
}
|
|
136
|
+
redis_1.default.createRedis(config.cache.redisUrl);
|
|
137
|
+
}
|
|
106
138
|
return config;
|
|
107
139
|
};
|
|
108
140
|
exports.normalizeConfig = normalizeConfig;
|
|
@@ -177,6 +209,12 @@ const validateConfig = (userConfig) => {
|
|
|
177
209
|
supportSort: joi_1.default.boolean().strict(),
|
|
178
210
|
}))),
|
|
179
211
|
customParams: joi_1.default.object(),
|
|
212
|
+
cache: joi_1.default.object({
|
|
213
|
+
type: joi_1.default.string().valid('redis', 'default'),
|
|
214
|
+
redisUrl: joi_1.default.string().uri({
|
|
215
|
+
scheme: [/rediss?/],
|
|
216
|
+
}),
|
|
217
|
+
}),
|
|
180
218
|
}).unknown();
|
|
181
219
|
const { error } = schema.validate(userConfig);
|
|
182
220
|
// istanbul ignore next
|
|
@@ -185,4 +223,4 @@ const validateConfig = (userConfig) => {
|
|
|
185
223
|
}
|
|
186
224
|
};
|
|
187
225
|
exports.validateConfig = validateConfig;
|
|
188
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/utils/config.ts"],"names":[],"mappings":"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"}
|
|
226
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/utils/config.ts"],"names":[],"mappings":"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"}
|
package/build/utils/filter.d.ts
CHANGED
|
@@ -12,10 +12,10 @@ export declare class SortFilterWithSortedKeywords implements SortedNodeNameFilte
|
|
|
12
12
|
filter<T>(nodeList: ReadonlyArray<T & SimpleNodeConfig>): ReadonlyArray<T & SimpleNodeConfig>;
|
|
13
13
|
}
|
|
14
14
|
export declare const validateFilter: (filter: any) => boolean;
|
|
15
|
-
export declare const applyFilter: <T extends SimpleNodeConfig>(nodeList: readonly T[], filter?:
|
|
16
|
-
export declare const mergeFilters: (filters: ReadonlyArray<NodeNameFilterType>, isStrict?: boolean
|
|
17
|
-
export declare const useKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean
|
|
18
|
-
export declare const discardKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean
|
|
15
|
+
export declare const applyFilter: <T extends SimpleNodeConfig>(nodeList: readonly T[], filter?: NodeNameFilterType | SortedNodeNameFilterType) => readonly T[];
|
|
16
|
+
export declare const mergeFilters: (filters: ReadonlyArray<NodeNameFilterType>, isStrict?: boolean) => NodeNameFilterType;
|
|
17
|
+
export declare const useKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
|
|
18
|
+
export declare const discardKeywords: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
|
|
19
19
|
export declare const useRegexp: (regexp: RegExp) => NodeNameFilterType;
|
|
20
20
|
export declare const useProviders: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
|
|
21
21
|
export declare const discardProviders: (keywords: ReadonlyArray<string>, isStrict?: boolean) => NodeNameFilterType;
|
package/build/utils/index.d.ts
CHANGED
|
@@ -3,13 +3,14 @@ import { NodeFilterType, NodeNameFilterType, PlainObjectOf, PossibleNodeConfigTy
|
|
|
3
3
|
export * from './surge';
|
|
4
4
|
export * from './clash';
|
|
5
5
|
export * from './quantumult';
|
|
6
|
-
export declare const getDownloadUrl: (baseUrl: string | undefined, artifactName: string, inline?: boolean, accessToken?: string
|
|
7
|
-
export declare const getUrl: (baseUrl: string, path: string, accessToken?: string
|
|
8
|
-
export declare const getMellowNodes: (list: ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>, filter?:
|
|
6
|
+
export declare const getDownloadUrl: (baseUrl: string | undefined, artifactName: string, inline?: boolean, accessToken?: string) => string;
|
|
7
|
+
export declare const getUrl: (baseUrl: string, path: string, accessToken?: string) => string;
|
|
8
|
+
export declare const getMellowNodes: (list: ReadonlyArray<VmessNodeConfig | ShadowsocksNodeConfig>, filter?: NodeFilterType | SortedNodeNameFilterType) => string;
|
|
9
9
|
export declare const toUrlSafeBase64: (str: string) => string;
|
|
10
10
|
export declare const fromUrlSafeBase64: (str: string) => string;
|
|
11
11
|
export declare const toBase64: (str: string) => string;
|
|
12
12
|
export declare const fromBase64: (str: string) => string;
|
|
13
|
+
export declare const toMD5: (str: string) => string;
|
|
13
14
|
/**
|
|
14
15
|
* @see https://github.com/shadowsocks/shadowsocks-org/wiki/SIP002-URI-Scheme
|
|
15
16
|
*/
|
|
@@ -17,7 +18,7 @@ export declare const getShadowsocksNodes: (list: ReadonlyArray<ShadowsocksNodeCo
|
|
|
17
18
|
export declare const getShadowsocksrNodes: (list: ReadonlyArray<ShadowsocksrNodeConfig>, groupName: string) => string;
|
|
18
19
|
export declare const getV2rayNNodes: (list: ReadonlyArray<VmessNodeConfig>) => string;
|
|
19
20
|
export declare const getShadowsocksNodesJSON: (list: ReadonlyArray<ShadowsocksNodeConfig>) => string;
|
|
20
|
-
export declare const getNodeNames: (list: ReadonlyArray<SimpleNodeConfig>, filter?:
|
|
21
|
+
export declare const getNodeNames: (list: ReadonlyArray<SimpleNodeConfig>, filter?: NodeNameFilterType | SortedNodeNameFilterType, separator?: string) => string;
|
|
21
22
|
export declare const generateClashProxyGroup: (ruleName: string, ruleType: 'select' | 'url-test' | 'fallback' | 'load-balance', nodeNameList: ReadonlyArray<SimpleNodeConfig>, options: {
|
|
22
23
|
readonly filter?: NodeNameFilterType | SortedNodeNameFilterType;
|
|
23
24
|
readonly existingProxies?: ReadonlyArray<string>;
|
|
@@ -47,6 +48,8 @@ export declare const isVercel: () => boolean;
|
|
|
47
48
|
export declare const isHeroku: () => boolean;
|
|
48
49
|
export declare const isGitHubActions: () => boolean;
|
|
49
50
|
export declare const isGitLabCI: () => boolean;
|
|
50
|
-
export declare const isPkgBundle: () => boolean;
|
|
51
51
|
export declare const isRailway: () => boolean;
|
|
52
52
|
export declare const isNetlify: () => boolean;
|
|
53
|
+
export declare const isAWSLambda: () => boolean;
|
|
54
|
+
export declare const isAWS: () => boolean;
|
|
55
|
+
export declare const isGFWFree: () => boolean;
|
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.
|
|
20
|
+
exports.isGFWFree = 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;
|
|
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"));
|
|
@@ -28,6 +28,7 @@ const url_1 = require("url");
|
|
|
28
28
|
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
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
31
32
|
const types_1 = require("../types");
|
|
32
33
|
const constant_1 = require("../constant");
|
|
33
34
|
const filter_1 = require("./filter");
|
|
@@ -113,6 +114,9 @@ exports.toBase64 = toBase64;
|
|
|
113
114
|
// istanbul ignore next
|
|
114
115
|
const fromBase64 = (str) => Buffer.from(str, 'base64').toString('utf8');
|
|
115
116
|
exports.fromBase64 = fromBase64;
|
|
117
|
+
// istanbul ignore next
|
|
118
|
+
const toMD5 = (str) => crypto_1.default.createHash('md5').update(str).digest('hex');
|
|
119
|
+
exports.toMD5 = toMD5;
|
|
116
120
|
/**
|
|
117
121
|
* @see https://github.com/shadowsocks/shadowsocks-org/wiki/SIP002-URI-Scheme
|
|
118
122
|
*/
|
|
@@ -454,12 +458,25 @@ exports.isGitHubActions = isGitHubActions;
|
|
|
454
458
|
const isGitLabCI = () => typeof process.env.GITLAB_CI !== 'undefined';
|
|
455
459
|
exports.isGitLabCI = isGitLabCI;
|
|
456
460
|
// istanbul ignore next
|
|
457
|
-
const isPkgBundle = () => __dirname.startsWith('/snapshot');
|
|
458
|
-
exports.isPkgBundle = isPkgBundle;
|
|
459
|
-
// istanbul ignore next
|
|
460
461
|
const isRailway = () => typeof process.env.RAILWAY_STATIC_URL !== 'undefined';
|
|
461
462
|
exports.isRailway = isRailway;
|
|
462
463
|
// istanbul ignore next
|
|
463
464
|
const isNetlify = () => typeof process.env.NETLIFY !== 'undefined';
|
|
464
465
|
exports.isNetlify = isNetlify;
|
|
465
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"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"}
|
|
466
|
+
// istanbul ignore next
|
|
467
|
+
const isAWSLambda = () => typeof process.env.AWS_LAMBDA_FUNCTION_NAME !== 'undefined';
|
|
468
|
+
exports.isAWSLambda = isAWSLambda;
|
|
469
|
+
// istanbul ignore next
|
|
470
|
+
const isAWS = () => (0, exports.isAWSLambda)() ||
|
|
471
|
+
typeof process.env.AWS_EXECUTION_ENV !== 'undefined' ||
|
|
472
|
+
typeof process.env.AWS_REGION !== 'undefined';
|
|
473
|
+
exports.isAWS = isAWS;
|
|
474
|
+
const isGFWFree = () => (0, exports.isAWS)() ||
|
|
475
|
+
(0, exports.isVercel)() ||
|
|
476
|
+
(0, exports.isHeroku)() ||
|
|
477
|
+
(0, exports.isGitHubActions)() ||
|
|
478
|
+
(0, exports.isGitLabCI)() ||
|
|
479
|
+
(0, exports.isRailway)() ||
|
|
480
|
+
(0, exports.isNetlify)();
|
|
481
|
+
exports.isGFWFree = isGFWFree;
|
|
482
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"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"}
|
package/build/utils/linter.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ESLint } from 'eslint';
|
|
2
|
-
export declare const createCli: (cliConfig?: ESLint.Options
|
|
2
|
+
export declare const createCli: (cliConfig?: ESLint.Options) => ESLint;
|
|
3
3
|
export declare const checkAndFix: (cwd: string) => Promise<boolean>;
|
|
4
4
|
export declare const check: (cwd: string) => Promise<boolean>;
|
package/build/utils/loon.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { NodeNameFilterType, PossibleNodeConfigType, SortedNodeNameFilterType } from '../types';
|
|
2
|
-
export declare const getLoonNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?:
|
|
2
|
+
export declare const getLoonNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeNameFilterType | SortedNodeNameFilterType) => string;
|
|
@@ -5,12 +5,7 @@ const logger_1 = require("@surgio/logger");
|
|
|
5
5
|
const _1 = require("./");
|
|
6
6
|
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:patch-proxy' });
|
|
7
7
|
const keys = ['http_proxy', 'https_proxy', 'all_proxy'];
|
|
8
|
-
if (!(0, _1.
|
|
9
|
-
!(0, _1.isHeroku)() &&
|
|
10
|
-
!(0, _1.isGitHubActions)() &&
|
|
11
|
-
!(0, _1.isGitLabCI)() &&
|
|
12
|
-
!(0, _1.isRailway)() &&
|
|
13
|
-
!(0, _1.isNetlify)()) {
|
|
8
|
+
if (!(0, _1.isGFWFree)()) {
|
|
14
9
|
process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = '';
|
|
15
10
|
keys.forEach((key) => {
|
|
16
11
|
if (key in process.env) {
|
|
@@ -21,4 +16,4 @@ if (!(0, _1.isNow)() &&
|
|
|
21
16
|
}
|
|
22
17
|
});
|
|
23
18
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0Y2gtcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcGF0Y2gtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1Qjs7QUFFdkIsMkNBQThDO0FBQzlDLHlCQUErQjtBQUUvQixNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsQ0FBQyxDQUFDO0FBQ3JFLE1BQU0sSUFBSSxHQUEwQixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFFL0UsSUFBSSxDQUFDLElBQUEsWUFBUyxHQUFFLEVBQUU7SUFDaEIsT0FBTyxDQUFDLEdBQUcsQ0FBQywyQ0FBMkMsR0FBRyxFQUFFLENBQUM7SUFFN0QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1FBQ25CLElBQUksR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDdEIsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2pDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFFL0IsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsRUFBRSxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDbEUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUM7U0FDN0I7SUFDSCxDQUFDLENBQUMsQ0FBQztDQUNKIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HttpsNodeConfig, NodeNameFilterType, PossibleNodeConfigType, ShadowsocksNodeConfig, ShadowsocksrNodeConfig, SortedNodeNameFilterType, VmessNodeConfig } from '../types';
|
|
2
|
-
export declare const getQuantumultNodes: (list: ReadonlyArray<ShadowsocksNodeConfig | VmessNodeConfig | ShadowsocksrNodeConfig | HttpsNodeConfig>, groupName?: string, filter?:
|
|
2
|
+
export declare const getQuantumultNodes: (list: ReadonlyArray<ShadowsocksNodeConfig | VmessNodeConfig | ShadowsocksrNodeConfig | HttpsNodeConfig>, groupName?: string, filter?: NodeNameFilterType | SortedNodeNameFilterType) => string;
|
|
3
3
|
/**
|
|
4
4
|
* @see https://github.com/crossutility/Quantumult-X/blob/master/sample.conf
|
|
5
5
|
*/
|
|
6
|
-
export declare const getQuantumultXNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?:
|
|
6
|
+
export declare const getQuantumultXNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeNameFilterType | SortedNodeNameFilterType) => string;
|
|
@@ -3,6 +3,6 @@ export declare const parseMacro: (snippet: string) => {
|
|
|
3
3
|
functionName: string;
|
|
4
4
|
arguments: string[];
|
|
5
5
|
};
|
|
6
|
-
export declare const addProxyToSurgeRuleSet: (str: string, proxyName?: string
|
|
6
|
+
export declare const addProxyToSurgeRuleSet: (str: string, proxyName?: string) => string;
|
|
7
7
|
export declare const renderSurgioSnippet: (str: string, args: string[]) => string;
|
|
8
8
|
export declare const loadRemoteSnippetList: (remoteSnippetList: ReadonlyArray<RemoteSnippetConfig>, cacheSnippet?: boolean) => Promise<ReadonlyArray<RemoteSnippet>>;
|
|
@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.loadRemoteSnippetList = exports.renderSurgioSnippet = exports.addProxyToSurgeRuleSet = exports.parseMacro = void 0;
|
|
7
7
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
8
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
9
8
|
const logger_1 = require("@surgio/logger");
|
|
10
9
|
const detect_newline_1 = __importDefault(require("detect-newline"));
|
|
11
10
|
const nunjucks_1 = __importDefault(require("nunjucks"));
|
|
12
11
|
const espree_1 = __importDefault(require("espree"));
|
|
12
|
+
const constant_1 = require("../constant");
|
|
13
13
|
const cache_1 = require("./cache");
|
|
14
|
+
const config_1 = require("./config");
|
|
14
15
|
const env_flag_1 = require("./env-flag");
|
|
15
16
|
const http_client_1 = __importDefault(require("./http-client"));
|
|
16
17
|
const index_1 = require("./index");
|
|
@@ -94,7 +95,9 @@ const renderSurgioSnippet = (str, args) => {
|
|
|
94
95
|
};
|
|
95
96
|
exports.renderSurgioSnippet = renderSurgioSnippet;
|
|
96
97
|
const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
97
|
-
|
|
98
|
+
var _a, _b;
|
|
99
|
+
const cacheType = ((_b = (_a = (0, config_1.getConfig)()) === null || _a === void 0 ? void 0 : _a.cache) === null || _b === void 0 ? void 0 : _b.type) || 'default';
|
|
100
|
+
const tmpFactory = (0, tmp_helper_1.createTmpFactory)(constant_1.CACHE_KEYS.RemoteSnippets, cacheType);
|
|
98
101
|
function load(url) {
|
|
99
102
|
return http_client_1.default
|
|
100
103
|
.get(url)
|
|
@@ -108,10 +111,10 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
|
108
111
|
});
|
|
109
112
|
}
|
|
110
113
|
return bluebird_1.default.map(remoteSnippetList, (item) => {
|
|
111
|
-
const fileMd5 =
|
|
114
|
+
const fileMd5 = (0, index_1.toMD5)(item.url);
|
|
112
115
|
const isSurgioSnippet = item.surgioSnippet;
|
|
113
116
|
return (async () => {
|
|
114
|
-
if (cacheSnippet
|
|
117
|
+
if (cacheSnippet) {
|
|
115
118
|
const tmp = tmpFactory(fileMd5, (0, env_flag_1.getRemoteSnippetCacheMaxage)());
|
|
116
119
|
const tmpContent = await tmp.getContent();
|
|
117
120
|
let snippet;
|
|
@@ -153,4 +156,4 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
|
153
156
|
});
|
|
154
157
|
};
|
|
155
158
|
exports.loadRemoteSnippetList = loadRemoteSnippetList;
|
|
156
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlLXNuaXBwZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcmVtb3RlLXNuaXBwZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsd0RBQWdDO0FBQ2hDLDJDQUF3QztBQUN4QyxvRUFBMkM7QUFDM0Msd0RBQWdDO0FBQ2hDLG9EQUF5RDtBQUN6RCwwQ0FBeUM7QUFHekMsbUNBQXNDO0FBQ3RDLHFDQUFxQztBQUNyQyx5Q0FBZ0Y7QUFDaEYsZ0VBQXVDO0FBQ3ZDLG1DQUFnQztBQUNoQyw2Q0FBZ0Q7QUFFekMsTUFBTSxVQUFVLEdBQUcsQ0FDeEIsT0FBZSxFQUlmLEVBQUU7SUFDRixNQUFNLEtBQUssR0FBRyx1QkFBdUIsQ0FBQztJQUN0QyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRWxDLElBQUksQ0FBQyxLQUFLLEVBQUU7UUFDVixNQUFNLElBQUksS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO0tBQy9CO0lBRUQsTUFBTSxHQUFHLEdBQUcsZ0JBQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDdkQsSUFBSSxTQUE4QyxDQUFDO0lBRW5ELEtBQUssTUFBTSxJQUFJLElBQUksR0FBRyxDQUFDLElBQUksRUFBRTtRQUMzQixJQUFJLElBQUksQ0FBQyxJQUFJLEtBQUsscUJBQXFCLEVBQUU7WUFDdkMsU0FBUyxHQUFHLElBQUksQ0FBQztZQUNqQixNQUFNO1NBQ1A7S0FDRjtJQUVELElBQ0UsQ0FBQyxTQUFTO1FBQ1YsU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLEtBQUssZ0JBQWdCO1FBQzlDLFNBQVMsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxNQUFNLEVBQzNDO1FBQ0EsTUFBTSxJQUFJLEtBQUssQ0FBQyxZQUFZLENB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
|
package/build/utils/ss.js
CHANGED
|
@@ -1,37 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.parseSSUri = void 0;
|
|
7
|
-
const
|
|
8
|
-
const url_1 =
|
|
4
|
+
const logger_1 = require("@surgio/logger");
|
|
5
|
+
const url_1 = require("url");
|
|
9
6
|
const types_1 = require("../types");
|
|
10
7
|
const index_1 = require("./index");
|
|
11
|
-
const
|
|
8
|
+
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:ss' });
|
|
12
9
|
const parseSSUri = (str) => {
|
|
13
|
-
debug('Shadowsocks URI', str);
|
|
14
|
-
const scheme = url_1.
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
|
|
10
|
+
logger.debug('Shadowsocks URI', str);
|
|
11
|
+
const scheme = new url_1.URL(str);
|
|
12
|
+
const pluginString = scheme.searchParams.get('plugin');
|
|
13
|
+
const userInfo = (0, index_1.fromUrlSafeBase64)(decodeURIComponent(scheme.username)).split(':');
|
|
14
|
+
const pluginInfo = typeof pluginString === 'string'
|
|
15
|
+
? (0, index_1.decodeStringList)(pluginString.split(';'))
|
|
18
16
|
: {};
|
|
19
17
|
return Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Shadowsocks, nodeName: decodeURIComponent(scheme.hash.replace('#', '')), hostname: scheme.hostname, port: scheme.port, method: userInfo[0], password: userInfo[1] }, (pluginInfo['obfs-local']
|
|
20
18
|
? {
|
|
21
19
|
obfs: pluginInfo.obfs,
|
|
22
|
-
'obfs-host': pluginInfo['obfs-host'],
|
|
20
|
+
'obfs-host': pluginInfo['obfs-host'] + '',
|
|
23
21
|
}
|
|
24
22
|
: null)), (pluginInfo['simple-obfs']
|
|
25
23
|
? {
|
|
26
24
|
obfs: pluginInfo.obfs,
|
|
27
|
-
'obfs-host': pluginInfo['obfs-host'],
|
|
25
|
+
'obfs-host': pluginInfo['obfs-host'] + '',
|
|
28
26
|
}
|
|
29
27
|
: null)), (pluginInfo['v2ray-plugin']
|
|
30
28
|
? {
|
|
31
29
|
obfs: pluginInfo.tls ? 'wss' : 'ws',
|
|
32
|
-
'obfs-host': pluginInfo.host,
|
|
30
|
+
'obfs-host': pluginInfo.host + '',
|
|
33
31
|
}
|
|
34
32
|
: null));
|
|
35
33
|
};
|
|
36
34
|
exports.parseSSUri = parseSSUri;
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQThDO0FBQzlDLDZCQUEwQjtBQUUxQixvQ0FBK0Q7QUFDL0QsbUNBQThEO0FBRTlELE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUM7QUFFckQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxHQUFXLEVBQXlCLEVBQUU7SUFDL0QsTUFBTSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUVyQyxNQUFNLE1BQU0sR0FBRyxJQUFJLFNBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM1QixNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN2RCxNQUFNLFFBQVEsR0FBRyxJQUFBLHlCQUFpQixFQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FDM0UsR0FBRyxDQUNKLENBQUM7SUFDRixNQUFNLFVBQVUsR0FDZCxPQUFPLFlBQVksS0FBSyxRQUFRO1FBQzlCLENBQUMsQ0FBQyxJQUFBLHdCQUFnQixFQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDM0MsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUVULG1EQUNFLElBQUksRUFBRSxvQkFBWSxDQUFDLFdBQVcsRUFDOUIsUUFBUSxFQUFFLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUMxRCxRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFDekIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQ2pCLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLEVBQ25CLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQ2xCLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQztRQUMxQixDQUFDLENBQUM7WUFDRSxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQXNCO1lBQ3ZDLFdBQVcsRUFBRSxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRTtTQUMxQztRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FDTixDQUFDLFVBQVUsQ0FBQyxhQUFhLENBQUM7UUFDM0IsQ0FBQyxDQUFDO1lBQ0UsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFzQjtZQUN2QyxXQUFXLEVBQUUsVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUU7U0FDMUM7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQ04sQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDO1FBQzVCLENBQUMsQ0FBQztZQUNFLElBQUksRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUk7WUFDbkMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxJQUFJLEdBQUcsRUFBRTtTQUNsQztRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsRUFDVDtBQUNKLENBQUMsQ0FBQztBQXZDVyxRQUFBLFVBQVUsY0F1Q3JCIn0=
|
package/build/utils/ssr.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.parseSSRUri = void 0;
|
|
7
|
-
const
|
|
4
|
+
const logger_1 = require("@surgio/logger");
|
|
8
5
|
const types_1 = require("../types");
|
|
9
6
|
const index_1 = require("./index");
|
|
10
|
-
const
|
|
7
|
+
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:ssr' });
|
|
11
8
|
/**
|
|
12
9
|
* 协议:https://github.com/shadowsocksr-backup/shadowsocks-rss/wiki/SSR-QRcode-scheme
|
|
13
10
|
* ssr://xxx:xxx:xxx:xxx:xxx:xxx/?a=1&b=2
|
|
@@ -18,7 +15,7 @@ const parseSSRUri = (str) => {
|
|
|
18
15
|
const scheme = (0, index_1.fromUrlSafeBase64)(str.replace('ssr://', ''));
|
|
19
16
|
const configArray = scheme.split('/');
|
|
20
17
|
const basicInfo = configArray[0].split(':');
|
|
21
|
-
debug('SSR URI', scheme);
|
|
18
|
+
logger.debug('SSR URI', scheme);
|
|
22
19
|
// 去除首部分
|
|
23
20
|
configArray.shift();
|
|
24
21
|
const extraString = configArray.join('/');
|
|
@@ -54,4 +51,4 @@ function getUrlParameters(url) {
|
|
|
54
51
|
});
|
|
55
52
|
return result;
|
|
56
53
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3Nzci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBOEM7QUFFOUMsb0NBQWdFO0FBQ2hFLG1DQUE0QztBQUU1QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO0FBRTdEOzs7O0dBSUc7QUFDSSxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQVcsRUFBMEIsRUFBRTs7SUFDakUsTUFBTSxNQUFNLEdBQUcsSUFBQSx5QkFBaUIsRUFBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUU1QyxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUVoQyxRQUFRO0lBQ1IsV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBRXBCLE1BQU0sV0FBVyxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUMsTUFBTSxNQUFNLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ2hFLE1BQU0sUUFBUSxHQUFHLElBQUEseUJBQWlCLEVBQUMsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDLENBQUM7SUFDOUQsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHLFNBQVMsQ0FBQyxHQUFHLEVBQVksQ0FBQztJQUN6QyxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUM7SUFDM0MsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDO0lBQ3ZDLE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDckMsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLE9BQU87UUFDN0IsQ0FBQyxDQUFDLElBQUEseUJBQWlCLEVBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztRQUNuQyxDQUFDLENBQUMsR0FBRyxRQUFRLElBQUksSUFBSSxFQUFFLENBQUM7SUFFMUIsT0FBTztRQUNMLElBQUksRUFBRSxvQkFBWSxDQUFDLFlBQVk7UUFDL0IsUUFBUTtRQUNSLFFBQVE7UUFDUixJQUFJO1FBQ0osUUFBUTtRQUNSLE1BQU07UUFDTixJQUFJO1FBQ0osUUFBUTtRQUNSLFVBQVUsRUFBRSxJQUFBLHlCQUFpQixFQUFDLE1BQUEsTUFBTSxDQUFDLFVBQVUsbUNBQUksRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUM7UUFDekUsU0FBUyxFQUFFLElBQUEseUJBQWlCLEVBQUMsTUFBQSxNQUFNLENBQUMsU0FBUyxtQ0FBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztLQUN4RSxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBbENXLFFBQUEsV0FBVyxlQWtDdEI7QUFFRixTQUFTLGdCQUFnQixDQUFDLEdBQVc7SUFDbkMsTUFBTSxNQUFNLEdBQTJCLEVBQUUsQ0FBQztJQUMxQyxHQUFHLENBQUMsT0FBTyxDQUFDLDBCQUEwQixFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRTtRQUN2RCxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2QsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQyxDQUFDLENBQUM7SUFDSCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDIn0=
|
package/build/utils/surge.d.ts
CHANGED
|
@@ -3,4 +3,4 @@ export declare const getSurgeExtendHeaders: (wsHeaders: Record<string, string>)
|
|
|
3
3
|
/**
|
|
4
4
|
* @see https://manual.nssurge.com/policy/proxy.html
|
|
5
5
|
*/
|
|
6
|
-
export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?:
|
|
6
|
+
export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType) => string;
|