wenay-common2 1.0.45 → 1.0.48

package/lib/Common/funcTimeWait.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FuncTimeWait = void 0;
+exports.rateWindow = exports.FuncTimeWait = void 0;
 exports.funcTimeW = funcTimeW;
+exports.createRateWindow = createRateWindow;
 function funcTimeW() {
     const dStatic = {};
     const data = [];
+    const sortByTime = (arr) => arr.sort((a, b) => a[0] - b[0]);
     return {
         dStatic,
         data,
@@ -13,11 +15,13 @@ function funcTimeW() {
                 dStatic[item.type] = [];
             }
             dStatic[item.type].push([item.timeStamp ?? Date.now(), item.weight]);
+            sortByTime(dStatic[item.type]);
         },
         cleanByTime(type, ms = 60 * 1000) {
             const arr = dStatic[type];
             if (!arr || arr.length === 0)
                 return;
+            sortByTime(arr);
             const timeStamp = Date.now();
             if (arr[0][0] > timeStamp - ms)
                 return;
@@ -33,24 +37,7 @@ function funcTimeW() {
             const arr = dStatic[type];
             if (!arr || arr.length === 0)
                 return 0;
-            const timeStamp = Date.now();
-            let sum = 0;
-            let i = arr.length - 1;
-            for (; i >= 0; i--) {
-                const [_time, _weight] = arr[i];
-                if (_time < timeStamp - ms)
-                    break;
-                sum += _weight;
-            }
-            if (i >= 0) {
-                arr.splice(0, i + 1);
-            }
-            return sum;
-        },
-        weightNow(type, ms = 60 * 1000) {
-            const arr = dStatic[type];
-            if (!arr || arr.length === 0)
-                return 0;
+            sortByTime(arr);
             const timeStamp = Date.now();
             let sum = 0;
             let i = arr.length - 1;
@@ -69,13 +56,14 @@ function funcTimeW() {
             const arr = dStatic[type];
             if (!arr || arr.length === 0)
                 return 0;
+            sortByTime(arr);
             let sum = 0;
             let i = arr.length - 1;
             let result = 0;
             for (; i >= 0; i--) {
                 sum += arr[i][1];
                 if (sum > weight) {
-                    result = arr[i + 1]?.[0] ?? 0;
+                    result = arr[i + 1]?.[0] ?? arr[i][0];
                     break;
                 }
             }
@@ -88,6 +76,7 @@ function funcTimeW() {
             const arr = dStatic[type];
             if (!arr || arr.length === 0)
                 return 0;
+            sortByTime(arr);
             let sum = 0;
             let i = arr.length - 1;
             for (; i >= 0; i--) {
@@ -100,7 +89,7 @@ function funcTimeW() {
             for (; i >= 0; i--) {
                 sum += arr[i][1];
                 if (sum > weight) {
-                    result = arr[i + 1]?.[0] ?? 0;
+                    result = arr[i + 1]?.[0] ?? arr[i][0];
                     break;
                 }
             }
@@ -112,3 +101,13 @@ function funcTimeW() {
     };
 }
 exports.FuncTimeWait = funcTimeW();
+function createRateWindow() {
+    const w = funcTimeW();
+    return {
+        ...w,
+        prune: w.cleanByTime,
+        sumWeight: w.weight,
+        readyAt: w.byWeight,
+    };
+}
+exports.rateWindow = createRateWindow();

package/lib/Common/id-pool.js

@@ -3,10 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIdPool = void 0;
 const createIdPool = () => {
     const s = [];
+    const free = new Set();
     let n = 0;
     return {
-        next: () => s.length > 0 ? s.pop() : ++n,
-        release(id) { s.push(id); }
+        next: () => {
+            const id = s.length > 0 ? s.pop() : ++n;
+            free.delete(id);
+            return id;
+        },
+        release(id) {
+            if (id < 1 || id > n || free.has(id))
+                return;
+            free.add(id);
+            s.push(id);
+        }
     };
 };
 exports.createIdPool = createIdPool;

package/lib/Common/inputAutoStep.js

@@ -30,14 +30,14 @@ function SetAutoStepForElement(element, params = { maxStep: 1 }) {
         _digits = digits;
         _step = step;
         if (_min != null) {
-            if (Math.abs(_min) % step != 0)
+            if (Math.abs(_min) % step > 1e-9 && step - Math.abs(_min) % step > 1e-9)
                 _min = Math.floor(Math.abs(_min) / step) * step * Math.sign(minDefault);
             element.min = _min + "";
         }
         element.step = step + "";
         return step;
     }
-    let modeAuto = !_step || (_step < 1 && Math.log10(_step - Math.trunc(_step)) % 1 == 0);
+    let modeAuto = !_step || (_step < 1 && Math.abs(Math.log10(_step) - Math.round(Math.log10(_step))) < 1e-9);
     const modeAuto0 = modeAuto;
     if (modeAuto) {
         calculateStep((_step ? (Math.round(parseFloat(element.value) / _step) * _step) : element.value) + "");

package/lib/Common/isProxy.d.ts

@@ -1,2 +1,3 @@
 export declare function isProxyInit(): void;
+export declare const installProxyTracking: typeof isProxyInit;
 export declare function isProxy(a: any): boolean;

package/lib/Common/isProxy.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.installProxyTracking = void 0;
 exports.isProxyInit = isProxyInit;
 exports.isProxy = isProxy;
 const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
@@ -31,6 +32,7 @@ function isProxyInit() {
     init = true;
     set();
 }
+exports.installProxyTracking = isProxyInit;
 function isProxy(a) {
     if (nodeIsProxy)
         return nodeIsProxy(a);

package/lib/Common/math/Math.d.ts

@@ -5,6 +5,7 @@ type tCorrelationByBuffer = {
 export declare function CorrelationRollingByBuffer(data: tCorrelationByBuffer): {
     init(data: tCorrelationByBuffer): void;
     clear(data?: tCorrelationByBuffer): void;
+    remove(key1: any, key2?: any): void;
     corr2(val1: number, val2: number, key1: any, key2: any): {
         corr: number;
     };

package/lib/Common/math/Math.js

@@ -26,8 +26,14 @@ function CorrelationRollingByBuffer(data) {
             if (data)
                 this.init(data);
         },
+        remove(key1, key2) {
+            if (key2 === undefined)
+                map.delete(key1);
+            else
+                map.get(key1)?.delete(key2);
+        },
         corr2(val1, val2, key1, key2) {
-            const buffer = setting.bufferOn ? getBuffer(key1, key2) : defBuf();
+            const buffer = getBuffer(key1, key2);
             buffer.history1.push(val1);
             buffer.history2.push(val2);
             let dropped1 = 0;

package/lib/Common/math/other.js

@@ -1,6 +1,7 @@
 "use strict";
 function PriceTOSumPercent(price) {
-    return price.map(e => e / price[0]);
+    const base = price[0];
+    return base ? price.map(e => e / base) : price.map(() => 0);
 }
 function strategyStepOfStepAll(symbols_) {
     const symbols = symbols_.map(e => ({ price: PriceTOSumPercent(e.price), key: e.key }));

package/lib/Common/math/scoreLana.js

@@ -22,7 +22,8 @@ function strategyStepOfStepAllL(symbols) {
     return result;
 }
 function PriceTOSumPercentL(price) {
-    return price.map(e => e / price[0]);
+    const base = price[0];
+    return base ? price.map(e => e / base) : price.map(() => 0);
 }
 function strategyStepOfStepL({ t1, t2, minK: _minK, percentM: _percentM, onlyBuy: _onlyBuy }) {
     const onlyBuy = !!_onlyBuy;
@@ -62,6 +63,6 @@ function strategyStepOfStepL({ t1, t2, minK: _minK, percentM: _percentM, onlyBuy
         }
     }
     const k1 = day.profitDays / result1.length;
-    const k2 = day.profit / ((day.profit + day.loss) || 1);
+    const k2 = day.profit / ((day.profit + Math.abs(day.loss)) || 1);
     return k1 * k2;
 }

package/lib/Common/node_console.d.ts

@@ -4,3 +4,5 @@ export declare function disable(): void;
 export declare function __LineFile(lvl?: number): string;
 export declare function __LineFile2(lvl?: number): string;
 export declare function __LineFiles(lvlStart?: number, lvlEnd?: number | undefined): string[];
+export declare const callerLine: typeof __LineFile2;
+export declare const callerLines: typeof __LineFiles;

package/lib/Common/node_console.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.callerLines = exports.callerLine = void 0;
 exports.enable = enable;
 exports.disable = disable;
 exports.__LineFile = __LineFile;
@@ -9,78 +10,6 @@ const { self, window } = globalThis;
 let _enabled = false;
 function enable(flag = true) { _enabled = flag; }
 function disable() { _enabled = false; }
-let wrapCallSite;
-function setupLogs2() {
-    if (typeof self != 'object' && typeof window != "object") {
-        function moduleName(name) { return name; }
-        let inspector = require(moduleName('inspector'));
-        if (inspector.url() != undefined)
-            return;
-        try {
-            let module = require(moduleName('source-map-support'));
-            module.install();
-            wrapCallSite = module.wrapCallSite;
-        }
-        catch (e) {
-            console.warn(e);
-            return;
-        }
-        _enabled = true;
-        const origLogMethod = console.log;
-        const origErrorMethod = console.error;
-        let _callee;
-        for (let methodName of [
-            'debug', 'info', 'log', 'warn', 'error', 'group', 'groupCollapsed', 'table', 'timeLog', 'timeEnd',
-            'count', 'assert', 'dir', 'dirxml'
-        ]) {
-            const origMethod = console[methodName];
-            console[methodName] = ((...args) => {
-                if (!_enabled)
-                    return origMethod(...args);
-                const originalPrepareStackTrace = Error.prepareStackTrace;
-                Error.prepareStackTrace = (_, stack) => stack;
-                let callee = new Error().stack[1];
-                Error.prepareStackTrace = originalPrepareStackTrace;
-                if (!callee) {
-                    origErrorMethod("сallee is not found in node_console");
-                    _enabled = false;
-                    return origMethod(...args);
-                }
-                if (!methodName.match(/debug|info|log|warn|error|dirxml/)) {
-                    _callee ??= callee;
-                    return origMethod(...args);
-                }
-                if (_callee) {
-                    callee = _callee;
-                    _callee = undefined;
-                }
-                if (wrapCallSite)
-                    callee = wrapCallSite(callee);
-                const fileName = callee.getFileName();
-                if (fileName?.includes("source-map-support")) {
-                    origMethod(...args);
-                    return;
-                }
-                let fileAndLine = `${fileName}:${callee.getLineNumber()}:${callee.getColumnNumber()}  ` + callee.getFunctionName();
-                fileAndLine = fileAndLine.replaceAll("\\", "/");
-                fileAndLine = fileAndLine.replace("webpack:///", "");
-                fileAndLine = fileAndLine.replace("?", "");
-                if (!fileAndLine.startsWith("./"))
-                    if (!fileAndLine.toLowerCase().startsWith("file:///"))
-                        fileAndLine = "file:///" + fileAndLine;
-                let [firstArg, ...otherArgs] = args;
-                if (1)
-                    origMethod(...args, "", fileAndLine);
-                else if (typeof firstArg === 'string') {
-                    origMethod(fileAndLine + ' ' + firstArg, ...otherArgs);
-                }
-                else {
-                    origMethod(fileAndLine, ...args);
-                }
-            });
-        }
-    }
-}
 function setupLogs() {
     if (typeof self != 'object' && typeof window != "object") {
         function moduleName(name) { return name; }
@@ -153,8 +82,6 @@ function __LineFile2(lvl = 0) {
     const originalPrepareStackTrace = Error.prepareStackTrace;
     Error.prepareStackTrace = (_, stack) => stack;
     let e = new Error().stack[lvl + 1];
-    if (wrapCallSite)
-        e = wrapCallSite(e);
     Error.prepareStackTrace = originalPrepareStackTrace;
     return `${e.getFileName()}:${e.getLineNumber()}:${e.getColumnNumber()}  ` + e.getFunctionName();
 }
@@ -162,9 +89,9 @@ function __LineFiles(lvlStart = 0, lvlEnd = 5) {
     const originalPrepareStackTrace = Error.prepareStackTrace;
     Error.prepareStackTrace = (_, stack) => stack;
     let e = new Error().stack.slice(lvlStart + 1, lvlEnd);
-    if (wrapCallSite)
-        e = e.map(e => wrapCallSite(e));
     const msgs = e.map(e => `${e.getFileName()}:${e.getLineNumber()}:${e.getColumnNumber()}  ` + e.getFunctionName());
     Error.prepareStackTrace = originalPrepareStackTrace;
     return msgs;
 }
+exports.callerLine = __LineFile2;
+exports.callerLines = __LineFiles;

package/lib/Common/rcp/createRpcServerAutoWithProtocolDetection.d.ts

@@ -17,5 +17,7 @@ export declare function createRpcServerAuto2<T extends object>({ socket, object:
     getProtocol: () => ClientProtocol;
     getLegacySchema: () => any;
     getResolved: () => any;
+    dispose: (reason?: string) => void;
+    reset: () => void;
 };
 export {};

package/lib/Common/rcp/createRpcServerAutoWithProtocolDetection.js

@@ -8,42 +8,58 @@ const rpc_protocol_1 = require("./rpc-protocol");
 const old_ommonsServerMini_1 = require("./old\u0421ommonsServerMini");
 const rpc_dynamic_1 = require("./rpc-dynamic");
 const rpc_limits_1 = require("./rpc-limits");
-function createRpcServerAuto({ socket, object: target, socketKey: key, debug, hooks, disconnectListen, limits }) {
-    const cache = new WeakMap();
-    function getListenSocket(parent, disconnectListen) {
-        let result = cache.get(parent);
-        if (!result) {
-            result = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen });
-            cache.set(parent, result);
-        }
-        return result;
-    }
-    (0, rpc_server_1.createRpcServer)({
-        socket, object: target, socketKey: key, debug, limits,
-        hooks: {
-            ...hooks,
-            resolveTransform: (obj) => {
-                if (!(0, Listen_1.isListenCallback)(obj))
-                    return obj;
-                return getListenSocket(obj, disconnectListen);
-            },
-        },
-    });
-}
 function createRpcServerAuto2({ socket, object: target, socketKey: key, debug = false, hooks, disconnectListen, limits, onProtocolDetect, }) {
     const cache = new WeakMap();
+    const listenSockets = new Set();
+    function unsubscribeAllActive() {
+        for (const w of [...listenSockets])
+            w.removeCallback();
+    }
     function getListenSocket(parent) {
         let result = cache.get(parent);
+        if (result)
+            listenSockets.add(result);
         if (!result) {
-            result = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen });
+            const subs = new Map();
+            function subscribe(z) {
+                if (typeof z !== "function")
+                    return Promise.reject(new TypeError("Listen callback expects a function"));
+                subs.get(z)?.removeCallback();
+                const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen });
+                subs.set(z, w);
+                const done = w.callback(z);
+                done.then(() => { if (subs.get(z) == w)
+                    subs.delete(z); });
+                return done;
+            }
+            function subscribeOnce(z) {
+                if (typeof z !== "function")
+                    return Promise.reject(new TypeError("Listen once expects a function"));
+                subs.get(z)?.removeCallback();
+                const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen });
+                subs.set(z, w);
+                const done = w.once(z);
+                done.then(() => { if (subs.get(z) == w)
+                    subs.delete(z); });
+                return done;
+            }
+            function unsubscribeAll() {
+                subs.forEach(w => w.removeCallback());
+                subs.clear();
+                return true;
+            }
+            result = { callback: subscribe, removeCallback: unsubscribeAll, on: subscribe, once: subscribeOnce, close: () => parent.close?.() };
+            listenSockets.add(result);
             cache.set(parent, result);
         }
         return result;
     }
     function resolveTransform(obj) {
-        if (!(0, Listen_1.isListenCallback)(obj))
-            return obj;
-        return getListenSocket(obj);
+        if ((0, Listen_1.isListenCallback)(obj))
+            return getListenSocket(obj);
+        if ((0, Listen_1.isListenOn)(obj))
+            return getListenSocket((0, Listen_1.getListenByOn)(obj));
+        return obj;
     }
     function transformTree(obj) {
         let current = obj;
@@ -61,7 +77,7 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
                 out[k] = v;
                 continue;
             }
-            out[k] = typeof v === 'function' ? v : (v != null && typeof v === 'object') ? transformTree(v) : v;
+            out[k] = typeof v === 'function' ? resolveTransform(v) : (v != null && typeof v === 'object') ? transformTree(v) : v;
         }
         return out;
     }
@@ -96,6 +112,8 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
     let protocol = null;
     let v2Handler = null;
     let legacyHandler = null;
+    let disposed = false;
+    let activeHandler = null;
     function isLegacyStrictRequest(msg) {
         return msg === '___STRICTLY';
     }
@@ -108,7 +126,7 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
     function isV2Message(msg) {
         if (msg === rpc_protocol_1.Pkt.STRICT)
             return true;
-        if (Array.isArray(msg) && (msg[0] === rpc_protocol_1.Pkt.CALL || msg[0] === rpc_protocol_1.Pkt.PIPE))
+        if (Array.isArray(msg) && (msg[0] === rpc_protocol_1.Pkt.CALL || msg[0] === rpc_protocol_1.Pkt.PIPE || msg[0] === rpc_protocol_1.Pkt.HELLO))
             return true;
         return false;
     }
@@ -143,6 +161,7 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
             limits,
             hooks: {
                 ...hooks,
+                onDispose: () => { unsubscribeAllActive(); hooks?.onDispose?.(); },
                 resolveTransform,
             },
         });
@@ -152,7 +171,7 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
             onMsgCb(msg);
         };
     }
-    socket.on(key, (msg) => {
+    function handleMessage(msg) {
         if (debug) {
             console.log('[RPC-AUTO2 IN]', typeof msg === 'object' ? JSON.stringify(msg) : msg);
         }
@@ -197,10 +216,24 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
         }
         if (debug)
             console.warn('[RPC-AUTO2] Unknown message format, ignoring:', msg);
-    });
+    }
+    activeHandler = handleMessage;
+    socket.on(key, (msg) => activeHandler?.(msg));
+    function reset() { unsubscribeAllActive(); protocol = null; legacyHandler = null; v2Handler = null; }
+    function dispose(reason) {
+        if (disposed)
+            return;
+        disposed = true;
+        activeHandler = null;
+        reset();
+        if (debug)
+            console.log('[RPC-AUTO2] disposed', reason ?? '');
+    }
     return {
         getProtocol: () => protocol,
         getLegacySchema: () => legacySchema,
         getResolved: () => resolved,
+        dispose,
+        reset,
     };
 }

