ddan-js 2.6.23 → 2.6.25

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

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_1 = require("./child");
+const convert_1 = require("../convert");
+const getSystemProxy = () => {
+    try {
+        if (process.platform === 'win32') {
+            return getWindowsSystemProxy();
+        }
+        else if (process.platform === 'darwin') {
+            return getMacOSSystemProxy();
+        }
+        else {
+            return undefined;
+        }
+    }
+    catch (error) {
+        return undefined;
+    }
+};
+const getWindowsSystemProxy = async () => {
+    do {
+        let err, text;
+        [err, text] = await child_1.default.child_exec(`reg query "HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"`);
+        if (err)
+            break;
+        const proxyEnabledLine = text.split('\n').find((line) => line.includes('ProxyEnable'));
+        const ProxyEnable = proxyEnabledLine && proxyEnabledLine.trim().endsWith('1');
+        if (!ProxyEnable)
+            break;
+        const proxyServerLine = text.split('\n').find((line) => line.includes('ProxyServer'));
+        const proxyServer = proxyServerLine ? proxyServerLine.split(' ').filter(Boolean).pop() : '';
+        if (!proxyServer)
+            break;
+        // 解析 IP 和端口
+        const proxyParts = proxyServer.split(':');
+        if (proxyParts.length <= 1)
+            break;
+        const ipaddress = proxyParts[0];
+        const port = +(proxyParts[1] || '');
+        if (!ipaddress || !port)
+            break;
+        return { ipaddress, port };
+    } while (false);
+    return undefined;
+};
+const getMacOSSystemProxy = async () => {
+    do {
+        let err, text;
+        [err, text] = await child_1.default.child_exec(`networksetup -getwebproxy "Wi-Fi"`);
+        if (err)
+            break;
+        const outputLines = text.split('\n');
+        const proxyEnabledLine = outputLines.find((line) => line.includes('Enabled'));
+        const isEnabled = proxyEnabledLine && proxyEnabledLine.includes('Yes');
+        if (!isEnabled)
+            break;
+        const proxyServerLine = outputLines.find((line) => line.includes('Server'));
+        const proxyPortLine = outputLines.find((line) => line.includes('Port'));
+        const ipaddress = proxyServerLine ? proxyServerLine.split(':')[1]?.trim() : null;
+        const proxyPort = proxyPortLine ? proxyPortLine.split(':')[1]?.trim() : null;
+        const port = +(proxyPort || '');
+        if (!ipaddress || !port)
+            break;
+        return { ipaddress, port };
+    } while (false);
+    return undefined;
+};
+// if (host === 'singapore-upgrade.geelark.com') {
+//   return 'SOCKS5 127.0.0.1:${port}';
+// }
+// { proxy = 'DIRECT'; default = 'DIRECT', rules: string[]
+const getPacDataUrl = ({ proxy = 'DIRECT', defProxy = 'DIRECT', rules = ['*'] }) => {
+    const _proxy = proxy || defProxy || "DIRECT";
+    const content = `
+    function FindProxyForURL(url, host) {
+      if (isInNet(host, "127.0.0.1", "255.255.255.255") ||
+          shExpMatch(host, "localhost") ||
+          shExpMatch(host, "<local>")) {
+          return "DIRECT";
+      }
+
+      for (let rule of ${rules}) {
+        if (rule && shExpMatch(host, rule)) {
+          return "${_proxy}";
+        }
+      }
+      return "${defProxy}";
+    }
+  `;
+    return convert_1.default.toDataUrl(content);
+};
+exports.default = { getSystemProxy, getPacDataUrl };

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

@@ -67,17 +67,11 @@ class Socks5 {
         this.upstreamProxy = upstreamProxy;
         return true;
     }
