wenay-common 1.0.238 → 1.0.239

package/lib/Common/ListenBySocket.d.ts

@@ -13,10 +13,18 @@ export declare function funcListenBySocket3<Z extends any[] = any[]>(e: ListenCa
     callback: (z: (a: Z[0]) => void) => void;
     removeCallback: () => boolean;
 };
+export declare function funcListenBySocket4<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, options?: Omit<Parameters<typeof funcListenBySocket2>[1], "paramsModify">): {
+    callback: (z: (...args: 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>>): {
     callback: (z: (a: Z[0]) => void) => void;
     removeCallback: () => boolean;
 };
+export declare function funcListenBySocketFull<Z extends any[] = any[]>(e: ReturnType<typeof funcListenCallback<Z>>, status: () => boolean, onStop?: ReturnType<typeof funcListenCallback<any>>): {
+    callback: (z: (...args: Z) => void) => void;
+    removeCallback: () => boolean;
+};
 export declare const funcListenBySocket1: typeof funcListenBySocket;
 type Obj = Record<string, any>;
 export declare function CompareKeys<T extends Obj, T2 extends Obj>(obj1: T, obj2: T2): boolean;
@@ -31,6 +39,7 @@ type DeepSocket<T> = {
 export declare function DeepCompareKeys<T, T2 extends Obj, T3>(obj1: T, obj2: T2, func: (a: T2) => T3): T3 | T | null;
 export declare function deepModifyByListenSocket<T>(obj: T, status: () => boolean): DeepSocket<T>;
 export declare function deepModifyByListenSocket2<T>(obj: T, data?: Parameters<typeof funcListenBySocket2>[1]): DeepSocket<T>;
-export declare function deepModifyByListenSocket3<T>(obj: T, data?: Parameters<typeof funcListenBySocket3>[1]): DeepSocket<T>;
+export declare function deepModifyByListenSocket3<T>(obj: T, data?: Parameters<typeof funcListenBySocket4>[1]): DeepSocket<T>;
+export declare function deepModifyByListenSocket4<T>(obj: T, status: () => boolean): DeepSocket<T>;
 export declare const funcListenBySocketObj: typeof deepModifyByListenSocket;
 export {};

package/lib/Common/ListenBySocket.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.funcListenBySocketObj = exports.funcListenBySocket1 = void 0;
 exports.funcListenBySocket2 = funcListenBySocket2;
 exports.funcListenBySocket3 = funcListenBySocket3;
+exports.funcListenBySocket4 = funcListenBySocket4;
 exports.funcListenBySocket = funcListenBySocket;
+exports.funcListenBySocketFull = funcListenBySocketFull;
 exports.CompareKeys = CompareKeys;
 exports.CompareKeys2 = CompareKeys2;
 exports.DeepCompareKeys2 = DeepCompareKeys2;
@@ -11,6 +13,7 @@ exports.DeepCompareKeys = DeepCompareKeys;
 exports.deepModifyByListenSocket = deepModifyByListenSocket;
 exports.deepModifyByListenSocket2 = deepModifyByListenSocket2;
 exports.deepModifyByListenSocket3 = deepModifyByListenSocket3;
+exports.deepModifyByListenSocket4 = deepModifyByListenSocket4;
 const isProxy_1 = require("./isProxy");
 const Listen_1 = require("./Listen");
 function isLeafValue(value) {
@@ -73,6 +76,15 @@ function funcListenBySocket3(e, options) {
         removeCallback: r.removeCallback,
     };
 }
+function funcListenBySocket4(e, options) {
+    const r = funcListenBySocket2(e, {
+        ...options,
+    });
+    return {
+        callback: r.callback,
+        removeCallback: r.removeCallback,
+    };
+}
 function funcListenBySocket(e, status, onStop) {
     const r = funcListenBySocket3(e, {
         status,
@@ -81,6 +93,14 @@ function funcListenBySocket(e, status, onStop) {
     });
     return r;
 }
+function funcListenBySocketFull(e, status, onStop) {
+    const r = funcListenBySocket4(e, {
+        status,
+        addListenClose: onStop,
+        stop: (x) => x?.("___STOP"),
+    });
+    return r;
+}
 exports.funcListenBySocket1 = funcListenBySocket;
 function CompareKeys(obj1, obj2) {
     return CompareKeys2(obj1, Object.keys(obj2));
@@ -112,6 +132,9 @@ function deepModifyByListenSocket2(obj, data) {
     return DeepCompareKeys(obj, NOOP_LISTEN, (e) => funcListenBySocket2(e, data));
 }
 function deepModifyByListenSocket3(obj, data) {
-    return DeepCompareKeys(obj, NOOP_LISTEN, (e) => funcListenBySocket3(e, data));
+    return DeepCompareKeys(obj, NOOP_LISTEN, (e) => funcListenBySocket4(e, data));
+}
+function deepModifyByListenSocket4(obj, status) {
+    return DeepCompareKeys(obj, NOOP_LISTEN, (e) => funcListenBySocketFull(e, status));
 }
 exports.funcListenBySocketObj = deepModifyByListenSocket;

package/lib/Common/commonsServerMini2.d.ts

@@ -3,6 +3,10 @@ type Socket = {
     on: (e: string, cb: (d: any) => void) => void;
 };
 type Func = (...args: any[]) => any;
+export declare const createIdPool: () => {
+    next: () => number;
+    release(id: number): void;
+};
 export declare function rpcEndCallback(fn: Function): void;
 type PromiseServerHooks<T> = {
     onRequest?: (ctx: {

package/lib/Common/commonsServerMini2.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createIdPool = void 0;
 exports.rpcEndCallback = rpcEndCallback;
 exports.CreatAPIFacadeServer2 = createAPIFacadeServer;
 exports.CreatAPIFacadeClient2 = createAPIFacadeClient;
@@ -8,13 +9,15 @@ const FN_MARKER = "$_f";
 const BANNED_KEYS = new Set(["__proto__", "constructor", "prototype"]);
 const isSafeKey = (k) => !BANNED_KEYS.has(k);
 const hasOwn = (obj, k) => Object.prototype.hasOwnProperty.call(obj, k);
-class IdPool {
-    s = [];
-    p = 0;
-    n = 0;
-    next() { return this.p > 0 ? this.s[--this.p] : ++this.n; }
-    release(id) { this.s[this.p++] = id; }
-}
+const createIdPool = () => {
+    const s = [];
+    let n = 0;
+    return {
+        next: () => s.length > 0 ? s.pop() : ++n,
+        release(id) { s.push(id); }
+    };
+};
+exports.createIdPool = createIdPool;
 function walk(val, onLeaf) {
     if (val == null || typeof val !== "object")
         return onLeaf(val);
@@ -190,7 +193,7 @@ function createServer(socket, key, target, hooks) {
 }
 function createClient(socket, key, opts) {
     const limit = opts?.limit ?? 10000;
-    const pool = new IdPool();
+    const pool = (0, exports.createIdPool)();
     const pending = new Map();
     const callbacks = new Map();
     const routeCache = {};

package/lib/Common/joinListens.d.ts

@@ -0,0 +1,17 @@
+import { UseListen } from "./Listen";
+type listen<T extends any[] = any[]> = ReturnType<typeof UseListen<T>>;
+type KeyExtractor<D> = (data: D) => string | undefined;
+type ListenMap<T extends Record<string, any>> = {
+    [K in keyof T]: listen<T[K]>[1];
+};
+type CollectedResult<T extends Record<string, any>> = {
+    [K in keyof T]: T[K];
+};
+type JoinResult<R> = {
+    listen: listen<[R, string]>[1];
+    pending: Map<string, Map<string, any>>;
+    clear: (tid?: string) => void;
+};
+export declare function joinListens<T extends Record<string, any[]>>(listens: ListenMap<T>, keyExtractor?: KeyExtractor<any>): JoinResult<CollectedResult<T>>;
+export declare function joinListens<D extends any[] = any[]>(listens: listen<D>[1][], keyExtractor?: KeyExtractor<any>): JoinResult<D[][]>;
+export {};

package/lib/Common/joinListens.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinListens = joinListens;
+const Listen_1 = require("./Listen");
+function joinListens(listens, keyExtractor) {
+    const isArray = Array.isArray(listens);
+    const map = isArray
+        ? Object.fromEntries(listens.map((l, i) => [String(i), l]))
+        : listens;
+    const [set, out] = (0, Listen_1.UseListen)();
+    const keys = Object.keys(map);
+    const buckets = new Map();
+    const getKey = (data) => keyExtractor?.(data) ?? "_";
+    const tryFire = (tid) => {
+        const bucket = buckets.get(tid);
+        if (bucket.size < keys.length)
+            return;
+        const result = isArray
+            ? keys.map(k => bucket.get(k))
+            : Object.fromEntries(bucket);
+        buckets.delete(tid);
+        set(result, tid);
+    };
+    for (const portId of keys) {
+        map[portId].addListen((...data) => {
+            const tid = getKey(data[0]);
+            if (!buckets.has(tid))
+                buckets.set(tid, new Map());
+            buckets.get(tid).set(portId, data);
+            tryFire(tid);
+        });
+    }
+    return {
+        listen: out,
+        pending: buckets,
+        clear: (tid) => {
+            tid ? buckets.delete(tid) : buckets.clear();
+        }
+    };
+}

package/package.json

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