ddan-js 2.6.29 → 2.6.31

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

@@ -5,6 +5,7 @@ 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");
 // interface IConnectionPool {
 //   [key: string]: Socket // Key为目标地址:端口组合
 // }
@@ -61,7 +62,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);
@@ -123,17 +124,17 @@ class Socks5 {
             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);
@@ -215,6 +216,7 @@ class Socks5 {
             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;
@@ -223,7 +225,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);
@@ -243,12 +245,13 @@ class Socks5 {
             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;
         }
         catch (err) {
-            throw new Error('Failed to connect to upstream proxy: ' + err);
+            throw new Error('Failed to connect to system proxy: ' + err);
         }
     }
     // 本地连接
@@ -265,6 +268,7 @@ class Socks5 {
             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) => {
@@ -276,16 +280,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) => {
@@ -300,10 +302,10 @@ class Socks5 {
     isAllowedDomain(addr) {
         // return this.allowedDomains.has(addr);
         // 只匹配主域名，忽略子域名
-        for (const domain of this.allowedDomains) {
-            if (domain === '*')
+        for (const pattern of this.allowedDomains) {
+            if (pattern === '*')
                 return true;
-            if (addr.includes(domain))
+            if (index_1.default.shExpMatch(addr, pattern))
                 return true;
         }
         return false;
@@ -312,7 +314,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);
@@ -332,7 +334,7 @@ class Socks5 {
     showPool() {
         Array.from(this.connectionPool.values).forEach((kv) => {
             if (kv && kv.value) {
-                console.log(`[socks] ${kv.value.remoteAddress} ${kv.value.localAddress}:${kv.value.localPort}`);
+                console.info(`[socks] ${kv.value.remoteAddress} ${kv.value.localAddress}:${kv.value.localPort}`);
             }
         });
     }

package/bin/lib/modules/qs/index.js

@@ -74,4 +74,30 @@ const parseHost = (url) => {
     result.query = arr.length > 1 ? arr[1] : '';
     return result;
 };
-exports.default = { parse: decode_1.default, stringify: encode_1.default, https, parseUrl, parsePath, parseHost, join };
+const shExpMatch = (text, pattern) => {
+    if (text === pattern)
+        return true;
+    if (!text)
+        return false;
+    if (!pattern)
+        return false;
+    if (pattern === "*")
+        return true;
+    // 将模式转换为正则表达式
+    const regexPattern = pattern
+        .replace(/\./g, '\\.') // 转义 .
+        .replace(/\*/g, '.*') // 将 * 转换为 .*
+        .replace(/\?/g, '.'); // 将 ? 转换为 .
+    const regex = new RegExp(regexPattern);
+    return regex.test(text);
+};
+exports.default = {
+    parse: decode_1.default,
+    stringify: encode_1.default,
+    https,
+    parseUrl,
+    parsePath,
+    parseHost,
+    join,
+    shExpMatch,
+};

package/bin/types/index.d.ts

@@ -212,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;
@@ -223,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;
@@ -325,6 +331,7 @@ declare const dMini: {
         };
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
+        shExpMatch: (text: string, pattern: string) => boolean;
     };
     icon: import("./class/icon").DIcon;
     html: {
@@ -464,6 +471,7 @@ declare const dWeb: {
         };
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
+        shExpMatch: (text: string, pattern: string) => boolean;
     };
     icon: import("./class/icon").DIcon;
     html: {
@@ -510,7 +518,7 @@ declare const dNode: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    getPacDataUrl: ({ proxy, defProxy, rules }: {
+    getPacScript: ({ proxy, defProxy, rules }: {
         proxy?: string | undefined;
         defProxy?: string | undefined;
         rules?: string[] | undefined;
@@ -754,6 +762,7 @@ declare const _default: {
         };
         parseHost: (url: string) => import("./typings").Ddan.IHttpHost;
         join: (...args: string[]) => string;
+        shExpMatch: (text: string, pattern: string) => boolean;
     };
     css: {
         stringify: (styleObj: Record<string, string | number>) => string;

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

@@ -9,7 +9,7 @@ declare const _default: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    getPacDataUrl: ({ proxy, defProxy, rules }: {
+    getPacScript: ({ proxy, defProxy, rules }: {
         proxy?: string | undefined;
         defProxy?: string | undefined;
         rules?: string[] | undefined;

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

@@ -3,7 +3,7 @@ declare const _default: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    getPacDataUrl: ({ proxy, defProxy, rules }: {
+    getPacScript: ({ proxy, defProxy, rules }: {
         proxy?: string | undefined;
         defProxy?: string | undefined;
         rules?: string[] | undefined;

package/bin/types/modules/qs/index.d.ts

@@ -44,5 +44,6 @@ declare const _default: {
     };
     parseHost: (url: string) => Ddan.IHttpHost;
     join: (...args: string[]) => string;
+    shExpMatch: (text: string, pattern: string) => boolean;
 };
 export default _default;

package/package.json

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