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.
Files changed (182) hide show
  1. package/bin/dev +17 -0
  2. package/bin/dev.cmd +3 -0
  3. package/bin/run +8 -0
  4. package/bin/run.cmd +3 -0
  5. package/build/base-command.d.ts +18 -0
  6. package/build/base-command.js +74 -0
  7. package/build/commands/check.d.ts +10 -0
  8. package/build/commands/check.js +88 -0
  9. package/build/commands/clean-cache.d.ts +6 -0
  10. package/build/commands/clean-cache.js +29 -0
  11. package/build/commands/doctor.d.ts +6 -0
  12. package/build/commands/doctor.js +21 -0
  13. package/build/commands/generate.d.ts +7 -0
  14. package/build/commands/generate.js +93 -0
  15. package/build/commands/lint.d.ts +6 -0
  16. package/build/commands/lint.js +36 -0
  17. package/build/commands/new.d.ts +6 -0
  18. package/build/commands/new.js +36 -0
  19. package/build/commands/subscriptions.d.ts +7 -0
  20. package/build/commands/subscriptions.js +96 -0
  21. package/build/commands/upload.d.ts +6 -0
  22. package/build/commands/upload.js +87 -0
  23. package/build/config.d.ts +6 -0
  24. package/build/config.js +151 -0
  25. package/build/constant/constant.d.ts +17 -16
  26. package/build/constant/constant.js +3 -2
  27. package/build/constant/env.js +1 -1
  28. package/build/constant/error.js +1 -1
  29. package/build/constant/index.js +1 -1
  30. package/build/generate.d.ts +0 -1
  31. package/build/generate.js +3 -65
  32. package/build/generator/artifact.d.ts +299 -64
  33. package/build/generator/artifact.js +90 -92
  34. package/build/generator/index.d.ts +2 -0
  35. package/build/generator/index.js +19 -0
  36. package/build/generator/template.js +2 -6
  37. package/build/hooks/init.d.ts +3 -0
  38. package/build/hooks/init.js +32 -0
  39. package/build/index.d.ts +55 -53
  40. package/build/index.js +13 -51
  41. package/build/internal.d.ts +4 -0
  42. package/build/internal.js +21 -0
  43. package/build/misc/deprecation.d.ts +1 -6
  44. package/build/misc/deprecation.js +1 -8
  45. package/build/misc/flag_cn.js +1 -1
  46. package/build/provider/BlackSSLProvider.d.ts +4 -3
  47. package/build/provider/BlackSSLProvider.js +24 -16
  48. package/build/provider/ClashProvider.d.ts +7 -10
  49. package/build/provider/ClashProvider.js +165 -76
  50. package/build/provider/CustomProvider.d.ts +4 -3
  51. package/build/provider/CustomProvider.js +81 -50
  52. package/build/provider/Provider.d.ts +9 -22
  53. package/build/provider/Provider.js +31 -69
  54. package/build/provider/ShadowsocksJsonSubscribeProvider.d.ts +4 -5
  55. package/build/provider/ShadowsocksJsonSubscribeProvider.js +27 -21
  56. package/build/provider/ShadowsocksSubscribeProvider.d.ts +5 -8
  57. package/build/provider/ShadowsocksSubscribeProvider.js +30 -27
  58. package/build/provider/ShadowsocksrSubscribeProvider.d.ts +5 -8
  59. package/build/provider/ShadowsocksrSubscribeProvider.js +30 -23
  60. package/build/provider/SsdProvider.d.ts +5 -8
  61. package/build/provider/SsdProvider.js +56 -39
  62. package/build/provider/TrojanProvider.d.ts +5 -8
  63. package/build/provider/TrojanProvider.js +37 -30
  64. package/build/provider/V2rayNSubscribeProvider.d.ts +4 -5
  65. package/build/provider/V2rayNSubscribeProvider.js +61 -33
  66. package/build/provider/index.d.ts +16 -2
  67. package/build/provider/index.js +12 -5
  68. package/build/provider/types.d.ts +10 -1
  69. package/build/provider/types.js +1 -1
  70. package/build/redis.js +1 -1
  71. package/build/types.d.ts +45 -236
  72. package/build/types.js +2 -1
  73. package/build/utils/cache.js +29 -27
  74. package/build/utils/clash.d.ts +204 -3
  75. package/build/utils/clash.js +247 -110
  76. package/build/utils/configurables.d.ts +71 -0
  77. package/build/utils/configurables.js +8 -0
  78. package/build/utils/constant.js +1 -1
  79. package/build/utils/dns.js +1 -1
  80. package/build/utils/doctor.d.ts +2 -0
  81. package/build/utils/doctor.js +38 -0
  82. package/build/utils/env-flag.js +2 -2
  83. package/build/utils/error-helper.d.ts +2 -2
  84. package/build/utils/error-helper.js +30 -16
  85. package/build/utils/filter.d.ts +46 -43
  86. package/build/utils/filter.js +51 -30
  87. package/build/utils/flag.js +1 -1
  88. package/build/utils/http-client.js +38 -5
  89. package/build/utils/index.d.ts +13 -21
  90. package/build/utils/index.js +98 -117
  91. package/build/utils/linter.js +5 -2
  92. package/build/utils/loon.d.ts +3 -2
  93. package/build/utils/loon.js +67 -5
  94. package/build/utils/quantumult.d.ts +3 -3
  95. package/build/utils/quantumult.js +190 -258
  96. package/build/utils/relayable-url.js +1 -1
  97. package/build/utils/remote-snippet.js +3 -4
  98. package/build/utils/ss.js +27 -17
  99. package/build/utils/ssr.js +3 -4
  100. package/build/utils/subscription.js +7 -7
  101. package/build/utils/surfboard.d.ts +3 -2
  102. package/build/utils/surfboard.js +142 -126
  103. package/build/utils/surge.d.ts +4 -2
  104. package/build/utils/surge.js +328 -300
  105. package/build/utils/time.d.ts +1 -0
  106. package/build/utils/time.js +6 -0
  107. package/build/utils/tmp-helper.js +8 -1
  108. package/build/utils/trojan.js +19 -11
  109. package/build/utils/v2ray.js +2 -2
  110. package/build/validators/artifact.d.ts +35 -0
  111. package/build/validators/artifact.js +17 -0
  112. package/build/validators/common.d.ts +121 -0
  113. package/build/validators/common.js +52 -0
  114. package/build/validators/filter.d.ts +10 -0
  115. package/build/validators/filter.js +15 -0
  116. package/build/validators/hooks.d.ts +7 -0
  117. package/build/validators/hooks.js +8 -0
  118. package/build/validators/http.d.ts +137 -0
  119. package/build/validators/http.js +19 -0
  120. package/build/validators/index.d.ts +15 -0
  121. package/build/validators/index.js +32 -0
  122. package/build/validators/provider.d.ts +109 -0
  123. package/build/validators/provider.js +41 -0
  124. package/build/validators/shadowsocks.d.ts +86 -0
  125. package/build/validators/shadowsocks.js +29 -0
  126. package/build/validators/shadowsocksr.d.ts +77 -0
  127. package/build/validators/shadowsocksr.js +19 -0
  128. package/build/validators/snell.d.ts +71 -0
  129. package/build/validators/snell.js +20 -0
  130. package/build/validators/socks5.d.ts +77 -0
  131. package/build/validators/socks5.js +19 -0
  132. package/build/validators/surgio-config.d.ts +307 -0
  133. package/build/validators/surgio-config.js +95 -0
  134. package/build/validators/trojan.d.ts +86 -0
  135. package/build/validators/trojan.js +15 -0
  136. package/build/validators/tuic.d.ts +301 -0
  137. package/build/validators/tuic.js +21 -0
  138. package/build/validators/vmess.d.ts +92 -0
  139. package/build/validators/vmess.js +29 -0
  140. package/build/validators/wireguard.d.ts +123 -0
  141. package/build/validators/wireguard.js +26 -0
  142. package/config.d.ts +1 -0
  143. package/config.js +1 -0
  144. package/constant.d.ts +1 -0
  145. package/constant.js +1 -0
  146. package/generator.d.ts +1 -0
  147. package/generator.js +1 -0
  148. package/hygen-template/artifact/new/index.js +15 -15
  149. package/hygen-template/provider/new/index.js +8 -7
  150. package/hygen-template/template/new/index.js +3 -3
  151. package/index.d.ts +1 -0
  152. package/index.js +1 -0
  153. package/internal.d.ts +1 -0
  154. package/internal.js +1 -0
  155. package/package.json +112 -75
  156. package/provider.d.ts +1 -0
  157. package/provider.js +1 -0
  158. package/utils.d.ts +1 -0
  159. package/utils.js +1 -0
  160. package/bin/surgio.js +0 -8
  161. package/build/command/check.d.ts +0 -9
  162. package/build/command/check.js +0 -79
  163. package/build/command/clean-cache.d.ts +0 -8
  164. package/build/command/clean-cache.js +0 -43
  165. package/build/command/doctor.d.ts +0 -9
  166. package/build/command/doctor.js +0 -63
  167. package/build/command/generate.d.ts +0 -8
  168. package/build/command/generate.js +0 -64
  169. package/build/command/lint.d.ts +0 -7
  170. package/build/command/lint.js +0 -42
  171. package/build/command/new.d.ts +0 -7
  172. package/build/command/new.js +0 -44
  173. package/build/command/subscriptions.d.ts +0 -10
  174. package/build/command/subscriptions.js +0 -87
  175. package/build/command/upload.d.ts +0 -9
  176. package/build/command/upload.js +0 -101
  177. package/build/utils/command.d.ts +0 -2
  178. package/build/utils/command.js +0 -23
  179. package/build/utils/config.d.ts +0 -6
  180. package/build/utils/config.js +0 -245
  181. package/build/utils/patch-proxy.d.ts +0 -1
  182. package/build/utils/patch-proxy.js +0 -19
