surgio 2.25.3 → 3.0.0-alpha.1
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/LICENSE +1 -1
- 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 +19 -0
- package/build/base-command.js +75 -0
- package/build/base-command.js.map +1 -0
- package/build/commands/check.d.ts +10 -0
- package/build/commands/check.js +88 -0
- package/build/commands/check.js.map +1 -0
- package/build/commands/clean-cache.d.ts +6 -0
- package/build/commands/clean-cache.js +29 -0
- package/build/commands/clean-cache.js.map +1 -0
- package/build/commands/doctor.d.ts +6 -0
- package/build/commands/doctor.js +21 -0
- package/build/commands/doctor.js.map +1 -0
- package/build/commands/generate.d.ts +7 -0
- package/build/commands/generate.js +93 -0
- package/build/commands/generate.js.map +1 -0
- package/build/commands/lint.d.ts +6 -0
- package/build/commands/lint.js +36 -0
- package/build/commands/lint.js.map +1 -0
- package/build/commands/new.d.ts +6 -0
- package/build/commands/new.js +36 -0
- package/build/commands/new.js.map +1 -0
- package/build/commands/subscriptions.d.ts +7 -0
- package/build/commands/subscriptions.js +96 -0
- package/build/commands/subscriptions.js.map +1 -0
- package/build/commands/upload.d.ts +6 -0
- package/build/commands/upload.js +89 -0
- package/build/commands/upload.js.map +1 -0
- package/build/config.d.ts +6 -0
- package/build/config.js +151 -0
- package/build/config.js.map +1 -0
- package/build/configurables.d.ts +80 -0
- package/build/configurables.js +52 -0
- package/build/configurables.js.map +1 -0
- package/build/constant/constant.d.ts +16 -16
- package/build/constant/constant.js +3 -13
- package/build/constant/constant.js.map +1 -0
- package/build/constant/env.js +1 -1
- package/build/constant/env.js.map +1 -0
- package/build/constant/error.js +1 -1
- package/build/constant/error.js.map +1 -0
- package/build/constant/index.js +1 -1
- package/build/constant/index.js.map +1 -0
- package/build/generator/artifact.d.ts +302 -67
- package/build/generator/artifact.js +141 -101
- package/build/generator/artifact.js.map +1 -0
- package/build/generator/index.d.ts +2 -0
- package/build/generator/index.js +19 -0
- package/build/generator/index.js.map +1 -0
- package/build/generator/template.js +2 -28
- package/build/generator/template.js.map +1 -0
- package/build/hooks/init.d.ts +3 -0
- package/build/hooks/init.js +33 -0
- package/build/hooks/init.js.map +1 -0
- package/build/index.d.ts +68 -66
- package/build/index.js +11 -51
- package/build/index.js.map +1 -0
- package/build/internal.d.ts +5 -0
- package/build/internal.js +25 -0
- package/build/internal.js.map +1 -0
- package/build/misc/deprecation.d.ts +1 -6
- package/build/misc/deprecation.js +1 -8
- package/build/misc/deprecation.js.map +1 -0
- package/build/misc/flag_cn.d.ts +49 -50
- package/build/misc/flag_cn.js +3 -3
- package/build/misc/flag_cn.js.map +1 -0
- package/build/provider/BlackSSLProvider.d.ts +4 -3
- package/build/provider/BlackSSLProvider.js +28 -16
- package/build/provider/BlackSSLProvider.js.map +1 -0
- package/build/provider/ClashProvider.d.ts +7 -10
- package/build/provider/ClashProvider.js +168 -76
- package/build/provider/ClashProvider.js.map +1 -0
- package/build/provider/CustomProvider.d.ts +4 -3
- package/build/provider/CustomProvider.js +98 -54
- package/build/provider/CustomProvider.js.map +1 -0
- package/build/provider/Provider.d.ts +9 -22
- package/build/provider/Provider.js +34 -69
- package/build/provider/Provider.js.map +1 -0
- package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +4 -5
- package/build/provider/ShadowsocksJsonSubscribeProvider.js +31 -21
- package/build/provider/ShadowsocksJsonSubscribeProvider.js.map +1 -0
- package/build/provider/ShadowsocksSubscribeProvider.d.ts +5 -8
- package/build/provider/ShadowsocksSubscribeProvider.js +33 -27
- package/build/provider/ShadowsocksSubscribeProvider.js.map +1 -0
- package/build/provider/ShadowsocksrSubscribeProvider.d.ts +5 -8
- package/build/provider/ShadowsocksrSubscribeProvider.js +33 -23
- package/build/provider/ShadowsocksrSubscribeProvider.js.map +1 -0
- package/build/provider/SsdProvider.d.ts +5 -8
- package/build/provider/SsdProvider.js +59 -39
- package/build/provider/SsdProvider.js.map +1 -0
- package/build/provider/TrojanProvider.d.ts +5 -8
- package/build/provider/TrojanProvider.js +40 -30
- package/build/provider/TrojanProvider.js.map +1 -0
- package/build/provider/V2rayNSubscribeProvider.d.ts +4 -5
- package/build/provider/V2rayNSubscribeProvider.js +64 -33
- package/build/provider/V2rayNSubscribeProvider.js.map +1 -0
- package/build/provider/index.d.ts +16 -2
- package/build/provider/index.js +12 -5
- package/build/provider/index.js.map +1 -0
- package/build/provider/types.d.ts +10 -1
- package/build/provider/types.js +1 -1
- package/build/provider/types.js.map +1 -0
- package/build/redis.js +1 -1
- package/build/redis.js.map +1 -0
- package/build/types.d.ts +42 -236
- package/build/types.js +2 -1
- package/build/types.js.map +1 -0
- package/build/utils/cache.js +29 -27
- package/build/utils/cache.js.map +1 -0
- package/build/utils/clash.d.ts +204 -3
- package/build/utils/clash.js +247 -110
- package/build/utils/clash.js.map +1 -0
- package/build/utils/constant.js +1 -1
- package/build/utils/constant.js.map +1 -0
- package/build/utils/dns.js +1 -1
- package/build/utils/dns.js.map +1 -0
- package/build/utils/doctor.d.ts +2 -0
- package/build/utils/doctor.js +38 -0
- package/build/utils/doctor.js.map +1 -0
- package/build/utils/env-flag.js +2 -2
- package/build/utils/env-flag.js.map +1 -0
- package/build/utils/error-helper.d.ts +2 -2
- package/build/utils/error-helper.js +51 -16
- package/build/utils/error-helper.js.map +1 -0
- package/build/utils/errors.d.ts +19 -0
- package/build/utils/errors.js +60 -0
- package/build/utils/errors.js.map +1 -0
- package/build/utils/filter.d.ts +46 -43
- package/build/utils/filter.js +57 -59
- package/build/utils/filter.js.map +1 -0
- package/build/utils/flag.js +6 -6
- package/build/utils/flag.js.map +1 -0
- package/build/utils/http-client.js +38 -5
- package/build/utils/http-client.js.map +1 -0
- package/build/utils/index.d.ts +14 -21
- package/build/utils/index.js +102 -118
- package/build/utils/index.js.map +1 -0
- package/build/utils/linter.js +5 -2
- package/build/utils/linter.js.map +1 -0
- package/build/utils/loon.d.ts +3 -2
- package/build/utils/loon.js +67 -5
- package/build/utils/loon.js.map +1 -0
- package/build/utils/quantumult.d.ts +3 -3
- package/build/utils/quantumult.js +190 -258
- package/build/utils/quantumult.js.map +1 -0
- package/build/utils/relayable-url.js +1 -1
- package/build/utils/relayable-url.js.map +1 -0
- package/build/utils/remote-snippet.js +37 -14
- package/build/utils/remote-snippet.js.map +1 -0
- package/build/utils/ss.js +27 -17
- package/build/utils/ss.js.map +1 -0
- package/build/utils/ssr.js +3 -4
- package/build/utils/ssr.js.map +1 -0
- package/build/utils/subscription.js +10 -9
- package/build/utils/subscription.js.map +1 -0
- package/build/utils/surfboard.d.ts +3 -2
- package/build/utils/surfboard.js +142 -126
- package/build/utils/surfboard.js.map +1 -0
- package/build/utils/surge.d.ts +4 -2
- package/build/utils/surge.js +328 -300
- package/build/utils/surge.js.map +1 -0
- package/build/utils/time.d.ts +1 -0
- package/build/utils/time.js +6 -0
- package/build/utils/time.js.map +1 -0
- package/build/utils/tmp-helper.js +8 -1
- package/build/utils/tmp-helper.js.map +1 -0
- package/build/utils/trojan.js +19 -11
- package/build/utils/trojan.js.map +1 -0
- package/build/validators/artifact.d.ts +35 -0
- package/build/validators/artifact.js +17 -0
- package/build/validators/artifact.js.map +1 -0
- package/build/validators/common.d.ts +121 -0
- package/build/validators/common.js +65 -0
- package/build/validators/common.js.map +1 -0
- package/build/validators/filter.d.ts +10 -0
- package/build/validators/filter.js +15 -0
- package/build/validators/filter.js.map +1 -0
- package/build/validators/hooks.d.ts +9 -0
- package/build/validators/hooks.js +11 -0
- package/build/validators/hooks.js.map +1 -0
- package/build/validators/http.d.ts +137 -0
- package/build/validators/http.js +19 -0
- package/build/validators/http.js.map +1 -0
- package/build/validators/index.d.ts +15 -0
- package/build/validators/index.js +32 -0
- package/build/validators/index.js.map +1 -0
- package/build/validators/provider.d.ts +114 -0
- package/build/validators/provider.js +42 -0
- package/build/validators/provider.js.map +1 -0
- package/build/validators/shadowsocks.d.ts +86 -0
- package/build/validators/shadowsocks.js +29 -0
- package/build/validators/shadowsocks.js.map +1 -0
- package/build/validators/shadowsocksr.d.ts +77 -0
- package/build/validators/shadowsocksr.js +19 -0
- package/build/validators/shadowsocksr.js.map +1 -0
- package/build/validators/snell.d.ts +71 -0
- package/build/validators/snell.js +17 -0
- package/build/validators/snell.js.map +1 -0
- package/build/validators/socks5.d.ts +77 -0
- package/build/validators/socks5.js +19 -0
- package/build/validators/socks5.js.map +1 -0
- package/build/validators/surgio-config.d.ts +307 -0
- package/build/validators/surgio-config.js +95 -0
- package/build/validators/surgio-config.js.map +1 -0
- package/build/validators/trojan.d.ts +86 -0
- package/build/validators/trojan.js +15 -0
- package/build/validators/trojan.js.map +1 -0
- package/build/validators/tuic.d.ts +301 -0
- package/build/validators/tuic.js +21 -0
- package/build/validators/tuic.js.map +1 -0
- package/build/validators/vmess.d.ts +92 -0
- package/build/validators/vmess.js +29 -0
- package/build/validators/vmess.js.map +1 -0
- package/build/validators/wireguard.d.ts +123 -0
- package/build/validators/wireguard.js +26 -0
- package/build/validators/wireguard.js.map +1 -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 +120 -80
- 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/generate.d.ts +0 -4
- package/build/generate.js +0 -75
- 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
- package/build/utils/v2ray.d.ts +0 -4
- package/build/utils/v2ray.js +0 -41
package/build/utils/index.js
CHANGED
|
@@ -17,16 +17,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.isGFWFree = exports.isFlyIO = exports.isAWS = exports.isAWSLambda = exports.isNetlify = exports.isRailway = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.
|
|
20
|
+
exports.getPortFromHost = exports.checkNotNullish = exports.assertNever = exports.isGFWFree = exports.isFlyIO = exports.isAWS = exports.isAWSLambda = exports.isNetlify = exports.isRailway = exports.isGitLabCI = exports.isGitHubActions = exports.isHeroku = exports.isVercel = exports.isNow = exports.isIp = exports.lowercaseHeaderKeys = exports.formatV2rayConfig = exports.ensureConfigFolder = exports.decodeStringList = exports.pickAndFormatKeys = exports.pickAndFormatStringList = exports.changeCase = exports.getNodeNames = exports.getShadowsocksNodesJSON = exports.getV2rayNNodes = exports.getShadowsocksrNodes = exports.getShadowsocksNodes = exports.toMD5 = exports.fromBase64 = exports.toBase64 = exports.fromUrlSafeBase64 = exports.toUrlSafeBase64 = exports.getUrl = exports.getDownloadUrl = exports.httpClient = void 0;
|
|
21
21
|
const logger_1 = require("@surgio/logger");
|
|
22
22
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
23
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
24
23
|
const os_1 = __importDefault(require("os"));
|
|
25
24
|
const path_1 = require("path");
|
|
26
25
|
const query_string_1 = __importDefault(require("query-string"));
|
|
27
26
|
const url_1 = require("url");
|
|
28
27
|
const urlsafe_base64_1 = __importDefault(require("urlsafe-base64"));
|
|
29
|
-
const yaml_1 = __importDefault(require("yaml"));
|
|
30
28
|
const net_1 = __importDefault(require("net"));
|
|
31
29
|
const crypto_1 = __importDefault(require("crypto"));
|
|
32
30
|
const change_case_1 = require("change-case");
|
|
@@ -34,11 +32,17 @@ const types_1 = require("../types");
|
|
|
34
32
|
const constant_1 = require("../constant");
|
|
35
33
|
const env_flag_1 = require("./env-flag");
|
|
36
34
|
const filter_1 = require("./filter");
|
|
37
|
-
const v2ray_1 = require("./v2ray");
|
|
38
35
|
__exportStar(require("./surge"), exports);
|
|
39
36
|
__exportStar(require("./surfboard"), exports);
|
|
40
37
|
__exportStar(require("./clash"), exports);
|
|
41
38
|
__exportStar(require("./quantumult"), exports);
|
|
39
|
+
__exportStar(require("./loon"), exports);
|
|
40
|
+
__exportStar(require("./remote-snippet"), exports);
|
|
41
|
+
__exportStar(require("./subscription"), exports);
|
|
42
|
+
__exportStar(require("./time"), exports);
|
|
43
|
+
__exportStar(require("./errors"), exports);
|
|
44
|
+
var http_client_1 = require("./http-client");
|
|
45
|
+
Object.defineProperty(exports, "httpClient", { enumerable: true, get: function () { return __importDefault(http_client_1).default; } });
|
|
42
46
|
const logger = (0, logger_1.createLogger)({ service: 'surgio:utils' });
|
|
43
47
|
const getDownloadUrl = (baseUrl = '/', artifactName, inline = true, accessToken) => {
|
|
44
48
|
let urlSearchParams;
|
|
@@ -70,36 +74,6 @@ const getUrl = (baseUrl, path, accessToken) => {
|
|
|
70
74
|
return url.toString();
|
|
71
75
|
};
|
|
72
76
|
exports.getUrl = getUrl;
|
|
73
|
-
const getMellowNodes = function (list, filter) {
|
|
74
|
-
// istanbul ignore next
|
|
75
|
-
if (arguments.length === 2 && typeof filter === 'undefined') {
|
|
76
|
-
throw new Error(constant_1.ERR_INVALID_FILTER);
|
|
77
|
-
}
|
|
78
|
-
const result = (0, filter_1.applyFilter)(list, filter)
|
|
79
|
-
.map((nodeConfig) => {
|
|
80
|
-
switch (nodeConfig.type) {
|
|
81
|
-
case types_1.NodeTypeEnum.Vmess: {
|
|
82
|
-
const uri = (0, v2ray_1.formatVmessUri)(nodeConfig, { isMellow: true });
|
|
83
|
-
return [
|
|
84
|
-
nodeConfig.nodeName,
|
|
85
|
-
'vmess1',
|
|
86
|
-
uri.trim().replace('vmess://', 'vmess1://'),
|
|
87
|
-
].join(', ');
|
|
88
|
-
}
|
|
89
|
-
case types_1.NodeTypeEnum.Shadowsocks: {
|
|
90
|
-
const uri = (0, exports.getShadowsocksNodes)([nodeConfig]);
|
|
91
|
-
return [nodeConfig.nodeName, 'ss', uri.trim()].join(', ');
|
|
92
|
-
}
|
|
93
|
-
// istanbul ignore next
|
|
94
|
-
default:
|
|
95
|
-
logger.warn(`不支持为 Mellow 生成 ${nodeConfig.type} 的节点,节点 ${nodeConfig.nodeName} 会被省略`);
|
|
96
|
-
return null;
|
|
97
|
-
}
|
|
98
|
-
})
|
|
99
|
-
.filter((item) => !!item);
|
|
100
|
-
return result.join('\n');
|
|
101
|
-
};
|
|
102
|
-
exports.getMellowNodes = getMellowNodes;
|
|
103
77
|
// istanbul ignore next
|
|
104
78
|
const toUrlSafeBase64 = (str) => urlsafe_base64_1.default.encode(Buffer.from(str, 'utf8'));
|
|
105
79
|
exports.toUrlSafeBase64 = toUrlSafeBase64;
|
|
@@ -132,26 +106,28 @@ const getShadowsocksNodes = (list, groupName = 'Surgio') => {
|
|
|
132
106
|
}
|
|
133
107
|
switch (nodeConfig.type) {
|
|
134
108
|
case types_1.NodeTypeEnum.Shadowsocks: {
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
109
|
+
const query = {
|
|
110
|
+
...(nodeConfig.obfs
|
|
111
|
+
? {
|
|
112
|
+
plugin: `${encodeURIComponent(`obfs-local;obfs=${nodeConfig.obfs};obfs-host=${nodeConfig.obfsHost}`)}`,
|
|
113
|
+
}
|
|
114
|
+
: null),
|
|
115
|
+
...(groupName ? { group: encodeURIComponent(groupName) } : null),
|
|
116
|
+
};
|
|
141
117
|
return [
|
|
142
118
|
'ss://',
|
|
143
|
-
(0, exports.toUrlSafeBase64)(`${
|
|
119
|
+
(0, exports.toUrlSafeBase64)(`${nodeConfig.method}:${nodeConfig.password}`),
|
|
144
120
|
'@',
|
|
145
|
-
|
|
121
|
+
nodeConfig.hostname,
|
|
146
122
|
':',
|
|
147
|
-
|
|
123
|
+
nodeConfig.port,
|
|
148
124
|
'/?',
|
|
149
125
|
query_string_1.default.stringify(query, {
|
|
150
126
|
encode: false,
|
|
151
127
|
sort: false,
|
|
152
128
|
}),
|
|
153
129
|
'#',
|
|
154
|
-
encodeURIComponent(
|
|
130
|
+
encodeURIComponent(nodeConfig.nodeName),
|
|
155
131
|
].join('');
|
|
156
132
|
}
|
|
157
133
|
// istanbul ignore next
|
|
@@ -252,13 +228,24 @@ const getShadowsocksNodesJSON = (list) => {
|
|
|
252
228
|
}
|
|
253
229
|
switch (nodeConfig.type) {
|
|
254
230
|
case types_1.NodeTypeEnum.Shadowsocks: {
|
|
255
|
-
const useObfs = Boolean(nodeConfig.obfs && nodeConfig
|
|
256
|
-
return
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
:
|
|
231
|
+
const useObfs = Boolean(nodeConfig.obfs && nodeConfig.obfsHost);
|
|
232
|
+
return {
|
|
233
|
+
remarks: nodeConfig.nodeName,
|
|
234
|
+
server: nodeConfig.hostname,
|
|
235
|
+
server_port: nodeConfig.port,
|
|
236
|
+
method: nodeConfig.method,
|
|
237
|
+
remarks_base64: (0, exports.toUrlSafeBase64)(nodeConfig.nodeName),
|
|
238
|
+
password: nodeConfig.password,
|
|
239
|
+
tcp_over_udp: false,
|
|
240
|
+
udp_over_tcp: false,
|
|
241
|
+
enable: true,
|
|
242
|
+
...(useObfs
|
|
243
|
+
? {
|
|
244
|
+
plugin: 'obfs-local',
|
|
245
|
+
'plugin-opts': `obfs=${nodeConfig.obfs};obfs-host=${nodeConfig.obfsHost}`,
|
|
246
|
+
}
|
|
247
|
+
: null),
|
|
248
|
+
};
|
|
262
249
|
}
|
|
263
250
|
// istanbul ignore next
|
|
264
251
|
default:
|
|
@@ -280,31 +267,6 @@ const getNodeNames = function (list, filter, separator) {
|
|
|
280
267
|
.join(separator || ', ');
|
|
281
268
|
};
|
|
282
269
|
exports.getNodeNames = getNodeNames;
|
|
283
|
-
const generateClashProxyGroup = (ruleName, ruleType, nodeNameList, options) => {
|
|
284
|
-
let proxies;
|
|
285
|
-
if (options.existingProxies) {
|
|
286
|
-
if (options.filter) {
|
|
287
|
-
const nodes = (0, filter_1.applyFilter)(nodeNameList, options.filter);
|
|
288
|
-
proxies = [].concat(options.existingProxies, nodes.map((item) => item.nodeName));
|
|
289
|
-
}
|
|
290
|
-
else {
|
|
291
|
-
proxies = options.existingProxies;
|
|
292
|
-
}
|
|
293
|
-
}
|
|
294
|
-
else {
|
|
295
|
-
const nodes = (0, filter_1.applyFilter)(nodeNameList, options.filter);
|
|
296
|
-
proxies = nodes.map((item) => item.nodeName);
|
|
297
|
-
}
|
|
298
|
-
return Object.assign({ type: ruleType, name: ruleName, proxies }, (['url-test', 'fallback', 'load-balance'].includes(ruleType)
|
|
299
|
-
? {
|
|
300
|
-
url: options.proxyTestUrl,
|
|
301
|
-
interval: options.proxyTestInterval,
|
|
302
|
-
}
|
|
303
|
-
: null));
|
|
304
|
-
};
|
|
305
|
-
exports.generateClashProxyGroup = generateClashProxyGroup;
|
|
306
|
-
const toYaml = (obj) => yaml_1.default.stringify(obj);
|
|
307
|
-
exports.toYaml = toYaml;
|
|
308
270
|
// istanbul ignore next
|
|
309
271
|
const changeCase = (str, format) => {
|
|
310
272
|
switch (format) {
|
|
@@ -321,22 +283,43 @@ const pickAndFormatStringList = (obj, keyList, options = {}) => {
|
|
|
321
283
|
const result = [];
|
|
322
284
|
keyList.forEach((key) => {
|
|
323
285
|
if (obj.hasOwnProperty(key)) {
|
|
324
|
-
const
|
|
286
|
+
const propertyKey = options.keyFormat
|
|
325
287
|
? (0, exports.changeCase)(key, options.keyFormat)
|
|
326
288
|
: key;
|
|
327
|
-
|
|
289
|
+
const propertyValue = obj[key];
|
|
290
|
+
if (Array.isArray(propertyValue)) {
|
|
291
|
+
result.push(`${propertyKey}=${propertyValue.join(',')}`);
|
|
292
|
+
}
|
|
293
|
+
else {
|
|
294
|
+
result.push(`${propertyKey}=${propertyValue}`);
|
|
295
|
+
}
|
|
328
296
|
}
|
|
329
297
|
});
|
|
330
298
|
return result;
|
|
331
299
|
};
|
|
332
300
|
exports.pickAndFormatStringList = pickAndFormatStringList;
|
|
301
|
+
const pickAndFormatKeys = (obj, keyList, options = {}) => {
|
|
302
|
+
const result = {};
|
|
303
|
+
keyList.forEach((key) => {
|
|
304
|
+
if (obj.hasOwnProperty(key)) {
|
|
305
|
+
const propertyKey = options.keyFormat
|
|
306
|
+
? (0, exports.changeCase)(key, options.keyFormat)
|
|
307
|
+
: key;
|
|
308
|
+
result[propertyKey] = obj[key];
|
|
309
|
+
}
|
|
310
|
+
});
|
|
311
|
+
return result;
|
|
312
|
+
};
|
|
313
|
+
exports.pickAndFormatKeys = pickAndFormatKeys;
|
|
333
314
|
const decodeStringList = (stringList) => {
|
|
334
315
|
const result = {};
|
|
335
316
|
stringList.forEach((item) => {
|
|
336
317
|
if (item.includes('=')) {
|
|
337
318
|
const match = item.match(/^(.*?)=(.*?)$/);
|
|
338
319
|
if (match) {
|
|
339
|
-
|
|
320
|
+
const key = match[1].trim();
|
|
321
|
+
const value = match[2].trim();
|
|
322
|
+
result[key] = value || true;
|
|
340
323
|
}
|
|
341
324
|
}
|
|
342
325
|
else {
|
|
@@ -346,31 +329,6 @@ const decodeStringList = (stringList) => {
|
|
|
346
329
|
return result;
|
|
347
330
|
};
|
|
348
331
|
exports.decodeStringList = decodeStringList;
|
|
349
|
-
const normalizeClashProxyGroupConfig = (nodeList, customFilters, proxyGroupModifier, options = {}) => {
|
|
350
|
-
const proxyGroup = proxyGroupModifier(nodeList, customFilters);
|
|
351
|
-
return proxyGroup.map((item) => {
|
|
352
|
-
if (item.hasOwnProperty('filter')) {
|
|
353
|
-
// istanbul ignore next
|
|
354
|
-
if (!item.filter || !(0, filter_1.validateFilter)(item.filter)) {
|
|
355
|
-
throw new Error(`过滤器 ${item.filter} 无效,请检查 proxyGroupModifier`);
|
|
356
|
-
}
|
|
357
|
-
return (0, exports.generateClashProxyGroup)(item.name, item.type, nodeList, {
|
|
358
|
-
filter: item.filter,
|
|
359
|
-
existingProxies: item.proxies,
|
|
360
|
-
proxyTestUrl: options.proxyTestUrl,
|
|
361
|
-
proxyTestInterval: options.proxyTestInterval,
|
|
362
|
-
});
|
|
363
|
-
}
|
|
364
|
-
else {
|
|
365
|
-
return (0, exports.generateClashProxyGroup)(item.name, item.type, nodeList, {
|
|
366
|
-
existingProxies: item.proxies,
|
|
367
|
-
proxyTestUrl: options.proxyTestUrl,
|
|
368
|
-
proxyTestInterval: options.proxyTestInterval,
|
|
369
|
-
});
|
|
370
|
-
}
|
|
371
|
-
});
|
|
372
|
-
};
|
|
373
|
-
exports.normalizeClashProxyGroupConfig = normalizeClashProxyGroupConfig;
|
|
374
332
|
const ensureConfigFolder = (dir = os_1.default.homedir()) => {
|
|
375
333
|
let baseDir;
|
|
376
334
|
try {
|
|
@@ -424,24 +382,36 @@ const formatV2rayConfig = (localPort, nodeConfig) => {
|
|
|
424
382
|
},
|
|
425
383
|
};
|
|
426
384
|
if (nodeConfig.tls) {
|
|
427
|
-
config.outbound.streamSettings =
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
:
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
385
|
+
config.outbound.streamSettings = {
|
|
386
|
+
...config.outbound.streamSettings,
|
|
387
|
+
security: 'tls',
|
|
388
|
+
tlsSettings: {
|
|
389
|
+
serverName: nodeConfig.host || nodeConfig.hostname,
|
|
390
|
+
...(typeof nodeConfig.skipCertVerify === 'boolean'
|
|
391
|
+
? {
|
|
392
|
+
allowInsecure: nodeConfig.skipCertVerify,
|
|
393
|
+
}
|
|
394
|
+
: null),
|
|
395
|
+
...(typeof nodeConfig.tls13 === 'boolean'
|
|
396
|
+
? {
|
|
397
|
+
allowInsecureCiphers: !nodeConfig.tls13,
|
|
398
|
+
}
|
|
399
|
+
: null),
|
|
400
|
+
},
|
|
401
|
+
};
|
|
436
402
|
}
|
|
437
403
|
if (nodeConfig.network === 'ws') {
|
|
438
|
-
config.outbound.streamSettings =
|
|
404
|
+
config.outbound.streamSettings = {
|
|
405
|
+
...config.outbound.streamSettings,
|
|
406
|
+
network: nodeConfig.network,
|
|
407
|
+
wsSettings: {
|
|
439
408
|
path: nodeConfig.path,
|
|
440
409
|
headers: {
|
|
441
410
|
Host: nodeConfig.host,
|
|
442
411
|
'User-Agent': constant_1.OBFS_UA,
|
|
443
412
|
},
|
|
444
|
-
}
|
|
413
|
+
},
|
|
414
|
+
};
|
|
445
415
|
}
|
|
446
416
|
return config;
|
|
447
417
|
};
|
|
@@ -454,8 +424,6 @@ const lowercaseHeaderKeys = (headers) => {
|
|
|
454
424
|
return wsHeaders;
|
|
455
425
|
};
|
|
456
426
|
exports.lowercaseHeaderKeys = lowercaseHeaderKeys;
|
|
457
|
-
const msToSeconds = (ms) => Math.floor(ms / 1000);
|
|
458
|
-
exports.msToSeconds = msToSeconds;
|
|
459
427
|
// istanbul ignore next
|
|
460
428
|
const isIp = (str) => net_1.default.isIPv4(str) || net_1.default.isIPv6(str);
|
|
461
429
|
exports.isIp = isIp;
|
|
@@ -492,6 +460,7 @@ exports.isAWS = isAWS;
|
|
|
492
460
|
// istanbul ignore next
|
|
493
461
|
const isFlyIO = () => typeof process.env.FLY_REGION !== 'undefined';
|
|
494
462
|
exports.isFlyIO = isFlyIO;
|
|
463
|
+
// istanbul ignore next
|
|
495
464
|
const isGFWFree = () => (0, env_flag_1.getIsGFWFree)() ||
|
|
496
465
|
(0, exports.isAWS)() ||
|
|
497
466
|
(0, exports.isAWSLambda)() ||
|
|
@@ -503,4 +472,19 @@ const isGFWFree = () => (0, env_flag_1.getIsGFWFree)() ||
|
|
|
503
472
|
(0, exports.isNetlify)() ||
|
|
504
473
|
(0, exports.isFlyIO)();
|
|
505
474
|
exports.isGFWFree = isGFWFree;
|
|
506
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"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"}
|
|
475
|
+
// istanbul ignore next
|
|
476
|
+
const assertNever = (x) => {
|
|
477
|
+
throw new TypeError(`Unexpected object: ${x}`);
|
|
478
|
+
};
|
|
479
|
+
exports.assertNever = assertNever;
|
|
480
|
+
const checkNotNullish = (val) => val !== null && val !== undefined;
|
|
481
|
+
exports.checkNotNullish = checkNotNullish;
|
|
482
|
+
const getPortFromHost = (host) => {
|
|
483
|
+
const match = host.match(/:(\d+)$/);
|
|
484
|
+
if (match) {
|
|
485
|
+
return Number(match[1]);
|
|
486
|
+
}
|
|
487
|
+
throw new Error(`Invalid host: ${host}`);
|
|
488
|
+
};
|
|
489
|
+
exports.getPortFromHost = getPortFromHost;
|
|
490
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/build/utils/linter.js
CHANGED
|
@@ -18,7 +18,10 @@ const createCli = (cliConfig) => {
|
|
|
18
18
|
require.resolve),
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
|
-
return new eslint_1.ESLint(
|
|
21
|
+
return new eslint_1.ESLint({
|
|
22
|
+
...linterConfig,
|
|
23
|
+
...cliConfig,
|
|
24
|
+
});
|
|
22
25
|
};
|
|
23
26
|
exports.createCli = createCli;
|
|
24
27
|
const checkAndFix = async (cwd) => {
|
|
@@ -43,4 +46,4 @@ const check = async (cwd) => {
|
|
|
43
46
|
return errorCount === 0;
|
|
44
47
|
};
|
|
45
48
|
exports.check = check;
|
|
46
|
-
//# sourceMappingURL=
|
|
49
|
+
//# sourceMappingURL=linter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/utils/linter.ts"],"names":[],"mappings":";AAAA,uBAAuB;;;;;;AAEvB,mCAA+B;AAC/B,oDAAsB;AAEf,MAAM,SAAS,GAAG,CAAC,SAA0B,EAAU,EAAE;IAC9D,MAAM,YAAY,GAAG;QACnB,0DAA0D;QAC1D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;QAC5C,UAAU,EAAE,CAAC,KAAK,CAAC;QACnB,UAAU,EAAE;YACV,OAAO,EAAE,CAAC,8BAA8B,CAAC,CAAC,GAAG;YAC3C,aAAa;YACb,OAAO,CAAC,OAAO,CAChB;SACF;KACF,CAAA;IAED,OAAO,IAAI,eAAM,CAAC;QAChB,GAAG,YAAY;QACf,GAAG,SAAS;KACb,CAAC,CAAA;AACJ,CAAC,CAAA;AAjBY,QAAA,SAAS,aAiBrB;AAEM,MAAM,WAAW,GAAG,KAAK,EAAE,GAAW,EAAoB,EAAE;IACjE,MAAM,GAAG,GAAG,IAAA,iBAAS,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;IACzC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1C,MAAM,UAAU,GAAG,gBAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC9D,MAAM,iBAAiB,GAAG,gBAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAE5E,MAAM,eAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IAEjC,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IACpD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAE5C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEvB,OAAO,UAAU,GAAG,iBAAiB,KAAK,CAAC,CAAA;AAC7C,CAAC,CAAA;AAdY,QAAA,WAAW,eAcvB;AAEM,MAAM,KAAK,GAAG,KAAK,EAAE,GAAW,EAAoB,EAAE;IAC3D,MAAM,GAAG,GAAG,IAAA,iBAAS,EAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IAC9B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1C,MAAM,UAAU,GAAG,gBAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC9D,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IACpD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAE5C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEvB,OAAO,UAAU,KAAK,CAAC,CAAA;AACzB,CAAC,CAAA;AAVY,QAAA,KAAK,SAUjB"}
|
package/build/utils/loon.d.ts
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const getLoonNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?:
|
|
1
|
+
import { NodeFilterType, PossibleNodeConfigType, SortedNodeFilterType } from '../types';
|
|
2
|
+
export declare const getLoonNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;
|
|
3
|
+
export declare const getLoonNodeNames: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType, separator?: string) => string;
|
package/build/utils/loon.js
CHANGED
|
@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getLoonNodes = void 0;
|
|
6
|
+
exports.getLoonNodeNames = exports.getLoonNodes = void 0;
|
|
7
7
|
const logger_1 = require("@surgio/logger");
|
|
8
8
|
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const net_1 = require("net");
|
|
9
10
|
const types_1 = require("../types");
|
|
10
11
|
const constant_1 = require("../constant");
|
|
11
12
|
const filter_1 = require("./filter");
|
|
@@ -28,7 +29,7 @@ const getLoonNodes = function (list, filter) {
|
|
|
28
29
|
];
|
|
29
30
|
if (nodeConfig.obfs) {
|
|
30
31
|
if (['http', 'tls'].includes(nodeConfig.obfs)) {
|
|
31
|
-
config.push(nodeConfig.obfs, nodeConfig
|
|
32
|
+
config.push(nodeConfig.obfs, nodeConfig.obfsHost || nodeConfig.hostname);
|
|
32
33
|
}
|
|
33
34
|
else {
|
|
34
35
|
logger.warn(`不支持为 Loon 生成混淆为 ${nodeConfig.obfs} 的节点,节点 ${nodeConfig.nodeName} 会被省略`);
|
|
@@ -38,7 +39,7 @@ const getLoonNodes = function (list, filter) {
|
|
|
38
39
|
if (nodeConfig.tfo) {
|
|
39
40
|
config.push('fast-open=true');
|
|
40
41
|
}
|
|
41
|
-
if (nodeConfig
|
|
42
|
+
if (nodeConfig.udpRelay) {
|
|
42
43
|
config.push('udp=true');
|
|
43
44
|
}
|
|
44
45
|
return config.join(',');
|
|
@@ -58,7 +59,7 @@ const getLoonNodes = function (list, filter) {
|
|
|
58
59
|
if (nodeConfig.tfo) {
|
|
59
60
|
config.push('fast-open=true');
|
|
60
61
|
}
|
|
61
|
-
if (nodeConfig
|
|
62
|
+
if (nodeConfig.udpRelay) {
|
|
62
63
|
config.push('udp=true');
|
|
63
64
|
}
|
|
64
65
|
return config.join(',');
|
|
@@ -127,6 +128,51 @@ const getLoonNodes = function (list, filter) {
|
|
|
127
128
|
nodeConfig.username /* istanbul ignore next */ || '',
|
|
128
129
|
JSON.stringify(nodeConfig.password /* istanbul ignore next */ || ''),
|
|
129
130
|
].join(',');
|
|
131
|
+
case types_1.NodeTypeEnum.Wireguard: {
|
|
132
|
+
const config = [
|
|
133
|
+
`${nodeConfig.nodeName} = wireguard`,
|
|
134
|
+
`interface-ip=${nodeConfig.selfIp}`,
|
|
135
|
+
`private-key=${JSON.stringify(nodeConfig.privateKey)}`,
|
|
136
|
+
];
|
|
137
|
+
const peers = [];
|
|
138
|
+
if (nodeConfig.selfIpV6) {
|
|
139
|
+
config.push(`interface-ipV6=${nodeConfig.selfIpV6}`);
|
|
140
|
+
}
|
|
141
|
+
if (nodeConfig.mtu) {
|
|
142
|
+
config.push(`mtu=${nodeConfig.mtu}`);
|
|
143
|
+
}
|
|
144
|
+
if (nodeConfig.dnsServers) {
|
|
145
|
+
for (const dns of nodeConfig.dnsServers) {
|
|
146
|
+
if ((0, net_1.isIPv4)(dns)) {
|
|
147
|
+
config.push(`dns=${dns}`);
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
config.push(`dnsV6=${dns}`);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
for (const peer of nodeConfig.peers) {
|
|
155
|
+
const peerConfig = [
|
|
156
|
+
`public-key=${JSON.stringify(peer.publicKey)}`,
|
|
157
|
+
`endpoint=${peer.endpoint}`,
|
|
158
|
+
];
|
|
159
|
+
if (peer.allowedIps) {
|
|
160
|
+
peers.push(`allowed-ips=${JSON.stringify(peer.allowedIps)}}}`);
|
|
161
|
+
}
|
|
162
|
+
if (peer.presharedKey) {
|
|
163
|
+
peers.push(`preshared-key=${JSON.stringify(peer.presharedKey)}}}`);
|
|
164
|
+
}
|
|
165
|
+
if (peer.reservedBits) {
|
|
166
|
+
peers.push(`reserved=${JSON.stringify(peer.reservedBits)}}`);
|
|
167
|
+
}
|
|
168
|
+
peers.push(`{${peerConfig.join(',')}}`);
|
|
169
|
+
}
|
|
170
|
+
if (nodeConfig.peers[0].keepalive) {
|
|
171
|
+
config.push(`keepalive=${nodeConfig.peers[0].keepalive}`);
|
|
172
|
+
}
|
|
173
|
+
config.push(`peers=[${peers.join(',')}]`);
|
|
174
|
+
return config.join(',');
|
|
175
|
+
}
|
|
130
176
|
// istanbul ignore next
|
|
131
177
|
default:
|
|
132
178
|
logger.warn(`不支持为 Loon 生成 ${nodeConfig.type} 的节点,节点 ${nodeConfig.nodeName} 会被省略`);
|
|
@@ -137,4 +183,20 @@ const getLoonNodes = function (list, filter) {
|
|
|
137
183
|
return result.join('\n');
|
|
138
184
|
};
|
|
139
185
|
exports.getLoonNodes = getLoonNodes;
|
|
140
|
-
|
|
186
|
+
const getLoonNodeNames = function (list, filter, separator) {
|
|
187
|
+
// istanbul ignore next
|
|
188
|
+
if (arguments.length === 2 && typeof filter === 'undefined') {
|
|
189
|
+
throw new Error(constant_1.ERR_INVALID_FILTER);
|
|
190
|
+
}
|
|
191
|
+
return (0, filter_1.applyFilter)(list.filter((item) => (0, filter_1.shadowsocksFilter)(item) ||
|
|
192
|
+
(0, filter_1.shadowsocksrFilter)(item) ||
|
|
193
|
+
(0, filter_1.vmessFilter)(item) ||
|
|
194
|
+
(0, filter_1.httpFilter)(item) ||
|
|
195
|
+
(0, filter_1.httpsFilter)(item) ||
|
|
196
|
+
(0, filter_1.trojanFilter)(item) ||
|
|
197
|
+
(0, filter_1.wireguardFilter)(item)), filter)
|
|
198
|
+
.map((item) => item.nodeName)
|
|
199
|
+
.join(separator || ', ');
|
|
200
|
+
};
|
|
201
|
+
exports.getLoonNodeNames = getLoonNodeNames;
|
|
202
|
+
//# sourceMappingURL=loon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loon.js","sourceRoot":"","sources":["../../src/utils/loon.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const getQuantumultNodes: (list: ReadonlyArray<ShadowsocksNodeConfig | VmessNodeConfig | ShadowsocksrNodeConfig | HttpsNodeConfig>, groupName?: string, filter?: NodeNameFilterType | SortedNodeNameFilterType) => string;
|
|
1
|
+
import { NodeFilterType, PossibleNodeConfigType, SortedNodeFilterType } from '../types';
|
|
3
2
|
/**
|
|
4
3
|
* @see https://github.com/crossutility/Quantumult-X/blob/master/sample.conf
|
|
5
4
|
*/
|
|
6
|
-
export declare const getQuantumultXNodes: (
|
|
5
|
+
export declare const getQuantumultXNodes: (nodeList: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;
|
|
6
|
+
export declare const getQuantumultXNodeNames: (nodeList: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeFilterType) => string;
|