ddan-js 2.7.5 → 2.7.6

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 (12) hide show
  1. package/LICENSE +7 -7
  2. package/README.md +10 -10
  3. package/bin/ddan-js.esm.js +1 -1
  4. package/bin/ddan-js.js +1 -1
  5. package/bin/lib/modules/node/proxy.js +22 -1
  6. package/bin/lib/modules/node/socks5.js +17 -17
  7. package/bin/lib/modules/rule/async-validator/rule/url.js +11 -11
  8. package/bin/types/index.d.ts +5 -0
  9. package/bin/types/modules/node/index.d.ts +5 -0
  10. package/bin/types/modules/node/proxy.d.ts +5 -0
  11. package/bin/types/modules/rule/async-validator/index.d.ts +6 -0
  12. package/package.json +1 -1
package/bin/lib/modules/node/socks5.js CHANGED
@@ -63,7 +63,7 @@ class Socks5 {
63
63
  if (this.validateProxyConfig())
64
64
  return 0;
65
65
  if (this.server) {
66
- this.__debug && console.info(`[socks] server is already running`);
66
+ this.__debug && console.info(`[socks5] server is already running`);
67
67
  return this.__port;
68
68
  }
69
69
  const port = await this.findAvailablePort(startPort);
@@ -72,10 +72,10 @@ class Socks5 {
72
72
  this.__port = port;
73
73
  this.server = net_1.default.createServer((socket) => this.handleSocksConnection(socket));
74
74
  this.server.listen(port, () => {
75
- this.__debug && this.__logger?.info(`[socks] server is running on port ${port}`);
75
+ this.__debug && this.__logger?.info(`[socks5] server is running on port ${port}`);
76
76
  });
77
77
  this.server.on('error', (err) => {
78
- this.__logger?.error('[socks] server error:', err);
78
+ this.__logger?.error('[socks5] server error:', err);
79
79
  this.close();
80
80
  });
81
81
  return port;
@@ -124,7 +124,7 @@ class Socks5 {
124
124
  port++; // 尝试下一个端口
125
125
  }
126
126
  }
127
- this.__debug && this.__logger?.warn('[socks] findAvailablePort failed');
127
+ this.__debug && this.__logger?.warn('[socks5] findAvailablePort failed');
128
128
  return 0;
129
129
  }
