ddan-js 2.8.10 → 2.8.12

package/bin/lib/modules/hook/modules/bezier.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lerpAverage = void 0;
+const lerp = (start, end, t) => {
+    // (1 - t) * p0.x + t * p1.x,
+    return start * (1 - t) + end * t;
+};
+const bezier1 = (p0, p1, t) => {
+    return {
+        x: lerp(p0.x, p1.x, t),
+        y: lerp(p0.y, p1.y, t),
+    };
+};
+const bezier2 = (p0, p1, p2, t) => {
+    const q0 = bezier1(p0, p1, t);
+    const q1 = bezier1(p1, p2, t);
+    return bezier1(q0, q1, t);
+};
+const bezier3 = (p0, p1, p2, p3, t) => {
+    const q0 = bezier2(p0, p1, p2, t);
+    const q1 = bezier2(p1, p2, p3, t);
+    return bezier1(q0, q1, t);
+};
+/**
+ * 贝塞尔曲线
+ * @param points
+ * @param t [0, 1]
+ * @returns
+ */
+const bezier = (points, t) => {
+    if (points.length === 1) {
+        return points[0]; // 递归终点
+    }
+    const nextPoints = [];
+    for (let i = 0; i < points.length - 1; i++) {
+        nextPoints.push({
+            x: (1 - t) * points[i].x + t * points[i + 1].x,
+            y: (1 - t) * points[i].y + t * points[i + 1].y,
+        });
+    }
+    return bezier(nextPoints, t);
+};
+/**
+ * 计算二项式系数 C(n, k)
+ * @param n 阶数
+ * @param k 选择的点数
+ * @returns 二项式系数
+ */
+const binomialCoefficient = (n, k) => {
+    if (k === 0 || k === n)
+        return 1;
+    let res = 1;
+    for (let i = 1; i <= k; i++) {
+        res = (res * (n - i + 1)) / i;
+    }
+    return res;
+};
+/**
+ * 贝塞尔曲线
+ * @param points
+ * @param t [0, 1]
+ * @returns
+ */
+const bezierCurve = (points, t) => {
+    const n = points.length - 1;
+    let x = 0;
+    let y = 0;
+    for (let i = 0; i <= n; i++) {
+        const coefficient = binomialCoefficient(n, i) * Math.pow(1 - t, n - i) * Math.pow(t, i);
+        x += coefficient * points[i].x;
+        y += coefficient * points[i].y;
+    }
+    return { x, y };
+};
+const lerpAverage = (points, step //
+) => {
+    if (points.length <= 0)
+        return 0;
+    if (points.length === 1)
+        return points[0].x;
+    if (points.length === 2)
+        return lerp(points[0].y, points[1].y, 0.5);
+    const values = [];
+    // 调整下排序
+    const _points = points.slice().sort((a, b) => a.x - b.x);
+    const start = _points[0].x;
+    const end = _points[_points.length - 1].x;
+    // 遍历每个插值点
+    for (let axis = start; axis <= end; axis += step) {
+        let value = 0;
+        // 找到 t 所在区间 [t1, t2]
+        for (let i = 0; i < _points.length - 1; i++) {
+            const p1 = _points[i];
+            const p2 = _points[i + 1];
+            if (axis >= p1.x && axis <= p2.x) {
+                if (p1.x === p2.x) {
+                    value = p1.y;
+                }
+                else {
+                    const t = (axis - p1.x) / (p2.x - p1.x);
+                    value = bezier1(p1, p2, t).y;
+                }
+                // 线性插值公式
+                break;
+            }
+        }
+        // 如果 t 超出范围，使用最后一个已知值
+        if (axis > _points[_points.length - 1].x) {
+            value = _points[_points.length - 1].y;
+        }
+        values.push(value);
+    }
+    const sum = values.reduce((acc, val) => acc + val, 0) / values.length;
+    return sum / values.length;
+};
+exports.lerpAverage = lerpAverage;
+exports.default = { bezier1, bezier2, bezier3, bezier, bezierCurve, lerp, lerpAverage: exports.lerpAverage };

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

