wenay-common 1.0.182 → 1.0.183

package/lib/Common/Listen.d.ts

@@ -33,22 +33,20 @@ export declare function funcListenCallback<T extends any[]>(a: (e: (tr222<T> | n
     getAllKeys: IterableIterator<any>;
 };
 type tr2<T extends (...a: any[]) => any> = (a: Parameters<T>[0]) => void;
+type tr2a<T extends (...a: any[]) => any> = (...a: Parameters<T>) => void;
 type t1<T extends any[] = any[]> = ReturnType<typeof funcListenCallback<T>>;
-type tt = tr2<Parameters<t1["addListen"]>[0]>;
-export declare function funcListenBySocket3<Z extends any[] = any[]>(e: t1<Z>, z: {
+type tta = tr2a<Parameters<t1["addListen"]>[0]>;
+export declare function funcListenBySocket2<Z extends any[] = any[]>(e: t1<Z>, d?: {
     readonly status?: () => boolean;
-    readonly setEventClose?: (eventClose: () => any) => any;
+    readonly addListenClose?: t1<any>;
+    readonly stop?: (x: tta) => any;
+    readonly paramsModify?: (...e: Parameters<tta>) => any[];
 }): {
-    callback: (z: (a: Z[0]) => void) => void;
+    callback: (z: (...params: Parameters<tr2a<tr222<Z>>>) => void) => void;
     removeCallback: () => boolean;
 };
-export declare function funcListenBySocket2<Z extends any[] = any[]>(e: t1<Z>, { stop, addListenClose, status, paramsModify }: {
-    readonly status?: () => boolean;
-    readonly addListenClose?: t1<any>;
-    readonly stop?: (x: tt) => any;
-    readonly paramsModify?: (...e: Parameters<tt>) => any[];
-}): {
-    callback: (z: (...params: Parameters<(a: Z[0]) => void>) => void) => void;
+export declare function funcListenBySocket3<Z extends any[] = any[]>(e: t1<Z>, options: Omit<Parameters<typeof funcListenBySocket2>[1], "paramsModify">): {
+    callback: (z: (...params: Parameters<tr2<tr222<Z>>>) => void) => void;
     removeCallback: () => boolean;
 };
 export declare function funcListenBySocket<Z extends any[] = any[]>(e: ReturnType<typeof funcListenCallback<Z>>, status: () => boolean, onStop?: ReturnType<typeof funcListenCallback<any>>): {
@@ -83,10 +81,8 @@ export declare function DeepCompareKeys<T, T2 extends obj, T3 extends unknown>(o
     [k: string]: any;
 } | NonNullable<T> | trr2<T> | null;
 export declare function deepModifyByListenSocket<T>(obj: T, status: () => boolean): ttt<T>;
-export declare function deepModifyByListenSocket2<T>(obj: T, data: {
-    status?: () => boolean;
-    addListenClose?: t1<any>;
-}): ttt<T>;
+export declare function deepModifyByListenSocket2<T>(obj: T, data: Parameters<typeof funcListenBySocket2>[1]): ttt<T>;
+export declare function deepModifyByListenSocket3<T>(obj: T, data: Parameters<typeof funcListenBySocket3>[1]): ttt<T>;
 export declare const funcListenBySocketObj: typeof deepModifyByListenSocket;
 export declare function PromiseArrayListen<T extends any = unknown>(array: ((() => Promise<T>) | (() => any) | Promise<T>)[]): {
     listenOk: (a: (...d: [data: T, i: number, countOk: number, countError: number, count: number]) => any) => () => void;

package/lib/Common/Listen.js

@@ -4,8 +4,8 @@ exports.funcListenBySocketObj = exports.funcListenBySocket1 = void 0;
 exports.funcListenCallbackBase = funcListenCallbackBase;
 exports.funcListenCallbackFast = funcListenCallbackFast;
 exports.funcListenCallback = funcListenCallback;
-exports.funcListenBySocket3 = funcListenBySocket3;
 exports.funcListenBySocket2 = funcListenBySocket2;
+exports.funcListenBySocket3 = funcListenBySocket3;
 exports.funcListenBySocket = funcListenBySocket;
 exports.UseListen = UseListen;
 exports.CompareKeys = CompareKeys;
@@ -14,6 +14,7 @@ exports.DeepCompareKeys2 = DeepCompareKeys2;
 exports.DeepCompareKeys = DeepCompareKeys;
 exports.deepModifyByListenSocket = deepModifyByListenSocket;
 exports.deepModifyByListenSocket2 = deepModifyByListenSocket2;
+exports.deepModifyByListenSocket3 = deepModifyByListenSocket3;
 exports.PromiseArrayListen = PromiseArrayListen;
 exports.socketBuffer3 = socketBuffer3;
 exports.funcListenCallbackSnapshot = funcListenCallbackSnapshot;
@@ -76,10 +77,8 @@ function funcListenCallbackFast(a) {
 function funcListenCallback(a, event, fast = true) {
     return funcListenCallbackBase(a, { event, fast });
 }
-function funcListenBySocket3(e, z) {
-    return funcListenBySocket2(e, { ...z, stop: x => x("___STOP"), paramsModify: (...e) => [e[0]] });
-}
-function funcListenBySocket2(e, { stop, addListenClose, status, paramsModify }) {
+function funcListenBySocket2(e, d) {
+    const { stop, addListenClose, status, paramsModify } = d ?? {};
     const { addListen, removeListen, count } = e;
     let last = null;
     let r2 = null;
@@ -109,7 +108,7 @@ function funcListenBySocket2(e, { stop, addListenClose, status, paramsModify })
         if (paramsModify)
             ta = (...a) => z(...paramsModify(...a));
         if (status)
-            r2 = (a) => { status() ? ta(a) : removeListen(r2); };
+            r2 = (...a) => { status() ? ta(...a) : removeListen(r2); };
         else
             r2 = ta;
         addListen(r2);
@@ -120,6 +119,14 @@ function funcListenBySocket2(e, { stop, addListenClose, status, paramsModify })
         removeCallback
     };
 }
+function funcListenBySocket3(e, options) {
+    const r = funcListenBySocket2(e, { ...options, paramsModify: e => [e] });
+    const callback = r.callback;
+    return {
+        callback,
+        removeCallback: r.removeCallback
+    };
+}
 function funcListenBySocket(e, status, onStop) {
     const { addListen, removeListen, count } = e;
     let x = null;
@@ -206,6 +213,9 @@ function deepModifyByListenSocket(obj, status) {
 function deepModifyByListenSocket2(obj, data) {
     return DeepCompareKeys(obj, funcListenCallbackBase(e => { }), e => funcListenBySocket2(e, data));
 }
+function deepModifyByListenSocket3(obj, data) {
+    return DeepCompareKeys(obj, funcListenCallbackBase(e => { }), e => funcListenBySocket3(e, data));
+}
 exports.funcListenBySocketObj = deepModifyByListenSocket;
 function PromiseArrayListen(array) {
     let ok = 0, error = 0;

package/lib/test.d.ts

@@ -1 +1 @@
-declare function test(): void;
+export {};

package/lib/test.js

@@ -1,47 +1,19 @@
 "use strict";
-function test() {
-    const ff = (a, b) => { };
-    const map = new Map();
-    map.set("d", ff);
-    const l = 10000000;
-    const par = [3, 5];
-    const ttt = (...par) => {
-        console.time("ss");
-        for (let i = 0; i < l; i++) {
-            map.forEach(e => {
-                e(...par);
-            });
-        }
-        console.timeEnd("ss");
-    };
-    map.set("z", ff);
-    ttt(...par);
-    map.set("v", ff);
-    ttt(...par);
-    map.set("zx", ff);
-    ttt(...par);
-    map.set("rt", ff);
-    map.set("xd", ff);
-    map.set("fd", ff);
-    ttt(...par);
-    map.set("frt", ff);
-    map.set("fxd", ff);
-    map.set("ffd", ff);
-    ttt(...par);
-    const ar = [...map.values()];
-    ar.length = 1;
-    console.time("zz");
-    let r = (...a) => {
-        for (let i = 0; i < ar.length; i++) {
-            ar[i](...a);
-        }
-    };
-    const tr = (...a) => {
-    };
-    r = null;
-    for (let i = 0; i < l; i++) {
-        r?.(...par);
+Object.defineProperty(exports, "__esModule", { value: true });
+const Listen_1 = require("./Common/Listen");
+const common_1 = require("./Common/common");
+async function test() {
+    const [setA, listenA] = (0, Listen_1.UseListen)();
+    const [setStop, listenStop] = (0, Listen_1.UseListen)();
+    const r = (0, Listen_1.funcListenBySocket3)(listenA, { addListenClose: listenStop });
+    r.callback((...a) => {
+        console.log(a);
+    });
+    for (let i = 0; i < 10; i++) {
+        await (0, common_1.sleepAsync)(200);
+        setA(6, [3.4]);
+        if (i == 5)
+            setStop();
     }
-    console.timeEnd("zz");
 }
 test();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.182",
+  "version": "1.0.183",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",