surgio 2.15.0 → 2.18.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.
Files changed (36) hide show
  1. package/CHANGELOG.md +29 -0
  2. package/build/generator/artifact.d.ts +3 -1
  3. package/build/generator/artifact.js +7 -5
  4. package/build/index.d.ts +2 -1
  5. package/build/index.js +6 -3
  6. package/build/provider/ClashProvider.d.ts +9 -2
  7. package/build/provider/ClashProvider.js +15 -7
  8. package/build/provider/CustomProvider.js +14 -5
  9. package/build/provider/Provider.d.ts +4 -1
  10. package/build/provider/Provider.js +36 -9
  11. package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +5 -3
  12. package/build/provider/ShadowsocksJsonSubscribeProvider.js +42 -4
  13. package/build/provider/ShadowsocksSubscribeProvider.d.ts +4 -2
  14. package/build/provider/ShadowsocksSubscribeProvider.js +7 -5
  15. package/build/provider/ShadowsocksrSubscribeProvider.d.ts +4 -2
  16. package/build/provider/ShadowsocksrSubscribeProvider.js +7 -5
  17. package/build/provider/SsdProvider.d.ts +4 -2
  18. package/build/provider/SsdProvider.js +7 -5
  19. package/build/provider/TrojanProvider.d.ts +9 -2
  20. package/build/provider/TrojanProvider.js +15 -6
  21. package/build/provider/V2rayNSubscribeProvider.d.ts +11 -2
  22. package/build/provider/V2rayNSubscribeProvider.js +16 -14
  23. package/build/types.d.ts +3 -2
  24. package/build/utils/cache.d.ts +4 -3
  25. package/build/utils/cache.js +17 -9
  26. package/build/utils/clash.d.ts +1 -1
  27. package/build/utils/dns.js +5 -5
  28. package/build/utils/env-flag.js +1 -1
  29. package/build/utils/index.d.ts +5 -8
  30. package/build/utils/index.js +8 -269
  31. package/build/utils/loon.js +50 -18
  32. package/build/utils/patch-proxy.js +7 -2
  33. package/build/utils/quantumult.d.ts +6 -0
  34. package/build/utils/quantumult.js +255 -0
  35. package/build/utils/surge.d.ts +1 -1
  36. package/package.json +2 -3
