ddan-js 2.6.28 → 2.6.30

package/bin/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dNode = exports.dLogger = exports.dTracker = exports.dJoker = exports.dStore = exports.dCdn = exports.dMini = exports.dWeb = exports.dHook = exports.dUtil = void 0;
+exports.Mapping = exports.KValue = exports.dNode = exports.dLogger = exports.dTracker = exports.dJoker = exports.dStore = exports.dCdn = exports.dMini = exports.dWeb = exports.dHook = exports.dUtil = void 0;
 const gbk_1 = require("./modules/gbk");
 const time_1 = require("./modules/time");
 const hook_1 = require("./modules/hook");
@@ -31,6 +31,10 @@ const tracker_1 = require("./class/tracker");
 const rsa_1 = require("./modules/rsa");
 const node_1 = require("./modules/node");
 const browser_1 = require("./modules/browser");
+const kvalue_1 = require("./class/kvalue");
+exports.KValue = kvalue_1.default;
+const mapping_1 = require("./class/mapping");
+exports.Mapping = mapping_1.default;
 const dUtil = {
     gbk: gbk_1.default,
     math: math_1.default,
@@ -46,10 +50,12 @@ const dUtil = {
     Event: event_1.default,
 };
 exports.dUtil = dUtil;
+const singleton = util_1.default.singleton;
 const dHook = {
     ...convert_1.default,
     ...crypto_1.default,
     ...hook_1.default,
+    singleton
 };
 exports.dHook = dHook;
 const dMini = { mini: mini_1.default, css: css_1.default, qs: qs_1.default, icon: icon_1.default, html: html_1.default };
@@ -87,6 +93,8 @@ exports.default = {
     rule: rule_1.default,
     regex: regex_1.default,
     convert: convert_1.default,
+    KValue: kvalue_1.default,
+    Mapping: mapping_1.default,
     Event: event_1.default,
     Http: http_1.default,
     Store: store_1.default,
@@ -98,5 +106,5 @@ exports.default = {
     tracker: tracker_1.default,
     logger: logger_1.default,
     fetch: fetch_1.default,
-    rsa: rsa_1.default
+    rsa: rsa_1.default,
 };

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

@@ -4,12 +4,16 @@ 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");
+// interface IConnectionPool {
+//   [key: string]: Socket // Key为目标地址:端口组合
+// }
 class Socks5 {
     upstreamProxy;
     server = null;
     clientSockets = new Set();
     allowedDomains;
-    connectionPool = {};
+    connectionPool;
     systemProxy = null;
     useSystemProxy = false;
     __debug = false;
@@ -20,6 +24,7 @@ class Socks5 {
         this.allowedDomains = new Set(allowedDomains);
         this.__debug = debug;
         this.__uuid = (0, uuid_1.default)();
+        this.connectionPool = new mapping_1.default();
     }
     get id() {
         return this.__uuid;
@@ -56,7 +61,7 @@ class Socks5 {
         this.__port = port;
         this.server = net_1.default.createServer((socket) => this.handleSocksConnection(socket));
         this.server.listen(port, () => {
-            this.__debug && console.log(`[socks] server is running on port ${port}`);
+            this.__debug && console.info(`[socks] server is running on port ${port}`);
         });
         this.server.on('error', (err) => {
             console.error('[socks] server error:', err);
@@ -112,22 +117,23 @@ class Socks5 {
             clientSocket?.destroy();
         });
         try {
+            this.connectionPool.clean(100, (kv) => kv?.destroy());
             await this.performHandshake(clientSocket);
             const destination = await this.parseClientRequest(clientSocket);
             if (this.isAllowedDomain(destination.addr)) {
                 // 走上游代理
                 const upstreamSocket = await this.connectToUpstreamProxy(destination);
-                this.__debug && console.log(`[socks] handle connection upstream`, destination.addr);
+                this.__debug && console.info(`[socks] handle connection upstream`, destination.addr);
                 this.setupDataForwarding(clientSocket, upstreamSocket);
             }
             else if (this.useSystemProxy && this.systemProxy) {
                 // 走系统代理
                 const systemSocket = await this.connectToSystemProxy(destination);
-                this.__debug && console.log(`[socks] handle connection system`, destination.addr);
+                this.__debug && console.info(`[socks] handle connection system`, destination.addr);
                 this.setupDataForwarding(clientSocket, systemSocket);
             }
             else {
-                this.__debug && console.log(`[socks] handle connection local`, destination.addr);
+                this.__debug && console.info(`[socks] handle connection local`, destination.addr);
                 // 本地连接
                 const localSocket = await this.connectToLocal(destination);
                 this.setupDataForwarding(clientSocket, localSocket);
@@ -178,10 +184,15 @@ 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;
     }
     // 上游代理连接
@@ -200,9 +211,12 @@ class Socks5 {
         };
         try {
             const { socket: upstreamSocket } = await socks_1.SocksClient.createConnection(options);
-            this.connectionPool[destKey] = upstreamSocket;
+            // this.connectionPool[destKey] = upstreamSocket
+            this.connectionPool.set(destKey, upstreamSocket);
             upstreamSocket.on('close', () => {
-                delete this.connectionPool[destKey];
+                // delete this.connectionPool[destKey]
+                this.__debug && console.info('[socks] connection pool delete', destKey);
+                this.connectionPool.delete(destKey);
             });
             return upstreamSocket;
         }
@@ -210,7 +224,7 @@ class Socks5 {
             throw new Error('Failed to connect to upstream proxy: ' + err);
         }
     }
-    // 上游代理连接
+    // 系统代理连接
     async connectToSystemProxy(destination) {
         const destKey = `${destination.addr}:${destination.port}`;
         const cacheConnection = this.getPoolConnection(destKey);
@@ -226,14 +240,17 @@ class Socks5 {
         };
         try {
             const { socket: upstreamSocket } = await socks_1.SocksClient.createConnection(options);
-            this.connectionPool[destKey] = upstreamSocket;
+            // this.connectionPool[destKey] = upstreamSocket
+            this.connectionPool.set(destKey, upstreamSocket);
             upstreamSocket.on('close', () => {
-                delete this.connectionPool[destKey];
+                // delete this.connectionPool[destKey]
+                this.__debug && console.info('[socks] connection pool delete', destKey);
+                this.connectionPool.delete(destKey);
             });
             return upstreamSocket;
         }
         catch (err) {
-            throw new Error('Failed to connect to upstream proxy: ' + err);
+            throw new Error('Failed to connect to system proxy: ' + err);
         }
     }
     // 本地连接
@@ -246,9 +263,12 @@ class Socks5 {
             const localSocket = net_1.default.createConnection(destination.port, destination.addr, () => {
                 resolve(localSocket);
             });
-            this.connectionPool[destKey] = localSocket;
+            // this.connectionPool[destKey] = localSocket
+            this.connectionPool.set(destKey, localSocket);
             localSocket.on('close', () => {
-                delete this.connectionPool[destKey];
+                // delete this.connectionPool[destKey]
+                this.__debug && console.info('[socks] connection pool delete', destKey);
+                this.connectionPool.delete(destKey);
             });
             localSocket.on('error', (err) => {
                 reject(err);
@@ -259,14 +279,14 @@ class Socks5 {
         clientSocket.write(new Uint8Array([0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]));
         clientSocket.pipe(targetSocket);
         targetSocket.pipe(clientSocket);
-        this.__debug && console.log(`[socks] setupDataForwarding ${targetSocket.localAddress}:${targetSocket.localPort}`);
+        const localIpPort = `${targetSocket.localAddress}:${targetSocket.localPort}`;
+        this.__debug && console.info(`[socks] setupDataForwarding ${localIpPort}`);
         clientSocket.on('close', () => {
-            this.__debug && console.error('[socks] client socket close', targetSocket?.remoteAddress || "");
+            this.__debug && console.info('[socks] client socket close', localIpPort);
             targetSocket.end();
         });
         targetSocket.on('close', () => {
-            this.__debug &&
-                console.error('[socks] target socket close', targetSocket?.remoteAddress || targetSocket?.localAddress || '');
+            this.__debug && console.info('[socks] target socket close', localIpPort);
             clientSocket.end();
         });
         clientSocket.on('error', (err) => {
@@ -293,7 +313,7 @@ class Socks5 {
         try {
             if (!this.server)
                 return;
-            this.__debug && console.log('[socks] closing SOCKS5 proxy server...');
+            this.__debug && console.info('[socks] closing SOCKS5 proxy server...');
             this.server.close((err) => {
                 if (err) {
                     this.__debug && console.error('[socks] closing the server failed:', err);
@@ -302,17 +322,18 @@ class Socks5 {
             // 销毁客户端 socket
             this.clientSockets.forEach((socket) => socket?.destroy());
             // 销毁所有连接池中的 socket
-            Object.values(this.connectionPool).forEach((socket) => socket?.destroy());
+            // Object.values(this.connectionPool).forEach((socket) => socket?.destroy())
+            Array.from(this.connectionPool.values).forEach((kv) => kv?.value?.destroy());
             this.server = null;
         }
         catch (error) {
             this.__debug && console.error('[socks] close errot:', error);
         }
     }
-    showConnectionPool() {
-        Object.values(this.connectionPool).forEach((socket) => {
-            if (socket) {
-                console.log(`[socks] ${socket.remoteAddress} ${socket.localAddress}:${socket.localPort}`);
+    showPool() {
+        Array.from(this.connectionPool.values).forEach((kv) => {
+            if (kv && kv.value) {
+                console.info(`[socks] ${kv.value.remoteAddress} ${kv.value.localAddress}:${kv.value.localPort}`);
             }
         });
     }

package/bin/types/class/kvalue.d.ts

@@ -0,0 +1,10 @@
+export default class KValue<T = any> {
+    timestamp: number;
+    _key: string;
+    _value: T | undefined;
+    constructor(key: string, value?: T);
+    get key(): string;
+    get value(): T | undefined;
+    set(value?: T): void;
+    updateAt(): void;
+}

package/bin/types/class/mapping.d.ts

@@ -0,0 +1,12 @@
+import KValue from './kvalue';
+export default class Mapping<T = any> {
+    _map: Map<string, KValue<T>>;
+    constructor();
+    get keys(): IterableIterator<string>;
+    get values(): IterableIterator<KValue<T>>;
+    get(key: string): T | undefined;
+    set(key: string, value?: T): void;
+    delete(key: string, cb?: (value?: T, key?: string) => void): void;
+    clear(): void;
+    clean(max?: number, cb?: (value?: T, key?: string) => void): void;
+}

package/bin/types/index.d.ts

@@ -3,6 +3,8 @@ import Http from './modules/http';
 import Event from './class/event';
 import Store from './class/store';
 import Persist from './class/persist';
+import KValue from './class/kvalue';
+import Mapping from './class/mapping';
 declare const dUtil: {
     Event: typeof Event;
     includes: typeof import("./util/includes").default;
@@ -210,8 +212,14 @@ declare const dUtil: {
     };
 };
 declare const dHook: {
+    singleton: <T>() => {
+        new (): {};
+        __instance__: any;
+        readonly Instance: T;
+        readonly I: T;
+    };
     sleep: (ms?: number) => Promise<unknown>;
-    run: <T = any>(task?: import("./typings").Ddan.PFunction<T> | undefined, wait?: number) => Promise<[any, undefined] | [null, T]>;
+    run: <T_1 = any>(task?: import("./typings").Ddan.PFunction<T_1> | undefined, wait?: number) => Promise<[any, undefined] | [null, T_1]>;
     exec: (func: import("./typings").Ddan.Function, taskId?: string) => import("./typings").Ddan.PSafeResult<any>;
     debounce: typeof import("./modules/hook/modules/debounce").default;
     throttle: typeof import("./modules/hook/modules/throttle").default;
@@ -221,10 +229,10 @@ declare const dHook: {
     pipe: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/pipeline").default;
     pipeline: (max?: number) => import("./modules/hook/modules/pipeline").default;
     safeTask: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/safeTask").default;
-    to: <T_1 = any, U extends object = any>(promise: Promise<T_1>, errorExt?: object | undefined) => Promise<[null, T_1] | [U, undefined]>;
-    go: <T_2 = any>(task?: import("./typings").Ddan.PFunction<T_2> | undefined) => Promise<[any, undefined] | [null, T_2]>;
+    to: <T_2 = any, U extends object = any>(promise: Promise<T_2>, errorExt?: object | undefined) => Promise<[null, T_2] | [U, undefined]>;
+    go: <T_3 = any>(task?: import("./typings").Ddan.PFunction<T_3> | undefined) => Promise<[any, undefined] | [null, T_3]>;
     delay: (ms?: number) => Promise<unknown>;
-    safeRun: <T_3 = any>(func: any) => Promise<[any, undefined] | [null, T_3]>;
+    safeRun: <T_4 = any>(func: any) => Promise<[any, undefined] | [null, T_4]>;
     base64: {
         encode: (input: string) => string;
         decode: (base64Str: string) => string;
@@ -517,7 +525,7 @@ declare const dNode: {
     brotliCompress: typeof import("./modules/node/brotli").brotliCompress;
     brotliDecompress: typeof import("./modules/node/brotli").brotliDecompress;
 };
-export { dUtil, dHook, dWeb, dMini, dCdn, dStore, dJoker, dTracker, dLogger, dNode };
+export { dUtil, dHook, dWeb, dMini, dCdn, dStore, dJoker, dTracker, dLogger, dNode, KValue, Mapping };
 declare const _default: {
     gbk: {
         gbkLength: (str: string) => number;
@@ -851,6 +859,8 @@ declare const _default: {
         toUtf8Bytes: (content: string) => Uint8Array;
         fromUtf8Bytes: (utf8Bytes: Uint8Array) => string;
     };
+    KValue: typeof KValue;
+    Mapping: typeof Mapping;
     Event: typeof Event;
     Http: typeof Http;
     Store: typeof Store;

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

@@ -35,6 +35,6 @@ export declare class Socks5 {
     private setupDataForwarding;
     private isAllowedDomain;
     close(): void;
-    showConnectionPool(): void;
+    showPool(): void;
 }
 export {};

package/package.json

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