wenay-common2 1.0.52 → 1.0.55

package/lib/Common/rcp/createRpcServerAutoWithProtocolDetection.js

@@ -13,7 +13,7 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
     const listenSockets = new Set();
     function unsubscribeAllActive() {
         for (const w of [...listenSockets])
-            w.removeCallback();
+            w.off();
     }
     function getListenSocket(parent) {
         let result = cache.get(parent);
@@ -24,10 +24,10 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
             function subscribe(z) {
                 if (typeof z !== "function")
                     return Promise.reject(new TypeError("Listen callback expects a function"));
-                subs.get(z)?.removeCallback();
+                subs.get(z)?.off();
                 const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen });
                 subs.set(z, w);
-                const done = w.callback(z);
+                const done = w.on(z);
                 done.then(() => { if (subs.get(z) == w)
                     subs.delete(z); });
                 return done;
@@ -35,7 +35,7 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
             function subscribeOnce(z) {
                 if (typeof z !== "function")
                     return Promise.reject(new TypeError("Listen once expects a function"));
-                subs.get(z)?.removeCallback();
+                subs.get(z)?.off();
                 const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen });
                 subs.set(z, w);
                 const done = w.once(z);
@@ -44,11 +44,11 @@ function createRpcServerAuto2({ socket, object: target, socketKey: key, debug =
                 return done;
             }
             function unsubscribeAll() {
-                subs.forEach(w => w.removeCallback());
+                subs.forEach(w => w.off());
                 subs.clear();
                 return true;
             }
-            result = { callback: subscribe, removeCallback: unsubscribeAll, on: subscribe, once: subscribeOnce, close: () => parent.close?.() };
+            result = { on: subscribe, off: unsubscribeAll, callback: subscribe, removeCallback: unsubscribeAll, once: subscribeOnce, close: () => parent.close?.() };
             listenSockets.add(result);
             cache.set(parent, result);
         }

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

@@ -2,6 +2,7 @@ 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, {
+    off: () => void;
     unsubscribe: () => void;
     removeCallback: () => void;
 }>;
@@ -12,9 +13,10 @@ export declare function listenSocket<Z extends any[] = any[]>(e: ListenCallbackR
     readonly paramsModify?: (...e: Z) => any[];
     readonly throttle?: number;
 }): {
+    on: (z: Listener<Z>) => Promise<void>;
+    off: () => boolean;
     callback: (z: Listener<Z>) => Promise<void>;
     removeCallback: () => boolean;
-    on: (z: Listener<Z>) => Promise<void>;
     once: (z: Listener<Z>) => Promise<void>;
     close: () => void;
 };
@@ -23,6 +25,7 @@ export declare function listenSocketFirst<Z extends any[] = any[]>(e: ListenCall
     on: (z: (a: Z[0]) => void) => tSubHandle;
     once: (z: (a: Z[0]) => void) => tSubHandle;
     close: () => void;
+    off: () => boolean;
     removeCallback: () => boolean;
 };
 export declare function listenSocketAll<Z extends any[] = any[]>(e: ListenCallbackResult<Z>, options?: Omit<Parameters<typeof listenSocket>[1], "paramsModify">): {
@@ -30,6 +33,7 @@ export declare function listenSocketAll<Z extends any[] = any[]>(e: ListenCallba
     on: (z: (...args: Z) => void) => tSubHandle;
     once: (z: (...args: Z) => void) => tSubHandle;
     close: () => void;
+    off: () => boolean;
     removeCallback: () => boolean;
 };
 type SmartCallback<Z extends any[]> = Z extends [infer Single] ? (a: Single) => void : (...args: Z) => void;
@@ -38,6 +42,7 @@ export declare function listenSocketSmart<Z extends any[] = any[]>(e: ListenCall
     on: (z: SmartCallback<Z>) => tSubHandle;
     once: (z: SmartCallback<Z>) => tSubHandle;
     close: () => void;
+    off: () => boolean;
     removeCallback: () => boolean;
 };
 export {};

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

@@ -58,7 +58,7 @@ function listenSocket(e, d) {
             resolveWait = null;
         }
     }
