ddan-js 2.8.5 → 2.8.7

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 index_1 = require("../qs/index");
+const list_1 = require("../list");
 const event_1 = require("../../class/event");
 const pipeline_1 = require("../hook/modules/pipeline");
 const Socks5Event = {
@@ -24,9 +25,11 @@ class Socks5 {
     __logger;
     __totalReceived = 0;
     __totalSent = 0;
+    __rules = [];
     constructor(upstreamProxy, debug = false, logger) {
         this.__event = new event_1.default();
         this.upstreamProxy = this.filterProxyConfigs(upstreamProxy);
+        this._updateRules();
         this.__debug = debug;
         this.__uuid = (0, uuid_1.default)();
         this.__pipeline = new pipeline_1.default(1);
@@ -49,6 +52,9 @@ class Socks5 {
     get totalSent() {
         return this.__totalSent;
     }
+    get rules() {
+        return this.__rules;
+    }
     validateProxyConfig(proxyConfig) {
         const { ipaddress, port, userId, password } = proxyConfig || {};
         if (!ipaddress || typeof ipaddress !== 'string') {
@@ -109,6 +115,7 @@ class Socks5 {
         if (!configs || configs.length <= 0)
             return false;
         this.upstreamProxy = configs;
+        this._updateRules();
         return true;
     }
     setSystemProxy(use, config) {
@@ -162,7 +169,7 @@ class Socks5 {
             const addr = destination.addr;
             addrport = `${addr}:${destination.port}`;
             this.__debug && this.__logger?.info(`[socks5] handle connection`, addrport);
-            const proxyConfig = this.getProxyConfig(addr);
+            const proxyConfig = this.findProxyConfig(addr);
             if (proxyConfig) {
                 // 走上游代理
                 const upstreamSocket = await this.connectToUpstreamProxy(destination, proxyConfig);
@@ -339,7 +346,7 @@ class Socks5 {
             clientSocket.end();
         });
     }
-    getProxyConfig(addr) {
+    findProxyConfig(addr) {
         if (index_1.default.isLocalIpAddress(addr))
             return undefined;
         for (const cfg of this.upstreamProxy) {
@@ -408,5 +415,10 @@ class Socks5 {
             // nothing
         }
     }
+    _updateRules() {
+        if (!this.upstreamProxy)
+            return;
+        this.__rules = list_1.default.distinct(this.upstreamProxy.reduce((prev, current) => prev.concat(current?.rules || []), []));
+    }
 }
 exports.Socks5 = Socks5;

package/bin/types/index.d.ts

@@ -680,7 +680,7 @@ declare const dNode: {
     readDirectory: (dir: string, callback?: import("./typings").Ddan.Func1<string, any> | undefined) => Promise<unknown>;
     readFiles: (dir: string, files: string[], callback?: import("./typings").Ddan.Func1<string, any> | undefined) => Promise<void>;
 };
-export { dUtil, dHook, dWeb, dMini, dCdn, dStore, dJoker, dTracker, dLogger, dNode, Event, KValue, Mapping };
+export { dUtil, dHook, dWeb, dMini, dCdn, dStore, dJoker, dTracker, dLogger, dNode, Event, KValue, Mapping, };
 declare const _default: {
     gbk: {
         gbkLength: (str: string) => number;

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

@@ -34,12 +34,14 @@ export declare class Socks5 {
     __logger: ILogger;
     __totalReceived: number;
     __totalSent: number;
+    __rules: string[];
     constructor(upstreamProxy: IRuleProxy | IRuleProxy[], debug?: boolean, logger?: ILogger);
     get id(): string;
     get port(): number;
     get url(): string;
     get totalReceived(): number;
     get totalSent(): number;
+    get rules(): string[];
     validateProxyConfig(proxyConfig: IProxy): "" | "无效的上游代理 IP 地址" | "无效的上游代理端口" | "无效的上游代理用户名" | "无效的上游代理密码";
     private filterProxyConfigs;
     start(startPort?: number): Promise<number>;
@@ -85,12 +87,13 @@ export declare class Socks5 {
     private connectToProxy;
     private connectToLocal;
     private setupDataForwarding;
-    private getProxyConfig;
+    findProxyConfig(addr: string): IRuleProxy | undefined;
     private isAllowedDomain;
     close(): void;
     on(name: Socks5EventType, listener: (...args: any[]) => void): void;
     off(name: Socks5EventType, listener: (...args: any[]) => void): void;
     resetStatistics(): void;
     private _emit;
+    private _updateRules;
 }
 export {};

package/package.json

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