surgio 2.9.0 → 2.10.2
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 +37 -1
- package/README.md +1 -7
- 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 +3 -1
- package/build/generator/artifact.js +19 -18
- package/build/generator/template.js +11 -17
- package/build/index.d.ts +7 -0
- package/build/index.js +17 -12
- package/build/provider/BlackSSLProvider.js +3 -3
- package/build/provider/ClashProvider.js +12 -11
- package/build/provider/CustomProvider.js +2 -4
- package/build/provider/Provider.js +2 -5
- package/build/provider/ShadowsocksJsonSubscribeProvider.js +3 -3
- package/build/provider/ShadowsocksSubscribeProvider.js +9 -9
- package/build/provider/ShadowsocksrSubscribeProvider.js +10 -10
- package/build/provider/SsdProvider.js +10 -10
- package/build/provider/V2rayNSubscribeProvider.js +6 -6
- package/build/provider/index.d.ts +3 -9
- package/build/provider/index.js +6 -2
- package/build/provider/types.d.ts +9 -0
- package/build/provider/types.js +3 -0
- package/build/utils/config.js +11 -13
- package/build/utils/constant.d.ts +2 -2
- package/build/utils/constant.js +5 -5
- package/build/utils/dns.js +5 -6
- 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.js +49 -49
- package/build/utils/linter.js +3 -3
- package/build/utils/loon.js +5 -5
- package/build/utils/patch-proxy.js +14 -11
- 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/package.json +19 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,39 @@
|
|
|
1
|
+
## [2.10.2](https://github.com/geekdada/surgio/compare/v2.10.1...v2.10.2) (2021-10-24)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* wrong loon config format ([340d324](https://github.com/geekdada/surgio/commit/340d32412ab3c2694b4f6780930e32a5cf0735f0)), closes [#159](https://github.com/geekdada/surgio/issues/159)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
## [2.10.1](https://github.com/geekdada/surgio/compare/v2.10.0...v2.10.1) (2021-08-27)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* export necessary type ([21c717f](https://github.com/geekdada/surgio/commit/21c717f4b93a5b8d54cc61180f2771c590b4882c))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
# [2.10.0](https://github.com/geekdada/surgio/compare/v2.9.1...v2.10.0) (2021-08-25)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Bug Fixes
|
|
23
|
+
|
|
24
|
+
* lint error ([78efe78](https://github.com/geekdada/surgio/commit/78efe78ae7ea241183f900be2dfbe242fe699c1b))
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
## [2.9.1](https://github.com/geekdada/surgio/compare/v2.9.0...v2.9.1) (2021-07-22)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### Features
|
|
32
|
+
|
|
33
|
+
* add some utils ([05dae9c](https://github.com/geekdada/surgio/commit/05dae9c5664e42a95f97e9b9b232a3191491d889))
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
1
37
|
# [2.9.0](https://github.com/geekdada/surgio/compare/v2.8.0...v2.9.0) (2021-06-20)
|
|
2
38
|
|
|
3
39
|
|
|
@@ -405,8 +441,8 @@
|
|
|
405
441
|
|
|
406
442
|
### Bug Fixes
|
|
407
443
|
|
|
408
|
-
* **command:new:** 生成 custom 类型 provider 报错 ([be83268](https://github.com/geekdada/surgio/commit/be832687b0cb1a5ceb96e6742eb451e9ed5e5903))
|
|
409
444
|
* 服务器地址为 ipv6 时触发解析 ([aa79c93](https://github.com/geekdada/surgio/commit/aa79c931bac1a81b2406e4c36180c62e064e0292))
|
|
445
|
+
* **command:new:** 生成 custom 类型 provider 报错 ([be83268](https://github.com/geekdada/surgio/commit/be832687b0cb1a5ceb96e6742eb451e9ed5e5903))
|
|
410
446
|
* SSR URI 中包含 ipv6 地址解析错误 ([1cd8436](https://github.com/geekdada/surgio/commit/1cd8436a6335a4f018fc96532f297502cec8ce3b))
|
|
411
447
|
|
|
412
448
|
|
package/README.md
CHANGED
|
@@ -39,13 +39,7 @@
|
|
|
39
39
|
|
|
40
40
|
## Sponsors
|
|
41
41
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
[<img width="200px" src="https://surgio.js.org/powered-by-vercel.svg" />](https://vercel.com/?utm_source=surgio&utm_campaign=oss)
|
|
45
|
-
|
|
46
|
-
---
|
|
47
|
-
|
|
48
|
-
<img width="180" src="docs/.vuepress/public/vxtrans.png" alt="vxtrans">
|
|
42
|
+
[<img width="180" src="docs/.vuepress/public/vxtrans.png" alt="vxtrans">](https://vx.link/?rel=geekdada)
|
|
49
43
|
|
|
50
44
|
[vxTrans - 网络优化工具,有效地降低延迟,改善传输性能](https://vx.link/?rel=geekdada)
|
|
51
45
|
|
package/build/command/check.js
CHANGED
|
@@ -62,9 +62,9 @@ class CheckCommand extends common_bin_1.default {
|
|
|
62
62
|
title: '获取 Provider 信息',
|
|
63
63
|
task: async (ctx) => {
|
|
64
64
|
const { cmdCtx } = ctx;
|
|
65
|
-
assert_1.default(cmdCtx.argv._[0], '没有指定 Provider');
|
|
65
|
+
(0, assert_1.default)(cmdCtx.argv._[0], '没有指定 Provider');
|
|
66
66
|
const providerName = cmdCtx.argv._[0];
|
|
67
|
-
const config = config_1.loadConfig(cmdCtx.cwd, cmdCtx.argv.config);
|
|
67
|
+
const config = (0, config_1.loadConfig)(cmdCtx.cwd, cmdCtx.argv.config);
|
|
68
68
|
const filePath = path_1.default.resolve(config.providerDir, `./${providerName}.js`);
|
|
69
69
|
const file = fs_1.default.existsSync(filePath)
|
|
70
70
|
? require(filePath)
|
|
@@ -72,7 +72,7 @@ class CheckCommand extends common_bin_1.default {
|
|
|
72
72
|
if (file instanceof Error) {
|
|
73
73
|
throw file;
|
|
74
74
|
}
|
|
75
|
-
const provider = provider_1.getProvider(providerName, file);
|
|
75
|
+
const provider = await (0, provider_1.getProvider)(providerName, file);
|
|
76
76
|
ctx.nodeList = await provider.getNodeList();
|
|
77
77
|
},
|
|
78
78
|
},
|
|
@@ -80,4 +80,4 @@ class CheckCommand extends common_bin_1.default {
|
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
module.exports = CheckCommand;
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvY29tbWFuZC9jaGVjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsdUJBQXVCO0FBQ3ZCLG9EQUE0QjtBQUM1Qiw0REFBOEM7QUFDOUMsNENBQW9CO0FBQ3BCLGdEQUF3QjtBQUN4QixrREFBMEI7QUFDMUIsd0RBQWdDO0FBR2hDLDRDQUE2QztBQUM3QywwQ0FBMEM7QUFDMUMsd0RBQXFEO0FBRXJELE1BQU0sWUFBYSxTQUFRLG9CQUFPO0lBQ2hDLFlBQVksT0FBa0I7UUFDNUIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLEtBQUssR0FBRywrQkFBK0IsQ0FBQztRQUM3QyxJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ2IsQ0FBQyxFQUFFO2dCQUNELEtBQUssRUFBRSxRQUFRO2dCQUNmLFlBQVksRUFBRSxLQUFLO2dCQUNuQixRQUFRLEVBQUUsYUFBYTtnQkFDdkIsT0FBTyxFQUFFLGtCQUFrQjtnQkFDM0IsSUFBSSxFQUFFLFFBQVE7YUFDZjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHO1FBQ2xCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUM5QixNQUFNLFdBQVcsR0FBRyxNQUFNLEtBQUssQ0FBQyxHQUFHLENBQUM7WUFDbEMsTUFBTSxFQUFFLEdBQUc7U0FDWixDQUFDLENBQUM7UUFDSCxNQUFNLEVBQUUsUUFBUSxFQUFFLEdBQUcsV0FBVyxDQUFDO1FBRWpDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRTtZQUN4QixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQy9DLE9BQU87U0FDUjtRQUVELE1BQU0sT0FBTyxHQUFHLE1BQU0sa0JBQVEsQ0FBQyxNQUFNLENBQUM7WUFDcEM7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLE1BQU07Z0JBQ1osT0FBTyxFQUFFLE9BQU87Z0JBQ2hCLE9BQU8sRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUMvQixJQUFJLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxNQUFNLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLElBQUksRUFBRTtvQkFDeEQsS0FBSyxFQUFFLElBQUk7aUJBQ1osQ0FBQyxDQUFDO2FBQ0o7U0FDRixDQUFDLENBQUM7UUFFSCxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsSUFBVyxXQUFXO1FBQ3BCLE9BQU8sYUFBYSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCx1QkFBdUI7SUFDaEIsWUFBWSxDQUFDLEdBQUc7UUFDckIsMkJBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFTyxRQUFRO1FBQ2QsT0FBTyxJQUFJLGVBQUssQ0FHYjtZQUNEO2dCQUNFLEtBQUssRUFBRSxnQkFBZ0I7Z0JBQ3ZCLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEVBQUU7b0JBQ2xCLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUM7b0JBRXZCLElBQUEsZ0JBQU0sRUFBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxlQUFlLENBQUMsQ0FBQztvQkFFMUMsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3RDLE1BQU0sTUFBTSxHQUFHLElBQUEsbUJBQVUsRUFBQyxNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQzFELE1BQU0sUUFBUSxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQzNCLE1BQU0sQ0FBQyxXQUFXLEVBQ2xCLEtBQUssWUFBWSxLQUFLLENBQ3ZCLENBQUM7b0JBQ0YsTUFBTSxJQUFJLEdBQWdCLFlBQUUsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDO3dCQUMvQyxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQzt3QkFDbkIsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO29CQUUvQixJQUFJLElBQUksWUFBWSxLQUFLLEVBQUU7d0JBQ3pCLE1BQU0sSUFBSSxDQUFDO3FCQUNaO29CQUVELE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBQSxzQkFBVyxFQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsQ0FBQztvQkFFdkQsR0FBRyxDQUFDLFFBQVEsR0FBRyxNQUFNLFFBQVEsQ0FBQyxXQUFXLEVBQUUsQ0FBQztnQkFDOUMsQ0FBQzthQUNGO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBRUQsaUJBQVMsWUFBWSxDQUFDIn0=
|
package/build/command/doctor.js
CHANGED
|
@@ -40,17 +40,17 @@ class DoctorCommand extends common_bin_1.default {
|
|
|
40
40
|
static async generateDoctorInfo(cwd) {
|
|
41
41
|
const doctorInfo = [];
|
|
42
42
|
const pkg = require('../../package.json');
|
|
43
|
-
const checkInfo = utils_1.isPkgBundle()
|
|
43
|
+
const checkInfo = (0, utils_1.isPkgBundle)()
|
|
44
44
|
? null
|
|
45
|
-
: await util_1.promisify(check_node_version_1.default)();
|
|
45
|
+
: await (0, util_1.promisify)(check_node_version_1.default)();
|
|
46
46
|
try {
|
|
47
|
-
const gatewayPkg = require(path_1.join(cwd, 'node_modules/@surgio/gateway/package.json'));
|
|
47
|
+
const gatewayPkg = require((0, path_1.join)(cwd, 'node_modules/@surgio/gateway/package.json'));
|
|
48
48
|
doctorInfo.push(`@surgio/gateway: ${gatewayPkg.version}`);
|
|
49
49
|
}
|
|
50
50
|
catch (_) {
|
|
51
51
|
// no catch
|
|
52
52
|
}
|
|
53
|
-
doctorInfo.push(`surgio: ${pkg.version} (${path_1.join(__dirname, '../..')})`);
|
|
53
|
+
doctorInfo.push(`surgio: ${pkg.version} (${(0, path_1.join)(__dirname, '../..')})`);
|
|
54
54
|
if (checkInfo) {
|
|
55
55
|
Object.keys(checkInfo.versions).forEach((key) => {
|
|
56
56
|
const version = checkInfo.versions[key].version;
|
|
@@ -68,4 +68,4 @@ class DoctorCommand extends common_bin_1.default {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
module.exports = DoctorCommand;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2NvbW1hbmQvZG9jdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSx1QkFBdUI7QUFDdkIsNERBQWlDO0FBQ2pDLDRFQUF1QztBQUN2QywrQkFBaUM7QUFDakMsK0JBQTRCO0FBRTVCLG9DQUF1QztBQUN2Qyx3REFBcUQ7QUFLckQsTUFBTSxhQUFjLFNBQVEsb0JBQU87SUFDakMsWUFBWSxPQUFrQjtRQUM1QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLHFCQUFxQixDQUFDO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUc7WUFDYixDQUFDLEVBQUU7Z0JBQ0QsS0FBSyxFQUFFLFFBQVE7Z0JBQ2YsWUFBWSxFQUFFLEtBQUs7Z0JBQ25CLFFBQVEsRUFBRSxhQUFhO2dCQUN2QixPQUFPLEVBQUUsa0JBQWtCO2dCQUMzQixJQUFJLEVBQUUsUUFBUTthQUNmO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUc7UUFDbEIsTUFBTSxVQUFVLEdBQUcsTUFBTSxhQUFhLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRW5FLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BCLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELHVCQUF1QjtJQUN2QixJQUFXLFdBQVc7UUFDcEIsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztJQUVELHVCQUF1QjtJQUNoQixZQUFZLENBQUMsR0FBRztRQUNyQiwyQkFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVNLE1BQU0sQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQ3BDLEdBQVc7UUFFWCxNQUFNLFVBQVUsR0FBYSxFQUFFLENBQUM7UUFDaEMsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFDMUMsTUFBTSxTQUFTLEdBQUcsSUFBQSxtQkFBVyxHQUFFO1lBQzdCLENBQUMsQ0FBQyxJQUFJO1lBQ04sQ0FBQyxDQUFDLE1BQU0sSUFBQSxnQkFBUyxFQUFZLDRCQUFLLENBQUMsRUFBRSxDQUFDO1FBRXhDLElBQUk7WUFDRixNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBQSxXQUFJLEVBQzdCLEdBQUcsRUFDSCwyQ0FBMkMsQ0FDNUMsQ0FBQyxDQUFDO1lBQ0gsVUFBVSxDQUFDLElBQUksQ0FBQyxvQkFBb0IsVUFBVSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7U0FDM0Q7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLFdBQVc7U0FDWjtRQUVELFVBQVUsQ0FBQyxJQUFJLENBQUMsV0FBVyxHQUFHLENBQUMsT0FBTyxLQUFLLElBQUEsV0FBSSxFQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFFeEUsSUFBSSxTQUFTLEVBQUU7WUFDYixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtnQkFDOUMsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUM7Z0JBQ2hELElBQUksT0FBTyxFQUFFO29CQUNYLElBQUksR0FBRyxLQUFLLE1BQU0sRUFBRTt3QkFDbEIsVUFBVSxDQUFDLElBQUksQ0FBQyxHQUFHLEdBQUcsS0FBSyxPQUFPLEtBQUssT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUM7cUJBQzdEO3lCQUFNO3dCQUNMLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLEtBQUssT0FBTyxFQUFFLENBQUMsQ0FBQztxQkFDdkM7aUJBQ0Y7WUFDSCxDQUFDLENBQUMsQ0FBQztTQUNKO1FBRUQsT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztDQUNGO0FBRUQsaUJBQVMsYUFBYSxDQUFDIn0=
|
|
@@ -41,17 +41,17 @@ class GenerateCommand extends common_bin_1.default {
|
|
|
41
41
|
}
|
|
42
42
|
async run(ctx) {
|
|
43
43
|
if (!ctx.argv.skipLint) {
|
|
44
|
-
const result = await linter_1.checkAndFix(ctx.cwd);
|
|
44
|
+
const result = await (0, linter_1.checkAndFix)(ctx.cwd);
|
|
45
45
|
if (!result) {
|
|
46
46
|
throw new Error('JS 语法检查不通过,请根据提示修改文件(参考 http://url.royli.dev/SeB6m)');
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
-
const config = config_1.loadConfig(ctx.cwd, ctx.argv.config, Object.assign({}, (ctx.argv.output
|
|
49
|
+
const config = (0, config_1.loadConfig)(ctx.cwd, ctx.argv.config, Object.assign({}, (ctx.argv.output
|
|
50
50
|
? {
|
|
51
51
|
output: path_1.default.resolve(ctx.cwd, ctx.argv.output),
|
|
52
52
|
}
|
|
53
53
|
: null)));
|
|
54
|
-
await generate_1.default(config, ctx.argv.skipFail, ctx.argv.cacheSnippet);
|
|
54
|
+
await (0, generate_1.default)(config, ctx.argv.skipFail, ctx.argv.cacheSnippet);
|
|
55
55
|
}
|
|
56
56
|
// istanbul ignore next
|
|
57
57
|
get description() {
|
|
@@ -63,4 +63,4 @@ class GenerateCommand extends common_bin_1.default {
|
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
module.exports = GenerateCommand;
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvY29tbWFuZC9nZW5lcmF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsNERBQWlDO0FBQ2pDLGdEQUF3QjtBQUV4Qiw0Q0FBNkM7QUFDN0MsMkRBQW1DO0FBQ25DLHdEQUFxRDtBQUNyRCw0Q0FBOEM7QUFFOUMsTUFBTSxlQUFnQixTQUFRLG9CQUFPO0lBQ25DLFlBQVksT0FBa0I7UUFDNUIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLEtBQUssR0FBRyx1QkFBdUIsQ0FBQztRQUNyQyxJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ2IsQ0FBQyxFQUFFO2dCQUNELElBQUksRUFBRSxRQUFRO2dCQUNkLEtBQUssRUFBRSxRQUFRO2dCQUNmLFdBQVcsRUFBRSxTQUFTO2FBQ3ZCO1lBQ0QsQ0FBQyxFQUFFO2dCQUNELEtBQUssRUFBRSxRQUFRO2dCQUNmLE9BQU8sRUFBRSxrQkFBa0I7YUFDNUI7WUFDRCxlQUFlLEVBQUU7Z0JBQ2YsSUFBSSxFQUFFLFNBQVM7Z0JBQ2YsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsV0FBVyxFQUFFLFFBQVE7YUFDdEI7WUFDRCxXQUFXLEVBQUU7Z0JBQ1gsSUFBSSxFQUFFLFNBQVM7Z0JBQ2YsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsV0FBVyxFQUFFLGtCQUFrQjthQUNoQztZQUNELFdBQVcsRUFBRTtnQkFDWCxJQUFJLEVBQUUsU0FBUztnQkFDZixPQUFPLEVBQUUsS0FBSztnQkFDZCxXQUFXLEVBQUUsUUFBUTthQUN0QjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHO1FBQ2xCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUN0QixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEsb0JBQVcsRUFBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFFMUMsSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDWCxNQUFNLElBQUksS0FBSyxDQUNiLHFEQUFxRCxDQUN0RCxDQUFDO2FBQ0g7U0FDRjtRQUVELE1BQU0sTUFBTSxHQUFHLElBQUEsbUJBQVUsRUFBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxvQkFFN0MsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07WUFDakIsQ0FBQyxDQUFDO2dCQUNFLE1BQU0sRUFBRSxjQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7YUFDL0M7WUFDSCxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQ1QsQ0FBQztRQUVILE1BQU0sSUFBQSxrQkFBUSxFQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxXQUFXO1FBQ3BCLE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7SUFFRCx1QkFBdUI7SUFDaEIsWUFBWSxDQUFDLEdBQUc7UUFDckIsMkJBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7Q0FDRjtBQUVELGlCQUFTLGVBQWUsQ0FBQyJ9
|
package/build/command/lint.js
CHANGED
|
@@ -24,10 +24,10 @@ class LintCommand extends common_bin_1.default {
|
|
|
24
24
|
async run(ctx) {
|
|
25
25
|
let result;
|
|
26
26
|
if (ctx.argv.fix) {
|
|
27
|
-
result = await linter_1.checkAndFix(ctx.cwd);
|
|
27
|
+
result = await (0, linter_1.checkAndFix)(ctx.cwd);
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
result = await linter_1.check(ctx.cwd);
|
|
30
|
+
result = await (0, linter_1.check)(ctx.cwd);
|
|
31
31
|
}
|
|
32
32
|
if (!result) {
|
|
33
33
|
console.warn('⚠️ JS 语法检查不通过,请根据提示修改文件(可添加参数 --fix 自动修复部分错误, 参考 http://url.royli.dev/SeB6m)');
|
|
@@ -39,4 +39,4 @@ class LintCommand extends common_bin_1.default {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
module.exports = LintCommand;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGludC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9jb21tYW5kL2xpbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLHVCQUF1QjtBQUN2Qiw0REFBaUM7QUFDakMsNENBQXFEO0FBRXJELE1BQU0sV0FBWSxTQUFRLG9CQUFPO0lBQy9CLFlBQVksT0FBa0I7UUFDNUIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLEtBQUssR0FBRywyQkFBMkIsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ2IsR0FBRyxFQUFFO2dCQUNILE9BQU8sRUFBRSxLQUFLO2dCQUNkLFFBQVEsRUFBRSxnQkFBZ0I7Z0JBQzFCLElBQUksRUFBRSxTQUFTO2FBQ2hCO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxXQUFXO1FBQ3BCLE9BQU8sWUFBWSxDQUFDO0lBQ3RCLENBQUM7SUFFTSxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUc7UUFDbEIsSUFBSSxNQUFNLENBQUM7UUFFWCxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO1lBQ2hCLE1BQU0sR0FBRyxNQUFNLElBQUEsb0JBQVcsRUFBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDckM7YUFBTTtZQUNMLE1BQU0sR0FBRyxNQUFNLElBQUEsY0FBSyxFQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUMvQjtRQUVELElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDWCxPQUFPLENBQUMsSUFBSSxDQUNWLCtFQUErRSxDQUNoRixDQUFDO1lBQ0YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNqQjthQUFNO1lBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztTQUM3QjtJQUNILENBQUM7Q0FDRjtBQUVELGlCQUFTLFdBQVcsQ0FBQyJ9
|
package/build/command/new.js
CHANGED
|
@@ -8,8 +8,8 @@ const path_1 = require("path");
|
|
|
8
8
|
const hygen_1 = require("@royli/hygen");
|
|
9
9
|
const logger_2 = __importDefault(require("@royli/hygen/lib/logger"));
|
|
10
10
|
const common_bin_1 = __importDefault(require("common-bin"));
|
|
11
|
-
const defaultTemplates = path_1.join(__dirname, '../../hygen-template');
|
|
12
|
-
const logger = logger_1.createLogger({ service: 'surgio:NewCommand' });
|
|
11
|
+
const defaultTemplates = (0, path_1.join)(__dirname, '../../hygen-template');
|
|
12
|
+
const logger = (0, logger_1.createLogger)({ service: 'surgio:NewCommand' });
|
|
13
13
|
class NewCommand extends common_bin_1.default {
|
|
14
14
|
constructor(rawArgv) {
|
|
15
15
|
super(rawArgv);
|
|
@@ -35,7 +35,7 @@ class NewCommand extends common_bin_1.default {
|
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
37
|
const args = [...ctx.rawArgv].concat('new'); // [type] new ...
|
|
38
|
-
hygen_1.runner(args, {
|
|
38
|
+
(0, hygen_1.runner)(args, {
|
|
39
39
|
templates: defaultTemplates,
|
|
40
40
|
cwd: process.cwd(),
|
|
41
41
|
logger: new logger_2.default(console.log.bind(console)),
|
|
@@ -49,4 +49,4 @@ class NewCommand extends common_bin_1.default {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
module.exports = NewCommand;
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV3LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2NvbW1hbmQvbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSx1QkFBdUI7QUFDdkIsMkNBQThDO0FBQzlDLCtCQUE0QjtBQUM1Qix3Q0FBc0M7QUFDdEMscUVBQTZDO0FBQzdDLDREQUE4QztBQUU5QyxNQUFNLGdCQUFnQixHQUFHLElBQUEsV0FBSSxFQUFDLFNBQVMsRUFBRSxzQkFBc0IsQ0FBQyxDQUFDO0FBQ2pFLE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxDQUFDLENBQUM7QUFFOUQsTUFBTSxVQUFXLFNBQVEsb0JBQU87SUFDOUIsWUFBWSxPQUFrQjtRQUM1QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLCtDQUErQyxDQUFDO1FBQzdELElBQUksQ0FBQyxPQUFPLEdBQUc7WUFDYixDQUFDLEVBQUU7Z0JBQ0QsS0FBSyxFQUFFLFFBQVE7Z0JBQ2YsWUFBWSxFQUFFLEtBQUs7Z0JBQ25CLFFBQVEsRUFBRSxhQUFhO2dCQUN2QixPQUFPLEVBQUUsa0JBQWtCO2dCQUMzQixJQUFJLEVBQUUsUUFBUTthQUNmO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCx1QkFBdUI7SUFDdkIsSUFBVyxXQUFXO1FBQ3BCLE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFTSxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQVk7UUFDM0IsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1lBQ3ZCLE1BQU0sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDMUIsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2hCLE9BQU87U0FDUjtRQUVELE1BQU0sSUFBSSxHQUFhLENBQUMsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsaUJBQWlCO1FBRXhFLElBQUEsY0FBTSxFQUFDLElBQUksRUFBRTtZQUNYLFNBQVMsRUFBRSxnQkFBZ0I7WUFDM0IsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHLEVBQUU7WUFDbEIsTUFBTSxFQUFFLElBQUksZ0JBQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUM3QyxjQUFjLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQztZQUN6QyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQ3JCLE1BQU0sSUFBSSxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDNUQsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztZQUM5QyxDQUFDO1lBQ0QsS0FBSyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUs7U0FDM0IsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBRUQsaUJBQVMsVUFBVSxDQUFDIn0=
|
|
@@ -11,7 +11,7 @@ const config_1 = require("../utils/config");
|
|
|
11
11
|
const provider_1 = require("../provider");
|
|
12
12
|
const error_helper_1 = require("../utils/error-helper");
|
|
13
13
|
const subscription_1 = require("../utils/subscription");
|
|
14
|
-
const logger = logger_1.createLogger({
|
|
14
|
+
const logger = (0, logger_1.createLogger)({
|
|
15
15
|
service: 'surgio:SubscriptionsCommand',
|
|
16
16
|
});
|
|
17
17
|
class SubscriptionsCommand extends common_bin_1.default {
|
|
@@ -29,13 +29,13 @@ class SubscriptionsCommand extends common_bin_1.default {
|
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
async run(ctx) {
|
|
32
|
-
this.config = config_1.loadConfig(ctx.cwd, ctx.argv.config);
|
|
32
|
+
this.config = (0, config_1.loadConfig)(ctx.cwd, ctx.argv.config);
|
|
33
33
|
const providerList = await this.listProviders();
|
|
34
34
|
for (const provider of providerList) {
|
|
35
35
|
if (provider.supportGetSubscriptionUserInfo) {
|
|
36
36
|
const userInfo = await provider.getSubscriptionUserInfo();
|
|
37
37
|
if (userInfo) {
|
|
38
|
-
const format = subscription_1.formatSubscriptionUserInfo(userInfo);
|
|
38
|
+
const format = (0, subscription_1.formatSubscriptionUserInfo)(userInfo);
|
|
39
39
|
console.log('🤟 %s 已用流量:%s 剩余流量:%s 有效期至:%s', provider.name, format.used, format.left, format.expire);
|
|
40
40
|
}
|
|
41
41
|
else {
|
|
@@ -63,9 +63,10 @@ class SubscriptionsCommand extends common_bin_1.default {
|
|
|
63
63
|
async function readProvider(path) {
|
|
64
64
|
let provider;
|
|
65
65
|
try {
|
|
66
|
-
const providerName = path_1.basename(path, '.js');
|
|
66
|
+
const providerName = (0, path_1.basename)(path, '.js');
|
|
67
67
|
logger.debug('read %s %s', providerName, path);
|
|
68
|
-
|
|
68
|
+
// eslint-disable-next-line prefer-const
|
|
69
|
+
provider = await (0, provider_1.getProvider)(providerName, require(path));
|
|
69
70
|
}
|
|
70
71
|
catch (err) {
|
|
71
72
|
logger.debug(`${path} 不是一个合法的模块`);
|
|
@@ -79,7 +80,7 @@ class SubscriptionsCommand extends common_bin_1.default {
|
|
|
79
80
|
return provider;
|
|
80
81
|
}
|
|
81
82
|
for (const file of files) {
|
|
82
|
-
const result = await readProvider(path_1.join(this.config.providerDir, file));
|
|
83
|
+
const result = await readProvider((0, path_1.join)(this.config.providerDir, file));
|
|
83
84
|
if (result) {
|
|
84
85
|
providerList.push(result);
|
|
85
86
|
}
|
|
@@ -88,4 +89,4 @@ class SubscriptionsCommand extends common_bin_1.default {
|
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
91
|
module.exports = SubscriptionsCommand;
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Vic2NyaXB0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9jb21tYW5kL3N1YnNjcmlwdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQUFBLHVCQUF1QjtBQUN2Qiw0REFBaUM7QUFDakMsMkJBQXFDO0FBQ3JDLCtCQUFzQztBQUN0QywyQ0FBOEM7QUFVOUMsNENBQTZDO0FBQzdDLDBDQUEwQztBQUMxQyx3REFBcUQ7QUFDckQsd0RBQW1FO0FBRW5FLE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVksRUFBQztJQUMxQixPQUFPLEVBQUUsNkJBQTZCO0NBQ3ZDLENBQUMsQ0FBQztBQVVILE1BQU0sb0JBQXFCLFNBQVEsb0JBQU87SUFHeEMsWUFBWSxPQUFrQjtRQUM1QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLDRCQUE0QixDQUFDO1FBQzFDLElBQUksQ0FBQyxPQUFPLEdBQUc7WUFDYixDQUFDLEVBQUU7Z0JBQ0QsS0FBSyxFQUFFLFFBQVE7Z0JBQ2YsWUFBWSxFQUFFLEtBQUs7Z0JBQ25CLFFBQVEsRUFBRSxhQUFhO2dCQUN2QixPQUFPLEVBQUUsa0JBQWtCO2dCQUMzQixJQUFJLEVBQUUsUUFBUTthQUNmO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUc7UUFDbEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFBLG1CQUFVLEVBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRW5ELE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBRWhELEtBQUssTUFBTSxRQUFRLElBQUksWUFBWSxFQUFFO1lBQ25DLElBQUksUUFBUSxDQUFDLDhCQUE4QixFQUFFO2dCQUMzQyxNQUFNLFFBQVEsR0FBRyxNQUFNLFFBQVEsQ0FBQyx1QkFB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
|
package/build/command/upload.js
CHANGED
|
@@ -15,7 +15,7 @@ class GenerateCommand extends common_bin_1.default {
|
|
|
15
15
|
constructor(rawArgv) {
|
|
16
16
|
super(rawArgv);
|
|
17
17
|
this.usage = '使用方法: surgio upload';
|
|
18
|
-
this.spinner = ora_1.default();
|
|
18
|
+
this.spinner = (0, ora_1.default)();
|
|
19
19
|
this.options = {
|
|
20
20
|
o: {
|
|
21
21
|
type: 'string',
|
|
@@ -33,7 +33,7 @@ class GenerateCommand extends common_bin_1.default {
|
|
|
33
33
|
}
|
|
34
34
|
async run(ctx) {
|
|
35
35
|
var _a, _b, _c, _d, _e, _f;
|
|
36
|
-
const config = config_1.loadConfig(ctx.cwd, ctx.argv.config, Object.assign({}, (ctx.argv.output
|
|
36
|
+
const config = (0, config_1.loadConfig)(ctx.cwd, ctx.argv.config, Object.assign({}, (ctx.argv.output
|
|
37
37
|
? {
|
|
38
38
|
output: path_1.default.resolve(ctx.cwd, ctx.argv.output),
|
|
39
39
|
}
|
|
@@ -102,4 +102,4 @@ class GenerateCommand extends common_bin_1.default {
|
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
module.exports = GenerateCommand;
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2NvbW1hbmQvdXBsb2FkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSx1QkFBdUI7QUFDdkIsc0RBQTBCO0FBQzFCLDREQUFpQztBQUNqQyw0Q0FBb0I7QUFDcEIsd0RBQTJCO0FBQzNCLDhDQUErQjtBQUMvQixnREFBd0I7QUFFeEIsNENBQTZDO0FBQzdDLHdEQUFxRDtBQUVyRCxNQUFNLGVBQWdCLFNBQVEsb0JBQU87SUFHbkMsWUFBWSxPQUFrQjtRQUM1QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLHFCQUFxQixDQUFDO1FBQ25DLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBQSxhQUFHLEdBQUUsQ0FBQztRQUNyQixJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ2IsQ0FBQyxFQUFFO2dCQUNELElBQUksRUFBRSxRQUFRO2dCQUNkLEtBQUssRUFBRSxRQUFRO2dCQUNmLFdBQVcsRUFBRSxTQUFTO2FBQ3ZCO1lBQ0QsQ0FBQyxFQUFFO2dCQUNELEtBQUssRUFBRSxRQUFRO2dCQUNmLFlBQVksRUFBRSxLQUFLO2dCQUNuQixRQUFRLEVBQUUsYUFBYTtnQkFDdkIsT0FBTyxFQUFFLGtCQUFrQjtnQkFDM0IsSUFBSSxFQUFFLFFBQVE7YUFDZjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRU0sS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHOztRQUNsQixNQUFNLE1BQU0sR0FBRyxJQUFBLG1CQUFVLEVBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sb0JBQzdDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNO1lBQ2pCLENBQUMsQ0FBQztnQkFDRSxNQUFNLEVBQUUsY0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxD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
|
package/build/generate.js
CHANGED
|
@@ -11,13 +11,13 @@ const logger_1 = require("@surgio/logger");
|
|
|
11
11
|
const artifact_1 = require("./generator/artifact");
|
|
12
12
|
const template_1 = require("./generator/template");
|
|
13
13
|
const remote_snippet_1 = require("./utils/remote-snippet");
|
|
14
|
-
const spinner = ora_1.default();
|
|
14
|
+
const spinner = (0, ora_1.default)();
|
|
15
15
|
async function run(config, skipFail, cacheSnippet) {
|
|
16
16
|
const artifactList = config.artifacts;
|
|
17
17
|
const distPath = config.output;
|
|
18
18
|
const remoteSnippetsConfig = config.remoteSnippets || [];
|
|
19
|
-
const remoteSnippetList = await remote_snippet_1.loadRemoteSnippetList(remoteSnippetsConfig, cacheSnippet);
|
|
20
|
-
const templateEngine = template_1.getEngine(config.templateDir);
|
|
19
|
+
const remoteSnippetList = await (0, remote_snippet_1.loadRemoteSnippetList)(remoteSnippetsConfig, cacheSnippet);
|
|
20
|
+
const templateEngine = (0, template_1.getEngine)(config.templateDir);
|
|
21
21
|
await fs_extra_1.default.mkdirp(distPath);
|
|
22
22
|
for (const artifact of artifactList) {
|
|
23
23
|
spinner.start(`正在生成规则 ${artifact.name}`);
|
|
@@ -72,4 +72,4 @@ async function default_1(config, skipFail, cacheSnippet) {
|
|
|
72
72
|
logger_1.logger.info('规则生成成功');
|
|
73
73
|
}
|
|
74
74
|
exports.default = default_1;
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9saWIvZ2VuZXJhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxDQUFDOzs7Ozs7QUFFYix3REFBMEI7QUFFMUIsOENBQXNCO0FBQ3RCLGdEQUF3QjtBQUN4QiwyQ0FBd0M7QUFDeEMsbURBQWdEO0FBRWhELG1EQUFpRDtBQUVqRCwyREFBK0Q7QUFFL0QsTUFBTSxPQUFPLEdBQUcsSUFBQSxhQUFHLEdBQUUsQ0FBQztBQUV0QixLQUFLLFVBQVUsR0FBRyxDQUNoQixNQUFxQixFQUNyQixRQUFrQixFQUNsQixZQUFzQjtJQUV0QixNQUFNLFlBQVksR0FBa0MsTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNyRSxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQy9CLE1BQU0sb0JBQW9CLEdBQUcsTUFBTSxDQUFDLGNBQWMsSUFBSSxFQUFFLENBQUM7SUFDekQsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLElBQUEsc0NBQXFCLEVBQ25ELG9CQUFvQixFQUNwQixZQUFZLENBQ2IsQ0FBQztJQUNGLE1BQU0sY0FBYyxHQUFHLElBQUEsb0JBQVMsRUFBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFFckQsTUFBTSxrQkFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUUxQixLQUFLLE1BQU0sUUFBUSxJQUFJLFlBQVksRUFBRTtRQUNuQyxPQUFPLENBQUMsS0FBSyxDQUFDLFVBQVUsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFFekMsSUFBSTtZQUNGLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxtQkFBUSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUU7Z0JBQ3RELGlCQUFpQjthQUNsQixDQUFDLENBQUM7WUFFSCxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsR0FBRyxFQUFFO2dCQUM3QyxPQUFPLENBQUMsSUFBSSxH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
|
|
@@ -3,6 +3,7 @@ import { Environment } from 'nunjucks';
|
|
|
3
3
|
import { EventEmitter } from 'events';
|
|
4
4
|
import { getProvider } from '../provider';
|
|
5
5
|
import { ArtifactConfig, CommandConfig, PossibleNodeConfigType, RemoteSnippet, SimpleNodeConfig } from '../types';
|
|
6
|
+
declare type ThenArg<T> = T extends PromiseLike<infer U> ? U : T;
|
|
6
7
|
export interface ArtifactOptions {
|
|
7
8
|
readonly remoteSnippetList?: ReadonlyArray<RemoteSnippet>;
|
|
8
9
|
readonly templateEngine?: Environment;
|
|
@@ -17,7 +18,7 @@ export declare class Artifact extends EventEmitter {
|
|
|
17
18
|
initProgress: number;
|
|
18
19
|
providerNameList: ReadonlyArray<string>;
|
|
19
20
|
nodeConfigListMap: Map<string, ReadonlyArray<PossibleNodeConfigType>>;
|
|
20
|
-
providerMap: Map<string, ReturnType<typeof getProvider
|
|
21
|
+
providerMap: Map<string, ThenArg<ReturnType<typeof getProvider>>>;
|
|
21
22
|
nodeList: PossibleNodeConfigType[];
|
|
22
23
|
nodeNameList: SimpleNodeConfig[];
|
|
23
24
|
private customFilters;
|
|
@@ -30,3 +31,4 @@ export declare class Artifact extends EventEmitter {
|
|
|
30
31
|
render(templateEngine?: Environment, extendRenderContext?: ExtendableRenderContext): string;
|
|
31
32
|
private providerMapper;
|
|
32
33
|
}
|
|
34
|
+
export {};
|
|
@@ -32,10 +32,10 @@ class Artifact extends events_1.EventEmitter {
|
|
|
32
32
|
this.nodeList = [];
|
|
33
33
|
this.nodeNameList = [];
|
|
34
34
|
const { name: artifactName, template, templateString } = artifact;
|
|
35
|
-
assert_1.default(artifactName, '必须指定 artifact 的 name 属性');
|
|
36
|
-
assert_1.default(artifact.provider, '必须指定 artifact 的 provider 属性');
|
|
35
|
+
(0, assert_1.default)(artifactName, '必须指定 artifact 的 name 属性');
|
|
36
|
+
(0, assert_1.default)(artifact.provider, '必须指定 artifact 的 provider 属性');
|
|
37
37
|
if (!templateString) {
|
|
38
|
-
assert_1.default(template, '必须指定 artifact 的 template 属性');
|
|
38
|
+
(0, assert_1.default)(template, '必须指定 artifact 的 template 属性');
|
|
39
39
|
}
|
|
40
40
|
const mainProviderName = artifact.provider;
|
|
41
41
|
const combineProviders = artifact.combineProviders || [];
|
|
@@ -55,10 +55,10 @@ class Artifact extends events_1.EventEmitter {
|
|
|
55
55
|
const mergedCustomParams = lodash_1.default.merge({}, globalCustomParams, customParams, extendRenderContext === null || extendRenderContext === void 0 ? void 0 : extendRenderContext.urlParams);
|
|
56
56
|
return Object.assign({ proxyTestUrl: config.proxyTestUrl, downloadUrl: downloadUrl
|
|
57
57
|
? downloadUrl
|
|
58
|
-
: utils_1.getDownloadUrl(config.urlBase, artifactName, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), snippet: (filePath) => {
|
|
59
|
-
return template_1.loadLocalSnippet(config.templateDir, filePath);
|
|
58
|
+
: (0, utils_1.getDownloadUrl)(config.urlBase, artifactName, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), snippet: (filePath) => {
|
|
59
|
+
return (0, template_1.loadLocalSnippet)(config.templateDir, filePath);
|
|
60
60
|
}, nodes: nodeList, names: nodeNameList, remoteSnippets,
|
|
61
|
-
nodeList, provider: this.artifact.provider, providerName: this.artifact.provider, artifactName, getDownloadUrl: (name) => utils_1.getDownloadUrl(config.urlBase, name, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getUrl: (p) => utils_1.getUrl(config.publicUrl, p, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getNodeNames: utils_1.getNodeNames,
|
|
61
|
+
nodeList, provider: this.artifact.provider, providerName: this.artifact.provider, artifactName, getDownloadUrl: (name) => (0, utils_1.getDownloadUrl)(config.urlBase, name, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getUrl: (p) => (0, utils_1.getUrl)(config.publicUrl, p, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getNodeNames: utils_1.getNodeNames,
|
|
62
62
|
getClashNodeNames: utils_1.getClashNodeNames,
|
|
63
63
|
getClashNodes: utils_1.getClashNodes,
|
|
64
64
|
getSurgeNodes: utils_1.getSurgeNodes,
|
|
@@ -95,8 +95,8 @@ class Artifact extends events_1.EventEmitter {
|
|
|
95
95
|
customFilters, customParams: mergedCustomParams }, (this.artifact.proxyGroupModifier
|
|
96
96
|
? {
|
|
97
97
|
clashProxyConfig: {
|
|
98
|
-
proxies: utils_1.getClashNodes(nodeList),
|
|
99
|
-
'proxy-groups': utils_1.normalizeClashProxyGroupConfig(nodeList, Object.assign({ usFilter: filter_1.usFilter,
|
|
98
|
+
proxies: (0, utils_1.getClashNodes)(nodeList),
|
|
99
|
+
'proxy-groups': (0, utils_1.normalizeClashProxyGroupConfig)(nodeList, Object.assign({ usFilter: filter_1.usFilter,
|
|
100
100
|
hkFilter: filter_1.hkFilter,
|
|
101
101
|
japanFilter: filter_1.japanFilter,
|
|
102
102
|
koreaFilter: filter_1.koreaFilter,
|
|
@@ -170,7 +170,8 @@ class Artifact extends events_1.EventEmitter {
|
|
|
170
170
|
let provider;
|
|
171
171
|
let nodeConfigList;
|
|
172
172
|
try {
|
|
173
|
-
|
|
173
|
+
// eslint-disable-next-line prefer-const
|
|
174
|
+
provider = await (0, provider_1.getProvider)(providerName, require(filePath));
|
|
174
175
|
this.providerMap.set(providerName, provider);
|
|
175
176
|
}
|
|
176
177
|
catch (err) /* istanbul ignore next */ {
|
|
@@ -197,7 +198,7 @@ class Artifact extends events_1.EventEmitter {
|
|
|
197
198
|
this.customFilters = Object.assign(Object.assign({}, config.customFilters), provider.customFilters);
|
|
198
199
|
}
|
|
199
200
|
}
|
|
200
|
-
if (filter_1.validateFilter(provider.nodeFilter) &&
|
|
201
|
+
if ((0, filter_1.validateFilter)(provider.nodeFilter) &&
|
|
201
202
|
typeof provider.nodeFilter === 'object' &&
|
|
202
203
|
provider.nodeFilter.supportSort) {
|
|
203
204
|
nodeConfigList = provider.nodeFilter.filter(nodeConfigList);
|
|
@@ -211,7 +212,7 @@ class Artifact extends events_1.EventEmitter {
|
|
|
211
212
|
if (!provider.nodeFilter) {
|
|
212
213
|
isValid = true;
|
|
213
214
|
}
|
|
214
|
-
else if (filter_1.validateFilter(provider.nodeFilter)) {
|
|
215
|
+
else if ((0, filter_1.validateFilter)(provider.nodeFilter)) {
|
|
215
216
|
isValid =
|
|
216
217
|
typeof provider.nodeFilter === 'function'
|
|
217
218
|
? provider.nodeFilter(nodeConfig)
|
|
@@ -233,11 +234,11 @@ class Artifact extends events_1.EventEmitter {
|
|
|
233
234
|
}
|
|
234
235
|
if (provider.addFlag) {
|
|
235
236
|
// 给节点名加国旗
|
|
236
|
-
nodeConfig.nodeName = flag_1.prependFlag(nodeConfig.nodeName, provider.removeExistingFlag);
|
|
237
|
+
nodeConfig.nodeName = (0, flag_1.prependFlag)(nodeConfig.nodeName, provider.removeExistingFlag);
|
|
237
238
|
}
|
|
238
239
|
else if (provider.removeExistingFlag) {
|
|
239
240
|
// 去掉名称中的国旗
|
|
240
|
-
nodeConfig.nodeName = flag_1.removeFlag(nodeConfig.nodeName);
|
|
241
|
+
nodeConfig.nodeName = (0, flag_1.removeFlag)(nodeConfig.nodeName);
|
|
241
242
|
}
|
|
242
243
|
// TCP Fast Open
|
|
243
244
|
if (provider.tfo) {
|
|
@@ -248,9 +249,9 @@ class Artifact extends events_1.EventEmitter {
|
|
|
248
249
|
nodeConfig.mptcp = provider.mptcp;
|
|
249
250
|
}
|
|
250
251
|
// check whether the hostname resolves in case of blocking clash's node heurestic
|
|
251
|
-
if ((config === null || config === void 0 ? void 0 : config.checkHostname) && !utils_1.isIp(nodeConfig.hostname)) {
|
|
252
|
+
if ((config === null || config === void 0 ? void 0 : config.checkHostname) && !(0, utils_1.isIp)(nodeConfig.hostname)) {
|
|
252
253
|
try {
|
|
253
|
-
const domains = await dns_1.resolveDomain(nodeConfig.hostname);
|
|
254
|
+
const domains = await (0, dns_1.resolveDomain)(nodeConfig.hostname);
|
|
254
255
|
if (domains.length < 1) {
|
|
255
256
|
logger_1.logger.warn(`DNS 解析结果中 ${nodeConfig.hostname} 未有对应 IP 地址,将忽略该节点`);
|
|
256
257
|
return undefined;
|
|
@@ -262,10 +263,10 @@ class Artifact extends events_1.EventEmitter {
|
|
|
262
263
|
}
|
|
263
264
|
}
|
|
264
265
|
if (((_a = config === null || config === void 0 ? void 0 : config.surgeConfig) === null || _a === void 0 ? void 0 : _a.resolveHostname) &&
|
|
265
|
-
!utils_1.isIp(nodeConfig.hostname) &&
|
|
266
|
+
!(0, utils_1.isIp)(nodeConfig.hostname) &&
|
|
266
267
|
[types_1.NodeTypeEnum.Vmess, types_1.NodeTypeEnum.Shadowsocksr].includes(nodeConfig.type)) {
|
|
267
268
|
try {
|
|
268
|
-
nodeConfig.hostnameIp = await dns_1.resolveDomain(nodeConfig.hostname);
|
|
269
|
+
nodeConfig.hostnameIp = await (0, dns_1.resolveDomain)(nodeConfig.hostname);
|
|
269
270
|
}
|
|
270
271
|
catch (err) /* istanbul ignore next */ {
|
|
271
272
|
logger_1.logger.warn(`${nodeConfig.hostname} 无法解析,将忽略该域名的解析结果`);
|
|
@@ -285,4 +286,4 @@ class Artifact extends events_1.EventEmitter {
|
|
|
285
286
|
}
|
|
286
287
|
}
|
|
287
288
|
exports.Artifact = Artifact;
|
|
288
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}
|
|
289
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAwC;AACxC,oDAA4B;AAC5B,wDAAgC;AAChC,wDAA0B;AAC1B,oDAAuB;AAEvB,gDAAwB;AACxB,mCAAsC;AAEtC,0CAA0C;AAC1C,oCAQkB;AAClB,oCAkBkB;AAClB,gDAAwD;AACxD,sCAA6C;AAC7C,4CAqByB;AACzB,wCAAwD;AACxD,wCAA6C;AAC7C,yCAA8C;AAa9C,MAAa,QAAS,SAAQ,qBAAY;IAiBxC,YACS,YAA2B,EAC3B,QAAwB,EACvB,UAA2B,EAAE;QAErC,KAAK,EAAE,CAAC;QAJD,iBAAY,GAAZ,YAAY,CAAe;QAC3B,aAAQ,GAAR,QAAQ,CAAgB;QACvB,YAAO,GAAP,OAAO,CAAsB;QAnBhC,iBAAY,GAAG,CAAC,CAAC;QAGjB,sBAAiB,GACtB,IAAI,GAAG,EAAE,CAAC;QACL,gBAAW,GAChB,IAAI,GAAG,EAAE,CAAC;QACL,aAAQ,GAA6B,EAAE,CAAC;QACxC,iBAAY,GAAuB,EAAE,CAAC;QAe3C,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QAElE,IAAA,gBAAM,EAAC,YAAY,EAAE,yBAAyB,CAAC,CAAC;QAChD,IAAA,gBAAM,EAAC,QAAQ,CAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,EAAE;YACnB,IAAA,gBAAM,EAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;SACjD;QAED,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAC3C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAEzD,IAAI,CAAC,gBAAgB,GAAG,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACtE,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;IAC5D,CAAC;IAEM,gBAAgB,CACrB,sBAA+C,EAAE;QAEjD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;QACjC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACrC,MAAM,eAAe,GAAG,CAAC,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,CAAA,CAAC;QACrD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAExE,MAAM,EACJ,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,aAAa,GACd,GAAG,IAAI,CAAC;QACT,MAAM,cAAc,GAAG,gBAAC,CAAC,KAAK,CAC5B,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,EAAE,EACpC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CACpB,CAAC;QACF,MAAM,kBAAkB,GAAG,MAAM,CAAC,YAAY,CAAC;QAC/C,MAAM,kBAAkB,GAAG,gBAAC,CAAC,KAAK,CAChC,EAAE,EACF,kBAAkB,EAClB,YAAY,EACZ,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,SAAS,CAC/B,CAAC;QAEF,uBACE,YAAY,EAAE,MAAM,CAAC,YAAY,EACjC,WAAW,EAAE,WAAW;gBACtB,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,IAAA,sBAAc,EACZ,MAAM,CAAC,OAAO,EACd,YAAY,EACZ,IAAI,EACJ,eAAe,CAAC,CAAC,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CACzD,EACL,OAAO,EAAE,CAAC,QAAgB,EAAiB,EAAE;gBAC3C,OAAO,IAAA,2BAAgB,EAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxD,CAAC,EACD,KAAK,EAAE,QAAQ,EACf,KAAK,EAAE,YAAY,EACnB,cAAc;YACd,QAAQ,EACR,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAChC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EACpC,YAAY,EACZ,cAAc,EAAE,CAAC,IAAY,EAAE,EAAE,CAC/B,IAAA,sBAAc,EACZ,MAAM,CAAC,OAAO,EACd,IAAI,EACJ,IAAI,EACJ,eAAe,CAAC,CAAC,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CACzD,EACH,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,CACpB,IAAA,cAAM,EACJ,MAAM,CAAC,SAAS,EAChB,CAAC,EACD,eAAe,CAAC,CAAC,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CACzD,EACH,YAAY,EAAZ,oBAAY;YACZ,iBAAiB,EAAjB,yBAAiB;YACjB,aAAa,EAAb,qBAAa;YACb,aAAa,EAAb,qBAAa;YACb,mBAAmB,EAAnB,2BAAmB;YACnB,uBAAuB,EAAvB,+BAAuB;YACvB,oBAAoB,EAApB,4BAAoB;YACpB,kBAAkB,EAAlB,0BAAkB;YAClB,cAAc,EAAd,sBAAc;YACd,mBAAmB,EAAnB,2BAAmB;YACnB,cAAc,EAAd,sBAAc;YACd,YAAY,EAAZ,mBAAY;YACZ,QAAQ,EAAR,iBAAQ;YACR,QAAQ,EAAR,iBAAQ;YACR,WAAW,EAAX,oBAAW;YACX,WAAW,EAAX,oBAAW;YACX,eAAe,EAAf,wBAAe;YACf,YAAY,EAAZ,qBAAY;YACZ,eAAe,EAAf,wBAAe;YACf,cAAc,EAAd,uBAAc;YACd,iBAAiB,EAAjB,0BAAiB;YACjB,kBAAkB,EAAlB,2BAAkB;YAClB,WAAW,EAAX,oBAAW;YACX,WAAW,EAAX,oBAAW;YACX,WAAW,EAAX,oBAAW;YACX,UAAU,EAAV,mBAAU;YACV,WAAW,EAAX,oBAAW;YACX,YAAY,EAAZ,qBAAY;YACZ,YAAY,EAAZ,qBAAY;YACZ,eAAe,EAAf,uBAAe;YACf,QAAQ,EAAR,gBAAQ;YACR,kBAAkB;YAClB,aAAa;YACb,oBAAoB;YACpB,aAAa,EACb,YAAY,EAAE,kBAAkB,IAC7B,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB;YAClC,CAAC,CAAC;gBACE,gBAAgB,EAAE;oBAChB,OAAO,EAAE,IAAA,qBAAa,EAAC,QAAQ,CAAC;oBAChC,cAAc,EAAE,IAAA,sCAA8B,EAC5C,QAAQ,kBAEN,QAAQ,EAAR,iBAAQ;wBACR,QAAQ,EAAR,iBAAQ;wBACR,WAAW,EAAX,oBAAW;wBACX,WAAW,EAAX,oBAAW;wBACX,eAAe,EAAf,wBAAe;wBACf,YAAY,EAAZ,qBAAY;wBACZ,eAAe,EAAf,wBAAe;wBACf,cAAc,EAAd,uBAAc;wBACd,aAAa;wBACb,oBAAoB,IACjB,aAAa,GAElB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAChC;wBACE,YAAY,EAAE,MAAM,CAAC,YAAY;wBACjC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;qBAC5C,CACF;iBACF;aACF;YACH,CAAC,CAAC,EAAE,CAAC,EACP;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACrC;QAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE7D,MAAM,kBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxE,WAAW,EAAE,8BAAmB;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAEhE,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACpC,IAAI,UAAU,EAAE;wBACd,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;4BACrB,IAAI,EAAE,UAAU,CAAC,IAAI;4BACrB,MAAM,EAAE,UAAU,CAAC,MAAM;4BACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;4BAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;yBAC9B,CAAC,CAAC;wBACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBAChC;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CACX,cAA4B,EAC5B,mBAA6C;QAE7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;QAED,MAAM,oBAAoB,GAAG,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;QAE3E,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QACjE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnD,MAAM,MAAM,GAAG,cAAc;YAC3B,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,cAAc,kBAC9C,cAAc,EAAE,oBAAoB,IACjC,aAAa,EAChB;YACJ,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,QAAQ,MAAM,kBAC3C,cAAc,EAAE,oBAAoB,IACjC,aAAa,EAChB,CAAC;QAEP,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjE,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,YAAoB;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;QACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAChD,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC;QAExE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,MAAM,QAAQ,MAAM,CAAC,CAAC;SACvC;QAED,IAAI,QAAiD,CAAC;QACtD,IAAI,cAAqD,CAAC;QAE1D,IAAI;YACF,wCAAwC;YACxC,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;SAC9C;QAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;YACvC,GAAG,CAAC,OAAO,GAAG,MAAM,YAAY,eAAe,QAAQ,WAAW,GAAG,CAAC,OAAO,EAAE,CAAC;YAChF,MAAM,GAAG,CAAC;SACX;QAED,IAAI;YACF,cAAc,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;SAC/C;QAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;YACvC,GAAG,CAAC,OAAO,GAAG,MAAM,YAAY,iBAAiB,QAAQ,WAAW,GAAG,CAAC,OAAO,EAAE,CAAC;YAClF,MAAM,GAAG,CAAC;SACX;QAED,8BAA8B;QAC9B,IAAI,YAAY,KAAK,gBAAgB,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,IAAI,sBAAoB,CAAC;aACrE;YACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBAC9B,IAAI,CAAC,oBAAoB;oBACvB,QAAQ,CAAC,oBAAoB,IAAI,6BAA2B,CAAC;aAChE;YACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,IAAI,CAAC,aAAa,mCACb,MAAM,CAAC,aAAa,GACpB,QAAQ,CAAC,aAAa,CAC1B,CAAC;aACH;SACF;QAED,IACE,IAAA,uBAAc,EAAC,QAAQ,CAAC,UAAU,CAAC;YACnC,OAAO,QAAQ,CAAC,UAAU,KAAK,QAAQ;YACvC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAC/B;YACA,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC7D;QAED,cAAc,GAAG,CACf,MAAM,kBAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;;YACtD,IAAI,OAAO,GAAG,KAAK,CAAC;YAEpB,IAAI,UAAU,CAAC,MAAM,KAAK,KAAK,EAAE;gBAC/B,OAAO,SAAS,CAAC;aAClB;YAED,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACxB,OAAO,GAAG,IAAI,CAAC;aAChB;iBAAM,IAAI,IAAA,uBAAc,EAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC9C,OAAO;oBACL,OAAO,QAAQ,CAAC,UAAU,KAAK,UAAU;wBACvC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;wBACjC,CAAC,CAAC,IAAI,CAAC;aACZ;YAED,IAAI,OAAO,EAAE;gBACX,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBACrD,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACrD,UAAU,CAAC,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAC;iBAC1C;gBAED,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC/B,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;gBAC5C,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;gBAE5C,IAAI,QAAQ,CAAC,UAAU,EAAE;oBACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;oBAEzD,IAAI,OAAO,EAAE;wBACX,UAAU,CAAC,QAAQ,GAAG,OAAO,CAAC;qBAC/B;iBACF;gBAED,IAAI,QAAQ,CAAC,OAAO,EAAE;oBACpB,UAAU;oBACV,UAAU,CAAC,QAAQ,GAAG,IAAA,kBAAW,EAC/B,UAAU,CAAC,QAAQ,EACnB,QAAQ,CAAC,kBAAkB,CAC5B,CAAC;iBACH;qBAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE;oBACtC,WAAW;oBACX,UAAU,CAAC,QAAQ,GAAG,IAAA,iBAAU,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;iBACvD;gBAED,gBAAgB;gBAChB,IAAI,QAAQ,CAAC,GAAG,EAAE;oBAChB,UAAU,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;iBAC/B;gBAED,QAAQ;gBACR,IAAI,QAAQ,CAAC,KAAK,EAAE;oBAClB,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;iBACnC;gBAED,iFAAiF;gBACjF,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,KAAI,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;oBACvD,IAAI;wBACF,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;wBACzD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;4BACtB,eAAM,CAAC,IAAI,CACT,aAAa,UAAU,CAAC,QAAQ,oBAAoB,CACrD,CAAC;4BACF,OAAO,SAAS,CAAC;yBAClB;qBACF;oBAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;wBACvC,eAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,QAAQ,cAAc,CAAC,CAAC;wBAClD,OAAO,SAAS,CAAC;qBAClB;iBACF;gBAED,IACE,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,0CAAE,eAAe;oBACpC,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,QAAQ,CAAC;oBAC1B,CAAC,oBAAY,CAAC,KAAK,EAAE,oBAAY,CAAC,YAAY,CAAC,CAAC,QAAQ,CACtD,UAAU,CAAC,IAAI,CAChB,EACD;oBACA,IAAI;wBACF,UAAU,CAAC,UAAU,GAAG,MAAM,IAAA,mBAAa,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;qBAClE;oBAAC,OAAO,GAAG,EAAE,0BAA0B,CAAC;wBACvC,eAAM,CAAC,IAAI,CACT,GAAG,UAAU,CAAC,QAAQ,mBAAmB,CAC1C,CAAC;qBACH;iBACF;gBAED,OAAO,UAAU,CAAC;aACnB;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CACH,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkC,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QAEvE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY;YACZ,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;CACF;AA5YD,4BA4YC"}
|