ddan-js 2.7.4 → 2.7.6

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

@@ -38,6 +38,11 @@ class Socks5 {
     get port() {
         return this.__port;
     }
+    get url() {
+        if (!this.__port)
+            return '';
+        return `socks5://127.0.0.1:${this.__port}`;
+    }
     validateProxyConfig(proxyConfig = this.upstreamProxy) {
         const { ipaddress, port, userId, password } = proxyConfig || {};
         if (!ipaddress || typeof ipaddress !== 'string') {
@@ -58,7 +63,7 @@ class Socks5 {
         if (this.validateProxyConfig())
             return 0;
         if (this.server) {
-            this.__debug && console.info(`[socks] server is already running`);
+            this.__debug && console.info(`[socks5] server is already running`);
             return this.__port;
         }
         const port = await this.findAvailablePort(startPort);
@@ -67,10 +72,10 @@ class Socks5 {
         this.__port = port;
         this.server = net_1.default.createServer((socket) => this.handleSocksConnection(socket));
         this.server.listen(port, () => {
-            this.__debug && this.__logger?.info(`[socks] server is running on port ${port}`);
+            this.__debug && this.__logger?.info(`[socks5] server is running on port ${port}`);
         });
         this.server.on('error', (err) => {
-            this.__logger?.error('[socks] server error:', err);
+            this.__logger?.error('[socks5] server error:', err);
             this.close();
         });
         return port;
@@ -119,7 +124,7 @@ class Socks5 {
                 port++; // 尝试下一个端口
             }
         }
-        this.__debug && this.__logger?.warn('[socks] findAvailablePort failed');
+        this.__debug && this.__logger?.warn('[socks5] findAvailablePort failed');
         return 0;
     }
     async handleSocksConnection(clientSocket) {
@@ -136,27 +141,28 @@ class Socks5 {
             const destination = await this.parseClientRequest(clientSocket);
             const addr = destination.addr;
             addrport = `${addr}:${destination.port}`;
+            this.__debug && this.__logger?.info(`[socks5] handle connection`, addrport);
             if (this.isAllowedDomain(addr)) {
                 // 走上游代理
                 const upstreamSocket = await this.connectToUpstreamProxy(destination);
-                this.__debug && this.__logger?.info(`[socks] handle connection upstream`, addrport);
+                this.__logger?.info(`[socks5] handle connection upstream`, addrport);
                 this.setupDataForwarding(clientSocket, upstreamSocket);
             }
             else if (this.useSystemProxy && this.systemProxy && !index_1.default.isLocalIpAddress(addr)) {
                 // 走系统代理
                 const systemSocket = await this.connectToSystemProxy(destination);
-                this.__debug && console.info(`[socks] handle connection system`, addrport);
+                this.__debug && console.info(`[socks5] handle connection system`, addrport);
                 this.setupDataForwarding(clientSocket, systemSocket);
             }
             else {
-                this.__debug && console.info(`[socks] handle connection local`, addrport);
+                this.__debug && console.info(`[socks5] handle connection local`, addrport);
                 // 本地连接
                 const localSocket = await this.connectToLocal(destination);
                 this.setupDataForwarding(clientSocket, localSocket);
             }
         }
         catch (err) {
-            this.__debug && this.__logger?.error('[socks] connection failed:', err);
+            this.__debug && this.__logger?.error('[socks5] connection failed:', err);
             // this.__event.emit(Socks5Event.Error, err, addrport)
             clientSocket.end(new Uint8Array([0x05, 0x01]));
             this._emit('error', err, addrport);
@@ -280,21 +286,21 @@ class Socks5 {
         clientSocket.pipe(targetSocket);
         targetSocket.pipe(clientSocket);
         const addrPort = `${targetSocket.localAddress}:${targetSocket.localPort}`;
-        this.__debug && console.info(`[socks] setupDataForwarding ${addrPort}`);
+        this.__debug && console.info(`[socks5] setupDataForwarding ${addrPort}`);
         clientSocket.on('close', () => {
-            this.__debug && console.info('[socks] client socket close', addrPort);
+            this.__debug && console.info('[socks5] client socket close', addrPort);
             targetSocket.end();
         });
         targetSocket.on('close', () => {
-            this.__debug && console.info('[socks] target socket close', addrPort);
+            this.__debug && console.info('[socks5] target socket close', addrPort);
             clientSocket.end();
         });
         clientSocket.on('error', (err) => {
-            this.__debug && console.error('[socks] client socket error:', err?.message);
+            this.__debug && console.error('[socks5] client socket error:', err?.message);
             targetSocket.end();
         });
         targetSocket.on('error', (err) => {
-            this.__debug && console.error('[socks] target socket error:', err?.message);
+            this.__debug && console.error('[socks5] target socket error:', err?.message);
             clientSocket.end();
         });
     }
@@ -313,10 +319,10 @@ class Socks5 {
         try {
             if (!this.server)
                 return;
-            this.__debug && this.__logger?.info('[socks] closing SOCKS5 proxy server...');
+            this.__debug && this.__logger?.info('[socks5] closing SOCKS5 proxy server...');
             this.server.close((err) => {
                 if (err) {
-                    this.__debug && this.__logger?.error('[socks] closing the server failed:', err);
+                    this.__debug && this.__logger?.error('[socks5] closing the server failed:', err);
                 }
             });
             // 销毁客户端 socket
@@ -328,7 +334,7 @@ class Socks5 {
             this.__port = 0;
         }
         catch (error) {
-            this.__debug && this.__logger?.error('[socks] close error:', error);
+            this.__debug && this.__logger?.error('[socks5] close error:', error);
         }
     }
     on(name, listener) {

package/bin/types/index.d.ts

@@ -571,15 +571,16 @@ declare const dNode: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, system, rules }: {
-        proxy?: string | undefined;
-        system?: string | undefined;
-        rules?: string[] | undefined;
-    }) => string;
+    toPacScript: (proxy: string, rules?: string[], defaultProxy?: string) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {
         type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
         direct?: boolean | undefined;
     } | undefined) => string;
+    pacScript: (host: string, port: number, options?: {
+        rules?: string[] | undefined;
+        type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
+        useSystem?: boolean | undefined;
+    } | undefined) => Promise<string>;
     child_exec: (cmd: string) => Promise<[any, string]>;
     brotliCompress: typeof import("./modules/node/brotli").brotliCompress;
     brotliDecompress: typeof import("./modules/node/brotli").brotliDecompress;

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

@@ -9,15 +9,16 @@ declare const _default: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, system, rules }: {
-        proxy?: string | undefined;
-        system?: string | undefined;
-        rules?: string[] | undefined;
-    }) => string;
+    toPacScript: (proxy: string, rules?: string[], defaultProxy?: string) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {
         type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
         direct?: boolean | undefined;
     } | undefined) => string;
+    pacScript: (host: string, port: number, options?: {
+        rules?: string[] | undefined;
+        type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
+        useSystem?: boolean | undefined;
+    } | undefined) => Promise<string>;
     child_exec: (cmd: string) => Promise<[any, string]>;
     brotliCompress: typeof import("./brotli").brotliCompress;
     brotliDecompress: typeof import("./brotli").brotliDecompress;

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

@@ -1,16 +1,17 @@
-declare const _default: {
+declare const _default_1: {
     getSystemProxy: () => Promise<{
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, system, rules }: {
-        proxy?: string | undefined;
-        system?: string | undefined;
-        rules?: string[] | undefined;
-    }) => string;
+    toPacScript: (proxy: string, rules?: string[], defaultProxy?: string) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {
         type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
         direct?: boolean | undefined;
     } | undefined) => string;
+    pacScript: (host: string, port: number, options?: {
+        rules?: string[] | undefined;
+        type?: "PROXY" | "SOCKS5" | "ALL" | undefined;
+        useSystem?: boolean | undefined;
+    } | undefined) => Promise<string>;
 };
-export default _default;
+export default _default_1;

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

@@ -33,6 +33,7 @@ export declare class Socks5 {
     constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[] | ['*'], debug?: boolean, logger?: ILogger);
     get id(): string;
     get port(): number;
+    get url(): string;
     validateProxyConfig(proxyConfig?: IProxyConfig): "" | "无效的上游代理 IP 地址" | "无效的上游代理端口" | "无效的上游代理用户名" | "无效的上游代理密码";
     start(startPort?: number): Promise<number>;
     setUpstreamProxy(upstreamProxy: IProxyConfig): boolean;

package/package.json

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