package/lib/Common/rcp/listen-deep.d.ts

@@ -1,4 +1,12 @@
-import { listenSocket, listenSocketFirst, listenSocketAll, listenSocketSmart } from "./listen-socket";
+import { type ListenOn } from "../events/Listen";
+import { listenSocket, listenSocketFirst, listenSocketAll, listenSocketSmart, type tSubHandle } from "./listen-socket";
+type WithSubHandle<R> = R extends {
+    callback: (...a: infer A) => any;
+} ? Omit<R, 'callback' | 'on' | 'once'> & {
+    callback: (...a: A) => tSubHandle & Promise<void>;
+    on: (...a: A) => tSubHandle & Promise<void>;
+    once: (...a: A) => tSubHandle & Promise<void>;
+} : R;
 type Obj = Record<string, any>;
 type InferArgs<T> = T extends {
     addListen: (cb: (...args: infer R) => void, ...rest: any[]) => any;
@@ -6,22 +14,22 @@ type InferArgs<T> = T extends {
 export type DeepSocketListen<T> = {
     [K in keyof T]: T[K] extends {
         addListen: Function;
-    } ? ReturnType<typeof listenSocket<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListen<T[K]> : T[K];
+    } ? WithSubHandle<ReturnType<typeof listenSocket<InferArgs<T[K]>>>> : T[K] extends ListenOn<infer Z> ? WithSubHandle<ReturnType<typeof listenSocket<Z>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends Promise<any> ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListen<T[K]> : T[K];
 };
 export type DeepSocketListenFirst<T> = {
     [K in keyof T]: T[K] extends {
         addListen: Function;
-    } ? ReturnType<typeof listenSocketFirst<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenFirst<T[K]> : T[K];
+    } ? ReturnType<typeof listenSocketFirst<InferArgs<T[K]>>> : T[K] extends ListenOn<infer Z> ? ReturnType<typeof listenSocketFirst<Z>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends Promise<any> ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenFirst<T[K]> : T[K];
 };
 export type DeepSocketListenAll<T> = {
     [K in keyof T]: T[K] extends {
         addListen: Function;
-    } ? ReturnType<typeof listenSocketAll<InferArgs<T[K]>>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenAll<T[K]> : T[K];
+    } ? ReturnType<typeof listenSocketAll<InferArgs<T[K]>>> : T[K] extends ListenOn<infer Z> ? ReturnType<typeof listenSocketAll<Z>> : T[K] extends (...a: any[]) => any ? T[K] : T[K] extends Promise<any> ? T[K] : T[K] extends typeof Promise ? T[K] : T[K] extends object ? DeepSocketListenAll<T[K]> : T[K];
 };
 export type DeepSocketListenSmart<T> = {
     [K in keyof T]: NonNullable<T[K]> extends {
         addListen: Function;
-    } ? ReturnType<typeof listenSocketSmart<InferArgs<NonNullable<T[K]>>>> | Extract<T[K], undefined | null> : NonNullable<T[K]> extends (...a: any[]) => any ? T[K] : NonNullable<T[K]> extends typeof Promise ? T[K] : NonNullable<T[K]> extends object ? DeepSocketListenSmart<T[K]> : T[K];
+    } ? ReturnType<typeof listenSocketSmart<InferArgs<NonNullable<T[K]>>>> | Extract<T[K], undefined | null> : NonNullable<T[K]> extends ListenOn<infer Z> ? ReturnType<typeof listenSocketSmart<Z>> : NonNullable<T[K]> extends (...a: any[]) => any ? T[K] : NonNullable<T[K]> extends Promise<any> ? T[K] : NonNullable<T[K]> extends typeof Promise ? T[K] : NonNullable<T[K]> extends object ? DeepSocketListenSmart<T[K]> : T[K];
 };
 export declare function matchKeys<T extends Obj, T2 extends Obj>(obj1: T, obj2: T2): boolean;
 export declare function matchKeysList<T extends Obj>(obj1: T, keys: string[]): boolean;