@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.parseClashConfig = exports.getClashSubscription = void 0;
7
- const joi_1 = __importDefault(require("joi"));
8
7
  const assert_1 = __importDefault(require("assert"));
9
8
  const yaml_1 = __importDefault(require("yaml"));
10
9
  const lodash_1 = __importDefault(require("lodash"));
11
10
  const logger_1 = require("@surgio/logger");
11
+ const zod_1 = require("zod");
12
12
  const types_1 = require("../types");
13
13
  const utils_1 = require("../utils");
14
14
  const env_flag_1 = require("../utils/env-flag");
@@ -18,52 +18,59 @@ const logger = (0, logger_1.createLogger)({
18
18
  service: 'surgio:ClashProvider',
19
19
  });
20
20
  class ClashProvider extends Provider_1.default {
21
+ #originalUrl;
22
+ udpRelay;
23
+ tls13;
21
24
  constructor(name, config) {
22
25
  super(name, config);
23
- const schema = joi_1.default.object({
24
- url: joi_1.default.string()
25
- .uri({
26
- scheme: [/https?/],
27
- })
28
- .required(),
29
- udpRelay: joi_1.default.bool().strict(),
30
- tls13: joi_1.default.bool().strict(),
31
- }).unknown();
32
- const { error } = schema.validate(config);
26
+ const schema = zod_1.z.object({
27
+ url: zod_1.z.string().url(),
28
+ udpRelay: zod_1.z.boolean().optional(),
29
+ tls13: zod_1.z.boolean().optional(),
30
+ });
31
+ const result = schema.safeParse(config);
33
32
  // istanbul ignore next
34
- if (error) {
35
- throw error;
33
+ if (!result.success) {
34
+ throw result.error;
36
35
  }
37
- this._url = config.url;
38
- this.udpRelay = config.udpRelay;
39
- this.tls13 = config.tls13;
36
+ this.#originalUrl = result.data.url;
37
+ this.udpRelay = result.data.udpRelay;
38
+ this.tls13 = result.data.tls13;
40
39
  this.supportGetSubscriptionUserInfo = true;
41
40
  }
42
41
  // istanbul ignore next
43
42
  get url() {
44
- return (0, relayable_url_1.default)(this._url, this.relayUrl);
43
+ return (0, relayable_url_1.default)(this.#originalUrl, this.config.relayUrl);
45
44
  }
46
- async getSubscriptionUserInfo({ requestUserAgent, } = {}) {
45
+ getSubscriptionUserInfo = async (params = {}) => {
46
+ const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
47
47
  const { subscriptionUserinfo } = await (0, exports.getClashSubscription)({
48
48
  url: this.url,
49
49
  udpRelay: this.udpRelay,
50
50
  tls13: this.tls13,
51
- requestUserAgent: requestUserAgent || this.requestUserAgent,
51
+ requestUserAgent,
52
52
  });
53
53
  if (subscriptionUserinfo) {
54
54
  return subscriptionUserinfo;
55
55
  }
56
- return void 0;
57
- }
58
- async getNodeList({ requestUserAgent, } = {}) {
56
+ return undefined;
57
+ };
58
+ getNodeList = async (params = {}) => {
59
+ const requestUserAgent = this.determineRequestUserAgent(params.requestUserAgent);
59
60
  const { nodeList } = await (0, exports.getClashSubscription)({
60
61
  url: this.url,
61
62
  udpRelay: this.udpRelay,
62
63
  tls13: this.tls13,
63
- requestUserAgent: requestUserAgent || this.requestUserAgent,
64
+ requestUserAgent,
64
65
  });
66
+ if (this.config.hooks?.afterFetchNodeList) {
67
+ const newList = await this.config.hooks.afterFetchNodeList(nodeList, params);
68
+ if (newList) {
69
+ return newList;
70
+ }
71
+ }
65
72
  return nodeList;
66
- }
73
+ };
67
74
  }
68
75
  exports.default = ClashProvider;
69
76
  const getClashSubscription = async ({ url, udpRelay, tls13, requestUserAgent, }) => {
@@ -96,50 +103,71 @@ const getClashSubscription = async ({ url, udpRelay, tls13, requestUserAgent, })
96
103
  exports.getClashSubscription = getClashSubscription;
97
104
  const parseClashConfig = (proxyList, udpRelay, tls13) => {
98
105
  const nodeList = proxyList.map((item) => {
99
- var _a, _b, _c, _d;
100
106
  switch (item.type) {
101
107
  case 'ss': {
102
108
  // istanbul ignore next
103
109
  if (item.plugin && !['obfs', 'v2ray-plugin'].includes(item.plugin)) {
104
110
  logger.warn(`不支持从 Clash 订阅中读取 ${item.plugin} 类型的 Shadowsocks 节点,节点 ${item.name} 会被省略`);
105
- return void 0;
111
+ return undefined;
106
112
  }
107
113
  // istanbul ignore next
108
114
  if (item.plugin === 'v2ray-plugin' &&
109
115
  item['plugin-opts'].mode.toLowerCase() === 'quic') {
110
116
  logger.warn(`不支持从 Clash 订阅中读取 QUIC 模式的 Shadowsocks 节点,节点 ${item.name} 会被省略`);
111
- return void 0;
117
+ return undefined;
112
118
  }
113
119
  const wsHeaders = (0, utils_1.lowercaseHeaderKeys)(lodash_1.default.get(item, 'plugin-opts.headers', {}));
114
- return Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Shadowsocks, nodeName: item.name, hostname: item.server, port: item.port, method: item.cipher, password: item.password, 'udp-relay': resolveUdpRelay(item.udp, udpRelay) }, (item.plugin && item.plugin === 'obfs'
115
- ? {
116
- obfs: item['plugin-opts'].mode,
117
- 'obfs-host': item['plugin-opts'].host || 'www.bing.com',
118
- }
119
- : null)), (item.obfs
120
- ? {
121
- obfs: item.obfs,
122
- 'obfs-host': item['obfs-host'] || 'www.bing.com',
123
- }
124
- : null)), (item.plugin &&
125
- item.plugin === 'v2ray-plugin' &&
126
- item['plugin-opts'].mode === 'websocket'
127
- ? Object.assign(Object.assign({ obfs: item['plugin-opts'].tls === true ? 'wss' : 'ws', 'obfs-host': item['plugin-opts'].host || item.server, 'obfs-uri': item['plugin-opts'].path || '/', wsHeaders }, (item['plugin-opts'].tls === true
120
+ return {
121
+ type: types_1.NodeTypeEnum.Shadowsocks,
122
+ nodeName: item.name,
123
+ hostname: item.server,
124
+ port: item.port,
125
+ method: item.cipher,
126
+ password: item.password,
127
+ udpRelay: resolveUdpRelay(item.udp, udpRelay),
128
+ // obfs-local 新格式
129
+ ...(item.plugin && item.plugin === 'obfs'
130
+ ? {
131
+ obfs: item['plugin-opts'].mode,
132
+ obfsHost: item['plugin-opts'].host || 'www.bing.com',
133
+ }
134
+ : null),
135
+ // obfs-local 旧格式
136
+ ...(item.obfs
128
137
  ? {
129
- skipCertVerify: item['plugin-opts']['skip-cert-verify'] === true,
130
- tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false,
138
+ obfs: item.obfs,
139
+ obfsHost: item['obfs-host'] || 'www.bing.com',
131
140
  }
132
- : null)), (typeof item['plugin-opts'].mux === 'boolean'
141
+ : null),
142
+ // v2ray-plugin
143
+ ...(item.plugin &&
144
+ item.plugin === 'v2ray-plugin' &&
145
+ item['plugin-opts'].mode === 'websocket'
133
146
  ? {
134
- mux: item['plugin-opts'].mux,
147
+ obfs: item['plugin-opts'].tls === true ? 'wss' : 'ws',
148
+ obfsHost: item['plugin-opts'].host || item.server,
149
+ obfsUri: item['plugin-opts'].path || '/',
150
+ wsHeaders,
151
+ ...(item['plugin-opts'].tls === true
152
+ ? {
153
+ skipCertVerify: item['plugin-opts']['skip-cert-verify'] === true,
154
+ tls13: tls13 ?? false,
155
+ }
156
+ : null),
157
+ ...(typeof item['plugin-opts'].mux === 'boolean'
158
+ ? {
159
+ mux: item['plugin-opts'].mux,
160
+ }
161
+ : null),
135
162
  }
136
- : null)) : null));
163
+ : null),
164
+ };
137
165
  }
138
166
  case 'vmess': {
139
167
  // istanbul ignore next
140
168
  if (item.network && !['tcp', 'ws'].includes(item.network)) {
141
169
  logger.warn(`不支持从 Clash 订阅中读取 network 类型为 ${item.network} 的 Vmess 节点,节点 ${item.name} 会被省略`);
142
- return void 0;
170
+ return undefined;
143
171
  }
144
172
  const isNewConfig = 'ws-opts' in item;
145
173
  const wsHeaders = isNewConfig
@@ -152,18 +180,31 @@ const parseClashConfig = (proxyList, udpRelay, tls13) => {
152
180
  path: lodash_1.default.get(item, 'ws-path', '/'),
153
181
  headers: wsHeaders,
154
182
  };
155
- return Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Vmess, nodeName: item.name, hostname: item.server, port: item.port, uuid: item.uuid, alterId: item.alterId ? `${item.alterId}` : '0', method: item.cipher || 'auto', 'udp-relay': resolveUdpRelay(item.udp, udpRelay), tls: (_a = item.tls) !== null && _a !== void 0 ? _a : false, network: item.network || 'tcp' }, (item.network === 'ws'
156
- ? {
157
- host: wsHost,
158
- path: lodash_1.default.get(wsOpts, 'path', '/'),
159
- wsHeaders,
160
- }
161
- : null)), (item.tls
162
- ? {
163
- skipCertVerify: item['skip-cert-verify'] === true,
164
- tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false,
165
- }
166
- : null));
183
+ return {
184
+ type: types_1.NodeTypeEnum.Vmess,
185
+ nodeName: item.name,
186
+ hostname: item.server,
187
+ port: item.port,
188
+ uuid: item.uuid,
189
+ alterId: item.alterId ? `${item.alterId}` : '0',
190
+ method: item.cipher || 'auto',
191
+ udpRelay: resolveUdpRelay(item.udp, udpRelay),
192
+ tls: item.tls ?? false,
193
+ network: item.network || 'tcp',
194
+ ...(item.network === 'ws'
195
+ ? {
196
+ host: wsHost,
197
+ path: lodash_1.default.get(wsOpts, 'path', '/'),
198
+ wsHeaders,
199
+ }
200
+ : null),
201
+ ...(item.tls
202
+ ? {
203
+ skipCertVerify: item['skip-cert-verify'] === true,
204
+ tls13: tls13 ?? false,
205
+ }
206
+ : null),
207
+ };
167
208
  }
