wenay-common 1.0.241 → 1.0.243

package/lib/Common/Listen.d.ts

@@ -1,44 +1,46 @@
 export type Listener<T extends any[]> = (...r: T) => void;
-export declare function funcListenCallbackBase<T extends any[]>(b: (e: Listener<T>) => (void | (() => void)), data?: {
-    event?: (type: "add" | "remove", count: number, api: ReturnType<typeof funcListenCallbackBase<T>>) => void;
+type NormalizeTuple<T> = T extends any[] ? T : [T];
+export declare function funcListenCallbackBase<T>(b: (e: Listener<NormalizeTuple<T>>) => (void | (() => void)), data?: {
+    event?: (type: "add" | "remove", count: number, api: ReturnType<typeof funcListenCallbackBase<any>>) => void;
     fast?: boolean;
 }): {
-    func: Listener<T>;
+    func: Listener<NormalizeTuple<T>>;
     isRun: () => boolean;
     run: () => void;
     close: () => void;
-    addListen: (cb: Listener<T>) => () => void;
-    removeListen: (cb: Listener<T> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>) => () => void;
+    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<T>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
 };
-export declare function funcListenCallbackFast<T extends any[]>(a: (e: (Listener<T> | null)) => (void | (() => void))): {
-    func: Listener<T>;
+export declare function funcListenCallback<T>(a: (e: (Listener<NormalizeTuple<T>> | null)) => (void | (() => void)), event?: (type: "add" | "remove", count: number, api: ReturnType<typeof funcListenCallbackBase<T>>) => void, fast?: boolean): {
+    func: Listener<NormalizeTuple<T>>;
     isRun: () => boolean;
     run: () => void;
     close: () => void;
-    addListen: (cb: Listener<T>) => () => void;
-    removeListen: (cb: Listener<T> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>) => () => void;
+    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<T_1>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T_1>>[];
 };
-export declare function funcListenCallback<T extends any[]>(a: (e: (Listener<T> | null)) => (void | (() => void)), event?: (type: "add" | "remove", count: number, api: ReturnType<typeof funcListenCallbackBase<T>>) => void, fast?: boolean): {
-    func: Listener<T>;
+export declare function funcListenCallbackFast<T>(a: (e: (Listener<NormalizeTuple<T>> | null)) => (void | (() => void))): {
+    func: Listener<NormalizeTuple<T>>;
     isRun: () => boolean;
     run: () => void;
     close: () => void;
-    addListen: (cb: Listener<T>) => () => void;
-    removeListen: (cb: Listener<T> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>) => () => void;
+    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<T_1>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T_1>>[];
 };
-export declare function UseListen<T extends any[]>(data?: Parameters<typeof funcListenCallbackBase>[1]): readonly [(...a: T) => void, {
-    func: Listener<T>;
+export declare function UseListen<T>(data?: Parameters<typeof funcListenCallbackBase>[1]): readonly [(...a: NormalizeTuple<T>) => void, {
+    func: Listener<NormalizeTuple<T>>;
     isRun: () => boolean;
     run: () => void;
     close: () => void;
-    addListen: (cb: Listener<T>) => () => void;
-    removeListen: (cb: Listener<T> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>) => () => void;
+    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<T_1>[];
+    readonly getAllKeys: Listener<NormalizeTuple<T_1>>[];
 }];
+export {};

package/lib/Common/Listen.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.funcListenCallbackBase = funcListenCallbackBase;
-exports.funcListenCallbackFast = funcListenCallbackFast;
 exports.funcListenCallback = funcListenCallback;
+exports.funcListenCallbackFast = funcListenCallbackFast;
 exports.UseListen = UseListen;
 function funcListenCallbackBase(b, data) {
     const { fast = false, event } = data ?? {};
@@ -61,12 +61,12 @@ function funcListenCallbackBase(b, data) {
     };
     return api;
 }
-function funcListenCallbackFast(a) {
-    return funcListenCallbackBase(a, { fast: true });
-}
 function funcListenCallback(a, event, fast = true) {
     return funcListenCallbackBase(a, { event, fast });
 }
+function funcListenCallbackFast(a) {
+    return funcListenCallbackBase(a, { fast: true });
+}
 function UseListen(data = { fast: true }) {
     let t;
     const a = funcListenCallbackBase((e) => { t = e; }, { fast: true, ...data });

package/lib/Common/ListenBySocket.d.ts

@@ -17,6 +17,16 @@ export declare function funcListenBySocket4<Z extends any[] = any[]>(e: ListenCa
     callback: (z: (...args: Z) => void) => void;
     removeCallback: () => boolean;
 };
+type SmartCallback<Z extends any[]> = Z extends [infer Single] ? (a: Single) => void : (...args: Z) => void;
+export declare function funcListenBySocket5<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, options?: Omit<Parameters<typeof funcListenBySocket2>[1], "paramsModify">): {
+    callback: (z: SmartCallback<Z>) => void;
+    removeCallback: () => boolean;
+};
+export declare function funcListenBySocketSmart<Z extends any[] = any[]>(e: ReturnType<typeof funcListenCallback<Z>>, status: () => boolean, onStop?: ReturnType<typeof funcListenCallback<any>>): {
+    callback: (z: SmartCallback<Z>) => void;
+    removeCallback: () => boolean;
+};
+export declare function deepModifyByListenSocket5<T>(obj: T, data?: Parameters<typeof funcListenBySocket5>[1]): DeepSocket<T>;
 export declare function funcListenBySocket<Z extends any[] = any[]>(e: ReturnType<typeof funcListenCallback<Z>>, status: () => boolean, onStop?: ReturnType<typeof funcListenCallback<any>>): {
     callback: (z: (a: Z[0]) => void) => void;
     removeCallback: () => boolean;

package/lib/Common/ListenBySocket.js

@@ -4,6 +4,9 @@ exports.funcListenBySocketObj = exports.funcListenBySocket1 = void 0;
 exports.funcListenBySocket2 = funcListenBySocket2;
 exports.funcListenBySocket3 = funcListenBySocket3;
 exports.funcListenBySocket4 = funcListenBySocket4;
+exports.funcListenBySocket5 = funcListenBySocket5;
+exports.funcListenBySocketSmart = funcListenBySocketSmart;
+exports.deepModifyByListenSocket5 = deepModifyByListenSocket5;
 exports.funcListenBySocket = funcListenBySocket;
 exports.funcListenBySocketFull = funcListenBySocketFull;
 exports.CompareKeys = CompareKeys;
@@ -85,6 +88,26 @@ function funcListenBySocket4(e, options) {
         removeCallback: r.removeCallback,
     };
 }
+function funcListenBySocket5(e, options) {
+    const r = funcListenBySocket2(e, {
+        ...options,
+    });
+    return {
+        callback: r.callback,
+        removeCallback: r.removeCallback,
+    };
+}
+function funcListenBySocketSmart(e, status, onStop) {
+    const r = funcListenBySocket5(e, {
+        status,
+        addListenClose: onStop,
+        stop: (x) => x?.("___STOP"),
+    });
+    return r;
+}
+function deepModifyByListenSocket5(obj, data) {
+    return DeepCompareKeys(obj, NOOP_LISTEN, (e) => funcListenBySocket5(e, data));
+}
 function funcListenBySocket(e, status, onStop) {
     const r = funcListenBySocket3(e, {
         status,

package/lib/Common/SocketBuffer.d.ts

@@ -29,7 +29,7 @@ export declare function funcListenCallbackSnapshot<T extends realSocket2<any | a
         addListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>) => () => void;
         removeListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]> | null) => void;
         count: () => number;
-        readonly getAllKeys: import("./Listen").Listener<T_1>[];
+        readonly getAllKeys: import("./Listen").Listener<T_1 extends any[] ? T_1 : [T_1]>[];
     };
     connect: () => void;
     readonly disconnect: ((a: Omit<Parameters<T>[0], "callback"> & {

package/lib/Common/SocketServerHook.d.ts

@@ -4,26 +4,26 @@ export declare function SocketServerHook(opt?: {
     transformer?: transformer;
 }): {
     obj: {
-        [k: string]: readonly [(...a: any[]) => void, {
-            func: import("./Listen").Listener<any[]>;
+        [k: string]: readonly [(a_0: unknown) => void, {
+            func: import("./Listen").Listener<[unknown]>;
             isRun: () => boolean;
             run: () => void;
             close: () => void;
-            addListen: (cb: import("./Listen").Listener<any[]>) => () => void;
-            removeListen: (cb: import("./Listen").Listener<any[]> | null) => void;
+            addListen: (cb: import("./Listen").Listener<[unknown]>) => () => void;
+            removeListen: (cb: import("./Listen").Listener<[unknown]> | null) => void;
             count: () => number;
-            readonly getAllKeys: import("./Listen").Listener<T>[];
+            readonly getAllKeys: import("./Listen").Listener<T extends any[] ? T : [T]>[];
         }];
     };
-    get(tag: string): readonly [(...a: any[]) => void, {
-        func: import("./Listen").Listener<any[]>;
+    get(tag: string): readonly [(a_0: unknown) => void, {
+        func: import("./Listen").Listener<[unknown]>;
         isRun: () => boolean;
         run: () => void;
         close: () => void;
-        addListen: (cb: import("./Listen").Listener<any[]>) => () => void;
-        removeListen: (cb: import("./Listen").Listener<any[]> | null) => void;
+        addListen: (cb: import("./Listen").Listener<[unknown]>) => () => void;
+        removeListen: (cb: import("./Listen").Listener<[unknown]> | null) => void;
         count: () => number;
-        readonly getAllKeys: import("./Listen").Listener<T>[];
+        readonly getAllKeys: import("./Listen").Listener<T extends any[] ? T : [T]>[];
     }];
     provider: (tag: string, data: any) => void;
 };

package/package.json

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