-    setSystemProxy(config) {
-        const { addr, port, use } = config || {};
-        if (!use) {
-            this.useSystemProxy = false;
-            return true;
+    setSystemProxy(use, config) {
+        this.useSystemProxy = use;
+        if (use && config && config.ipaddress && config.port) {
+            this.systemProxy = config;
         }
-        if (!addr || !port)
-            return false;
-        this.systemProxy = { addr, port };
-        this.useSystemProxy = true;
-        return true;
     }
     setAllowedDomains(allowedDomains = []) {
         this.allowedDomains = new Set(allowedDomains);
@@ -124,11 +118,8 @@ class Socks5 {
             else if (this.useSystemProxy && this.systemProxy) {
                 this.__debug && console.log(`[socks] handle connection system`, destination.addr);
                 // 走系统代理
-                const localSocket = await this.connectToLocal({
-                    addr: this.systemProxy.addr,
-                    port: this.systemProxy.port,
-                });
-                this.setupDataForwarding(clientSocket, localSocket);
+                const systemSocket = await this.connectToSystemProxy(destination);
+                this.setupDataForwarding(clientSocket, systemSocket);
             }
             else {
                 this.__debug && console.log(`[socks] handle connection local`, destination.addr);
@@ -179,6 +170,15 @@ class Socks5 {
             });
         });
     }
+    getPoolConnection(key) {
+        if (!key)
+            return undefined;
+        // 如果已有连接在池中，复用
+        if (this.connectionPool[key] && !this.connectionPool[key].destroyed) {
+            return this.connectionPool[key];
+        }
+        return undefined;
+    }
     // 上游代理连接
     async connectToUpstreamProxy(destination) {
         const destKey = `${destination.addr}:${destination.port}`;
@@ -205,14 +205,31 @@ class Socks5 {
             throw new Error('Failed to connect to upstream proxy: ' + err);
         }
     }
-    getPoolConnection(key) {
-        if (!key)
-            return undefined;
-        // 如果已有连接在池中，复用
-        if (this.connectionPool[key] && !this.connectionPool[key].destroyed) {
-            return this.connectionPool[key];
+    // 上游代理连接
+    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',
+            destination: {
+                host: destination.addr,
+                port: destination.port,
+            },
+        };
+        try {
+            const { socket: upstreamSocket } = await socks_1.SocksClient.createConnection(options);
+            this.connectionPool[destKey] = upstreamSocket;
+            upstreamSocket.on('close', () => {
+                delete this.connectionPool[destKey];
+            });
+            return upstreamSocket;
+        }
+        catch (err) {
+            throw new Error('Failed to connect to upstream proxy: ' + err);
         }
-        return undefined;
     }
     // 本地连接
     async connectToLocal(destination) {

package/bin/types/index.d.ts

@@ -79,6 +79,7 @@ declare const dUtil: {
     getRandomBytes: (length: number) => Uint8Array;
     textEncode: (text: string) => Uint8Array;
     textDecode: (buf: ArrayBuffer) => string;
+    toDataUrl: (textOrBuf: string | ArrayBuffer, contentType?: string) => string;
     toBase64: (input?: string) => string;
     fromBase64: (input?: string) => string;
     bytesToBase64: (bytes: Uint8Array) => string;
@@ -247,6 +248,7 @@ declare const dHook: {
     getRandomBytes: (length: number) => Uint8Array;
     textEncode: (text: string) => Uint8Array;
     textDecode: (buf: ArrayBuffer) => string;
+    toDataUrl: (textOrBuf: string | ArrayBuffer, contentType?: string) => string;
     toBase64: (input?: string) => string;
     fromBase64: (input?: string) => string;
     bytesToBase64: (bytes: Uint8Array) => string;
@@ -502,6 +504,16 @@ declare const dNode: {
     Ecdh: typeof import("./modules/node/ecdh").default;
     EcdhSpki: typeof import("./modules/node/ecdh-spki").default;
     Socks5: typeof import("./modules/node/socks5").Socks5;
+    getSystemProxy: () => Promise<{
+        ipaddress: string;
+        port: number;
+    } | undefined> | undefined;
+    getPacDataUrl: ({ proxy, defProxy, rules }: {
+        proxy?: string | undefined;
+        defProxy?: string | undefined;
+        rules?: string[] | undefined;
+    }) => string;
+    child_exec: (cmd: string) => Promise<[any, string]>;
     brotliCompress: typeof import("./modules/node/brotli").brotliCompress;
     brotliDecompress: typeof import("./modules/node/brotli").brotliDecompress;
 };
@@ -829,6 +841,7 @@ declare const _default: {
         getRandomBytes: (length: number) => Uint8Array;
         textEncode: (text: string) => Uint8Array;
         textDecode: (buf: ArrayBuffer) => string;
+        toDataUrl: (textOrBuf: string | ArrayBuffer, contentType?: string) => string;
         toBase64: (input?: string) => string;
         fromBase64: (input?: string) => string;
         bytesToBase64: (bytes: Uint8Array) => string;

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

@@ -10,6 +10,7 @@ declare const _default: {
     getRandomBytes: (length: number) => Uint8Array;
     textEncode: (text: string) => Uint8Array;
     textDecode: (buf: ArrayBuffer) => string;
+    toDataUrl: (textOrBuf: string | ArrayBuffer, contentType?: string) => string;
     toBase64: (input?: string) => string;
     fromBase64: (input?: string) => string;
     bytesToBase64: (bytes: Uint8Array) => string;

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

@@ -0,0 +1,4 @@
+declare const _default: {
+    child_exec: (cmd: string) => Promise<[any, string]>;
+};
+export default _default;

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

@@ -1,10 +1,20 @@
-import Ecdh from "./ecdh";
-import EcdhSpki from "./ecdh-spki";
-import { Socks5 } from "./socks5";
+import Ecdh from './ecdh';
+import EcdhSpki from './ecdh-spki';
+import { Socks5 } from './socks5';
 declare const _default: {
     Ecdh: typeof Ecdh;
     EcdhSpki: typeof EcdhSpki;
     Socks5: typeof Socks5;
+    getSystemProxy: () => Promise<{
+        ipaddress: string;
+        port: number;
+    } | undefined> | undefined;
+    getPacDataUrl: ({ proxy, defProxy, rules }: {
+        proxy?: string | undefined;
+        defProxy?: string | undefined;
+        rules?: string[] | undefined;
+    }) => 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

@@ -0,0 +1,12 @@
+declare const _default: {
+    getSystemProxy: () => Promise<{
+        ipaddress: string;
+        port: number;
+    } | undefined> | undefined;
+    getPacDataUrl: ({ proxy, defProxy, rules }: {
+        proxy?: string | undefined;
+        defProxy?: string | undefined;
+        rules?: string[] | undefined;
+    }) => string;
+};
+export default _default;

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

@@ -2,12 +2,8 @@ interface IProxyConfig {
     ipaddress: string;
     port: number;
     type?: 5;
-    userId: string;
-    password: string;
-}
-interface IDestination {
-    addr: string;
-    port: number;
+    userId?: string;
+    password?: string;
 }
 export declare class Socks5 {
     private upstreamProxy;
@@ -24,16 +20,15 @@ export declare class Socks5 {
     validateProxyConfig(proxyConfig?: IProxyConfig): "" | "无效的上游代理 IP 地址" | "无效的上游代理端口" | "无效的上游代理用户名" | "无效的上游代理密码";
     start(startPort?: number): Promise<number>;
     setUpstreamProxy(upstreamProxy: IProxyConfig): boolean;
-    setSystemProxy(config: Partial<IDestination> & {
-        use: boolean;
-    }): boolean;
+    setSystemProxy(use: boolean, config?: IProxyConfig): void;
     setAllowedDomains(allowedDomains?: string[]): void;
     private findAvailablePort;
     private handleSocksConnection;
     private performHandshake;
     private parseClientRequest;
-    private connectToUpstreamProxy;
     private getPoolConnection;
+    private connectToUpstreamProxy;
+    private connectToSystemProxy;
     private connectToLocal;
     private setupDataForwarding;
     private isAllowedDomain;

package/package.json

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