@@ -0,0 +1,255 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.getQuantumultXNodes = exports.getQuantumultNodes = void 0;
7
+ const logger_1 = require("@surgio/logger");
8
+ const lodash_1 = __importDefault(require("lodash"));
9
+ const constant_1 = require("../constant");
10
+ const types_1 = require("../types");
11
+ const filter_1 = require("./filter");
12
+ const index_1 = require("./index");
13
+ const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:quantumult' });
14
+ const getQuantumultNodes = function (list, groupName = 'Surgio', filter) {
15
+ // istanbul ignore next
16
+ if (arguments.length === 3 && typeof filter === 'undefined') {
17
+ throw new Error(constant_1.ERR_INVALID_FILTER);
18
+ }
19
+ function getHeader(wsHeaders) {
20
+ return Object.keys(wsHeaders)
21
+ .map((headerKey) => `${headerKey}:${wsHeaders[headerKey]}`)
22
+ .join('[Rr][Nn]');
23
+ }
24
+ const result = (0, filter_1.applyFilter)(list, filter)
25
+ .map((nodeConfig) => {
26
+ switch (nodeConfig.type) {
27
+ case types_1.NodeTypeEnum.Vmess: {
28
+ const config = [
29
+ 'vmess',
30
+ nodeConfig.hostname,
31
+ nodeConfig.port,
32
+ nodeConfig.method === 'auto'
33
+ ? 'chacha20-ietf-poly1305'
34
+ : nodeConfig.method,
35
+ JSON.stringify(nodeConfig.uuid),
36
+ nodeConfig.alterId,
37
+ `group=${groupName}`,
38
+ `over-tls=${nodeConfig.tls === true ? 'true' : 'false'}`,
39
+ `certificate=1`,
40
+ `obfs=${nodeConfig.network}`,
41
+ `obfs-path=${JSON.stringify(nodeConfig.path || '/')}`,
42
+ `obfs-header=${JSON.stringify(getHeader(Object.assign({ host: nodeConfig.host || nodeConfig.hostname, 'user-agent': constant_1.OBFS_UA }, lodash_1.default.omit(nodeConfig.wsHeaders, ['host']))))}`,
43
+ ]
44
+ .filter((value) => !!value)
45
+ .join(',');
46
+ return ('vmess://' + (0, index_1.toBase64)([nodeConfig.nodeName, config].join(' = ')));
47
+ }
48
+ case types_1.NodeTypeEnum.Shadowsocks: {
49
+ return (0, index_1.getShadowsocksNodes)([nodeConfig], groupName);
50
+ }
51
+ case types_1.NodeTypeEnum.Shadowsocksr:
52
+ return (0, index_1.getShadowsocksrNodes)([nodeConfig], groupName);
53
+ case types_1.NodeTypeEnum.HTTPS: {
54
+ const config = [
55
+ nodeConfig.nodeName,
56
+ [
57
+ 'http',
58
+ `upstream-proxy-address=${nodeConfig.hostname}`,
59
+ `upstream-proxy-port=${nodeConfig.port}`,
60
+ 'upstream-proxy-auth=true',
61
+ `upstream-proxy-username=${nodeConfig.username}`,
62
+ `upstream-proxy-password=${nodeConfig.password}`,
63
+ 'over-tls=true',
64
+ 'certificate=1',
65
+ ].join(', '),
66
+ ].join(' = ');
67
+ return 'http://' + (0, index_1.toBase64)(config);
68
+ }
69
+ // istanbul ignore next
70
+ default:
71
+ logger.warn(`不支持为 Quantumult 生成 ${nodeConfig.type} 的节点,节点 ${nodeConfig.nodeName} 会被省略`);
72
+ return void 0;
73
+ }
74
+ })
75
+ .filter((item) => item !== undefined);
76
+ return result.join('\n');
77
+ };
78
+ exports.getQuantumultNodes = getQuantumultNodes;
79
+ /**
80
+ * @see https://github.com/crossutility/Quantumult-X/blob/master/sample.conf
81
+ */
82
+ const getQuantumultXNodes = function (list, filter) {
83
+ // istanbul ignore next
84
+ if (arguments.length === 2 && typeof filter === 'undefined') {
85
+ throw new Error(constant_1.ERR_INVALID_FILTER);
86
+ }
87
+ const result = (0, filter_1.applyFilter)(list, filter)
88
+ .map((nodeConfig) => {
89
+ var _a;
90
+ switch (nodeConfig.type) {
91
+ case types_1.NodeTypeEnum.Vmess: {
92
+ const config = [
93
+ `${nodeConfig.hostname}:${nodeConfig.port}`,
94
+ // method 为 auto 时 qx 会无法识别
95
+ nodeConfig.method === 'auto'
96
+ ? `method=chacha20-ietf-poly1305`
97
+ : `method=${nodeConfig.method}`,
98
+ `password=${nodeConfig.uuid}`,
99
+ ...(nodeConfig['udp-relay'] ? ['udp-relay=true'] : []),
100
+ ...(nodeConfig.tfo ? ['fast-open=true'] : []),
101
+ ...(((_a = nodeConfig.quantumultXConfig) === null || _a === void 0 ? void 0 : _a.vmessAEAD)
102
+ ? ['aead=true']
103
+ : ['aead=false']),
104
+ ];
105
+ switch (nodeConfig.network) {
106
+ case 'ws':
107
+ if (nodeConfig.tls) {
108
+ config.push(`obfs=wss`);
109
+ if (nodeConfig.skipCertVerify) {
110
+ config.push('tls-verification=false');
111
+ }
112
+ else {
113
+ config.push('tls-verification=true');
114
+ }
115
+ // istanbul ignore next
116
+ if (nodeConfig.tls13) {
117
+ config.push(`tls13=true`);
118
+ }
119
+ }
120
+ else {
121
+ config.push(`obfs=ws`);
122
+ }
123
+ config.push(`obfs-uri=${nodeConfig.path || '/'}`);
124
+ config.push(`obfs-host=${nodeConfig.host || nodeConfig.hostname}`);
125
+ break;
126
+ case 'tcp':
127
+ if (nodeConfig.tls) {
128
+ config.push(`obfs=over-tls`);
129
+ if (nodeConfig.skipCertVerify) {
130
+ config.push('tls-verification=false');
131
+ }
132
+ else {
133
+ config.push('tls-verification=true');
134
+ }
135
+ // istanbul ignore next
136
+ if (nodeConfig.tls13) {
137
+ config.push(`tls13=true`);
138
+ }
139
+ }
140
+ break;
141
+ default:
142
+ // do nothing
143
+ }
144
+ config.push(`tag=${nodeConfig.nodeName}`);
145
+ // istanbul ignore next
146
+ if (nodeConfig.wsHeaders &&
147
+ Object.keys(nodeConfig.wsHeaders).length > 1) {
148
+ logger.warn(`Quantumult X 不支持自定义额外的 Header 字段,节点 ${nodeConfig.nodeName} 可能不可用`);
149
+ }
150
+ return `vmess=${config.join(', ')}`;
151
+ }
152
+ case types_1.NodeTypeEnum.Shadowsocks: {
153
+ const config = [
154
+ `${nodeConfig.hostname}:${nodeConfig.port}`,
155
+ ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['method', 'password']),
156
+ ...(nodeConfig.obfs && ['http', 'tls'].includes(nodeConfig.obfs)
157
+ ? [
158
+ `obfs=${nodeConfig.obfs}`,
159
+ `obfs-host=${nodeConfig['obfs-host']}`,
160
+ ]
161
+ : []),
162
+ ...(nodeConfig.obfs && ['ws', 'wss'].includes(nodeConfig.obfs)
163
+ ? [
164
+ `obfs=${nodeConfig.obfs}`,
165
+ `obfs-host=${nodeConfig['obfs-host'] || nodeConfig.hostname}`,
166
+ `obfs-uri=${nodeConfig['obfs-uri'] || '/'}`,
167
+ ]
168
+ : []),
169
+ ...(nodeConfig['udp-relay'] ? [`udp-relay=true`] : []),
170
+ ...(nodeConfig.tfo ? [`fast-open=${nodeConfig.tfo}`] : []),
171
+ ];
172
+ if (nodeConfig.obfs === 'wss') {
173
+ if (nodeConfig.skipCertVerify) {
174
+ config.push('tls-verification=false');
175
+ }
176
+ else {
177
+ config.push('tls-verification=true');
178
+ }
179
+ if (nodeConfig.tls13) {
180
+ config.push('tls13=true');
181
+ }
182
+ }
183
+ // istanbul ignore next
184
+ if (nodeConfig.wsHeaders &&
185
+ Object.keys(lodash_1.default.omit(nodeConfig.wsHeaders, ['host'])).length > 0) {
186
+ logger.warn(`Quantumult X 不支持自定义额外的 Header 字段,节点 ${nodeConfig.nodeName} 可能不可用`);
187
+ }
188
+ config.push(`tag=${nodeConfig.nodeName}`);
189
+ return `shadowsocks=${config.join(', ')}`;
190
+ }
191
+ case types_1.NodeTypeEnum.Shadowsocksr: {
192
+ const config = [
193
+ `${nodeConfig.hostname}:${nodeConfig.port}`,
194
+ ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['method', 'password']),
195
+ `ssr-protocol=${nodeConfig.protocol}`,
196
+ `ssr-protocol-param=${nodeConfig.protoparam}`,
197
+ `obfs=${nodeConfig.obfs}`,
198
+ `obfs-host=${nodeConfig.obfsparam}`,
199
+ ...(nodeConfig['udp-relay'] ? [`udp-relay=true`] : []),
200
+ ...(nodeConfig.tfo ? [`fast-open=${nodeConfig.tfo}`] : []),
201
+ `tag=${nodeConfig.nodeName}`,
202
+ ].join(', ');
203
+ return `shadowsocks=${config}`;
204
+ }
205
+ case types_1.NodeTypeEnum.HTTP:
206
+ case types_1.NodeTypeEnum.HTTPS: {
207
+ const config = [
208
+ `${nodeConfig.hostname}:${nodeConfig.port}`,
209
+ ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['username', 'password']),
210
+ ...(nodeConfig.tfo ? [`fast-open=${nodeConfig.tfo}`] : []),
211
+ ];
212
+ if (nodeConfig.type === types_1.NodeTypeEnum.HTTPS) {
213
+ config.push('over-tls=true', `tls-verification=${nodeConfig.skipCertVerify !== true}`, ...(nodeConfig.tls13 ? [`tls13=${nodeConfig.tls13}`] : []));
214
+ }
215
+ config.push(`tag=${nodeConfig.nodeName}`);
216
+ return `http=${config.join(', ')}`;
217
+ }
218
+ case types_1.NodeTypeEnum.Trojan: {
219
+ const config = [
220
+ `${nodeConfig.hostname}:${nodeConfig.port}`,
221
+ ...(0, index_1.pickAndFormatStringList)(nodeConfig, ['password']),
222
+ 'over-tls=true',
223
+ `tls-verification=${nodeConfig.skipCertVerify !== true}`,
224
+ ...(nodeConfig.sni ? [`tls-host=${nodeConfig.sni}`] : []),
225
+ ...(nodeConfig.tfo ? [`fast-open=${nodeConfig.tfo}`] : []),
226
+ ...(nodeConfig['udp-relay'] ? [`udp-relay=true`] : []),
227
+ ...(nodeConfig.tls13 ? [`tls13=${nodeConfig.tls13}`] : []),
228
+ ];
229
+ if (nodeConfig.network === 'ws') {
230
+ config.push('obfs=wss');
231
+ if (nodeConfig.wsPath) {
232
+ config.push(`obfs-uri=${nodeConfig.wsPath}`);
233
+ }
234
+ if (nodeConfig.wsHeaders && nodeConfig.wsHeaders.host) {
235
+ config.push(`obfs-host=${nodeConfig.wsHeaders.host}`);
236
+ // istanbul ignore next
237
+ if (Object.keys(lodash_1.default.omit(nodeConfig.wsHeaders, ['host'])).length > 0) {
238
+ logger.warn(`Quantumult X 不支持自定义额外的 Header 字段,节点 ${nodeConfig.nodeName} 可能不可用`);
239
+ }
240
+ }
241
+ }
242
+ config.push(`tag=${nodeConfig.nodeName}`);
243
+ return `trojan=${config.join(', ')}`;
244
+ }
245
+ // istanbul ignore next
246
+ default:
247
+ logger.warn(`不支持为 QuantumultX 生成 ${nodeConfig.type} 的节点,节点 ${nodeConfig.nodeName} 会被省略`);
248
+ return void 0;
249
+ }
250
+ })
251
+ .filter((item) => item !== undefined);
252
+ return result.join('\n');
253
+ };
254
+ exports.getQuantumultXNodes = getQuantumultXNodes;
255
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quantumult.js","sourceRoot":"","sources":["../../lib/utils/quantumult.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,4 @@ export declare const getSurgeExtendHeaders: (wsHeaders: Record<string, string>)
3
3
  /**
4
4
  * @see https://manual.nssurge.com/policy/proxy.html
5
5
  */
