surgio 2.10.1 → 2.12.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 +83 -50
- package/build/command/check.js +4 -4
- package/build/command/doctor.js +5 -5
- package/build/command/generate.js +4 -4
- package/build/command/lint.js +3 -3
- package/build/command/new.js +4 -4
- package/build/command/subscriptions.js +8 -7
- package/build/command/upload.js +3 -3
- package/build/generate.js +4 -4
- package/build/generator/artifact.d.ts +2 -1
- package/build/generator/artifact.js +19 -18
- package/build/generator/template.js +11 -17
- package/build/index.js +12 -8
- package/build/misc/flag_cn.d.ts +1 -0
- package/build/misc/flag_cn.js +3 -2
- package/build/provider/BlackSSLProvider.js +4 -4
- package/build/provider/ClashProvider.js +28 -54
- package/build/provider/CustomProvider.js +3 -5
- package/build/provider/Provider.d.ts +4 -0
- package/build/provider/Provider.js +34 -6
- package/build/provider/ShadowsocksJsonSubscribeProvider.js +4 -4
- package/build/provider/ShadowsocksSubscribeProvider.js +10 -26
- package/build/provider/ShadowsocksrSubscribeProvider.js +11 -26
- package/build/provider/SsdProvider.js +11 -27
- package/build/provider/TrojanProvider.d.ts +18 -0
- package/build/provider/TrojanProvider.js +78 -0
- package/build/provider/V2rayNSubscribeProvider.d.ts +3 -2
- package/build/provider/V2rayNSubscribeProvider.js +39 -22
- package/build/provider/index.js +4 -1
- package/build/types.d.ts +7 -1
- package/build/types.js +2 -1
- package/build/utils/config.js +12 -14
- package/build/utils/constant.js +5 -5
- package/build/utils/dns.js +6 -17
- package/build/utils/error-helper.js +1 -1
- package/build/utils/filter.js +3 -3
- package/build/utils/flag.js +4 -4
- package/build/utils/http-client.js +2 -2
- package/build/utils/index.d.ts +1 -0
- package/build/utils/index.js +58 -53
- package/build/utils/linter.js +3 -3
- package/build/utils/loon.js +5 -5
- package/build/utils/patch-proxy.js +3 -3
- package/build/utils/remote-snippet.js +10 -13
- package/build/utils/ss.js +4 -4
- package/build/utils/ssr.js +7 -7
- package/build/utils/subscription.js +7 -7
- package/build/utils/tmp-helper.js +2 -2
- package/build/utils/trojan.d.ts +2 -0
- package/build/utils/trojan.js +33 -0
- package/hygen-template/provider/new/index.js +3 -0
- package/package.json +22 -20
package/build/utils/linter.js
CHANGED
|
@@ -22,7 +22,7 @@ const createCli = (cliConfig) => {
|
|
|
22
22
|
};
|
|
23
23
|
exports.createCli = createCli;
|
|
24
24
|
const checkAndFix = async (cwd) => {
|
|
25
|
-
const cli = exports.createCli({ fix: true, cwd });
|
|
25
|
+
const cli = (0, exports.createCli)({ fix: true, cwd });
|
|
26
26
|
const results = await cli.lintFiles(['.']);
|
|
27
27
|
const errorCount = lodash_1.default.sumBy(results, (curr) => curr.errorCount);
|
|
28
28
|
const fixableErrorCount = lodash_1.default.sumBy(results, (curr) => curr.fixableErrorCount);
|
|
@@ -34,7 +34,7 @@ const checkAndFix = async (cwd) => {
|
|
|
34
34
|
};
|
|
35
35
|
exports.checkAndFix = checkAndFix;
|
|
36
36
|
const check = async (cwd) => {
|
|
37
|
-
const cli = exports.createCli({ cwd });
|
|
37
|
+
const cli = (0, exports.createCli)({ cwd });
|
|
38
38
|
const results = await cli.lintFiles(['.']);
|
|
39
39
|
const errorCount = lodash_1.default.sumBy(results, (curr) => curr.errorCount);
|
|
40
40
|
const formatter = await cli.loadFormatter('stylish');
|
|
@@ -43,4 +43,4 @@ const check = async (cwd) => {
|
|
|
43
43
|
return errorCount === 0;
|
|
44
44
|
};
|
|
45
45
|
exports.check = check;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL2xpbnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsdUJBQXVCOzs7Ozs7QUFFdkIsbUNBQWdDO0FBQ2hDLG9EQUF1QjtBQUVoQixNQUFNLFNBQVMsR0FBRyxDQUFDLFNBQTBCLEVBQVUsRUFBRTtJQUM5RCxNQUFNLFlBQVksR0FBRztRQUNuQiwwREFBMEQ7UUFDMUQsV0FBVyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLE1BQU07UUFDNUMsVUFBVSxFQUFFLENBQUMsS0FBSyxDQUFDO1FBQ25CLFVBQVUsRUFBRTtZQUNWLE9BQU8sRUFBRSxDQUFDLDhCQUE4QixDQUFDLENBQUMsR0FBRztZQUMzQyxhQUFhO1lBQ2IsT0FBTyxDQUFDLE9BQU8sQ0FDaEI7U0FDRjtLQUNGLENBQUM7SUFFRixPQUFPLElBQUksZUFBTSxpQ0FDWixZQUFZLEdBQ1osU0FBUyxFQUNaLENBQUM7QUFDTCxDQUFDLENBQUM7QUFqQlcsUUFBQSxTQUFTLGFBaUJwQjtBQUVLLE1BQU0sV0FBVyxHQUFHLEtBQUssRUFBRSxHQUFXLEVBQW9CLEVBQUU7SUFDakUsTUFBTSxHQUFHLEdBQUcsSUFBQSxpQkFBUyxFQUFDLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQzFDLE1BQU0sT0FBTyxHQUFHLE1BQU0sR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDM0MsTUFBTSxVQUFVLEdBQUcsZ0JBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDL0QsTUFBTSxpQkFBaUIsR0FBRyxnQkFBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBRTdFLE1BQU0sZUFBTSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVsQyxNQUFNLFNBQVMsR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDckQsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU3QyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXhCLE9BQU8sVUFBVSxHQUFHLGlCQUFpQixLQUFLLENBQUMsQ0FBQztBQUM5QyxDQUFDLENBQUM7QUFkVyxRQUFBLFdBQVcsZUFjdEI7QUFFSyxNQUFNLEtBQUssR0FBRyxLQUFLLEVBQUUsR0FBVyxFQUFvQixFQUFFO0lBQzNELE1BQU0sR0FBRyxHQUFHLElBQUEsaUJBQVMsRUFBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDL0IsTUFBTSxPQUFPLEdBQUcsTUFBTSxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUMzQyxNQUFNLFVBQVUsR0FBRyxnQkFBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUMvRCxNQUFNLFNBQVMsR0FBRyxNQUFNLEdBQUcsQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDckQsTUFBTSxVQUFVLEdBQUcsU0FBUyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU3QyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXhCLE9BQU8sVUFBVSxLQUFLLENBQUMsQ0FBQztBQUMxQixDQUFDLENBQUM7QUFWVyxRQUFBLEtBQUssU0FVaEIifQ==
|
package/build/utils/loon.js
CHANGED
|
@@ -5,13 +5,13 @@ const logger_1 = require("@surgio/logger");
|
|
|
5
5
|
const types_1 = require("../types");
|
|
6
6
|
const constant_1 = require("./constant");
|
|
7
7
|
const index_1 = require("./index");
|
|
8
|
-
const logger = logger_1.createLogger({ service: 'surgio:utils' });
|
|
8
|
+
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils' });
|
|
9
9
|
// @see https://www.notion.so/1-9809ce5acf524d868affee8dd5fc0a6e
|
|
10
10
|
const getLoonNodes = function (list, filter) {
|
|
11
11
|
if (arguments.length === 2 && typeof filter === 'undefined') {
|
|
12
12
|
throw new Error(constant_1.ERR_INVALID_FILTER);
|
|
13
13
|
}
|
|
14
|
-
const result = index_1.applyFilter(list, filter)
|
|
14
|
+
const result = (0, index_1.applyFilter)(list, filter)
|
|
15
15
|
.map((nodeConfig) => {
|
|
16
16
|
switch (nodeConfig.type) {
|
|
17
17
|
case types_1.NodeTypeEnum.Shadowsocks: {
|
|
@@ -79,7 +79,7 @@ const getLoonNodes = function (list, filter) {
|
|
|
79
79
|
}
|
|
80
80
|
case types_1.NodeTypeEnum.HTTPS:
|
|
81
81
|
return [
|
|
82
|
-
`${nodeConfig.nodeName} =
|
|
82
|
+
`${nodeConfig.nodeName} = https`,
|
|
83
83
|
nodeConfig.hostname,
|
|
84
84
|
nodeConfig.port,
|
|
85
85
|
nodeConfig.username /* istanbul ignore next */ || '',
|
|
@@ -88,7 +88,7 @@ const getLoonNodes = function (list, filter) {
|
|
|
88
88
|
].join(',');
|
|
89
89
|
case types_1.NodeTypeEnum.HTTP:
|
|
90
90
|
return [
|
|
91
|
-
`${nodeConfig.nodeName} =
|
|
91
|
+
`${nodeConfig.nodeName} = http`,
|
|
92
92
|
nodeConfig.hostname,
|
|
93
93
|
nodeConfig.port,
|
|
94
94
|
nodeConfig.username /* istanbul ignore next */ || '',
|
|
@@ -105,4 +105,4 @@ const getLoonNodes = function (list, filter) {
|
|
|
105
105
|
return result.join('\n');
|
|
106
106
|
};
|
|
107
107
|
exports.getLoonNodes = getLoonNodes;
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9vbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy9sb29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUE4QztBQUU5QyxvQ0FLa0I7QUFDbEIseUNBQWdEO0FBQ2hELG1DQUFzQztBQUV0QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztBQUV6RCxnRUFBZ0U7QUFDekQsTUFBTSxZQUFZLEdBQUcsVUFDMUIsSUFBMkMsRUFDM0MsTUFBc0Q7SUFFdEQsSUFBSSxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsSUFBSSxPQUFPLE1BQU0sS0FBSyxXQUFXLEVBQUU7UUFDM0QsTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBa0IsQ0FBQyxDQUFDO0tBQ3JDO0lBRUQsTUFBTSxNQUFNLEdBQTBCLElBQUEsbUJBQVcsRUFBQyxJQUFJLEVBQUUsTUFBTSxDQUFDO1NBQzVELEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBc0IsRUFBRTtRQUN0QyxRQUFRLFVBQVUsQ0FBQyxJQUFJLEVBQUU7WUFDdkIsS0FBSyxvQkFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO2dCQUM3QixNQUFNLE1BQU0sR0FBMkI7b0JBQ3JDLEdBQUcsVUFBVSxDQUFDLFFBQVEsZ0JBQWdCO29CQUN0QyxVQUFVLENBQUMsUUFBUTtvQkFDbkIsVUFBVSxDQUFDLElBQUk7b0JBQ2YsVUFBVSxDQUFDLE1BQU07b0JBQ2pCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQztpQkFDcEMsQ0FBQztnQkFFRixJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7b0JBQ25CLElBQUksQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTt3QkFDN0MsTUFBTSxDQUFDLElBQUksQ0FDVCxVQUFVLENBQUMsSUFBSSxF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
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const logger_1 = require("@surgio/logger");
|
|
5
5
|
const _1 = require("./");
|
|
6
|
-
const logger = logger_1.createLogger({ service: 'surgio:utils:patch-proxy' });
|
|
6
|
+
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:patch-proxy' });
|
|
7
7
|
const keys = ['http_proxy', 'https_proxy', 'all_proxy'];
|
|
8
|
-
if (!_1.isHeroku() && !_1.isNow() && !_1.isGitHubActions() && !_1.isGitLabCI()) {
|
|
8
|
+
if (!(0, _1.isHeroku)() && !(0, _1.isNow)() && !(0, _1.isGitHubActions)() && !(0, _1.isGitLabCI)()) {
|
|
9
9
|
process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = '';
|
|
10
10
|
keys.forEach((key) => {
|
|
11
11
|
if (key in process.env) {
|
|
@@ -16,4 +16,4 @@ if (!_1.isHeroku() && !_1.isNow() && !_1.isGitHubActions() && !_1.isGitLabCI())
|
|
|
16
16
|
}
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0Y2gtcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcGF0Y2gtcHJveHkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUF1Qjs7QUFFdkIsMkNBQThDO0FBQzlDLHlCQUFrRTtBQUVsRSxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsQ0FBQyxDQUFDO0FBQ3JFLE1BQU0sSUFBSSxHQUEwQixDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFFL0UsSUFBSSxDQUFDLElBQUEsV0FBUSxHQUFFLElBQUksQ0FBQyxJQUFBLFFBQUssR0FBRSxJQUFJLENBQUMsSUFBQSxrQkFBZSxHQUFFLElBQUksQ0FBQyxJQUFBLGFBQVUsR0FBRSxFQUFFO0lBQ2xFLE9BQU8sQ0FBQyxHQUFHLENBQUMsMkNBQTJDLEdBQUcsRUFBRSxDQUFDO0lBRTdELElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNuQixJQUFJLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO1lBQ3RCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRS9CLE1BQU0sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO1lBQ2xFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDO1NBQzdCO0lBQ0gsQ0FBQyxDQUFDLENBQUM7Q0FDSiJ9
|
|
@@ -44,7 +44,7 @@ const addProxyToSurgeRuleSet = (str, proxyName) => {
|
|
|
44
44
|
if (!proxyName) {
|
|
45
45
|
throw new Error('必须为片段指定一个策略');
|
|
46
46
|
}
|
|
47
|
-
const eol = detect_newline_1.default(str) || '\n';
|
|
47
|
+
const eol = (0, detect_newline_1.default)(str) || '\n';
|
|
48
48
|
return str
|
|
49
49
|
.split(eol)
|
|
50
50
|
.map((item) => {
|
|
@@ -77,7 +77,7 @@ const addProxyToSurgeRuleSet = (str, proxyName) => {
|
|
|
77
77
|
};
|
|
78
78
|
exports.addProxyToSurgeRuleSet = addProxyToSurgeRuleSet;
|
|
79
79
|
const renderSurgioSnippet = (str, args) => {
|
|
80
|
-
const macro = exports.parseMacro(str);
|
|
80
|
+
const macro = (0, exports.parseMacro)(str);
|
|
81
81
|
macro.arguments.forEach((key, index) => {
|
|
82
82
|
if (typeof args[index] === 'undefined') {
|
|
83
83
|
throw new Error('Surgio 片段参数不足,缺少 ' + key);
|
|
@@ -94,7 +94,7 @@ const renderSurgioSnippet = (str, args) => {
|
|
|
94
94
|
};
|
|
95
95
|
exports.renderSurgioSnippet = renderSurgioSnippet;
|
|
96
96
|
const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
97
|
-
const tmpFactory = tmp_helper_1.createTmpFactory('remote-snippets');
|
|
97
|
+
const tmpFactory = (0, tmp_helper_1.createTmpFactory)('remote-snippets');
|
|
98
98
|
function load(url) {
|
|
99
99
|
return http_client_1.default
|
|
100
100
|
.get(url)
|
|
@@ -108,13 +108,10 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
return bluebird_1.default.map(remoteSnippetList, (item) => {
|
|
111
|
-
const fileMd5 = crypto_1.default
|
|
112
|
-
.createHash('md5')
|
|
113
|
-
.update(item.url)
|
|
114
|
-
.digest('hex');
|
|
111
|
+
const fileMd5 = crypto_1.default.createHash('md5').update(item.url).digest('hex');
|
|
115
112
|
const isSurgioSnippet = item.surgioSnippet;
|
|
116
113
|
return (async () => {
|
|
117
|
-
if (cacheSnippet || index_1.isNow()) {
|
|
114
|
+
if (cacheSnippet || (0, index_1.isNow)()) {
|
|
118
115
|
const tmp = tmpFactory(fileMd5, constant_1.REMOTE_SNIPPET_CACHE_MAXAGE);
|
|
119
116
|
const tmpContent = await tmp.getContent();
|
|
120
117
|
let snippet;
|
|
@@ -127,8 +124,8 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
|
127
124
|
}
|
|
128
125
|
return {
|
|
129
126
|
main: (...args) => isSurgioSnippet
|
|
130
|
-
? exports.renderSurgioSnippet(snippet, args)
|
|
131
|
-
: exports.addProxyToSurgeRuleSet(snippet, args[0]),
|
|
127
|
+
? (0, exports.renderSurgioSnippet)(snippet, args)
|
|
128
|
+
: (0, exports.addProxyToSurgeRuleSet)(snippet, args[0]),
|
|
132
129
|
name: item.name,
|
|
133
130
|
url: item.url,
|
|
134
131
|
text: snippet, // 原始内容
|
|
@@ -143,8 +140,8 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
|
143
140
|
});
|
|
144
141
|
return {
|
|
145
142
|
main: (...args) => isSurgioSnippet
|
|
146
|
-
? exports.renderSurgioSnippet(snippet, args)
|
|
147
|
-
: exports.addProxyToSurgeRuleSet(snippet, args[0]),
|
|
143
|
+
? (0, exports.renderSurgioSnippet)(snippet, args)
|
|
144
|
+
: (0, exports.addProxyToSurgeRuleSet)(snippet, args[0]),
|
|
148
145
|
name: item.name,
|
|
149
146
|
url: item.url,
|
|
150
147
|
text: snippet, // 原始内容
|
|
@@ -156,4 +153,4 @@ const loadRemoteSnippetList = (remoteSnippetList, cacheSnippet = true) => {
|
|
|
156
153
|
});
|
|
157
154
|
};
|
|
158
155
|
exports.loadRemoteSnippetList = loadRemoteSnippetList;
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVtb3RlLXNuaXBwZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvcmVtb3RlLXNuaXBwZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsd0RBQWdDO0FBQ2hDLG9EQUE0QjtBQUM1QiwyQ0FBd0M7QUFDeEMsb0VBQTJDO0FBQzNDLHdEQUFnQztBQUNoQyxvREFBeUQ7QUFHekQseUNBQThFO0FBQzlFLG1DQUFzQztBQUN0QyxnRUFBdUM7QUFDdkMsbUNBQWdDO0FBQ2hDLDZDQUFnRDtBQUV6QyxNQUFNLFVBQVUsR0FBRyxDQUN4QixPQUFlLEVBSWYsRUFBRTtJQUNGLE1BQU0sS0FBSyxHQUFHLHVCQUF1QixDQUFDO0lBQ3RDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFbEMsSUFBSSxDQUFDLEtBQUssRUFBRTtRQUNWLE1BQU0sSUFBSSxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7S0FDL0I7SUFFRCxNQUFNLEdBQUcsR0FBRyxnQkFBTSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN2RCxJQUFJLFNBQThDLENBQUM7SUFFbkQsS0FBSyxNQUFNLElBQUksSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFO1FBQzNCLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxxQkFBcUIsRUFBRTtZQUN2QyxTQUFTLEdBQUcsSUFBSSxDQUFDO1lBQ2pCLE1BQU07U0FDUDtLQUNGO0lBRUQsSUFDRSxDQUFDLFNBQVM7UUFDVixTQUFTLENBQUMsVUFBVSxDQUFDLElBQUksS0FBSyxnQkFBZ0I7UUFDOUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFDM0M7UUFDQSxNQUFNLElBQUksS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO0tBQy9C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
|
package/build/utils/ss.js
CHANGED
|
@@ -8,13 +8,13 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
8
8
|
const url_1 = __importDefault(require("url"));
|
|
9
9
|
const types_1 = require("../types");
|
|
10
10
|
const index_1 = require("./index");
|
|
11
|
-
const debug = debug_1.default('surgio:utils:ss');
|
|
11
|
+
const debug = (0, debug_1.default)('surgio:utils:ss');
|
|
12
12
|
const parseSSUri = (str) => {
|
|
13
13
|
debug('Shadowsocks URI', str);
|
|
14
14
|
const scheme = url_1.default.parse(str, true);
|
|
15
|
-
const userInfo = index_1.fromUrlSafeBase64(scheme.auth).split(':');
|
|
15
|
+
const userInfo = (0, index_1.fromUrlSafeBase64)(scheme.auth).split(':');
|
|
16
16
|
const pluginInfo = typeof scheme.query.plugin === 'string'
|
|
17
|
-
? index_1.decodeStringList(scheme.query.plugin.split(';'))
|
|
17
|
+
? (0, index_1.decodeStringList)(scheme.query.plugin.split(';'))
|
|
18
18
|
: {};
|
|
19
19
|
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
20
|
? {
|
|
@@ -34,4 +34,4 @@ const parseSSUri = (str) => {
|
|
|
34
34
|
: null));
|
|
35
35
|
};
|
|
36
36
|
exports.parseSSUri = parseSSUri;
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvdXRpbHMvc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLDhDQUEyQztBQUUzQyxvQ0FBK0Q7QUFDL0QsbUNBQThEO0FBRTlELE1BQU0sS0FBSyxHQUFHLElBQUEsZUFBSyxFQUFDLGlCQUFpQixDQUFDLENBQUM7QUFFaEMsTUFBTSxVQUFVLEdBQUcsQ0FBQyxHQUFXLEVBQXlCLEVBQUU7SUFDL0QsS0FBSyxDQUFDLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRTlCLE1BQU0sTUFBTSxHQUFHLGFBQVMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzFDLE1BQU0sUUFBUSxHQUFHLElBQUEseUJBQWlCLEVBQUMsTUFBTSxDQUFDLElBQWMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNyRSxNQUFNLFVBQVUsR0FDZCxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxLQUFLLFFBQVE7UUFDckMsQ0FBQyxDQUFDLElBQUEsd0JBQWdCLEVBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2xELENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFVCxtREFDRSxJQUFJLEVBQUUsb0JBQVksQ0FBQyxXQUFXLEVBQzlCLFFBQVEsRUFBRSxrQkFBa0IsQ0FBRSxNQUFNLENBQUMsSUFBZSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFDdEUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxRQUFrQixFQUNuQyxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQWMsRUFDM0IsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFDbkIsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFDbEIsQ0FBQyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQzFCLENBQUMsQ0FBQztZQUNFLElBQUksRUFBRSxVQUFVLENBQUMsSUFBc0I7WUFDdkMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQVc7U0FDL0M7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQ04sQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDO1FBQzNCLENBQUMsQ0FBQztZQUNFLElBQUksRUFBRSxVQUFVLENBQUMsSUFBc0I7WUFDdkMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXLENBQVc7U0FDL0M7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQ04sQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDO1FBQzVCLENBQUMsQ0FBQztZQUNFLElBQUksRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUk7WUFDbkMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxJQUFjO1NBQ3ZDO1FBQ0gsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUNUO0FBQ0osQ0FBQyxDQUFDO0FBcENXLFFBQUEsVUFBVSxjQW9DckIifQ==
|
package/build/utils/ssr.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.parseSSRUri = void 0;
|
|
|
7
7
|
const debug_1 = __importDefault(require("debug"));
|
|
8
8
|
const types_1 = require("../types");
|
|
9
9
|
const index_1 = require("./index");
|
|
10
|
-
const debug = debug_1.default('surgio:utils:ssr');
|
|
10
|
+
const debug = (0, debug_1.default)('surgio:utils:ssr');
|
|
11
11
|
/**
|
|
12
12
|
* 协议:https://github.com/shadowsocksr-backup/shadowsocks-rss/wiki/SSR-QRcode-scheme
|
|
13
13
|
* ssr://xxx:xxx:xxx:xxx:xxx:xxx/?a=1&b=2
|
|
@@ -15,7 +15,7 @@ const debug = debug_1.default('surgio:utils:ssr');
|
|
|
15
15
|
*/
|
|
16
16
|
const parseSSRUri = (str) => {
|
|
17
17
|
var _a, _b;
|
|
18
|
-
const scheme = index_1.fromUrlSafeBase64(str.replace('ssr://', ''));
|
|
18
|
+
const scheme = (0, index_1.fromUrlSafeBase64)(str.replace('ssr://', ''));
|
|
19
19
|
const configArray = scheme.split('/');
|
|
20
20
|
const basicInfo = configArray[0].split(':');
|
|
21
21
|
debug('SSR URI', scheme);
|
|
@@ -23,14 +23,14 @@ const parseSSRUri = (str) => {
|
|
|
23
23
|
configArray.shift();
|
|
24
24
|
const extraString = configArray.join('/');
|
|
25
25
|
const extras = extraString ? getUrlParameters(extraString) : {};
|
|
26
|
-
const password = index_1.fromUrlSafeBase64(basicInfo.pop());
|
|
26
|
+
const password = (0, index_1.fromUrlSafeBase64)(basicInfo.pop());
|
|
27
27
|
const obfs = basicInfo.pop();
|
|
28
28
|
const method = basicInfo.pop();
|
|
29
29
|
const protocol = basicInfo.pop();
|
|
30
30
|
const port = basicInfo.pop();
|
|
31
31
|
const hostname = basicInfo.join(':');
|
|
32
32
|
const nodeName = extras.remarks
|
|
33
|
-
? index_1.fromUrlSafeBase64(extras.remarks)
|
|
33
|
+
? (0, index_1.fromUrlSafeBase64)(extras.remarks)
|
|
34
34
|
: `${hostname}:${port}`;
|
|
35
35
|
return {
|
|
36
36
|
type: types_1.NodeTypeEnum.Shadowsocksr,
|
|
@@ -41,8 +41,8 @@ const parseSSRUri = (str) => {
|
|
|
41
41
|
method,
|
|
42
42
|
obfs,
|
|
43
43
|
password,
|
|
44
|
-
protoparam: index_1.fromUrlSafeBase64((_a = extras.protoparam) !== null && _a !== void 0 ? _a : '').replace(/\s/g, ''),
|
|
45
|
-
obfsparam: index_1.fromUrlSafeBase64((_b = extras.obfsparam) !== null && _b !== void 0 ? _b : '').replace(/\s/g, ''),
|
|
44
|
+
protoparam: (0, index_1.fromUrlSafeBase64)((_a = extras.protoparam) !== null && _a !== void 0 ? _a : '').replace(/\s/g, ''),
|
|
45
|
+
obfsparam: (0, index_1.fromUrlSafeBase64)((_b = extras.obfsparam) !== null && _b !== void 0 ? _b : '').replace(/\s/g, ''),
|
|
46
46
|
};
|
|
47
47
|
};
|
|
48
48
|
exports.parseSSRUri = parseSSRUri;
|
|
@@ -54,4 +54,4 @@ function getUrlParameters(url) {
|
|
|
54
54
|
});
|
|
55
55
|
return result;
|
|
56
56
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3Nzci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrREFBMEI7QUFFMUIsb0NBQWdFO0FBQ2hFLG1DQUE0QztBQUU1QyxNQUFNLEtBQUssR0FBRyxJQUFBLGVBQUssRUFBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBRXhDOzs7O0dBSUc7QUFDSSxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQVcsRUFBMEIsRUFBRTs7SUFDakUsTUFBTSxNQUFNLEdBQUcsSUFBQSx5QkFBaUIsRUFBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzVELE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUU1QyxLQUFLLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRXpCLFFBQVE7SUFDUixXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7SUFFcEIsTUFBTSxXQUFXLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMxQyxNQUFNLE1BQU0sR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDaEUsTUFBTSxRQUFRLEdBQUcsSUFBQSx5QkFBaUIsRUFBQyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUMsQ0FBQztJQUM5RCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUM7SUFDdkMsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLEdBQUcsRUFBWSxDQUFDO0lBQ3pDLE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxHQUFHLEVBQVksQ0FBQztJQUMzQyxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFZLENBQUM7SUFDdkMsTUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNyQyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsT0FBTztRQUM3QixDQUFDLENBQUMsSUFBQSx5QkFBaUIsRUFBQyxNQUFNLENBQUMsT0FBTyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxHQUFHLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQztJQUUxQixPQUFPO1FBQ0wsSUFBSSxFQUFFLG9CQUFZLENBQUMsWUFBWTtRQUMvQixRQUFRO1FBQ1IsUUFBUTtRQUNSLElBQUk7UUFDSixRQUFRO1FBQ1IsTUFBTTtRQUNOLElBQUk7UUFDSixRQUFRO1FBQ1IsVUFBVSxFQUFFLElBQUEseUJBQWlCLEVBQUMsTUFBQSxNQUFNLENBQUMsVUFBVSxtQ0FBSSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUN6RSxTQUFTLEVBQUUsSUFBQSx5QkFBaUIsRUFBQyxNQUFBLE1BQU0sQ0FBQyxTQUFTLG1DQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDO0tBQ3hFLENBQUM7QUFDSixDQUFDLENBQUM7QUFsQ1csUUFBQSxXQUFXLGVBa0N0QjtBQUVGLFNBQVMsZ0JBQWdCLENBQUMsR0FBVztJQUNuQyxNQUFNLE1BQU0sR0FBMkIsRUFBRSxDQUFDO0lBQzFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsMEJBQTBCLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ3ZELE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDZCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDLENBQUMsQ0FBQztJQUNILE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMifQ==
|
|
@@ -51,15 +51,15 @@ const parseSubscriptionNode = (dataString, expireString) => {
|
|
|
51
51
|
exports.parseSubscriptionNode = parseSubscriptionNode;
|
|
52
52
|
const formatSubscriptionUserInfo = (userInfo) => {
|
|
53
53
|
return {
|
|
54
|
-
upload: filesize_1.default(userInfo.upload),
|
|
55
|
-
download: filesize_1.default(userInfo.download),
|
|
56
|
-
used: filesize_1.default(userInfo.upload + userInfo.download),
|
|
57
|
-
left: filesize_1.default(userInfo.total - userInfo.upload - userInfo.download),
|
|
58
|
-
total: filesize_1.default(userInfo.total),
|
|
54
|
+
upload: (0, filesize_1.default)(userInfo.upload),
|
|
55
|
+
download: (0, filesize_1.default)(userInfo.download),
|
|
56
|
+
used: (0, filesize_1.default)(userInfo.upload + userInfo.download),
|
|
57
|
+
left: (0, filesize_1.default)(userInfo.total - userInfo.upload - userInfo.download),
|
|
58
|
+
total: (0, filesize_1.default)(userInfo.total),
|
|
59
59
|
expire: userInfo.expire
|
|
60
|
-
? `${date_fns_1.format(new Date(userInfo.expire * 1000), 'yyyy-MM-dd')} (${date_fns_1.formatDistanceToNow(new Date(userInfo.expire * 1000))})`
|
|
60
|
+
? `${(0, date_fns_1.format)(new Date(userInfo.expire * 1000), 'yyyy-MM-dd')} (${(0, date_fns_1.formatDistanceToNow)(new Date(userInfo.expire * 1000))})`
|
|
61
61
|
: '无数据',
|
|
62
62
|
};
|
|
63
63
|
};
|
|
64
64
|
exports.formatSubscriptionUserInfo = formatSubscriptionUserInfo;
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Vic2NyaXB0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3N1YnNjcmlwdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBZ0M7QUFDaEMsa0RBQTBCO0FBQzFCLHVDQUF1RDtBQUloRCxNQUFNLHlCQUF5QixHQUFHLENBQ3ZDLEdBQVcsRUFDVyxFQUFFO0lBQ3hCLE1BQU0sR0FBRyxHQUFHO1FBQ1YsTUFBTSxFQUFFLENBQUM7UUFDVCxRQUFRLEVBQUUsQ0FBQztRQUNYLEtBQUssRUFBRSxDQUFDO1FBQ1IsTUFBTSxFQUFFLENBQUM7S0FDVixDQUFDO0lBRUYsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUM5QixJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1QsT0FBTztTQUNSO1FBQ0QsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3QixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFckMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDeEIsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztTQUM5QztJQUNILENBQUMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDLENBQUM7QUF2QlcsUUFBQSx5QkFBeUIsNkJBdUJwQztBQUVLLE1BQU0scUJBQXFCLEdBQUcsQ0FDbkMsVUFBa0IsRUFDbEIsWUFBb0IsRUFDYyxFQUFFO0lBQ3BDLG1DQUFtQztJQUNuQywyQ0FBMkM7SUFFM0MsTUFBTSxTQUFTLEdBQUcsVUFBVSxDQUFDLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO0lBQ3pFLE1BQU0sV0FBVyxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFFckQsSUFBSSxTQUFTLElBQUksV0FBVyxFQUFFO1FBQzVCLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUM7UUFDM0MsTUFBTSxRQUFRLEdBQUcsZUFBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMzQyxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUVyRSxPQUFPO1lBQ0wsTUFBTSxFQUFFLENBQUM7WUFDVCxRQUFRLEVBQUUsS0FBSyxHQUFHLFFBQVE7WUFDMUIsS0FBSztZQUNMLE1BQU07U0FDUCxDQUFDO0tBQ0g7U0FBTTtRQUNMLE9BQU8sU0FBUyxDQUFDO0tBQ2xCO0FBQ0gsQ0FBQyxDQUFDO0FBekJXLFFBQUEscUJBQXFCLHlCQXlCaEM7QUFFSyxNQUFNLDBCQUEwQixHQUFHLENBQ3hDLFFBQThCLEVBUTlCLEVBQUU7SUFDRixPQUFPO1FBQ0wsTUFBTSxFQUFFLElBQUEsa0JBQVEsRUFBQyxRQUFRLENBQUMsTUFBTSxDQUFDO1FBQ2pDLFFBQVEsRUFBRSxJQUFBLGtCQUFRLEVBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQztRQUNyQyxJQUFJLEVBQUUsSUFBQSxrQkFBUSxFQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQztRQUNuRCxJQUFJLEVBQUUsSUFBQSxrQkFBUSxFQUFDLFFBQVEsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFDO1FBQ3BFLEtBQUssRUFBRSxJQUFBLGtCQUFRLEVBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQztRQUMvQixNQUFNLEVBQUUsUUFBUSxDQUFDLE1BQU07WUFDckIsQ0FBQyxDQUFDLEdBQUcsSUFBQSxpQkFBTSxFQUNQLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLEVBQ2hDLFlBQVksQ0FDYixLQUFLLElBQUEsOEJBQW1CLEVBQUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsQ0FBQyxHQUFHO1lBQ2hFLENBQUMsQ0FBQyxLQUFLO0tBQ1YsQ0FBQztBQUNKLENBQUMsQ0FBQztBQXZCVyxRQUFBLDBCQUEwQiw4QkF1QnJDIn0=
|
|
@@ -9,7 +9,7 @@ const os_1 = __importDefault(require("os"));
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
11
11
|
const constant_1 = require("./constant");
|
|
12
|
-
const logger = logger_1.createLogger({ service: 'surgio:utils:tmp-helper' });
|
|
12
|
+
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:tmp-helper' });
|
|
13
13
|
const tmpDir = path_1.default.join(os_1.default.tmpdir(), constant_1.TMP_FOLDER_NAME);
|
|
14
14
|
class TmpFile {
|
|
15
15
|
constructor(filePath, maxAge) {
|
|
@@ -62,4 +62,4 @@ const createTmpFactory = (baseDir) => {
|
|
|
62
62
|
return (filePath, maxAge) => new TmpFile(path_1.default.join(baseDir, filePath), maxAge);
|
|
63
63
|
};
|
|
64
64
|
exports.createTmpFactory = createTmpFactory;
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG1wLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy90bXAtaGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDJDQUE4QztBQUM5Qyw0Q0FBb0I7QUFDcEIsZ0RBQXdCO0FBQ3hCLHdEQUEwQjtBQUUxQix5Q0FBNkM7QUFFN0MsTUFBTSxNQUFNLEdBQUcsSUFBQSxxQkFBWSxFQUFDLEVBQUUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLENBQUMsQ0FBQztBQUNwRSxNQUFNLE1BQU0sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFlBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSwwQkFBZSxDQUFDLENBQUM7QUFFdkQsTUFBYSxPQUFPO0lBSWxCLFlBQW1CLFFBQWdCLEVBQVMsTUFBZTtRQUF4QyxhQUFRLEdBQVIsUUFBUSxDQUFRO1FBQVMsV0FBTSxHQUFOLE1BQU0sQ0FBUztRQUN6RCxJQUFJLENBQUMsUUFBUSxHQUFHLGNBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDeEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxjQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRXRDLGtCQUFFLENBQUMsVUFBVSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLGtCQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFFTSxLQUFLLENBQUMsVUFBVSxDQUFDLE9BQWU7UUFDckMsTUFBTSxrQkFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2hDLE9BQU87WUFDUCxNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07WUFDbkIsWUFBWSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsT0FBTyxFQUFFO1NBQ25DLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQ2hELElBQUksVUFBVSxFQUFFO1lBQ2QsT0FBTyxVQUFVLENBQUMsT0FBTyxDQUFDO1NBQzNCO1FBQ0QsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVPLEtBQUssQ0FBQyxlQUFlO1FBQzNCLElBQUksQ0FBQyxrQkFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7WUFDakMsT0FBTyxTQUFTLENBQUM7U0FDbEI7UUFFRCxNQUFNLFVBQVUsR0FBZSxNQUFNLGtCQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNoRSxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFFdkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUU7WUFDdEIsT0FBTyxVQUFVLENBQUM7U0FDbkI7YUFBTSxJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksR0FBRyxHQUFHLFVBQVUsQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNyRSxPQUFPLFVBQVUsQ0FBQztTQUNuQjthQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLEVBQUU7WUFDNUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO1NBQ2pDO1FBRUQsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztDQUNGO0FBL0NELDBCQStDQztBQVFNLE1BQU0sZ0JBQWdCLEdBQUcsQ0FDOUIsT0FBZSxFQUNtQyxFQUFFO0lBQ3BELE9BQU8sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUVyQyxNQUFNLENBQUMsS0FBSyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUMsQ0FBQztJQUVwQyxJQUFJLENBQUMsa0JBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEVBQUU7UUFDM0Isa0JBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDeEI7SUFFRCxPQUFPLENBQUMsUUFBZ0IsRUFBRSxNQUFlLEVBQUUsRUFBRSxDQUMzQyxJQUFJLE9BQU8sQ0FBQyxjQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUN0RCxDQUFDLENBQUM7QUFiVyxRQUFBLGdCQUFnQixvQkFhM0IifQ==
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.parseTrojanUri = void 0;
|
|
7
|
+
const debug_1 = __importDefault(require("debug"));
|
|
8
|
+
const url_1 = require("url");
|
|
9
|
+
const types_1 = require("../types");
|
|
10
|
+
const debug = (0, debug_1.default)('surgio:utils:trojan');
|
|
11
|
+
const parseTrojanUri = (str) => {
|
|
12
|
+
debug('Trojan URI', str);
|
|
13
|
+
const scheme = new url_1.URL(str);
|
|
14
|
+
if (scheme.protocol !== 'trojan:') {
|
|
15
|
+
throw new Error('Invalid Trojan URI.');
|
|
16
|
+
}
|
|
17
|
+
const allowInsecure = scheme.searchParams.get('allowInsecure') === '1' ||
|
|
18
|
+
scheme.searchParams.get('allowInsecure') === 'true';
|
|
19
|
+
const sni = scheme.searchParams.get('sni') || scheme.searchParams.get('peer');
|
|
20
|
+
return Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Trojan, hostname: scheme.hostname, port: scheme.port, password: scheme.username, nodeName: scheme.hash
|
|
21
|
+
? decodeURIComponent(scheme.hash.slice(1))
|
|
22
|
+
: `${scheme.hostname}:${scheme.port}` }, (allowInsecure
|
|
23
|
+
? {
|
|
24
|
+
skipCertVerify: true,
|
|
25
|
+
}
|
|
26
|
+
: null)), (sni
|
|
27
|
+
? {
|
|
28
|
+
sni,
|
|
29
|
+
}
|
|
30
|
+
: null));
|
|
31
|
+
};
|
|
32
|
+
exports.parseTrojanUri = parseTrojanUri;
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJvamFuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3V0aWxzL3Ryb2phbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxrREFBMEI7QUFDMUIsNkJBQTBCO0FBRTFCLG9DQUEwRDtBQUUxRCxNQUFNLEtBQUssR0FBRyxJQUFBLGVBQUssRUFBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBRXBDLE1BQU0sY0FBYyxHQUFHLENBQUMsR0FBVyxFQUFvQixFQUFFO0lBQzlELEtBQUssQ0FBQyxZQUFZLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFFekIsTUFBTSxNQUFNLEdBQUcsSUFBSSxTQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFFNUIsSUFBSSxNQUFNLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRTtRQUNqQyxNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixDQUFDLENBQUM7S0FDeEM7SUFFRCxNQUFNLGFBQWEsR0FDakIsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLEtBQUssR0FBRztRQUNoRCxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsS0FBSyxNQUFNLENBQUM7SUFDdEQsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFOUUscUNBQ0UsSUFBSSxFQUFFLG9CQUFZLENBQUMsTUFBTSxFQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFDekIsSUFBSSxFQUFFLE1BQU0sQ0FBQyxJQUFJLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLENBQUMsUUFBUSxFQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDLElBQUk7WUFDbkIsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxRQUFRLElBQUksTUFBTSxDQUFDLElBQUksRUFBRSxJQUNwQyxDQUFDLGFBQWE7UUFDZixDQUFDLENBQUM7WUFDRSxjQUFjLEVBQUUsSUFBSTtTQUNyQjtRQUNILENBQUMsQ0FBQyxJQUFJLENBQUMsR0FDTixDQUFDLEdBQUc7UUFDTCxDQUFDLENBQUM7WUFDRSxHQUFHO1NBQ0o7UUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQ1Q7QUFDSixDQUFDLENBQUM7QUFqQ1csUUFBQSxjQUFjLGtCQWlDekIifQ==
|
|
@@ -29,6 +29,7 @@ module.exports = {
|
|
|
29
29
|
SupportProviderEnum.ShadowsocksJsonSubscribe,
|
|
30
30
|
SupportProviderEnum.ShadowsocksrSubscribe,
|
|
31
31
|
SupportProviderEnum.ShadowsocksSubscribe,
|
|
32
|
+
SupportProviderEnum.Trojan,
|
|
32
33
|
].includes(results.type);
|
|
33
34
|
},
|
|
34
35
|
validate: (str) => /^https?:\/{2}/.test(str),
|
|
@@ -49,6 +50,7 @@ module.exports = {
|
|
|
49
50
|
SupportProviderEnum.ShadowsocksJsonSubscribe,
|
|
50
51
|
SupportProviderEnum.ShadowsocksrSubscribe,
|
|
51
52
|
SupportProviderEnum.ShadowsocksSubscribe,
|
|
53
|
+
SupportProviderEnum.Trojan,
|
|
52
54
|
].includes(results.type);
|
|
53
55
|
},
|
|
54
56
|
},
|
|
@@ -64,6 +66,7 @@ module.exports = {
|
|
|
64
66
|
SupportProviderEnum.ShadowsocksJsonSubscribe,
|
|
65
67
|
SupportProviderEnum.ShadowsocksrSubscribe,
|
|
66
68
|
SupportProviderEnum.ShadowsocksSubscribe,
|
|
69
|
+
SupportProviderEnum.Trojan,
|
|
67
70
|
].includes(results.type);
|
|
68
71
|
},
|
|
69
72
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "surgio",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.12.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"typings": "build/index.d.ts",
|
|
6
6
|
"bin": {
|
|
@@ -26,29 +26,30 @@
|
|
|
26
26
|
"@types/bytes": "^3.1.0",
|
|
27
27
|
"@types/debug": "^4.1.5",
|
|
28
28
|
"@types/eslint": "^7.2.0",
|
|
29
|
-
"@types/fs-extra": "^9.0.
|
|
29
|
+
"@types/fs-extra": "^9.0.13",
|
|
30
30
|
"@types/hapi__joi": "^17.1.3",
|
|
31
31
|
"@types/inquirer": "^7.3.0",
|
|
32
32
|
"@types/listr": "^0.14.2",
|
|
33
|
-
"@types/lodash": "^4.14.
|
|
33
|
+
"@types/lodash": "^4.14.174",
|
|
34
34
|
"@types/lru-cache": "^5.1.0",
|
|
35
35
|
"@types/node": "^12",
|
|
36
|
-
"@types/nunjucks": "^3.
|
|
36
|
+
"@types/nunjucks": "^3.2.0",
|
|
37
|
+
"@types/sinon": "^10.0.6",
|
|
37
38
|
"@types/urlsafe-base64": "^1.0.28",
|
|
38
|
-
"@
|
|
39
|
-
"@typescript-eslint/
|
|
40
|
-
"@
|
|
41
|
-
"@vuepress/plugin-google-analytics": "^
|
|
42
|
-
"@vuepress/plugin-
|
|
39
|
+
"@typescript-eslint/eslint-plugin": "^4.31.2",
|
|
40
|
+
"@typescript-eslint/parser": "^4.31.2",
|
|
41
|
+
"@vuepress/plugin-docsearch": "^2.0.0-beta.26",
|
|
42
|
+
"@vuepress/plugin-google-analytics": "^2.0.0-beta.26",
|
|
43
|
+
"@vuepress/plugin-register-components": "^2.0.0-beta.26",
|
|
44
|
+
"@vuepress/theme-default": "^2.0.0-beta.26",
|
|
45
|
+
"@vuepress/utils": "^2.0.0-beta.25",
|
|
43
46
|
"ava": "^3.14.0",
|
|
44
47
|
"benchmark": "^2.1.4",
|
|
45
48
|
"codecov": "^3.7.1",
|
|
46
49
|
"coffee": "^5.3.0",
|
|
47
50
|
"conventional-changelog-cli": "^2.0.31",
|
|
48
|
-
"esbuild": "^0.8.46",
|
|
49
|
-
"esbuild-register": "^2.0.0",
|
|
50
51
|
"eslint-config-prettier": "^8.3.0",
|
|
51
|
-
"eslint-plugin-prettier": "^
|
|
52
|
+
"eslint-plugin-prettier": "^4.0.0",
|
|
52
53
|
"husky": "^4.3.0",
|
|
53
54
|
"ini": "^1.3.5",
|
|
54
55
|
"jsdom": "^16.2.2",
|
|
@@ -59,12 +60,13 @@
|
|
|
59
60
|
"npm-run-all": "^4.1.5",
|
|
60
61
|
"nyc": "^15.0.1",
|
|
61
62
|
"pkg": "^4.4.8",
|
|
62
|
-
"
|
|
63
|
-
"
|
|
64
|
-
"
|
|
65
|
-
"
|
|
66
|
-
"
|
|
67
|
-
"
|
|
63
|
+
"prettier": "^2.4.1",
|
|
64
|
+
"sinon": "^12.0.1",
|
|
65
|
+
"sitemap": "^3.0.0",
|
|
66
|
+
"ts-node": "^10.4.0",
|
|
67
|
+
"type-fest": "^2.3.4",
|
|
68
|
+
"typescript": "^4.4.3",
|
|
69
|
+
"vuepress": "^2.0.0-beta.26"
|
|
68
70
|
},
|
|
69
71
|
"scripts": {
|
|
70
72
|
"dev": "run-s clean && tsc -p tsconfig.json --watch",
|
|
@@ -83,7 +85,6 @@
|
|
|
83
85
|
"docs:build": "vuepress build docs"
|
|
84
86
|
},
|
|
85
87
|
"dependencies": {
|
|
86
|
-
"@hapi/joi": "^17.1.1",
|
|
87
88
|
"@royli/hygen": "^5.0.4",
|
|
88
89
|
"@surgio/eslint-config-surgio": "^1.0.3",
|
|
89
90
|
"@surgio/logger": "^1.1.0",
|
|
@@ -109,6 +110,7 @@
|
|
|
109
110
|
"global-agent": "^2.1.7",
|
|
110
111
|
"got": "^11.6.1",
|
|
111
112
|
"inquirer": "^7.1.0",
|
|
113
|
+
"joi": "^17.1.1",
|
|
112
114
|
"listr": "^0.14.3",
|
|
113
115
|
"lodash": "^4.17.19",
|
|
114
116
|
"lru-cache": "^6.0.0",
|
|
@@ -138,7 +140,7 @@
|
|
|
138
140
|
"lib/**/*.test.ts"
|
|
139
141
|
],
|
|
140
142
|
"require": [
|
|
141
|
-
"
|
|
143
|
+
"ts-node/register",
|
|
142
144
|
"./test/stub-axios.js"
|
|
143
145
|
]
|
|
144
146
|
},
|