168
209
  case 'http':
169
210
  if (!item.tls) {
@@ -183,13 +224,22 @@ const parseClashConfig = (proxyList, udpRelay, tls13) => {
183
224
  port: item.port,
184
225
  username: item.username || '',
185
226
  password: item.password || '',
186
- tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false,
227
+ tls13: tls13 ?? false,
187
228
  skipCertVerify: item['skip-cert-verify'] === true,
188
229
  };
189
230
  case 'snell':
190
- return Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Snell, nodeName: item.name, hostname: item.server, port: item.port, psk: item.psk, obfs: lodash_1.default.get(item, 'obfs-opts.mode', 'http') }, (typeof ((_b = item === null || item === void 0 ? void 0 : item['obfs-opts']) === null || _b === void 0 ? void 0 : _b.host) !== 'undefined'
191
- ? { 'obfs-host': item['obfs-opts'].host }
192
- : null)), ('version' in item ? { version: item.version } : null));
231
+ return {
232
+ type: types_1.NodeTypeEnum.Snell,
233
+ nodeName: item.name,
234
+ hostname: item.server,
235
+ port: item.port,
236
+ psk: item.psk,
237
+ obfs: lodash_1.default.get(item, 'obfs-opts.mode', 'http'),
238
+ ...(typeof item?.['obfs-opts']?.host !== 'undefined'
239
+ ? { obfsHost: item['obfs-opts'].host }
240
+ : null),
241
+ ...('version' in item ? { version: item.version } : null),
242
+ };
193
243
  // istanbul ignore next