130
130
  async handleSocksConnection(clientSocket) {
@@ -141,28 +141,28 @@ class Socks5 {
141
141
  const destination = await this.parseClientRequest(clientSocket);
142
142
  const addr = destination.addr;
143
143
  addrport = `${addr}:${destination.port}`;
144
- this.__debug && this.__logger?.info(`[socks] handle connection`, addrport);
144
+ this.__debug && this.__logger?.info(`[socks5] handle connection`, addrport);
145
145
  if (this.isAllowedDomain(addr)) {
146
146
  // 走上游代理
147
147
  const upstreamSocket = await this.connectToUpstreamProxy(destination);
148
- this.__logger?.info(`[socks] handle connection upstream`, addrport);
148
+ this.__logger?.info(`[socks5] handle connection upstream`, addrport);
149
149
  this.setupDataForwarding(clientSocket, upstreamSocket);
150
150
  }
151
151
  else if (this.useSystemProxy && this.systemProxy && !index_1.default.isLocalIpAddress(addr)) {
152
152
  // 走系统代理
153
153
  const systemSocket = await this.connectToSystemProxy(destination);
154
- this.__debug && console.info(`[socks] handle connection system`, addrport);
154
+ this.__debug && console.info(`[socks5] handle connection system`, addrport);
155
155
  this.setupDataForwarding(clientSocket, systemSocket);
156
156
  }
157
157
  else {
158
- this.__debug && console.info(`[socks] handle connection local`, addrport);
158
+ this.__debug && console.info(`[socks5] handle connection local`, addrport);
159
159
  // 本地连接
160
160
  const localSocket = await this.connectToLocal(destination);
161
161
  this.setupDataForwarding(clientSocket, localSocket);
162
162
  }
163
163
  }
164
164
  catch (err) {
165
- this.__debug && this.__logger?.error('[socks] connection failed:', err);
165
+ this.__debug && this.__logger?.error('[socks5] connection failed:', err);
166
166
  // this.__event.emit(Socks5Event.Error, err, addrport)
167
167
  clientSocket.end(new Uint8Array([0x05, 0x01]));
168
168
  this._emit('error', err, addrport);
@@ -286,21 +286,21 @@ class Socks5 {
286
286
  clientSocket.pipe(targetSocket);
287
287
  targetSocket.pipe(clientSocket);
288
288
  const addrPort = `${targetSocket.localAddress}:${targetSocket.localPort}`;
289
- this.__debug && console.info(`[socks] setupDataForwarding ${addrPort}`);
289
+ this.__debug && console.info(`[socks5] setupDataForwarding ${addrPort}`);
290
290
  clientSocket.on('close', () => {
291
- this.__debug && console.info('[socks] client socket close', addrPort);
291
+ this.__debug && console.info('[socks5] client socket close', addrPort);
292
292
  targetSocket.end();
293
293
  });
294
294
  targetSocket.on('close', () => {
295
- this.__debug && console.info('[socks] target socket close', addrPort);
295
+ this.__debug && console.info('[socks5] target socket close', addrPort);
296
296
  clientSocket.end();
297
297
  });
298
298
  clientSocket.on('error', (err) => {
299
- this.__debug && console.error('[socks] client socket error:', err?.message);
299
+ this.__debug && console.error('[socks5] client socket error:', err?.message);
300
300
  targetSocket.end();
301
301
  });
302
302
  targetSocket.on('error', (err) => {
303
- this.__debug && console.error('[socks] target socket error:', err?.message);
303
+ this.__debug && console.error('[socks5] target socket error:', err?.message);
304
304
  clientSocket.end();
305
305
  });
306
306
  }
@@ -319,10 +319,10 @@ class Socks5 {
319
319
  try {
320
320
  if (!this.server)
321
321
  return;
322
- this.__debug && this.__logger?.info('[socks] closing SOCKS5 proxy server...');
322
+ this.__debug && this.__logger?.info('[socks5] closing SOCKS5 proxy server...');
323
323
  this.server.close((err) => {
324
324
  if (err) {
325
- this.__debug && this.__logger?.error('[socks] closing the server failed:', err);
325
+ this.__debug && this.__logger?.error('[socks5] closing the server failed:', err);
326
326
  }
327
327
  });
328
328
  // 销毁客户端 socket
@@ -334,7 +334,7 @@ class Socks5 {
334
334
  this.__port = 0;
335
335
  }
336
336
  catch (error) {
337
- this.__debug && this.__logger?.error('[socks] close error:', error);
337
+ this.__debug && this.__logger?.error('[socks5] close error:', error);
338
338
  }
339
339
  }
340
340
  on(name, listener) {
package/bin/lib/modules/rule/async-validator/rule/url.js CHANGED
@@ -12,17 +12,17 @@ exports.default = () => {
12
12
  : '';
13
13
  const v4 = '(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}';
14
14
  const v6seg = '[a-fA-F\\d]{1,4}';
15
- const v6 = `
16
- (?:
17
- (?:${v6seg}:){7}(?:${v6seg}|:)| // 1:2:3:4:5:6:7:: 1:2:3:4:5:6:7:8
18
- (?:${v6seg}:){6}(?:${v4}|:${v6seg}|:)| // 1:2:3:4:5:6:: 1:2:3:4:5:6::8 1:2:3:4:5:6::8 1:2:3:4:5:6::1.2.3.4
19
- (?:${v6seg}:){5}(?::${v4}|(?::${v6seg}){1,2}|:)| // 1:2:3:4:5:: 1:2:3:4:5::7:8 1:2:3:4:5::8 1:2:3:4:5::7:1.2.3.4
20
- (?:${v6seg}:){4}(?:(?::${v6seg}){0,1}:${v4}|(?::${v6seg}){1,3}|:)| // 1:2:3:4:: 1:2:3:4::6:7:8 1:2:3:4::8 1:2:3:4::6:7:1.2.3.4
21
- (?:${v6seg}:){3}(?:(?::${v6seg}){0,2}:${v4}|(?::${v6seg}){1,4}|:)| // 1:2:3:: 1:2:3::5:6:7:8 1:2:3::8 1:2:3::5:6:7:1.2.3.4
22
- (?:${v6seg}:){2}(?:(?::${v6seg}){0,3}:${v4}|(?::${v6seg}){1,5}|:)| // 1:2:: 1:2::4:5:6:7:8 1:2::8 1:2::4:5:6:7:1.2.3.4
23
- (?:${v6seg}:){1}(?:(?::${v6seg}){0,4}:${v4}|(?::${v6seg}){1,6}|:)| // 1:: 1::3:4:5:6:7:8 1::8 1::3:4:5:6:7:1.2.3.4
24
- (?::(?:(?::${v6seg}){0,5}:${v4}|(?::${v6seg}){1,7}|:)) // ::2:3:4:5:6:7:8 ::2:3:4:5:6:7:8 ::8 ::1.2.3.4
25
- )(?:%[0-9a-zA-Z]{1,})? // %eth0 %1
15
+ const v6 = `
16
+ (?:
17
+ (?:${v6seg}:){7}(?:${v6seg}|:)| // 1:2:3:4:5:6:7:: 1:2:3:4:5:6:7:8
18
+ (?:${v6seg}:){6}(?:${v4}|:${v6seg}|:)| // 1:2:3:4:5:6:: 1:2:3:4:5:6::8 1:2:3:4:5:6::8 1:2:3:4:5:6::1.2.3.4
19
+ (?:${v6seg}:){5}(?::${v4}|(?::${v6seg}){1,2}|:)| // 1:2:3:4:5:: 1:2:3:4:5::7:8 1:2:3:4:5::8 1:2:3:4:5::7:1.2.3.4
20
+ (?:${v6seg}:){4}(?:(?::${v6seg}){0,1}:${v4}|(?::${v6seg}){1,3}|:)| // 1:2:3:4:: 1:2:3:4::6:7:8 1:2:3:4::8 1:2:3:4::6:7:1.2.3.4
21
+ (?:${v6seg}:){3}(?:(?::${v6seg}){0,2}:${v4}|(?::${v6seg}){1,4}|:)| // 1:2:3:: 1:2:3::5:6:7:8 1:2:3::8 1:2:3::5:6:7:1.2.3.4
22
+ (?:${v6seg}:){2}(?:(?::${v6seg}){0,3}:${v4}|(?::${v6seg}){1,5}|:)| // 1:2:: 1:2::4:5:6:7:8 1:2::8 1:2::4:5:6:7:1.2.3.4
23
+ (?:${v6seg}:){1}(?:(?::${v6seg}){0,4}:${v4}|(?::${v6seg}){1,6}|:)| // 1:: 1::3:4:5:6:7:8 1::8 1::3:4:5:6:7:1.2.3.4
24
+ (?::(?:(?::${v6seg}){0,5}:${v4}|(?::${v6seg}){1,7}|:)) // ::2:3:4:5:6:7:8 ::2:3:4:5:6:7:8 ::8 ::1.2.3.4
25
+ )(?:%[0-9a-zA-Z]{1,})? // %eth0 %1
26
26
  `
27
27
  .replace(/\s*\/\/.*$/gm, '')
28
28
  .replace(/\n/g, '')
package/bin/types/index.d.ts CHANGED
@@ -576,6 +576,11 @@ declare const dNode: {
576
576
  type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
577
577
  direct?: boolean | undefined;
578
578
  } | undefined) => string;
579
+ pacScript: (host: string, port: number, options?: {
580
+ rules?: string[] | undefined;
581
+ type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
582
+ useSystem?: boolean | undefined;
583
+ } | undefined) => Promise<string>;
579
584
  child_exec: (cmd: string) => Promise<[any, string]>;
580
585
  brotliCompress: typeof import("./modules/node/brotli").brotliCompress;
581
586
  brotliDecompress: typeof import("./modules/node/brotli").brotliDecompress;
package/bin/types/modules/node/index.d.ts CHANGED
@@ -14,6 +14,11 @@ declare const _default: {
14
14
  type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
15
15
  direct?: boolean | undefined;
16
16
  } | undefined) => string;
17
+ pacScript: (host: string, port: number, options?: {
18
+ rules?: string[] | undefined;
19
+ type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
20
+ useSystem?: boolean | undefined;
21
+ } | undefined) => Promise<string>;
17
22
  child_exec: (cmd: string) => Promise<[any, string]>;
18
23
  brotliCompress: typeof import("./brotli").brotliCompress;
19
24
  brotliDecompress: typeof import("./brotli").brotliDecompress;
package/bin/types/modules/node/proxy.d.ts CHANGED
@@ -8,5 +8,10 @@ declare const _default_1: {
8
8
  type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
9
9
  direct?: boolean | undefined;
10
10
  } | undefined) => string;
11
+ pacScript: (host: string, port: number, options?: {
12
+ rules?: string[] | undefined;
13
+ type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
14
+ useSystem?: boolean | undefined;
15
+ } | undefined) => Promise<string>;
11
16
  };
12
17
  export default _default_1;
package/bin/types/modules/rule/async-validator/index.d.ts CHANGED
@@ -14,6 +14,12 @@ declare class Schema {
14
14
  string: import("./interface").ExecuteValidator;
15
15
  method: import("./interface").ExecuteValidator;
16
16
  number: import("./interface").ExecuteValidator;
17
+ /**
18
+ * Encapsulates a validation schema.
19
+ *
20
+ * @param descriptor An object declaring validation rules
21
+ * for this schema.
22
+ */
17
23
  boolean: import("./interface").ExecuteValidator;
18
24
  regexp: import("./interface").ExecuteValidator;
19
25
  integer: import("./interface").ExecuteValidator;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ddan-js",
3
- "version": "2.7.5",
3
+ "version": "2.7.6",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "ddan-js",