surgio 2.25.3 → 3.0.0-alpha.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/bin/dev +17 -0
- package/bin/dev.cmd +3 -0
- package/bin/run +8 -0
- package/bin/run.cmd +3 -0
- package/build/base-command.d.ts +18 -0
- package/build/base-command.js +74 -0
- package/build/commands/check.d.ts +10 -0
- package/build/commands/check.js +88 -0
- package/build/commands/clean-cache.d.ts +6 -0
- package/build/commands/clean-cache.js +29 -0
- package/build/commands/doctor.d.ts +6 -0
- package/build/commands/doctor.js +21 -0
- package/build/commands/generate.d.ts +7 -0
- package/build/commands/generate.js +93 -0
- package/build/commands/lint.d.ts +6 -0
- package/build/commands/lint.js +36 -0
- package/build/commands/new.d.ts +6 -0
- package/build/commands/new.js +36 -0
- package/build/commands/subscriptions.d.ts +7 -0
- package/build/commands/subscriptions.js +96 -0
- package/build/commands/upload.d.ts +6 -0
- package/build/commands/upload.js +87 -0
- package/build/config.d.ts +6 -0
- package/build/config.js +151 -0
- package/build/constant/constant.d.ts +17 -16
- package/build/constant/constant.js +3 -2
- package/build/constant/env.js +1 -1
- package/build/constant/error.js +1 -1
- package/build/constant/index.js +1 -1
- package/build/generate.d.ts +0 -1
- package/build/generate.js +3 -65
- package/build/generator/artifact.d.ts +299 -64
- package/build/generator/artifact.js +90 -92
- package/build/generator/index.d.ts +2 -0
- package/build/generator/index.js +19 -0
- package/build/generator/template.js +2 -6
- package/build/hooks/init.d.ts +3 -0
- package/build/hooks/init.js +32 -0
- package/build/index.d.ts +55 -53
- package/build/index.js +13 -51
- package/build/internal.d.ts +4 -0
- package/build/internal.js +21 -0
- package/build/misc/deprecation.d.ts +1 -6
- package/build/misc/deprecation.js +1 -8
- package/build/misc/flag_cn.js +1 -1
- package/build/provider/BlackSSLProvider.d.ts +4 -3
- package/build/provider/BlackSSLProvider.js +24 -16
- package/build/provider/ClashProvider.d.ts +7 -10
- package/build/provider/ClashProvider.js +165 -76
- package/build/provider/CustomProvider.d.ts +4 -3
- package/build/provider/CustomProvider.js +81 -50
- package/build/provider/Provider.d.ts +9 -22
- package/build/provider/Provider.js +31 -69
- package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +4 -5
- package/build/provider/ShadowsocksJsonSubscribeProvider.js +27 -21
- package/build/provider/ShadowsocksSubscribeProvider.d.ts +5 -8
- package/build/provider/ShadowsocksSubscribeProvider.js +30 -27
- package/build/provider/ShadowsocksrSubscribeProvider.d.ts +5 -8
- package/build/provider/ShadowsocksrSubscribeProvider.js +30 -23
- package/build/provider/SsdProvider.d.ts +5 -8
- package/build/provider/SsdProvider.js +56 -39
- package/build/provider/TrojanProvider.d.ts +5 -8
- package/build/provider/TrojanProvider.js +37 -30
- package/build/provider/V2rayNSubscribeProvider.d.ts +4 -5
- package/build/provider/V2rayNSubscribeProvider.js +61 -33
- package/build/provider/index.d.ts +16 -2
- package/build/provider/index.js +12 -5
- package/build/provider/types.d.ts +10 -1
- package/build/provider/types.js +1 -1
- package/build/redis.js +1 -1
- package/build/types.d.ts +45 -236
- package/build/types.js +2 -1
- package/build/utils/cache.js +29 -27
- package/build/utils/clash.d.ts +204 -3
- package/build/utils/clash.js +247 -110
- package/build/utils/configurables.d.ts +71 -0
- package/build/utils/configurables.js +8 -0
- package/build/utils/constant.js +1 -1
- package/build/utils/dns.js +1 -1
- package/build/utils/doctor.d.ts +2 -0
- package/build/utils/doctor.js +38 -0
- package/build/utils/env-flag.js +2 -2
- package/build/utils/error-helper.d.ts +2 -2
- package/build/utils/error-helper.js +30 -16
- package/build/utils/filter.d.ts +46 -43
- package/build/utils/filter.js +51 -30
- package/build/utils/flag.js +1 -1
- package/build/utils/http-client.js +38 -5
- package/build/utils/index.d.ts +13 -21
- package/build/utils/index.js +98 -117
- package/build/utils/linter.js +5 -2
- package/build/utils/loon.d.ts +3 -2
- package/build/utils/loon.js +67 -5
- package/build/utils/quantumult.d.ts +3 -3
- package/build/utils/quantumult.js +190 -258
- package/build/utils/relayable-url.js +1 -1
- package/build/utils/remote-snippet.js +3 -4
- package/build/utils/ss.js +27 -17
- package/build/utils/ssr.js +3 -4
- package/build/utils/subscription.js +7 -7
- package/build/utils/surfboard.d.ts +3 -2
- package/build/utils/surfboard.js +142 -126
- package/build/utils/surge.d.ts +4 -2
- package/build/utils/surge.js +328 -300
- package/build/utils/time.d.ts +1 -0
- package/build/utils/time.js +6 -0
- package/build/utils/tmp-helper.js +8 -1
- package/build/utils/trojan.js +19 -11
- package/build/utils/v2ray.js +2 -2
- package/build/validators/artifact.d.ts +35 -0
- package/build/validators/artifact.js +17 -0
- package/build/validators/common.d.ts +121 -0
- package/build/validators/common.js +52 -0
- package/build/validators/filter.d.ts +10 -0
- package/build/validators/filter.js +15 -0
- package/build/validators/hooks.d.ts +7 -0
- package/build/validators/hooks.js +8 -0
- package/build/validators/http.d.ts +137 -0
- package/build/validators/http.js +19 -0
- package/build/validators/index.d.ts +15 -0
- package/build/validators/index.js +32 -0
- package/build/validators/provider.d.ts +109 -0
- package/build/validators/provider.js +41 -0
- package/build/validators/shadowsocks.d.ts +86 -0
- package/build/validators/shadowsocks.js +29 -0
- package/build/validators/shadowsocksr.d.ts +77 -0
- package/build/validators/shadowsocksr.js +19 -0
- package/build/validators/snell.d.ts +71 -0
- package/build/validators/snell.js +20 -0
- package/build/validators/socks5.d.ts +77 -0
- package/build/validators/socks5.js +19 -0
- package/build/validators/surgio-config.d.ts +307 -0
- package/build/validators/surgio-config.js +95 -0
- package/build/validators/trojan.d.ts +86 -0
- package/build/validators/trojan.js +15 -0
- package/build/validators/tuic.d.ts +301 -0
- package/build/validators/tuic.js +21 -0
- package/build/validators/vmess.d.ts +92 -0
- package/build/validators/vmess.js +29 -0
- package/build/validators/wireguard.d.ts +123 -0
- package/build/validators/wireguard.js +26 -0
- package/config.d.ts +1 -0
- package/config.js +1 -0
- package/constant.d.ts +1 -0
- package/constant.js +1 -0
- package/generator.d.ts +1 -0
- package/generator.js +1 -0
- package/hygen-template/artifact/new/index.js +15 -15
- package/hygen-template/provider/new/index.js +8 -7
- package/hygen-template/template/new/index.js +3 -3
- package/index.d.ts +1 -0
- package/index.js +1 -0
- package/internal.d.ts +1 -0
- package/internal.js +1 -0
- package/package.json +112 -75
- package/provider.d.ts +1 -0
- package/provider.js +1 -0
- package/utils.d.ts +1 -0
- package/utils.js +1 -0
- package/bin/surgio.js +0 -8
- package/build/command/check.d.ts +0 -9
- package/build/command/check.js +0 -79
- package/build/command/clean-cache.d.ts +0 -8
- package/build/command/clean-cache.js +0 -43
- package/build/command/doctor.d.ts +0 -9
- package/build/command/doctor.js +0 -63
- package/build/command/generate.d.ts +0 -8
- package/build/command/generate.js +0 -64
- package/build/command/lint.d.ts +0 -7
- package/build/command/lint.js +0 -42
- package/build/command/new.d.ts +0 -7
- package/build/command/new.js +0 -44
- package/build/command/subscriptions.d.ts +0 -10
- package/build/command/subscriptions.js +0 -87
- package/build/command/upload.d.ts +0 -9
- package/build/command/upload.js +0 -101
- package/build/utils/command.d.ts +0 -2
- package/build/utils/command.js +0 -23
- package/build/utils/config.d.ts +0 -6
- package/build/utils/config.js +0 -245
- package/build/utils/patch-proxy.d.ts +0 -1
- package/build/utils/patch-proxy.js +0 -19
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
'use strict'
|
|
1
|
+
'use strict'
|
|
2
2
|
|
|
3
|
-
const { basename } = require('path')
|
|
4
|
-
const { promises: fsp } = require('fs')
|
|
5
|
-
const _ = require('lodash')
|
|
3
|
+
const { basename } = require('path')
|
|
4
|
+
const { promises: fsp } = require('fs')
|
|
5
|
+
const _ = require('lodash')
|
|
6
6
|
|
|
7
|
-
const
|
|
7
|
+
const internal = require('../../../build/internal')
|
|
8
8
|
|
|
9
9
|
module.exports = {
|
|
10
10
|
prompt: ({ prompter: inquirer }) => {
|
|
11
|
-
const config = loadConfig(process.cwd()
|
|
11
|
+
const config = internal.config.loadConfig(process.cwd())
|
|
12
12
|
|
|
13
13
|
return inquirer.prompt([
|
|
14
14
|
{
|
|
@@ -22,12 +22,12 @@ module.exports = {
|
|
|
22
22
|
name: 'provider',
|
|
23
23
|
message: 'Provider 名称',
|
|
24
24
|
choices: async () => {
|
|
25
|
-
const files = await listFolder(config.providerDir)
|
|
25
|
+
const files = await listFolder(config.providerDir)
|
|
26
26
|
|
|
27
27
|
return _.chain(files)
|
|
28
28
|
.filter((item) => item.endsWith('js'))
|
|
29
29
|
.map((item) => basename(item, '.js'))
|
|
30
|
-
.value()
|
|
30
|
+
.value()
|
|
31
31
|
},
|
|
32
32
|
},
|
|
33
33
|
{
|
|
@@ -35,12 +35,12 @@ module.exports = {
|
|
|
35
35
|
name: 'template',
|
|
36
36
|
message: 'Template 名称',
|
|
37
37
|
choices: async () => {
|
|
38
|
-
const files = await listFolder(config.templateDir)
|
|
38
|
+
const files = await listFolder(config.templateDir)
|
|
39
39
|
|
|
40
40
|
return _.chain(files)
|
|
41
41
|
.filter((item) => item.endsWith('tpl'))
|
|
42
42
|
.map((item) => basename(item, '.tpl'))
|
|
43
|
-
.value()
|
|
43
|
+
.value()
|
|
44
44
|
},
|
|
45
45
|
},
|
|
46
46
|
{
|
|
@@ -48,21 +48,21 @@ module.exports = {
|
|
|
48
48
|
name: 'combineProviders',
|
|
49
49
|
message: '是否合并其它 Provider(不合并直接回车跳过)',
|
|
50
50
|
choices: async (results) => {
|
|
51
|
-
const files = await listFolder(config.providerDir)
|
|
51
|
+
const files = await listFolder(config.providerDir)
|
|
52
52
|
|
|
53
53
|
return _.chain(files)
|
|
54
54
|
.filter((item) => item.endsWith('js'))
|
|
55
55
|
.map((item) => basename(item, '.js'))
|
|
56
56
|
.filter((item) => item !== results.provider)
|
|
57
|
-
.value()
|
|
57
|
+
.value()
|
|
58
58
|
},
|
|
59
59
|
},
|
|
60
|
-
])
|
|
60
|
+
])
|
|
61
61
|
},
|
|
62
|
-
}
|
|
62
|
+
}
|
|
63
63
|
|
|
64
64
|
function listFolder(f) {
|
|
65
65
|
return fsp.readdir(f, {
|
|
66
66
|
encoding: 'utf8',
|
|
67
|
-
})
|
|
67
|
+
})
|
|
68
68
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
'use strict'
|
|
1
|
+
'use strict'
|
|
2
2
|
|
|
3
|
-
const {
|
|
3
|
+
const { types } = require('../../../build/internal')
|
|
4
|
+
const { SupportProviderEnum } = types
|
|
4
5
|
|
|
5
6
|
module.exports = {
|
|
6
7
|
prompt: ({ prompter: inquirer }) => {
|
|
@@ -30,7 +31,7 @@ module.exports = {
|
|
|
30
31
|
SupportProviderEnum.ShadowsocksrSubscribe,
|
|
31
32
|
SupportProviderEnum.ShadowsocksSubscribe,
|
|
32
33
|
SupportProviderEnum.Trojan,
|
|
33
|
-
].includes(results.type)
|
|
34
|
+
].includes(results.type)
|
|
34
35
|
},
|
|
35
36
|
validate: (str) => /^https?:\/{2}/.test(str),
|
|
36
37
|
},
|
|
@@ -51,7 +52,7 @@ module.exports = {
|
|
|
51
52
|
SupportProviderEnum.ShadowsocksrSubscribe,
|
|
52
53
|
SupportProviderEnum.ShadowsocksSubscribe,
|
|
53
54
|
SupportProviderEnum.Trojan,
|
|
54
|
-
].includes(results.type)
|
|
55
|
+
].includes(results.type)
|
|
55
56
|
},
|
|
56
57
|
},
|
|
57
58
|
{
|
|
@@ -67,9 +68,9 @@ module.exports = {
|
|
|
67
68
|
SupportProviderEnum.ShadowsocksrSubscribe,
|
|
68
69
|
SupportProviderEnum.ShadowsocksSubscribe,
|
|
69
70
|
SupportProviderEnum.Trojan,
|
|
70
|
-
].includes(results.type)
|
|
71
|
+
].includes(results.type)
|
|
71
72
|
},
|
|
72
73
|
},
|
|
73
|
-
])
|
|
74
|
+
])
|
|
74
75
|
},
|
|
75
|
-
}
|
|
76
|
+
}
|
package/index.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './build/index'
|
package/index.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
module.exports = require('./build/index.js')
|
package/internal.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './build/internal'
|
package/internal.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
module.exports = require('./build/internal.js')
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "surgio",
|
|
3
3
|
"description": "Generating rules for Surge, Clash, Quantumult like a PRO",
|
|
4
|
-
"version": "
|
|
5
|
-
"main": "build/index.js",
|
|
6
|
-
"
|
|
4
|
+
"version": "3.0.0-alpha.0",
|
|
5
|
+
"main": "./build/index.js",
|
|
6
|
+
"types": "./build/index.d.ts",
|
|
7
7
|
"bin": {
|
|
8
|
-
"surgio": "bin/
|
|
8
|
+
"surgio": "bin/run"
|
|
9
9
|
},
|
|
10
10
|
"repository": "https://github.com/geekdada/surgio",
|
|
11
11
|
"author": "Yihang Li <me@royli.dev>",
|
|
@@ -13,121 +13,158 @@
|
|
|
13
13
|
"files": [
|
|
14
14
|
"bin",
|
|
15
15
|
"build",
|
|
16
|
-
"hygen-template"
|
|
16
|
+
"hygen-template",
|
|
17
|
+
"index.js",
|
|
18
|
+
"index.d.ts",
|
|
19
|
+
"internal.js",
|
|
20
|
+
"internal.d.ts",
|
|
21
|
+
"generator.js",
|
|
22
|
+
"generator.d.ts",
|
|
23
|
+
"provider.js",
|
|
24
|
+
"provider.d.ts",
|
|
25
|
+
"constant.js",
|
|
26
|
+
"constant.d.ts",
|
|
27
|
+
"utils.js",
|
|
28
|
+
"utils.d.ts",
|
|
29
|
+
"config.js",
|
|
30
|
+
"config.d.ts"
|
|
17
31
|
],
|
|
18
32
|
"bugs": {
|
|
19
33
|
"url": "https://github.com/geekdada/surgio/issues"
|
|
20
34
|
},
|
|
21
35
|
"homepage": "https://surgio.royli.dev",
|
|
22
36
|
"scripts": {
|
|
23
|
-
"dev": "run
|
|
24
|
-
"test": "run-s test:*",
|
|
37
|
+
"dev": "npm run build -- --watch",
|
|
38
|
+
"test": "run-s build test:*",
|
|
39
|
+
"test:types": "tsc --noEmit",
|
|
25
40
|
"test:lint": "eslint -c .eslintrc.js --ext .js,.ts .",
|
|
26
|
-
"test:unit": "
|
|
27
|
-
"
|
|
41
|
+
"test:unit": "ava",
|
|
42
|
+
"test:cli": "mocha",
|
|
43
|
+
"coverage": "TS_NODE_FILES=true nyc ava",
|
|
28
44
|
"clean": "rimraf build",
|
|
29
|
-
"build": "
|
|
30
|
-
"prepublishOnly": "run
|
|
45
|
+
"build": "tsc -p tsconfig.build.json",
|
|
46
|
+
"prepublishOnly": "npm run clean && npm run build",
|
|
31
47
|
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
|
|
32
|
-
"pub": "np --no-cleanup",
|
|
33
|
-
"version": "npm run changelog && git add .",
|
|
34
48
|
"prepare": "husky install",
|
|
35
49
|
"docs:dev": "vuepress dev docs",
|
|
36
50
|
"docs:build": "vuepress build docs"
|
|
37
51
|
},
|
|
52
|
+
"oclif": {
|
|
53
|
+
"bin": "surgio",
|
|
54
|
+
"dirname": "surgio",
|
|
55
|
+
"commands": "./build/commands",
|
|
56
|
+
"plugins": [
|
|
57
|
+
"@oclif/plugin-help",
|
|
58
|
+
"@oclif/plugin-plugins"
|
|
59
|
+
],
|
|
60
|
+
"hooks": {
|
|
61
|
+
"init": [
|
|
62
|
+
"./build/hooks/init"
|
|
63
|
+
],
|
|
64
|
+
"prerun": [],
|
|
65
|
+
"postrun": []
|
|
66
|
+
},
|
|
67
|
+
"topicSeparator": " ",
|
|
68
|
+
"topics": {}
|
|
69
|
+
},
|
|
38
70
|
"dependencies": {
|
|
71
|
+
"@brillout/import": "^0.2.3",
|
|
72
|
+
"@oclif/core": "^2.8.5",
|
|
73
|
+
"@oclif/plugin-help": "^5.2.9",
|
|
74
|
+
"@oclif/plugin-plugins": "^2.4.7",
|
|
39
75
|
"@royli/hygen": "^6.2.0",
|
|
40
|
-
"@surgio/eslint-config-surgio": "^1.0.
|
|
41
|
-
"@surgio/logger": "^1.2.
|
|
42
|
-
"@types/eslint": "^
|
|
43
|
-
"agentkeepalive": "^4.
|
|
76
|
+
"@surgio/eslint-config-surgio": "^1.0.5",
|
|
77
|
+
"@surgio/logger": "^1.2.1",
|
|
78
|
+
"@types/eslint": "^8.40.0",
|
|
79
|
+
"agentkeepalive": "^4.3.0",
|
|
44
80
|
"ali-oss": "^6.17.1",
|
|
45
81
|
"bluebird": "^3.7.2",
|
|
46
82
|
"bytes": "^3.1.2",
|
|
47
83
|
"chalk": "^4.1.2",
|
|
48
84
|
"change-case": "^4.1.2",
|
|
49
85
|
"check-node-version": "^4.2.1",
|
|
50
|
-
"
|
|
51
|
-
"cross-env": "^7.0.3",
|
|
52
|
-
"date-fns": "^2.29.3",
|
|
86
|
+
"date-fns": "^2.30.0",
|
|
53
87
|
"detect-newline": "^3.1.0",
|
|
88
|
+
"dotenv": "^16.1.2",
|
|
54
89
|
"emoji-regex": "^10.2.1",
|
|
55
|
-
"
|
|
56
|
-
"eslint": "^7.32.0",
|
|
90
|
+
"eslint": "^8.41.0",
|
|
57
91
|
"espree": "^7.3.1",
|
|
58
92
|
"execa": "^4.1.0",
|
|
59
|
-
"filesize": "^
|
|
60
|
-
"fs-extra": "^
|
|
61
|
-
"
|
|
62
|
-
"
|
|
63
|
-
"
|
|
64
|
-
"
|
|
65
|
-
"ioredis": "^5.2.3",
|
|
66
|
-
"joi": "^17.6.3",
|
|
67
|
-
"listr": "^0.14.3",
|
|
93
|
+
"filesize": "^10.0.7",
|
|
94
|
+
"fs-extra": "^11.1.1",
|
|
95
|
+
"got": "^11.8.6",
|
|
96
|
+
"hpagent": "^1.2.0",
|
|
97
|
+
"inquirer": "^8.2.5",
|
|
98
|
+
"ioredis": "^5.3.2",
|
|
68
99
|
"lodash": "^4.17.21",
|
|
69
100
|
"micromatch": "^4.0.5",
|
|
70
101
|
"ms": "^2.1.3",
|
|
71
102
|
"node-cache": "^5.1.2",
|
|
72
103
|
"node-dir": "^0.1.17",
|
|
73
|
-
"nunjucks": "^3.2.
|
|
104
|
+
"nunjucks": "^3.2.4",
|
|
74
105
|
"ora": "^5.4.1",
|
|
75
|
-
"query-string": "^7.1.
|
|
76
|
-
"rimraf": "^
|
|
106
|
+
"query-string": "^7.1.3",
|
|
107
|
+
"rimraf": "^4.4.1",
|
|
77
108
|
"source-map-support": "^0.5.21",
|
|
78
|
-
"type-fest": "^3.1
|
|
109
|
+
"type-fest": "^3.11.1",
|
|
79
110
|
"update-notifier": "^5.1.0",
|
|
80
111
|
"urlsafe-base64": "^1.0.0",
|
|
81
|
-
"yaml": "^
|
|
112
|
+
"yaml": "^2.3.1",
|
|
113
|
+
"zod": "^3.21.4",
|
|
114
|
+
"zod-validation-error": "^1.3.0"
|
|
82
115
|
},
|
|
83
116
|
"devDependencies": {
|
|
84
|
-
"@algolia/client-search": "^4.
|
|
85
|
-
"@commitlint/cli": "^17.
|
|
86
|
-
"@commitlint/config-angular": "^17.
|
|
117
|
+
"@algolia/client-search": "^4.17.1",
|
|
118
|
+
"@commitlint/cli": "^17.6.5",
|
|
119
|
+
"@commitlint/config-angular": "^17.6.5",
|
|
87
120
|
"@istanbuljs/nyc-config-typescript": "^1.0.2",
|
|
88
|
-
"@
|
|
121
|
+
"@oclif/test": "^2.3.21",
|
|
122
|
+
"@types/bluebird": "^3.5.38",
|
|
89
123
|
"@types/bytes": "^3.1.1",
|
|
90
|
-
"@types/
|
|
91
|
-
"@types/
|
|
92
|
-
"@types/
|
|
93
|
-
"@types/inquirer": "^
|
|
94
|
-
"@types/
|
|
95
|
-
"@types/lodash": "^4.14.
|
|
96
|
-
"@types/
|
|
97
|
-
"@types/
|
|
98
|
-
"@types/
|
|
124
|
+
"@types/chai": "^4.3.5",
|
|
125
|
+
"@types/debug": "^4.1.8",
|
|
126
|
+
"@types/fs-extra": "^11.0.1",
|
|
127
|
+
"@types/inquirer": "^8.2.6",
|
|
128
|
+
"@types/ioredis-mock": "^8.2.2",
|
|
129
|
+
"@types/lodash": "^4.14.195",
|
|
130
|
+
"@types/mocha": "^10.0.1",
|
|
131
|
+
"@types/node": "^16.18.34",
|
|
132
|
+
"@types/nunjucks": "^3.2.2",
|
|
133
|
+
"@types/sinon": "^10.0.15",
|
|
99
134
|
"@types/urlsafe-base64": "^1.0.28",
|
|
100
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
101
|
-
"@typescript-eslint/parser": "^5.
|
|
102
|
-
"@vuepress/client": "2.0.0-beta.
|
|
103
|
-
"@vuepress/plugin-docsearch": "2.0.0-beta.
|
|
104
|
-
"@vuepress/plugin-google-analytics": "2.0.0-beta.
|
|
105
|
-
"@vuepress/plugin-register-components": "2.0.0-beta.
|
|
106
|
-
"@vuepress/theme-default": "2.0.0-beta.
|
|
107
|
-
"@vuepress/utils": "2.0.0-beta.
|
|
108
|
-
"ava": "^
|
|
135
|
+
"@typescript-eslint/eslint-plugin": "^5.59.8",
|
|
136
|
+
"@typescript-eslint/parser": "^5.59.8",
|
|
137
|
+
"@vuepress/client": "2.0.0-beta.62",
|
|
138
|
+
"@vuepress/plugin-docsearch": "2.0.0-beta.62",
|
|
139
|
+
"@vuepress/plugin-google-analytics": "2.0.0-beta.62",
|
|
140
|
+
"@vuepress/plugin-register-components": "2.0.0-beta.62",
|
|
141
|
+
"@vuepress/theme-default": "2.0.0-beta.62",
|
|
142
|
+
"@vuepress/utils": "2.0.0-beta.62",
|
|
143
|
+
"ava": "^5.3.0",
|
|
109
144
|
"benchmark": "^2.1.4",
|
|
110
|
-
"
|
|
145
|
+
"bumpp": "^9.1.0",
|
|
146
|
+
"chai": "^4.3.7",
|
|
147
|
+
"chai-jest-snapshot": "^2.0.0",
|
|
111
148
|
"conventional-changelog-cli": "^2.2.2",
|
|
112
|
-
"eslint-config-prettier": "^8.
|
|
149
|
+
"eslint-config-prettier": "^8.8.0",
|
|
113
150
|
"eslint-plugin-prettier": "^4.2.1",
|
|
114
|
-
"husky": "^8.0.
|
|
151
|
+
"husky": "^8.0.3",
|
|
115
152
|
"ini": "^3.0.1",
|
|
116
|
-
"ioredis-mock": "^8.
|
|
117
|
-
"lint-staged": "^13.
|
|
118
|
-
"
|
|
153
|
+
"ioredis-mock": "^8.7.0",
|
|
154
|
+
"lint-staged": "^13.2.2",
|
|
155
|
+
"mocha": "^10.2.0",
|
|
156
|
+
"nock": "^13.3.1",
|
|
119
157
|
"np": "^6.5.0",
|
|
120
158
|
"npm-debug-log-cleaner": "^1.0.3",
|
|
121
159
|
"npm-run-all": "^4.1.5",
|
|
122
160
|
"nyc": "^15.1.0",
|
|
123
|
-
"prettier": "^2.
|
|
124
|
-
"sass": "^1.
|
|
125
|
-
"sinon": "^
|
|
161
|
+
"prettier": "^2.8.8",
|
|
162
|
+
"sass": "^1.62.1",
|
|
163
|
+
"sinon": "^15.1.0",
|
|
126
164
|
"ts-node": "^10.9.1",
|
|
127
|
-
"typescript": "^
|
|
128
|
-
"
|
|
129
|
-
"vuepress": "2.0.0-beta.
|
|
130
|
-
"vuepress-plugin-sitemap2": "2.0.0-beta.110"
|
|
165
|
+
"typescript": "^5.0.4",
|
|
166
|
+
"vuepress": "2.0.0-beta.62",
|
|
167
|
+
"vuepress-plugin-sitemap2": "2.0.0-beta.205"
|
|
131
168
|
},
|
|
132
169
|
"ava": {
|
|
133
170
|
"failFast": false,
|
|
@@ -137,12 +174,12 @@
|
|
|
137
174
|
"js"
|
|
138
175
|
],
|
|
139
176
|
"files": [
|
|
140
|
-
"test/**/*.test.ts",
|
|
141
|
-
"
|
|
177
|
+
"./test/**/*.test.ts",
|
|
178
|
+
"./src/**/*.test.ts"
|
|
142
179
|
],
|
|
143
180
|
"require": [
|
|
144
181
|
"ts-node/register",
|
|
145
|
-
"./test/stub-axios.js"
|
|
182
|
+
"./test/helpers/stub-axios.js"
|
|
146
183
|
]
|
|
147
184
|
},
|
|
148
185
|
"nyc": {
|
|
@@ -154,7 +191,7 @@
|
|
|
154
191
|
]
|
|
155
192
|
},
|
|
156
193
|
"engines": {
|
|
157
|
-
"node": ">=
|
|
194
|
+
"node": ">=16.9.0"
|
|
158
195
|
},
|
|
159
196
|
"lint-staged": {
|
|
160
197
|
"*.js": "eslint",
|
package/provider.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './build/provider'
|
package/provider.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
module.exports = require('./build/provider')
|
package/utils.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './build/utils'
|
package/utils.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
module.exports = require('./build/utils')
|
package/bin/surgio.js
DELETED
package/build/command/check.d.ts
DELETED
package/build/command/check.js
DELETED
|
@@ -1,79 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
// istanbul ignore file
|
|
6
|
-
const assert_1 = __importDefault(require("assert"));
|
|
7
|
-
const common_bin_1 = __importDefault(require("common-bin"));
|
|
8
|
-
const fs_1 = __importDefault(require("fs"));
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const listr_1 = __importDefault(require("listr"));
|
|
11
|
-
const inquirer_1 = __importDefault(require("inquirer"));
|
|
12
|
-
const redis_1 = __importDefault(require("../redis"));
|
|
13
|
-
const command_1 = require("../utils/command");
|
|
14
|
-
const config_1 = require("../utils/config");
|
|
15
|
-
const provider_1 = require("../provider");
|
|
16
|
-
const error_helper_1 = require("../utils/error-helper");
|
|
17
|
-
class CheckCommand extends common_bin_1.default {
|
|
18
|
-
constructor(rawArgv) {
|
|
19
|
-
super(rawArgv);
|
|
20
|
-
this.usage = '使用方法: surgio check [provider]';
|
|
21
|
-
(0, command_1.defineGlobalOptions)(this.yargs);
|
|
22
|
-
}
|
|
23
|
-
async run(ctx) {
|
|
24
|
-
(0, config_1.loadConfig)(ctx.cwd, ctx.argv.config);
|
|
25
|
-
const tasks = this.getTasks();
|
|
26
|
-
const tasksResult = await tasks.run({
|
|
27
|
-
cmdCtx: ctx,
|
|
28
|
-
});
|
|
29
|
-
const { nodeList } = tasksResult;
|
|
30
|
-
if (!process.stdin.isTTY) {
|
|
31
|
-
console.log(JSON.stringify(nodeList, null, 2));
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
const answers = await inquirer_1.default.prompt([
|
|
35
|
-
{
|
|
36
|
-
type: 'list',
|
|
37
|
-
name: 'node',
|
|
38
|
-
message: '请选择节点',
|
|
39
|
-
choices: nodeList.map((node) => ({
|
|
40
|
-
name: `${node.nodeName} - ${node.hostname}:${node.port}`,
|
|
41
|
-
value: node,
|
|
42
|
-
})),
|
|
43
|
-
},
|
|
44
|
-
]);
|
|
45
|
-
console.log(JSON.stringify(answers.node, null, 2));
|
|
46
|
-
await redis_1.default.destroyRedis();
|
|
47
|
-
}
|
|
48
|
-
get description() {
|
|
49
|
-
return '查询 Provider';
|
|
50
|
-
}
|
|
51
|
-
// istanbul ignore next
|
|
52
|
-
errorHandler(err) {
|
|
53
|
-
error_helper_1.errorHandler.call(this, err);
|
|
54
|
-
}
|
|
55
|
-
getTasks() {
|
|
56
|
-
return new listr_1.default([
|
|
57
|
-
{
|
|
58
|
-
title: '获取 Provider 信息',
|
|
59
|
-
task: async (ctx) => {
|
|
60
|
-
const { cmdCtx } = ctx;
|
|
61
|
-
(0, assert_1.default)(cmdCtx.argv._[0], '没有指定 Provider');
|
|
62
|
-
const providerName = cmdCtx.argv._[0];
|
|
63
|
-
const config = (0, config_1.getConfig)();
|
|
64
|
-
const filePath = path_1.default.resolve(config.providerDir, `./${providerName}.js`);
|
|
65
|
-
const file = fs_1.default.existsSync(filePath)
|
|
66
|
-
? require(filePath)
|
|
67
|
-
: new Error('找不到该 Provider');
|
|
68
|
-
if (file instanceof Error) {
|
|
69
|
-
throw file;
|
|
70
|
-
}
|
|
71
|
-
const provider = await (0, provider_1.getProvider)(providerName, file);
|
|
72
|
-
ctx.nodeList = await provider.getNodeList();
|
|
73
|
-
},
|
|
74
|
-
},
|
|
75
|
-
]);
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
module.exports = CheckCommand;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvY29tbWFuZC9jaGVjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsdUJBQXVCO0FBQ3ZCLG9EQUE0QjtBQUM1Qiw0REFBOEM7QUFDOUMsNENBQW9CO0FBQ3BCLGdEQUF3QjtBQUN4QixrREFBMEI7QUFDMUIsd0RBQWdDO0FBRWhDLHFEQUE2QjtBQUU3Qiw4Q0FBdUQ7QUFDdkQsNENBQXdEO0FBQ3hELDBDQUEwQztBQUMxQyx3REFBcUQ7QUFFckQsTUFBTSxZQUFhLFNBQVEsb0JBQU87SUFDaEMsWUFBWSxPQUFrQjtRQUM1QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLCtCQUErQixDQUFDO1FBRTdDLElBQUEsNkJBQW1CLEVBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFTSxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUc7UUFDbEIsSUFBQSxtQkFBVSxFQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUVyQyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUIsTUFBTSxXQUFXLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxDQUFDO1lBQ2xDLE1BQU0sRUFBRSxHQUFHO1NBQ1osQ0FBQyxDQUFDO1FBQ0gsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLFdBQVcsQ0FBQztRQUVqQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUU7WUFDeEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMvQyxPQUFPO1NBQ1I7UUFFRCxNQUFNLE9BQU8sR0FBRyxNQUFNLGtCQUFRLENBQUMsTUFBTSxDQUFDO1lBQ3BDO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLElBQUksRUFBRSxNQUFNO2dCQUNaLE9BQU8sRUFBRSxPQUFPO2dCQUNoQixPQUFPLEVBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztvQkFDL0IsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDLFFBQVEsTUFBTSxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxJQUFJLEVBQUU7b0JBQ3hELEtBQUssRUFBRSxJQUFJO2lCQUNaLENBQUMsQ0FBQzthQUNKO1NBQ0YsQ0FBQyxDQUFDO1FBRUgsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFbkQsTUFBTSxlQUFLLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVELElBQVcsV0FBVztRQUNwQixPQUFPLGFBQWEsQ0FBQztJQUN2QixDQUFDO0lBRUQsdUJBQXVCO0lBQ2hCLFlBQVksQ0FBQyxHQUFHO1FBQ3JCLDJCQUFZLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRU8sUUFBUTtRQUNkLE9BQU8sSUFBSSxlQUFLLENBR2I7WUFDRDtnQkFDRSxLQUFLLEVBQUUsZ0JBQWdCO2dCQUN2QixJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUNsQixNQUFNLEVBQUUsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDO29CQUV2QixJQUFBLGdCQUFNLEVBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsZUFBZSxDQUFDLENBQUM7b0JBRTFDLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUN0QyxNQUFNLE1BQU0sR0FBRyxJQUFBLGtCQUFTLEdBQUUsQ0FBQztvQkFDM0IsTUFBTSxRQUFRLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FDM0IsTUFBTSxDQUFDLFdBQVcsRUFDbEIsS0FBSyxZQUFZLEtBQUssQ0FDdkIsQ0FBQztvQkFDRixNQUFNLElBQUksR0FBZ0IsWUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUM7d0JBQy9DLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDO3dCQUNuQixDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7b0JBRS9CLElBQUksSUFBSSxZQUFZLEtBQUssRUFBRTt3QkFDekIsTUFBTSxJQUFJLENBQUM7cUJBQ1o7b0JBRUQsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLHNCQUFXLEVBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO29CQUV2RCxHQUFHLENBQUMsUUFBUSxHQUFHLE1BQU0sUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDO2dCQUM5QyxDQUFDO2FBQ0Y7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFFRCxpQkFBUyxZQUFZLENBQUMifQ==
|
|
@@ -1,43 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
// istanbul ignore file
|
|
6
|
-
const common_bin_1 = __importDefault(require("common-bin"));
|
|
7
|
-
const os_1 = __importDefault(require("os"));
|
|
8
|
-
const path_1 = __importDefault(require("path"));
|
|
9
|
-
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
10
|
-
const logger_1 = require("@surgio/logger");
|
|
11
|
-
const constant_1 = require("../constant");
|
|
12
|
-
const redis_1 = __importDefault(require("../redis"));
|
|
13
|
-
const cache_1 = require("../utils/cache");
|
|
14
|
-
const command_1 = require("../utils/command");
|
|
15
|
-
const config_1 = require("../utils/config");
|
|
16
|
-
const error_helper_1 = require("../utils/error-helper");
|
|
17
|
-
class CleanCacheCommand extends common_bin_1.default {
|
|
18
|
-
constructor(rawArgv) {
|
|
19
|
-
super(rawArgv);
|
|
20
|
-
this.usage = '使用方法: surgio clean-cache';
|
|
21
|
-
(0, command_1.defineGlobalOptions)(this.yargs);
|
|
22
|
-
}
|
|
23
|
-
// istanbul ignore next
|
|
24
|
-
get description() {
|
|
25
|
-
return '清除缓存';
|
|
26
|
-
}
|
|
27
|
-
async run(ctx) {
|
|
28
|
-
const tmpDir = path_1.default.join(os_1.default.tmpdir(), constant_1.TMP_FOLDER_NAME);
|
|
29
|
-
(0, config_1.loadConfig)(ctx.cwd, ctx.argv.config);
|
|
30
|
-
if (fs_extra_1.default.existsSync(tmpDir)) {
|
|
31
|
-
await fs_extra_1.default.remove(tmpDir);
|
|
32
|
-
}
|
|
33
|
-
await (0, cache_1.cleanCaches)();
|
|
34
|
-
logger_1.logger.info('清除成功');
|
|
35
|
-
await redis_1.default.destroyRedis();
|
|
36
|
-
}
|
|
37
|
-
// istanbul ignore next
|
|
38
|
-
errorHandler(err) {
|
|
39
|
-
error_helper_1.errorHandler.call(this, err);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
module.exports = CleanCacheCommand;
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xlYW4tY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvY29tbWFuZC9jbGVhbi1jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsdUJBQXVCO0FBQ3ZCLDREQUFpQztBQUNqQyw0Q0FBb0I7QUFDcEIsZ0RBQXdCO0FBQ3hCLHdEQUEwQjtBQUMxQiwyQ0FBd0M7QUFFeEMsMENBQThDO0FBQzlDLHFEQUE2QjtBQUM3QiwwQ0FBNkM7QUFDN0MsOENBQXVEO0FBQ3ZELDRDQUE2QztBQUM3Qyx3REFBcUQ7QUFFckQsTUFBTSxpQkFBa0IsU0FBUSxvQkFBTztJQUNyQyxZQUFZLE9BQWtCO1FBQzVCLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxLQUFLLEdBQUcsMEJBQTBCLENBQUM7UUFFeEMsSUFBQSw2QkFBbUIsRUFBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUVELHVCQUF1QjtJQUN2QixJQUFXLFdBQVc7UUFDcEIsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVNLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRztRQUNsQixNQUFNLE1BQU0sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFlBQUUsQ0FBQyxNQUFNLEVBQUUsRUFBRSwwQkFBZSxDQUFDLENBQUM7UUFFdkQsSUFBQSxtQkFBVSxFQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUVyQyxJQUFJLGtCQUFFLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ3pCLE1BQU0sa0JBQUUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDekI7UUFFRCxNQUFNLElBQUEsbUJBQVcsR0FBRSxDQUFDO1FBRXBCLGVBQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFFcEIsTUFBTSxlQUFLLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQUVELHVCQUF1QjtJQUNoQixZQUFZLENBQUMsR0FBRztRQUNyQiwyQkFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDL0IsQ0FBQztDQUNGO0FBRUQsaUJBQVMsaUJBQWlCLENBQUMifQ==
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import Command from 'common-bin';
|
|
2
|
-
declare class DoctorCommand extends Command {
|
|
3
|
-
constructor(rawArgv?: string[]);
|
|
4
|
-
run(ctx: any): Promise<void>;
|
|
5
|
-
get description(): string;
|
|
6
|
-
errorHandler(err: any): void;
|
|
7
|
-
static generateDoctorInfo(cwd: string): Promise<ReadonlyArray<string>>;
|
|
8
|
-
}
|
|
9
|
-
export = DoctorCommand;
|