194
244
  case 'ssr':
195
245
  return {
@@ -199,30 +249,69 @@ const parseClashConfig = (proxyList, udpRelay, tls13) => {
199
249
  port: item.port,
200
250
  password: item.password,
201
251
  obfs: item.obfs,
202
- obfsparam: (_c = item['obfs-param']) !== null && _c !== void 0 ? _c : item.obfsparam,
252
+ obfsparam: item['obfs-param'] ?? item.obfsparam,
203
253
  protocol: item.protocol,
204
- protoparam: (_d = item['protocol-param']) !== null && _d !== void 0 ? _d : item.protocolparam,
254
+ protoparam: item['protocol-param'] ?? item.protocolparam,
205
255
  method: item.cipher,
206
- 'udp-relay': resolveUdpRelay(item.udp, udpRelay),
256
+ udpRelay: resolveUdpRelay(item.udp, udpRelay),
207
257
  };
208
258
  case 'trojan': {
209
259
  const network = item.network;
210
260
  const wsOpts = lodash_1.default.get(item, 'ws-opts', {});
211
261
  const wsHeaders = (0, utils_1.lowercaseHeaderKeys)(lodash_1.default.get(wsOpts, 'headers', {}));
212
- return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Trojan, nodeName: item.name, hostname: item.server, port: item.port, password: item.password }, ('skip-cert-verify' in item
213
- ? { skipCertVerify: item['skip-cert-verify'] === true }
214
- : null)), ('alpn' in item ? { alpn: item.alpn } : null)), ('sni' in item ? { sni: item.sni } : null)), { 'udp-relay': resolveUdpRelay(item.udp, udpRelay), tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false }), (network === 'ws'
215
- ? { network: 'ws', wsPath: lodash_1.default.get(wsOpts, 'path', '/'), wsHeaders }
216
- : null));
262
+ return {
263
+ type: types_1.NodeTypeEnum.Trojan,
264
+ nodeName: item.name,
265
+ hostname: item.server,
266
+ port: item.port,
267
+ password: item.password,
268
+ ...('skip-cert-verify' in item
269
+ ? { skipCertVerify: item['skip-cert-verify'] === true }
270
+ : null),
271
+ ...('alpn' in item ? { alpn: item.alpn } : null),
272
+ ...('sni' in item ? { sni: item.sni } : null),
273
+ udpRelay: resolveUdpRelay(item.udp, udpRelay),
274
+ tls13: tls13 ?? false,
275
+ ...(network === 'ws'
276
+ ? { network: 'ws', wsPath: lodash_1.default.get(wsOpts, 'path', '/'), wsHeaders }
277
+ : null),
278
+ };
217
279
  }
