ddan-js 2.6.40 → 2.6.42

package/bin/lib/modules/node/socks5.js

@@ -4,9 +4,9 @@ exports.Socks5 = void 0;
 const net_1 = require("net");
 const socks_1 = require("socks");
 const uuid_1 = require("../crypto/uuid");
-const mapping_1 = require("../../class/mapping");
 const index_1 = require("../qs/index");
 const event_1 = require("../../class/event");
+const pipeline_1 = require("../hook/modules/pipeline");
 const Socks5Event = {
     Error: 'error',
 };
@@ -15,20 +15,20 @@ class Socks5 {
     server = null;
     clientSockets = new Set();
     allowedDomains;
-    connectionPool;
     systemProxy = null;
     useSystemProxy = false;
     __debug = false;
     __uuid;
     __port = 0;
     __event;
+    __pipeline;
     constructor(upstreamProxy, allowedDomains = ['*'], debug = false) {
         this.__event = new event_1.default();
         this.upstreamProxy = upstreamProxy;
         this.allowedDomains = new Set(allowedDomains);
         this.__debug = debug;
         this.__uuid = (0, uuid_1.default)();
-        this.connectionPool = new mapping_1.default();
+        this.__pipeline = new pipeline_1.default(1);
     }
     get id() {
         return this.__uuid;
@@ -61,7 +61,7 @@ class Socks5 {
         }
         const port = await this.findAvailablePort(startPort);
         if (!port)
-            return port;
+            return 0;
         this.__port = port;
         this.server = net_1.default.createServer((socket) => this.handleSocksConnection(socket));
         this.server.listen(port, () => {
@@ -115,6 +115,18 @@ class Socks5 {
         return 0;
     }
     async handleSocksConnection(clientSocket) {
+        const id = (0, uuid_1.default)();
+        this.__pipeline.push(async () => {
+            this.__debug &&
+                console.info(`[socks] pipeline ${clientSocket.remoteAddress}:${clientSocket.remotePort} ${id}`);
+            await this._handleSocksConnection(clientSocket);
+        }, () => {
+            console.info(`[socks] pipeline ${id} end`);
+        });
+    }
+    async _handleSocksConnection(clientSocket) {
+        if (!clientSocket)
+            return;
         this.clientSockets.add(clientSocket);
         clientSocket.on('close', () => {
             this.clientSockets.delete(clientSocket);
@@ -122,7 +134,6 @@ class Socks5 {
         });
         let addrport = '';
         try {
-            this.connectionPool.clean(100, (kv) => kv?.destroy());
             await this.performHandshake(clientSocket);
             const destination = await this.parseClientRequest(clientSocket);
             addrport = `${destination.addr}:${destination.port}`;
@@ -207,26 +218,8 @@ class Socks5 {
             });
         });
     }
-    getPoolConnection(key) {
-        if (!key)
-            return undefined;
-        const connection = this.connectionPool.get(key);
-        // 如果已有连接在池中，复用
-        if (this.connectionPool[key] && !this.connectionPool[key].destroyed) {
-            return this.connectionPool[key];
-        }
-        // 如果已有连接在池中，复用
-        if (connection && !connection.destroyed) {
-            return connection;
-        }
-        return undefined;
-    }
     // 上游代理连接
     async connectToUpstreamProxy(destination) {
-        const destKey = `${destination.addr}:${destination.port}`;
-        const cacheConnection = this.getPoolConnection(destKey);
-        if (cacheConnection)
-            return cacheConnection;
         const options = {
             proxy: { ...this.upstreamProxy, type: 5 },
             command: 'connect',
@@ -236,15 +229,7 @@ class Socks5 {
             },
         };
         try {
-            const { socket: upstreamSocket } = await socks_1.SocksClient.createConnection(options);
-            // this.connectionPool[destKey] = upstreamSocket
-            this.connectionPool.set(destKey, upstreamSocket);
-            upstreamSocket.on('close', () => {
-                // delete this.connectionPool[destKey]
-                this.__debug && console.info('[socks] connection pool delete', destKey);
-                this.connectionPool.delete(destKey);
-            });
-            return upstreamSocket;
+            return await this.connectToProxy(options);
         }
         catch (err) {
             throw new Error('Failed to connect to upstream proxy: ' + err);
@@ -252,10 +237,6 @@ class Socks5 {
     }
     // 系统代理连接
     async connectToSystemProxy(destination) {
-        const destKey = `${destination.addr}:${destination.port}`;
-        const cacheConnection = this.getPoolConnection(destKey);
-        if (cacheConnection)
-            return cacheConnection;
         const options = {
             proxy: { ...this.systemProxy, type: 5 },
             command: 'connect',
@@ -265,36 +246,22 @@ class Socks5 {
             },
         };
         try {
-            const { socket: systemSocket } = await socks_1.SocksClient.createConnection(options);
-            this.connectionPool.set(destKey, systemSocket);
-            systemSocket.on('close', () => {
-                // delete this.connectionPool[destKey]
-                this.__debug && console.info('[socks] connection pool delete', destKey);
-                this.connectionPool.delete(destKey);
-            });
-            return systemSocket;
+            return await this.connectToProxy(options);
         }
         catch (err) {
             throw new Error('Failed to connect to system proxy: ' + err);
         }
     }
+    async connectToProxy(options) {
+        const { socket } = await socks_1.SocksClient.createConnection(options);
+        return socket;
+    }
     // 本地连接
     async connectToLocal(destination) {
-        const destKey = `${destination.addr}:${destination.port}`;
-        const cacheConnection = this.getPoolConnection(destKey);
-        if (cacheConnection)
-            return cacheConnection;
         return new Promise((resolve, reject) => {
             const localSocket = net_1.default.createConnection(destination.port, destination.addr, () => {
                 resolve(localSocket);
             });
-            // this.connectionPool[destKey] = localSocket
-            this.connectionPool.set(destKey, localSocket);
-            localSocket.on('close', () => {
-                // delete this.connectionPool[destKey]
-                this.__debug && console.info('[socks] connection pool delete', destKey);
-                this.connectionPool.delete(destKey);
-            });
             localSocket.on('error', (err) => {
                 reject(err);
             });
@@ -304,14 +271,14 @@ class Socks5 {
         clientSocket.write(new Uint8Array([0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]));
         clientSocket.pipe(targetSocket);
         targetSocket.pipe(clientSocket);
-        const localIpPort = `${targetSocket.localAddress}:${targetSocket.localPort}`;
-        this.__debug && console.info(`[socks] setupDataForwarding ${localIpPort}`);
+        const addrPort = `${targetSocket.localAddress}:${targetSocket.localPort}`;
+        this.__debug && console.info(`[socks] setupDataForwarding ${addrPort}`);
         clientSocket.on('close', () => {
-            this.__debug && console.info('[socks] client socket close', localIpPort);
+            this.__debug && console.info('[socks] client socket close', addrPort);
             targetSocket.end();
         });
         targetSocket.on('close', () => {
-            this.__debug && console.info('[socks] target socket close', localIpPort);
+            this.__debug && console.info('[socks] target socket close', addrPort);
             clientSocket.end();
         });
         clientSocket.on('error', (err) => {
@@ -349,8 +316,6 @@ class Socks5 {
             this.clientSockets.clear();
             // 销毁所有连接池中的 socket
             // Object.values(this.connectionPool).forEach((socket) => socket?.destroy())
-            this.connectionPool.values.forEach((kv) => kv?.value?.destroy());
-            this.connectionPool.clear();
             this.server = null;
             this.__port = 0;
         }
@@ -358,15 +323,6 @@ class Socks5 {
             this.__debug && console.error('[socks] close errot:', error);
         }
     }
-    showPools() {
-        this.connectionPool.values.forEach((kv) => {
-            const socket = kv?.value;
-            const key = kv?.key;
-            if (key && socket) {
-                console.info(`[socks] ${key} ${socket.localAddress}:${socket.localPort}`);
-            }
-        });
-    }
     on(name, listener) {
         if (!name || !listener)
             return;

package/bin/lib/modules/rule/async-validator/rule/url.js

@@ -12,17 +12,17 @@ exports.default = () => {
         : '';
     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}';
     const v6seg = '[a-fA-F\\d]{1,4}';
-    const v6 = `
-(?:
-(?:${v6seg}:){7}(?:${v6seg}|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8
-(?:${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
-(?:${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
-(?:${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
-(?:${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
-(?:${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
-(?:${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
-(?::(?:(?::${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
-)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1
+    const v6 = `
+(?:
+(?:${v6seg}:){7}(?:${v6seg}|:)|                                    // 1:2:3:4:5:6:7::  1:2:3:4:5:6:7:8
+(?:${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
+(?:${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
+(?:${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
+(?:${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
+(?:${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
+(?:${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
+(?::(?:(?::${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
+)(?:%[0-9a-zA-Z]{1,})?                                             // %eth0            %1
 `
         .replace(/\s*\/\/.*$/gm, '')
         .replace(/\n/g, '')

package/bin/types/modules/node/ecdh.d.ts

@@ -9,7 +9,7 @@ export default class Ecdh {
     __algorithm: string;
     __ecdh: crypto.ECDH | undefined;
     constructor(curve?: string, algorithm?: string);
-    generateKey(): void;
+    generateKeys(): void;
     setPrivateKey(privateBase64: string): boolean;
     setSharedSecret(secretBase64: string): boolean;
     deriveSharedSecret(otherPublicKey: string, iv?: string): boolean;

package/bin/types/modules/node/socks5.d.ts

@@ -1,4 +1,5 @@
 import DEvent from '../../class/event';
+import DPipeline from '../hook/modules/pipeline';
 interface IProxyConfig {
     ipaddress: string;
     port: number;
@@ -15,13 +16,13 @@ export declare class Socks5 {
     private server;
     private clientSockets;
     private allowedDomains;
-    private connectionPool;
     private systemProxy;
     private useSystemProxy;
     __debug: boolean;
     __uuid: string;
     __port: number;
     __event: DEvent;
+    __pipeline: DPipeline;
     constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[] | ['*'], debug?: boolean);
     get id(): string;
     get port(): number;
@@ -32,6 +33,7 @@ export declare class Socks5 {
     setAllowedDomains(allowedDomains?: string[]): void;
     private findAvailablePort;
     private handleSocksConnection;
+    private _handleSocksConnection;
     /**
      * 回复客户端请求响应数据
      * VER是SOCKS版本，这里应该是0x05；
@@ -50,14 +52,13 @@ export declare class Socks5 {
     /**  */
     private performHandshake;
     private parseClientRequest;
-    private getPoolConnection;
     private connectToUpstreamProxy;
     private connectToSystemProxy;
+    private connectToProxy;
     private connectToLocal;
     private setupDataForwarding;
     private isAllowedDomain;
     close(): void;
-    showPools(): void;
     on(name: Socks5EventType, listener: (...args: any[]) => void): void;
     off(name: Socks5EventType, listener: (...args: any[]) => void): void;
     private _emit;

package/bin/types/modules/rule/async-validator/index.d.ts

@@ -14,12 +14,6 @@ declare class Schema {
         string: import("./interface").ExecuteValidator;
         method: import("./interface").ExecuteValidator;
         number: import("./interface").ExecuteValidator;
-        /**
-         *  Encapsulates a validation schema.
-         *
-         *  @param descriptor An object declaring validation rules
-         *  for this schema.
-         */
         boolean: import("./interface").ExecuteValidator;
         regexp: import("./interface").ExecuteValidator;
         integer: import("./interface").ExecuteValidator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.6.40",
+  "version": "2.6.42",
   "description": "",
   "keywords": [
     "ddan-js",