ddan-js 4.0.1 → 4.0.3

package/bin/modules/hook/base.d.ts

@@ -1,5 +1,6 @@
 import { Ddan } from '../../typings';
 declare function to<T = any, U extends object = any>(promise: Promise<T>, errorExt?: object, fn?: Ddan.noop): Promise<[null, T] | [U, undefined]>;
+declare function jsonParse<T = unknown>(text: string, defaultValue?: T | null): T | null;
 declare const _default: {
     to: typeof to;
     go: <T = any>(task?: Ddan.PFunction<T> | undefined, fn?: Ddan.noop | undefined) => Promise<[any, undefined] | [null, T]>;
@@ -11,5 +12,6 @@ declare const _default: {
     resolveValue: <T_4 = any>(value: T_4 | (() => T_4)) => T_4;
     compareVersion: (ver1: string, ver2: string) => 0 | 1 | -1;
     toOpen: (content: string, defaultOpen?: boolean) => boolean;
+    jsonParse: typeof jsonParse;
 };
 export default _default;

package/bin/modules/hook/index.d.ts

@@ -53,5 +53,6 @@ declare const _default: {
     resolveValue: <T_6 = any>(value: T_6 | (() => T_6)) => T_6;
     compareVersion: (ver1: string, ver2: string) => 0 | 1 | -1;
     toOpen: (content: string, defaultOpen?: boolean) => boolean;
+    jsonParse: <T_7 = unknown>(text: string, defaultValue?: T_7 | null) => T_7 | null;
 };
 export default _default;

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

@@ -1,20 +1,42 @@
 import DEvent from '../../class/event';
 import DPipeline from '../hook/modules/pipeline';
-interface IProxy {
+/**
+ * 代理配置接口
+ */
+export interface IProxy {
     ipaddress: string;
     port: number;
     type?: 5;
     userId?: string;
     password?: string;
 }
-interface IRuleProxy extends IProxy {
+/**
+ * 带规则的代理配置接口
+ */
+export interface IRuleProxy extends IProxy {
     rules?: string[];
 }
-declare const Socks5Event: {
+/**
+ * 目标地址接口
+ */
+export interface IDestination {
+    addr: string;
+    port: number;
+}
+/**
+ * SOCKS5事件类型
+ */
+export declare const Socks5Event: {
     readonly Error: "error";
 };
-type Socks5EventType = (typeof Socks5Event)[keyof typeof Socks5Event];
-interface ILogger {
+/**
+ * SOCKS5事件类型
+ */
+export type Socks5EventType = (typeof Socks5Event)[keyof typeof Socks5Event];
+/**
+ * 日志接口
+ */
+export interface ILogger {
     log: (...args: any[]) => void;
     info: (...args: any[]) => void;
     warn: (...args: any[]) => void;
@@ -51,12 +73,29 @@ export declare class Socks5 {
     setSystemProxy(use: boolean, config?: IProxy): void;
     /**
      * 查找可用端口
-     * @param startPort
-     * @param maxRetries
-     * @returns
+     * @param startPort 起始端口
+     * @param maxRetries 最大重试次数
+     * @returns 可用端口或0（表示失败）
      */
     private findAvailablePort;
+    /**
+     * 处理SOCKS5客户端连接
+     * @param clientSocket 客户端socket连接
+     */
     private handleSocksConnection;
+    /**
+     * 设置客户端socket事件处理
+     * @param clientSocket 客户端socket连接
+     */
+    private setupClientSocketEvents;
+    /**
+     * 根据代理配置建立连接
+     * @param clientSocket 客户端socket连接
+     * @param destination 目标地址
+     * @param proxyConfig 代理配置
+     * @param addrport 地址端口字符串
+     */
+    private establishConnection;
     /**
      * 回复客户端请求响应数据
      * VER是SOCKS版本，这里应该是0x05；
@@ -89,7 +128,18 @@ export declare class Socks5 {
     private connectToProxy;
     private connectToLocal;
     private setupDataForwarding;
+    /**
+     * 查找适合目标地址的代理配置
+     * @param addr 目标地址
+     * @returns 匹配的代理配置或undefined
+     */
     findProxyConfig(addr: string): IRuleProxy | undefined;
+    /**
+     * 检查域名是否符合规则
+     * @param addr 目标地址
+     * @param rules 规则列表
+     * @returns 是否符合规则
+     */
     private isAllowedDomain;
     close(): void;
     on(name: Socks5EventType, listener: (...args: any[]) => void): void;
@@ -98,4 +148,3 @@ export declare class Socks5 {
     private _emit;
     private _updateRules;
 }
-export {};

package/bin/tiny/hook.d.ts

@@ -157,6 +157,7 @@ declare const dHook: {
     resolveValue: <T_10 = any>(value: T_10 | (() => T_10)) => T_10;
     compareVersion: (ver1: string, ver2: string) => 0 | 1 | -1;
     toOpen: (content: string, defaultOpen?: boolean) => boolean;
+    jsonParse: <T_11 = unknown>(text: string, defaultValue?: T_11 | null) => T_11 | null;
     base64: {
         encode: (input: string) => string;
         decode: (base64Str: string) => string;
@@ -213,7 +214,7 @@ declare const dHook: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
-    flatten: <T_11>(data: T_11[], recursive?: boolean, list?: T_11[]) => T_11[];
+    flatten: <T_12>(data: T_12[], recursive?: boolean, list?: T_12[]) => T_12[];
     flattenPath: (data: Record<string, any>) => Record<string, any>;
     normalizeStructure: (data: any, prevData: any) => void;
     diffPath: (data: Record<string, any>, prevData: Record<string, any>) => Record<string, any>;
@@ -229,12 +230,12 @@ declare const dHook: {
         ignoreEmptyString?: boolean | undefined;
     }) => any;
     clone: (source: any, weakMap?: WeakMap<object, any>) => any;
-    cloneClass: <T_12>(source: T_12) => T_12;
-    isEqual: <T_13 = any>(value: T_13, other: T_13, depth?: number) => boolean;
+    cloneClass: <T_13>(source: T_13) => T_13;
+    isEqual: <T_14 = any>(value: T_14, other: T_14, depth?: number) => boolean;
     isEqualArray: (value: any[], other: any[], depth?: number) => boolean;
     isEqualObject: (value: Record<string, any>, other: Record<string, any>, depth?: number) => boolean;
-    isEqualValue: <T_14>(value: T_14, other: T_14, type: string) => boolean;
+    isEqualValue: <T_15>(value: T_15, other: T_15, type: string) => boolean;
     isEqualAB: (value: ArrayBuffer, other: ArrayBuffer) => boolean;
-    isEqualDeep: <T_15>(value: T_15, other: T_15) => boolean;
+    isEqualDeep: <T_16>(value: T_16, other: T_16) => boolean;
 };
 export default dHook;

package/package.json

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