218
280
  case 'tuic': {
219
- return Object.assign(Object.assign(Object.assign(Object.assign({ type: types_1.NodeTypeEnum.Tuic, nodeName: item.name, hostname: item.server, port: item.port, token: item.token, 'udp-relay': resolveUdpRelay(item.udp, udpRelay) }, ('skip-cert-verify' in item
220
- ? { skipCertVerify: item['skip-cert-verify'] === true }
221
- : null)), { tls13: tls13 !== null && tls13 !== void 0 ? tls13 : false }), ('sni' in item ? { sni: item.sni } : null)), ('alpn' in item ? { alpn: item.alpn } : null));
281
+ if (item.version >= 5) {
282
+ return {
283
+ type: types_1.NodeTypeEnum.Tuic,
284
+ version: item.version,
285
+ nodeName: item.name,
286
+ hostname: item.server,
287
+ port: item.port,
288
+ password: item.password,
289
+ uuid: item.uuid,
290
+ ...('skip-cert-verify' in item
291
+ ? { skipCertVerify: item['skip-cert-verify'] === true }
292
+ : null),
293
+ tls13: tls13 ?? false,
294
+ ...('sni' in item ? { sni: item.sni } : null),
295
+ ...('alpn' in item ? { alpn: item.alpn } : null),
296
+ };
297
+ }
298
+ return {
299
+ type: types_1.NodeTypeEnum.Tuic,
300
+ nodeName: item.name,
301
+ hostname: item.server,
302
+ port: item.port,
303
+ token: item.token,
304
+ ...('skip-cert-verify' in item
305
+ ? { skipCertVerify: item['skip-cert-verify'] === true }
306
+ : null),
307
+ tls13: tls13 ?? false,
308
+ ...('sni' in item ? { sni: item.sni } : null),
309
+ ...('alpn' in item ? { alpn: item.alpn } : null),
310
+ };
222
311
  }
