ddan-js 2.6.24 → 2.6.26

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

@@ -14,7 +14,8 @@ class Socks5 {
     useSystemProxy = false;
     __debug = false;
     __uuid;
-    constructor(upstreamProxy, allowedDomains = [], debug = false) {
+    __port = 0;
+    constructor(upstreamProxy, allowedDomains = ['*'], debug = false) {
         this.upstreamProxy = upstreamProxy;
         this.allowedDomains = new Set(allowedDomains);
         this.__debug = debug;
@@ -23,6 +24,9 @@ class Socks5 {
     get id() {
         return this.__uuid;
     }
+    get port() {
+        return this.__port;
+    }
     validateProxyConfig(proxyConfig = this.upstreamProxy) {
         const { ipaddress, port, userId, password } = proxyConfig || {};
         if (!ipaddress || typeof ipaddress !== 'string') {
@@ -49,6 +53,7 @@ class Socks5 {
         const port = await this.findAvailablePort(startPort);
         if (!port)
             return port;
+        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}`);
@@ -251,11 +256,12 @@ class Socks5 {
         clientSocket.pipe(targetSocket);
         targetSocket.pipe(clientSocket);
         clientSocket.on('close', () => {
-            this.__debug && console.error('[socks] client socket close', targetSocket?.remoteAddress);
+            this.__debug && console.error('[socks] client socket close', targetSocket?.remoteAddress || "");
             targetSocket.end();
         });
         targetSocket.on('close', () => {
-            this.__debug && console.error('[socks] target socket close', targetSocket?.remoteAddress);
+            this.__debug &&
+                console.error('[socks] target socket close', targetSocket?.remoteAddress || targetSocket?.localAddress || '');
             clientSocket.end();
         });
         clientSocket.on('error', (err) => {
@@ -279,7 +285,9 @@ class Socks5 {
         return false;
     }
     close() {
-        if (this.server) {
+        try {
+            if (!this.server)
+                return;
             console.log('[socks] closing SOCKS5 proxy server...');
             this.server.close((err) => {
                 if (err) {
@@ -292,6 +300,9 @@ class Socks5 {
             Object.values(this.connectionPool).forEach((socket) => socket.destroy());
             this.server = null;
         }
+        catch (error) {
+            console.error('[socks] close errot:', error);
+        }
     }
 }
 exports.Socks5 = Socks5;

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

@@ -15,8 +15,10 @@ export declare class Socks5 {
     private useSystemProxy;
     __debug: boolean;
     __uuid: string;
-    constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[], debug?: boolean);
+    __port: number;
+    constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[] | ['*'], debug?: boolean);
     get id(): string;
+    get port(): number;
     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.6.24",
+  "version": "2.6.26",
   "description": "",
   "keywords": [
     "ddan-js",