ddan-js 2.6.35 → 2.6.37

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

@@ -6,6 +6,10 @@ const socks_1 = require("socks");
 const uuid_1 = require("../crypto/uuid");
 const mapping_1 = require("../../class/mapping");
 const index_1 = require("../qs/index");
+const event_1 = require("../../class/event");
+const Socks5Event = {
+    Error: 'error',
+};
 class Socks5 {
     upstreamProxy;
     server = null;
@@ -17,7 +21,9 @@ class Socks5 {
     __debug = false;
     __uuid;
     __port = 0;
+    __event;
     constructor(upstreamProxy, allowedDomains = ['*'], debug = false) {
+        this.__event = new event_1.default();
         this.upstreamProxy = upstreamProxy;
         this.allowedDomains = new Set(allowedDomains);
         this.__debug = debug;
@@ -46,12 +52,12 @@ class Socks5 {
         }
         return '';
     }
-    async start(startPort = 9968) {
+    async start(startPort = 8838) {
         if (this.validateProxyConfig())
             return 0;
         if (this.server) {
-            console.log(`[socks] server is already running`);
-            return 0;
+            this.__debug && console.info(`[socks] server is already running`);
+            return this.__port;
         }
         const port = await this.findAvailablePort(startPort);
         if (!port)
@@ -114,7 +120,7 @@ class Socks5 {
             this.clientSockets.delete(clientSocket);
             clientSocket?.destroy();
         });
-        let addrport = "";
+        let addrport = '';
         try {
             this.connectionPool.clean(100, (kv) => kv?.destroy());
             await this.performHandshake(clientSocket);
@@ -143,8 +149,25 @@ class Socks5 {
             this.__debug && console.error('[socks] connection failed:', err);
             // this.__event.emit(Socks5Event.Error, err, addrport)
             clientSocket.end(new Uint8Array([0x05, 0x01]));
+            this._emit('error', err, addrport);
         }
     }
+    /**
+     * 回复客户端请求响应数据
+     * VER是SOCKS版本，这里应该是0x05；
+     * REP应答字段：
+     * 0x00表示成功
+     * 0x01普通SOCKS服务器连接失败
+     * 0x02现有规则不允许连接
+     * 0x03网络不可达
+     * 0x04主机不可达
+     * 0x05连接被拒
+     * 0x06 TTL超时
+     * 0x07不支持的命令
+     * 0x08不支持的地址类型
+     * 0x09 - 0xFF未定义
+     */
+    /**  */
     performHandshake(clientSocket) {
         return new Promise((resolve, reject) => {
             clientSocket.once('data', (data) => {
@@ -164,6 +187,8 @@ class Socks5 {
                 if (data[1] !== 0x01) {
                     return reject(new Error('Unsupported command'));
                 }
+                // 3 为 addrtype
+                // remotePort = data.readUInt16BE(data.length - 2); //最后两位为端口值
                 if (data[3] === 0x01) {
                     // IPv4 地址
                     addr = data.slice(4, 8).join('.');
@@ -321,21 +346,47 @@ class Socks5 {
             });
             // 销毁客户端 socket
             this.clientSockets.forEach((socket) => socket?.destroy());
+            this.clientSockets.clear();
             // 销毁所有连接池中的 socket
             // Object.values(this.connectionPool).forEach((socket) => socket?.destroy())
-            Array.from(this.connectionPool.values).forEach((kv) => kv?.value?.destroy());
+            this.connectionPool.values.forEach((kv) => kv?.value?.destroy());
+            this.connectionPool.clear();
             this.server = null;
+            this.__port = 0;
         }
         catch (error) {
             this.__debug && console.error('[socks] close errot:', error);
         }
     }
-    showPool() {
-        Array.from(this.connectionPool.values).forEach((kv) => {
-            if (kv && kv.value) {
-                console.info(`[socks] ${kv.value.remoteAddress} ${kv.value.localAddress}:${kv.value.localPort}`);
+    showPools() {
+        this.connectionPool.values.forEach((kv) => {
+            const socket = kv?.value;
+            const key = kv?.key;
+            if (key && socket) {
+                console.info(`[socks] ${key} ${socket.localAddress}:${socket.localPort}`);
             }
         });
     }
+    on(name, listener) {
+        if (!name || !listener)
+            return;
+        this.__event.off(name, listener);
+        this.__event.on(name, listener);
+    }
+    off(name, listener) {
+        if (!name)
+            return;
+        this.__event.off(name, listener);
+    }
+    _emit(name, ...args) {
+        try {
+            if (!name)
+                return;
+            this.__event.emit(name, ...args);
+        }
+        catch (error) {
+            // nothing
+        }
+    }
 }
 exports.Socks5 = Socks5;

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

@@ -2,8 +2,8 @@ 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 keys(): string[];
+    get values(): KValue<T>[];
     get(key: string): T | undefined;
     set(key: string, value?: T): void;
     delete(key: string, cb?: (value?: T, key?: string) => void): void;

package/bin/types/index.d.ts

@@ -565,9 +565,9 @@ declare const dNode: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, defProxy, rules }: {
+    toPacScript: ({ proxy, system, rules }: {
         proxy?: string | undefined;
-        defProxy?: string | undefined;
+        system?: string | undefined;
         rules?: string[] | undefined;
     }) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {

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

@@ -9,9 +9,9 @@ declare const _default: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, defProxy, rules }: {
+    toPacScript: ({ proxy, system, rules }: {
         proxy?: string | undefined;
-        defProxy?: string | undefined;
+        system?: string | undefined;
         rules?: string[] | undefined;
     }) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {

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

@@ -3,9 +3,9 @@ declare const _default: {
         ipaddress: string;
         port: number;
     } | undefined> | undefined;
-    toPacScript: ({ proxy, defProxy, rules }: {
+    toPacScript: ({ proxy, system, rules }: {
         proxy?: string | undefined;
-        defProxy?: string | undefined;
+        system?: string | undefined;
         rules?: string[] | undefined;
     }) => string;
     toPacProxy: (ipaddress: string, port: number, options?: {

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

@@ -1,3 +1,4 @@
+import DEvent from '../../class/event';
 interface IProxyConfig {
     ipaddress: string;
     port: number;
@@ -5,6 +6,10 @@ interface IProxyConfig {
     userId?: string;
     password?: string;
 }
+declare const Socks5Event: {
+    readonly Error: "error";
+};
+type Socks5EventType = (typeof Socks5Event)[keyof typeof Socks5Event];
 export declare class Socks5 {
     private upstreamProxy;
     private server;
@@ -16,6 +21,7 @@ export declare class Socks5 {
     __debug: boolean;
     __uuid: string;
     __port: number;
+    __event: DEvent;
     constructor(upstreamProxy: IProxyConfig, allowedDomains?: string[] | ['*'], debug?: boolean);
     get id(): string;
     get port(): number;
@@ -26,6 +32,22 @@ export declare class Socks5 {
     setAllowedDomains(allowedDomains?: string[]): void;
     private findAvailablePort;
     private handleSocksConnection;
+    /**
+     * 回复客户端请求响应数据
+     * VER是SOCKS版本，这里应该是0x05；
+     * REP应答字段：
+     * 0x00表示成功
+     * 0x01普通SOCKS服务器连接失败
+     * 0x02现有规则不允许连接
+     * 0x03网络不可达
+     * 0x04主机不可达
+     * 0x05连接被拒
+     * 0x06 TTL超时
+     * 0x07不支持的命令
+     * 0x08不支持的地址类型
+     * 0x09 - 0xFF未定义
+     */
+    /**  */
     private performHandshake;
     private parseClientRequest;
     private getPoolConnection;
@@ -35,6 +57,9 @@ export declare class Socks5 {
     private setupDataForwarding;
     private isAllowedDomain;
     close(): void;
-    showPool(): void;
+    showPools(): void;
+    on(name: Socks5EventType, listener: (...args: any[]) => void): void;
+    off(name: Socks5EventType, listener: (...args: any[]) => void): void;
+    private _emit;
 }
 export {};

package/package.json

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