223
312
  default:
224
313
  logger.warn(`不支持从 Clash 订阅中读取 ${item.type} 的节点,节点 ${item.name} 会被省略`);
225
- return void 0;
314
+ return undefined;
226
315
  }
227
316
  });
228
317
  return nodeList.filter((item) => item !== undefined);
@@ -234,4 +323,4 @@ function resolveUdpRelay(val, defaultVal = false) {
234
323
  }
235
324
  return defaultVal;
236
325
  }
237
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ClashProvider.js","sourceRoot":"","sources":["../../lib/provider/ClashProvider.ts"],"names":[],"mappings":"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"}
326
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ClashProvider.js","sourceRoot":"","sources":["../../src/provider/ClashProvider.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,9 @@
1
- import { CustomProviderConfig, PossibleNodeConfigType } from '../types';
1
+ import { CustomProviderConfig } from '../types';
2
2
  import Provider from './Provider';
3
+ import { GetNodeListFunction, GetNodeListParams } from './types';
3
4
  export default class CustomProvider extends Provider {
4
- readonly nodeList: ReadonlyArray<any>;
5
+ readonly nodeList: unknown[] | ((params: GetNodeListParams) => Promise<unknown[]>);
5
6
  readonly underlyingProxy?: string;
6
7
  constructor(name: string, config: CustomProviderConfig);
7
- getNodeList(): Promise<ReadonlyArray<PossibleNodeConfigType>>;
8
+ getNodeList: GetNodeListFunction;
8
9
  }
@@ -3,70 +3,101 @@ 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
- const joi_1 = __importDefault(require("joi"));
6
+ const zod_1 = require("zod");
7
7
  const types_1 = require("../types");
8
8
  const Provider_1 = __importDefault(require("./Provider"));