@@ -168,7 +168,7 @@ class Socks5 {
             const destination = await this.parseClientRequest(clientSocket);
             const addr = destination.addr;
             addrport = `${addr}:${destination.port}`;
-            this.__debug && this.__logger?.info(`[socks5] handle connection`, addrport);
+            this.__debug && this.__logger?.info(`[socks5] connection`, addrport);
             const proxyConfig = this.findProxyConfig(addr);
             if (proxyConfig) {
                 // 走上游代理

package/bin/types/browser.d.ts

@@ -334,6 +334,12 @@ declare const dHook: {
     pipe: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/pipeline").default;
     pipeline: (max?: number) => import("./modules/hook/modules/pipeline").default;
     safeTask: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/safeTask").default;
+    bezier1: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+    bezier2: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+    bezier3: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, p3: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+    bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+    bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+    lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
     logString: (data: any) => string;
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;
@@ -685,6 +691,13 @@ declare const _default: {
         pipe: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/pipeline").default;
         pipeline: (max?: number) => import("./modules/hook/modules/pipeline").default;
         safeTask: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/safeTask").default;
+        bezier1: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+        bezier2: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+        bezier3: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, p3: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+        bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+        bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+        lerp: (start: number, end: number, t: number) => number;
+        lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
         logString: (data: any) => string;
         logParse: (logStr: string) => string;
         logRString: (data: any) => Promise<string>;

package/bin/types/index.d.ts

@@ -334,6 +334,12 @@ declare const dHook: {
     pipe: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/pipeline").default;
     pipeline: (max?: number) => import("./modules/hook/modules/pipeline").default;
     safeTask: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/safeTask").default;
+    bezier1: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+    bezier2: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+    bezier3: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, p3: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+    bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+    bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+    lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
     logString: (data: any) => string;
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;
@@ -721,6 +727,13 @@ declare const _default: {
         pipe: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/pipeline").default;
         pipeline: (max?: number) => import("./modules/hook/modules/pipeline").default;
         safeTask: (func: import("./typings").Ddan.Function, callback?: ((result: import("./typings").Ddan.SafeResult<any>) => void) | undefined) => import("./modules/hook/modules/safeTask").default;
+        bezier1: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+        bezier2: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+        bezier3: (p0: import("./typings").Ddan.IPoint, p1: import("./typings").Ddan.IPoint, p2: import("./typings").Ddan.IPoint, p3: import("./typings").Ddan.IPoint, t: number) => import("./typings").Ddan.IPoint;
+        bezier: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+        bezierCurve: (points: import("./typings").Ddan.IPoint[], t: number) => import("./typings").Ddan.IPoint;
+        lerp: (start: number, end: number, t: number) => number;
+        lerpAverage: (points: import("./typings").Ddan.IPoint[], step: number) => number;
         logString: (data: any) => string;
         logParse: (logStr: string) => string;
         logRString: (data: any) => Promise<string>;

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

@@ -25,6 +25,13 @@ declare const _default: {
     pipe: (func: Ddan.Function, callback?: ((result: Ddan.SafeResult<any>) => void) | undefined) => DPipeline;
     pipeline: (max?: number) => DPipeline;
     safeTask: (func: Ddan.Function, callback?: ((result: Ddan.SafeResult<any>) => void) | undefined) => DSafeTask;
+    bezier1: (p0: Ddan.IPoint, p1: Ddan.IPoint, t: number) => Ddan.IPoint;
+    bezier2: (p0: Ddan.IPoint, p1: Ddan.IPoint, p2: Ddan.IPoint, t: number) => Ddan.IPoint;
+    bezier3: (p0: Ddan.IPoint, p1: Ddan.IPoint, p2: Ddan.IPoint, p3: Ddan.IPoint, t: number) => Ddan.IPoint;
+    bezier: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
+    bezierCurve: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
+    lerp: (start: number, end: number, t: number) => number;
+    lerpAverage: (points: Ddan.IPoint[], step: number) => number;
     logString: (data: any) => string;
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;

package/bin/types/modules/hook/modules/bezier.d.ts

@@ -0,0 +1,12 @@
+import { Ddan } from '../../../typings';
+export declare const lerpAverage: (points: Ddan.IPoint[], step: number) => number;
+declare const _default: {
+    bezier1: (p0: Ddan.IPoint, p1: Ddan.IPoint, t: number) => Ddan.IPoint;
+    bezier2: (p0: Ddan.IPoint, p1: Ddan.IPoint, p2: Ddan.IPoint, t: number) => Ddan.IPoint;
+    bezier3: (p0: Ddan.IPoint, p1: Ddan.IPoint, p2: Ddan.IPoint, p3: Ddan.IPoint, t: number) => Ddan.IPoint;
+    bezier: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
+    bezierCurve: (points: Ddan.IPoint[], t: number) => Ddan.IPoint;
+    lerp: (start: number, end: number, t: number) => number;
+    lerpAverage: (points: Ddan.IPoint[], step: number) => number;
+};
+export default _default;

package/bin/types/typings/index.d.ts

@@ -4,6 +4,10 @@ export declare namespace Ddan {
         key: string;
         value: T;
     }
+    interface IPoint {
+        x: number;
+        y: number;
+    }
     type KeyValue<T = any> = Required<IKeyValuePart<T>>;
     type Function = (...args: any[]) => void;
     type PFunction<T = any> = Promise<T> | Function;

package/package.json

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