package/lib/Common/rcp/listen-deep.js

@@ -30,12 +30,7 @@ function deepMapByKeysList(obj1, keys, func) {
     return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, deepMapByKeysList(v, keys, func)]));
 }
 function deepMapByKeys(obj1, obj2, func) {
-    if (isLeafValue(obj1))
-        return obj1;
-    const keys = Object.keys(obj2);
-    if (matchKeysList(obj1, keys))
-        return func(obj1);
-    return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, deepMapByKeysList(v, keys, func)]));
+    return deepMapByKeysList(obj1, Object.keys(obj2), func);
 }
 const NOOP_LISTEN = (0, Listen_1.funcListenCallbackBase)((_e) => { });
 function deepListenFirst(obj, data) {

package/lib/Common/rcp/listen-socket.d.ts

@@ -1,25 +1,43 @@
 import { funcListenCallbackBase, type Listener } from "../events/Listen";
+import { type Off } from "./rpc-off";
 type ListenCallbackResult<T extends any[] = any[]> = ReturnType<typeof funcListenCallbackBase<T>>;
+export type tSubHandle = Off<void, {
+    unsubscribe: () => void;
+    removeCallback: () => void;
+}>;
 export declare function listenSocket<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, d?: {
     readonly status?: () => boolean;
     readonly addListenClose?: ListenCallbackResult<any>;
     readonly stop?: (x: Listener<Z>) => any;
     readonly paramsModify?: (...e: Z) => any[];
+    readonly throttle?: number;
 }): {
     callback: (z: Listener<Z>) => Promise<void>;
     removeCallback: () => boolean;
+    on: (z: Listener<Z>) => Promise<void>;
+    once: (z: Listener<Z>) => Promise<void>;
+    close: () => void;
 };
 export declare function listenSocketFirst<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, options?: Omit<Parameters<typeof listenSocket>[1], "paramsModify">): {
-    callback: (z: (a: Z[0]) => void) => void;
+    callback: (z: (a: Z[0]) => void) => tSubHandle;
+    on: (z: (a: Z[0]) => void) => tSubHandle;
+    once: (z: (a: Z[0]) => void) => tSubHandle;
+    close: () => void;
     removeCallback: () => boolean;
 };
 export declare function listenSocketAll<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, options?: Omit<Parameters<typeof listenSocket>[1], "paramsModify">): {
-    callback: (z: (...args: Z) => void) => void;
+    callback: (z: (...args: Z) => void) => tSubHandle;
+    on: (z: (...args: Z) => void) => tSubHandle;
+    once: (z: (...args: Z) => void) => tSubHandle;
+    close: () => void;
     removeCallback: () => boolean;
 };
 type SmartCallback<Z extends any[]> = Z extends [infer Single] ? (a: Single) => void : (...args: Z) => void;
 export declare function listenSocketSmart<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, options?: Omit<Parameters<typeof listenSocket>[1], "paramsModify">): {
-    callback: (z: SmartCallback<Z>) => void;
+    callback: (z: SmartCallback<Z>) => tSubHandle;
+    on: (z: SmartCallback<Z>) => tSubHandle;
+    once: (z: SmartCallback<Z>) => tSubHandle;
+    close: () => void;
     removeCallback: () => boolean;
 };
 export {};