9
+ const validators_1 = require("../validators");
9
10
  class CustomProvider extends Provider_1.default {
11
+ nodeList;
12
+ underlyingProxy;
10
13
  constructor(name, config) {
11
14
  super(name, config);
12
- const nodeSchema = joi_1.default.object({
13
- type: joi_1.default.string()
14
- .valid(...Object.values(types_1.NodeTypeEnum))
15
- .required(),
16
- nodeName: joi_1.default.string().required(),
17
- enable: joi_1.default.boolean().strict(),
18
- tfo: joi_1.default.boolean().strict(),
19
- mptcp: joi_1.default.boolean().strict(),
20
- shadowTls: joi_1.default.object({
21
- password: joi_1.default.string().required(),
22
- sni: joi_1.default.string(),
23
- version: joi_1.default.string(),
24
- }),
25
- binPath: joi_1.default.string(),
26
- localPort: joi_1.default.number(),
27
- underlyingProxy: joi_1.default.string(),
28
- skipCertVerify: joi_1.default.boolean().strict(),
29
- sni: joi_1.default.string(),
30
- alpn: joi_1.default.array().items(joi_1.default.string()),
31
- serverCertFingerprintSha256: joi_1.default.string(),
32
- }).unknown();
33
- const schema = joi_1.default.object({
34
- nodeList: joi_1.default.array().items(nodeSchema).required(),
35
- underlyingProxy: joi_1.default.string(),
36
- }).unknown();
37
- const { error, value } = schema.validate(config);
15
+ const schema = zod_1.z.object({
16
+ nodeList: zod_1.z.union([
17
+ zod_1.z.array(zod_1.z.any()),
18
+ zod_1.z.function().args(zod_1.z.any()).returns(zod_1.z.any()),
19
+ ]),
20
+ underlyingProxy: zod_1.z.ostring(),
21
+ });
22
+ const result = schema.safeParse(config);
38
23
  // istanbul ignore next
39
- if (error) {
40
- throw error;
24
+ if (!result.success) {
25
+ throw result.error;
41
26
  }
42
- this.nodeList = value.nodeList;
43
- this.underlyingProxy = value.underlyingProxy;
27
+ this.nodeList = result.data.nodeList;
28
+ this.underlyingProxy = result.data.underlyingProxy;
44
29
  }
45
- async getNodeList() {
46
- const udpRelayCheckSchema = joi_1.default.object({
47
- 'udp-relay': joi_1.default.bool().strict(),
48
- }).unknown();
49
- return this.nodeList.map((item) => {
50
- const { error: udpRelayCheckError } = udpRelayCheckSchema.validate(item);
51
- const lowercaseKeys = ['wsHeaders'];
30
+ getNodeList = async (params = {}) => {
31
+ let nodeList;
32
+ const parsedNodeList = [];
33
+ if (typeof this.nodeList === 'function') {
34
+ nodeList = await this.nodeList(params);
35
+ }
36
+ else {
37
+ nodeList = this.nodeList;
38
+ }
39
+ for (const node of nodeList) {
40
+ const type = node.type;
52
41
  // istanbul ignore next
53
- if (udpRelayCheckError) {
54
- throw udpRelayCheckError;
42
+ if (node['udp-relay']) {
43
+ throw new Error('udp-relay is abandoned, please use udpRelay instead');
55
44
  }
56
- if (this.underlyingProxy && !item.underlyingProxy) {
57
- item.underlyingProxy = this.underlyingProxy;
45
+ // istanbul ignore next
46
+ if (node['obfs-host']) {
47
+ throw new Error('obfs-host is abandoned, please use obfsHost instead');
58
48
  }
59
- lowercaseKeys.forEach((key) => {
60
- if (item[key]) {
61
- item[key] = Object.keys(item[key]).reduce((acc, curr) => {
62
- acc[curr.toLowerCase()] = item[key][curr];
49
+ // istanbul ignore next
50
+ if (node['obfs-uri']) {
51
+ throw new Error('obfs-uri is abandoned, please use obfsUri instead');
52
+ }
53
+ const parsedNode = (() => {
54
+ switch (type) {
55
+ case types_1.NodeTypeEnum.Shadowsocks:
56
+ return validators_1.ShadowsocksNodeConfigValidator.parse(node);
57
+ case types_1.NodeTypeEnum.Shadowsocksr:
58
+ return validators_1.ShadowsocksrNodeConfigValidator.parse(node);
59
+ case types_1.NodeTypeEnum.Vmess:
60
+ return validators_1.VmessNodeConfigValidator.parse(node);
61
+ case types_1.NodeTypeEnum.Trojan:
62
+ return validators_1.TrojanNodeConfigValidator.parse(node);
63
+ case types_1.NodeTypeEnum.Socks5:
64
+ return validators_1.Socks5NodeConfigValidator.parse(node);
65
+ case types_1.NodeTypeEnum.HTTP:
66
+ return validators_1.HttpNodeConfigValidator.parse(node);
67
+ case types_1.NodeTypeEnum.HTTPS:
68
+ return validators_1.HttpsNodeConfigValidator.parse(node);
69
+ case types_1.NodeTypeEnum.Snell:
70
+ return validators_1.SnellNodeConfigValidator.parse(node);
71
+ case types_1.NodeTypeEnum.Tuic:
72
+ return validators_1.TuicNodeConfigValidator.parse(node);
73
+ case types_1.NodeTypeEnum.Wireguard:
74
+ return validators_1.WireguardNodeConfigValidator.parse(node);
75
+ default:
76
+ throw new TypeError(`Unexpected object: ${type}`);
77
+ }
78
+ })();
79
+ const propertyKeysMustBeLowercase = ['wsHeaders'];
80
+ if (this.underlyingProxy && !parsedNode.underlyingProxy) {
81
+ parsedNode.underlyingProxy = this.underlyingProxy;
82
+ }
83
+ propertyKeysMustBeLowercase.forEach((key) => {
84
+ if (parsedNode[key]) {
85
+ parsedNode[key] = Object.keys(parsedNode[key]).reduce((acc, curr) => {
86
+ acc[curr.toLowerCase()] = parsedNode[key][curr];
63
87
  return acc;
64
88
  }, {});
65
89
  }
66
90
  });
67
- return item;
68
- });
69
- }
91
+ parsedNodeList.push(parsedNode);
92
+ }
93
+ if (this.config.hooks?.afterFetchNodeList) {
94
+ const newList = await this.config.hooks.afterFetchNodeList(parsedNodeList, params);
95
+ if (newList) {
96
+ return newList;
97
+ }
98
+ }
99
+ return parsedNodeList;
100
+ };
70
101
  }
71
102
  exports.default = CustomProvider;
72
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvcHJvdmlkZXIvQ3VzdG9tUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw4Q0FBc0I7QUFDdEIsb0NBSWtCO0FBQ2xCLDBEQUFrQztBQUVsQyxNQUFxQixjQUFlLFNBQVEsa0JBQVE7SUFJbEQsWUFBWSxJQUFZLEVBQUUsTUFBNEI7UUFDcEQsS0FBSyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUVwQixNQUFNLFVBQVUsR0FBRyxhQUFHLENBQUMsTUFBTSxDQUFDO1lBQzVCLElBQUksRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2lCQUNmLEtBQUssQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQVMsb0JBQVksQ0FBQyxDQUFDO2lCQUM3QyxRQUFRLEVBQUU7WUFDYixRQUFRLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsRUFBRTtZQUNqQyxNQUFNLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM5QixHQUFHLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUMzQixLQUFLLEVBQUUsYUFBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRTtZQUM3QixTQUFTLEVBQUUsYUFBRyxDQUFDLE1BQU0sQ0FBQztnQkFDcEIsUUFBUSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLEVBQUU7Z0JBQ2pDLEdBQUcsRUFBRSxhQUFHLENBQUMsTUFBTSxFQUFFO2dCQUNqQixPQUFPLEVBQUUsYUFBRyxDQUFDLE1BQU0sRUFBRTthQUN0QixDQUFDO1lBQ0YsT0FBTyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7WUFDckIsU0FBUyxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVBQUU7WUFDdkIsZUFBZSxFQUFFLGFBQUcsQ0FBQyxNQUFNLEVB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
103
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VzdG9tUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmlkZXIvQ3VzdG9tUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2QkFBdUI7QUFFdkIsb0NBSWlCO0FBQ2pCLDBEQUFpQztBQUNqQyw4Q0FXc0I7QUFHdEIsTUFBcUIsY0FBZSxTQUFRLGtCQUFRO0lBQ2xDLFFBQVEsQ0FFK0I7SUFDdkMsZUFBZSxDQUFTO0lBRXhDLFlBQVksSUFBWSxFQUFFLE1BQTRCO1FBQ3BELEtBQUssQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFFbkIsTUFBTSxNQUFNLEdBQUcsT0FBQyxDQUFDLE1BQU0sQ0FBQztZQUN0QixRQUFRLEVBQUUsT0FBQyxDQUFDLEtBQUssQ0FBQztnQkFDaEIsT0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFDLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2hCLE9BQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE9BQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQzthQUM1QyxDQUFDO1lBQ0YsZUFBZSxFQUFFLE9BQUMsQ0FBQyxPQUFPLEVBQUU7U0FDN0IsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUV2Qyx1QkFBdUI7UUFDdkIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7WUFDbkIsTUFBTSxNQUFNLENBQUMsS0FBSyxDQUFBO1NBQ25CO1FBRUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQTtRQUNwQyxJQUFJLENBQUMsZUFBZSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFBO0lBQ3BELENBQUM7SUFFTSxXQUFXLEdBQXdCLEtBQUssRUFD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
@@ -1,31 +1,18 @@
1
- import { ProviderConfig, SupportProviderEnum, PossibleNodeConfigType, SubscriptionUserinfo } from '../types';
1
+ import { ProviderConfig, SupportProviderEnum } from '../types';
2
2
  import { SubsciptionCacheItem } from '../utils/cache';
3
- export default class Provider {
3
+ import { GetNodeListFunction, GetSubscriptionUserInfoFunction } from './types';
4
+ export default abstract class Provider {
4
5
  name: string;
5
6
  readonly type: SupportProviderEnum;
6
- readonly nodeFilter?: ProviderConfig['nodeFilter'];
7
- readonly netflixFilter?: ProviderConfig['netflixFilter'];
8
- readonly youtubePremiumFilter?: ProviderConfig['youtubePremiumFilter'];
9
- readonly customFilters?: ProviderConfig['customFilters'];
10
- readonly addFlag?: boolean;
11
- readonly removeExistingFlag?: boolean;
12
- readonly tfo?: boolean;
13
- readonly underlyingProxy?: string;
14
- readonly mptcp?: boolean;
15
- readonly renameNode?: ProviderConfig['renameNode'];
16
- readonly relayUrl?: boolean | string;
17
- readonly requestUserAgent?: string;
7
+ readonly config: ProviderConfig;
18
8
  supportGetSubscriptionUserInfo: boolean;
19
- startPort?: number;
20
- constructor(name: string, config: ProviderConfig);
9
+ passGatewayRequestUserAgent: boolean;
10
+ protected constructor(name: string, config: ProviderConfig);
21
11
  static requestCacheableResource(url: string, options?: {
22
12
  requestUserAgent?: string;
23
13
  }): Promise<SubsciptionCacheItem>;
14
+ determineRequestUserAgent(requestUserAgent?: string | undefined): string | undefined;
24
15
  get nextPort(): number;
25
- getSubscriptionUserInfo({}?: {
26
- requestUserAgent?: string;
27
- }): Promise<SubscriptionUserinfo | undefined>;
28
- getNodeList({}?: {
29
- requestUserAgent?: string;
30
- }): Promise<ReadonlyArray<PossibleNodeConfigType>>;
16
+ getSubscriptionUserInfo: GetSubscriptionUserInfoFunction;
17
+ getNodeList: GetNodeListFunction;
31
18
  }