-    function removeCallback() {
+    function off() {
         if (throttleCh) {
             throttleCh.cancel();
             throttleCh = null;
@@ -79,9 +79,10 @@ function listenSocket(e, d) {
         finish();
         return true;
     }
-    function callback(z) {
+    const removeCallback = off;
+    function on(z) {
         if (typeof z !== "function") {
-            throw new TypeError("listenSocket.callback expects a function");
+            throw new TypeError("listenSocket.on expects a function");
         }
         if (last)
             stop?.(last);
@@ -110,7 +111,7 @@ function listenSocket(e, d) {
                 if (status())
                     wrapped(...a);
                 else
-                    removeCallback();
+                    off();
             };
         }
         let inner = handler;
@@ -146,12 +147,12 @@ function listenSocket(e, d) {
             }
             inner(...a);
         };
-        activeOff = subscribe(active, { cbClose: removeCallback });
-        closeSignalOff = subscribeClose?.(removeCallback) ?? null;
+        activeOff = subscribe(active, { cbClose: off });
+        closeSignalOff = subscribeClose?.(off) ?? null;
         const wait = new Promise((resolve) => {
             resolveWait = () => { resolve(); };
         });
-        return (0, rpc_off_1.makeOff)(wait, removeCallback, { unsubscribe: removeCallback, removeCallback });
+        return (0, rpc_off_1.makeOff)(wait, off, { off, unsubscribe: off, removeCallback });
     }
     function once(z) {
         if (typeof z !== "function") {
@@ -160,7 +161,7 @@ function listenSocket(e, d) {
         let fired = false;
         const oneShot = ((...a) => {
             if (a[0] === rpc_protocol_1.RPC_STOP) {
-                removeCallback();
+                off();
                 return;
             }
             if (fired)
@@ -171,13 +172,18 @@ function listenSocket(e, d) {
             }
             finally {
                 (0, rpc_off_1.endCallback)(z);
-                removeCallback();
+                off();
             }
         });
-        return callback(oneShot);
+        return on(oneShot);
     }
     function closeStream() { e.close?.(); }
-    return { callback, removeCallback, on: callback, once, close: closeStream };
+    function callback(z) {
+        if (typeof z !== "function")
+            throw new TypeError("listenSocket.callback expects a function");
+        return on(z);
+    }
+    return { on, off, callback, removeCallback, once, close: closeStream };
 }
 function listenSocketFirst(e, options) {
     const r = listenSocket(e, {
@@ -186,9 +192,10 @@ function listenSocketFirst(e, options) {
     });
     return {
         callback: r.callback,
-        on: r.callback,
+        on: r.on,
         once: r.once,
         close: r.close,
+        off: r.off,
         removeCallback: r.removeCallback,
     };
 }
@@ -196,9 +203,10 @@ function listenSocketAll(e, options) {
     const r = listenSocket(e, { ...options });
     return {
         callback: r.callback,
-        on: r.callback,
+        on: r.on,
         once: r.once,
         close: r.close,
+        off: r.off,
         removeCallback: r.removeCallback,
     };
 }
@@ -206,9 +214,10 @@ function listenSocketSmart(e, options) {
     const r = listenSocket(e, { ...options });
     return {
         callback: r.callback,
-        on: r.callback,
+        on: r.on,
         once: r.once,
         close: r.close,
+        off: r.off,
         removeCallback: r.removeCallback,
     };
 }

package/lib/Common/rcp/rpc-client.js

@@ -348,7 +348,7 @@ function createClient(socket, key, opts) {
             if (sub.consumers.size == 0)
                 sub.stop();
         };
-        return (0, rpc_off_1.makeOff)(p, unsub, { unsubscribe: unsub, removeCallback: unsub });
+        return (0, rpc_off_1.makeOff)(p, unsub, { off: unsub, unsubscribe: unsub, removeCallback: unsub });
     }
     const sendCall = (path, args, wait) => {
         const last = path[path.length - 1];

package/lib/Common/rcp/rpc-limits.d.ts

@@ -7,6 +7,7 @@ export type RpcLimits = {
     maxStringLen?: number;
     maxCallbacks?: number;
     maxPathLen?: number;
+    maxBinaryLen?: number;
 };
 export declare const resolveLimits: (opts?: RpcLimits) => Required<RpcLimits>;
 export declare class PayloadLimitError extends Error {

package/lib/Common/rcp/rpc-limits.js

@@ -12,6 +12,7 @@ const DEFAULT_LIMITS = {
     maxStringLen: 1_000_000,
     maxCallbacks: 100,
     maxPathLen: 16,
+    maxBinaryLen: 8_000_000,
 };
 const resolveLimits = (opts) => opts ? { ...DEFAULT_LIMITS, ...opts } : DEFAULT_LIMITS;
 exports.resolveLimits = resolveLimits;

package/lib/Common/rcp/rpc-server-auto.js

@@ -10,7 +10,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
     const registry = new Map();
     function unsubscribeAllActive() {
         for (const { subs } of registry.values()) {
-            subs.forEach(w => w.removeCallback());
+            subs.forEach(w => w.off());
             subs.clear();
         }
         registry.clear();
@@ -26,10 +26,10 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
                     return Promise.resolve();
                 if (!registry.has(parent))
                     registry.set(parent, { subs });
-                subs.get(z)?.removeCallback();
+                subs.get(z)?.off();
                 const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen, throttle });
                 subs.set(z, w);
-                const done = w.callback(z);
+                const done = w.on(z);
                 done.then(() => {
                     if (subs.get(z) == w)
                         subs.delete(z);
@@ -45,7 +45,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
                     return Promise.resolve();
                 if (!registry.has(parent))
                     registry.set(parent, { subs });
-                subs.get(z)?.removeCallback();
+                subs.get(z)?.off();
                 const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen, throttle });
                 let fired = false;
                 const oneShot = (...a) => {
@@ -57,23 +57,23 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
                         z(rpc_protocol_1.RPC_STOP);
                     }
                     finally {
-                        w.removeCallback();
+                        w.off();
                     }
                 };
                 subs.set(z, w);
-                const done = w.callback(oneShot);
+                const done = w.on(oneShot);
                 done.then(() => { if (subs.get(z) == w)
                     subs.delete(z); if (subs.size == 0)
                     registry.delete(parent); });
                 return done;
             }
             function unsubscribeAll() {
-                subs.forEach(w => w.removeCallback());
+                subs.forEach(w => w.off());
                 subs.clear();
                 registry.delete(parent);
                 return true;
             }
-            result = { callback: subscribe, removeCallback: unsubscribeAll, on: subscribe, once: subscribeOnce, close: () => parent.close?.() };
+            result = { on: subscribe, off: unsubscribeAll, callback: subscribe, removeCallback: unsubscribeAll, once: subscribeOnce, close: () => parent.close?.() };
             result[rpc_protocol_1.IS_RPC_LISTEN] = true;
             cache.set(parent, result);
         }

package/lib/Common/rcp/rpc-walk.js

@@ -32,6 +32,13 @@ const SERIALIZERS = [
     (v) => v instanceof RegExp ? [REGEXP_MARKER, { source: v.source, flags: v.flags }] : null,
     (v) => typeof v === "bigint" ? [BIGINT_MARKER, v.toString()] : null,
 ];
+function binaryByteLength(v) {
+    if (ArrayBuffer.isView(v))
+        return v.byteLength;
+    if (v instanceof ArrayBuffer)
+        return v.byteLength;
+    return null;
+}
 function walk(val, onLeaf, lim, depth = 0) {
     if (lim) {
         if (depth > lim.maxDepth)
@@ -41,6 +48,12 @@ function walk(val, onLeaf, lim, depth = 0) {
     }
     if (val == null || typeof val !== "object")
         return onLeaf(val);
+    const bin = binaryByteLength(val);
+    if (bin != null) {
+        if (lim && bin > lim.maxBinaryLen)
+            throw new rpc_limits_1.PayloadLimitError("binary too long");
+        return val;
+    }
     if (val instanceof Date || val instanceof Map || val instanceof Set || val instanceof RegExp)
         return onLeaf(val);
     const ks0 = Object.keys(val);

package/lib/index.d.ts

@@ -33,3 +33,4 @@ export * as Params from "./Exchange/CParams";
 export * as Time from "./Common/Time";
 export * as Color from "./Common/Color";
 export * as ObserveAll2 from "./Common/ObserveAll2";
+export * as Replay from "./Common/events/replay-index";

package/lib/index.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObserveAll2 = exports.Color = exports.Time = exports.Params = exports.Bars = exports.Math = exports.ListenNext = void 0;
+exports.Replay = exports.ObserveAll2 = exports.Color = exports.Time = exports.Params = exports.Bars = exports.Math = exports.ListenNext = void 0;
 __exportStar(require("./Common/node_console"), exports);
 __exportStar(require("./Common/core/Decorator"), exports);
 __exportStar(require("./Common/core/BaseTypes"), exports);
@@ -72,3 +72,4 @@ exports.Params = __importStar(require("./Exchange/CParams"));
 exports.Time = __importStar(require("./Common/Time"));
 exports.Color = __importStar(require("./Common/Color"));
 exports.ObserveAll2 = __importStar(require("./Common/ObserveAll2"));
+exports.Replay = __importStar(require("./Common/events/replay-index"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.52",
+  "version": "1.0.55",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",
@@ -25,6 +25,7 @@
     ".": "./lib/index.js",
     "./observe-all2": "./lib/Common/ObserveAll2/index.js",
     "./listen2": "./lib/Common/events/Listen2.js",
+    "./replay": "./lib/Common/events/replay-index.js",
     "./lib/client": "./lib/client.js",
     "./lib/server": "./lib/server.js",
     "./client": "./lib/client.js",