6
- export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType | undefined) => string;
6
+ export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: SortedNodeNameFilterType | NodeFilterType | undefined) => string;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "surgio",
3
3
  "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
4
- "version": "2.15.0",
4
+ "version": "2.18.0",
5
5
  "main": "build/index.js",
6
6
  "typings": "build/index.d.ts",
7
7
  "bin": {
@@ -65,9 +65,9 @@
65
65
  "joi": "^17.1.1",
66
66
  "listr": "^0.14.3",
67
67
  "lodash": "^4.17.19",
68
- "lru-cache": "^6.0.0",
69
68
  "merge-stream": "^2.0.0",
70
69
  "ms": "^2.1.3",
70
+ "node-cache": "^5.1.2",
71
71
  "node-dir": "^0.1.17",
72
72
  "nunjucks": "^3.2.1",
73
73
  "ora": "^5.1.0",
@@ -92,7 +92,6 @@
92
92
  "@types/inquirer": "^7.3.0",
93
93
  "@types/listr": "^0.14.2",
94
94
  "@types/lodash": "^4.14.174",
95
- "@types/lru-cache": "^5.1.0",
96
95
  "@types/node": "^16",
97
96
  "@types/nunjucks": "^3.2.0",
98
97
  "@types/sinon": "^10.0.6",