wenay-common2 1.0.61 → 1.0.63

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

@@ -29,7 +29,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
                 if (!registry.has(parent))
                     registry.set(parent, { subs });
                 subs.get(z)?.off();
-                const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen, throttle: nodeThrottle });
+                const w = (0, listen_socket_1.listenSocket)(parent, { closeOn: disconnectListen, throttle: nodeThrottle });
                 subs.set(z, w);
                 const done = w.on(z);
                 done.then(() => {
@@ -48,7 +48,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
                 if (!registry.has(parent))
                     registry.set(parent, { subs });
                 subs.get(z)?.off();
-                const w = (0, listen_socket_1.listenSocket)(parent, { addListenClose: disconnectListen, throttle: nodeThrottle });
+                const w = (0, listen_socket_1.listenSocket)(parent, { closeOn: disconnectListen, throttle: nodeThrottle });
                 let fired = false;
                 const oneShot = (...a) => {
                     if (fired)
@@ -111,16 +111,12 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
         if (gatesHooked || !disconnectListen)
             return;
         gatesHooked = true;
-        const dl = disconnectListen;
-        if (typeof dl.on == "function")
-            dl.on(closeAllGates);
-        else
-            dl.addListen(closeAllGates);
+        disconnectListen.on(closeAllGates);
     }
     function gatedLineNode(parent) {
         const { pending: pendingOpt, highWater = Infinity, lowWater = 0, pollMs = 25 } = replayOpts ?? {};
         const pending = pendingOpt ?? (() => socket?.conn?.writeBuffer?.length ?? 0);
-        const out = (0, Listen_1.funcListenCallbackBase)(() => { });
+        const out = (0, Listen_1.createListen)(() => { });
         out.run();
         let lastSent = typeof parent.head == "function" ? parent.head() : 0;
         let gated = false;
@@ -150,7 +146,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
             const emitStop = !closed;
             close();
             if (emitStop)
-                out.func(rpc_protocol_1.RPC_STOP);
+                out.emit(rpc_protocol_1.RPC_STOP);
             out.close?.();
         }
         function recoverIfDrained() {
@@ -171,7 +167,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
             for (const ev of envs) {
                 if (ev.seq > lastSent)
                     lastSent = ev.seq;
-                out.func(ev);
+                out.emit(ev);
             }
         }
         const offLine = parent.line.on(function gateForward(ev) {
@@ -186,7 +182,7 @@ function createRpcServerAuto({ socket, object: target, socketKey: key, debug, ho
                 return;
             }
             lastSent = ev.seq;
-            out.func(ev);
+            out.emit(ev);
         });
         gateClosers.add(close);
         hookGateTeardown();

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

@@ -6,6 +6,7 @@ const rpc_limits_1 = require("./rpc-limits");
 const rpc_walk_1 = require("./rpc-walk");
 const rpc_shape_1 = require("./rpc-shape");
 const rpc_protocol_1 = require("./rpc-protocol");
+const rpc_path_1 = require("./rpc-path");
 const rpc_caps_1 = require("./rpc-caps");
 const myThrow_1 = require("../../toError/myThrow");
 const SERVERS = new WeakMap();
@@ -64,33 +65,36 @@ function createServer(socket, key, target, hooks, limits, auth, opt) {
     }
     let methods = [];
     let contexts = [];
+    let methodPaths = [];
     let routeMap = {};
     let listenPaths = [];
     let strictSchema = {};
     let currentTarget = target;
     function buildDispatch(t) {
-        const m = [], cx = [], rm = {}, lp = [];
+        const m = [], cx = [], paths = [], rm = {}, lp = [];
         const resolved = transformTree(t);
         (function index(obj, prefix) {
             for (const k of Object.keys(obj)) {
                 if (!(0, rpc_limits_1.isSafeKey)(k))
                     continue;
                 const v = obj[k];
-                const path = prefix ? prefix + "." + k : k;
+                const path = [...prefix, k];
                 if (typeof v == "function") {
-                    rm[path] = m.length;
+                    rm[(0, rpc_path_1.rpcPathKey)(path)] = m.length;
                     m.push(v);
                     cx.push(obj);
+                    paths.push(path);
                 }
                 else if (v && typeof v == "object" && !(0, rpc_dynamic_1.isNoStrict)(v)) {
                     if (hasRpcListen(v))
-                        lp.push(path);
+                        lp.push((0, rpc_path_1.rpcPathKey)(path));
                     index(v, path);
                 }
             }
-        })(resolved, "");
+        })(resolved, []);
         methods = m;
         contexts = cx;
+        methodPaths = paths;
         routeMap = rm;
         listenPaths = lp;
         strictSchema = serialize(resolved);
@@ -213,7 +217,7 @@ function createServer(socket, key, target, hooks, limits, auth, opt) {
                         send([rpc_protocol_1.Pkt.RESP, reqId, null, (0, rpc_walk_1.errToObj)(new rpc_limits_1.PayloadLimitError("path too long"))]);
                     return;
                 }
-                const idx = routeMap[ref.join(".")];
+                const idx = routeMap[(0, rpc_path_1.rpcPathKey)(ref)];
                 if (idx !== undefined) {
                     fn = methods[idx];
                     ctx = contexts[idx];
@@ -245,7 +249,7 @@ function createServer(socket, key, target, hooks, limits, auth, opt) {
             }
             if (hooks?.onRequest) {
                 const keyArr = typeof ref == "number"
-                    ? Object.keys(routeMap).find(k => routeMap[k] == ref)?.split(".") ?? []
+                    ? methodPaths[ref] ?? []
                     : ref;
                 const allowed = await hooks.onRequest({ key: keyArr, request: rawArgsOrSteps, fnName: keyArr[keyArr.length - 1] ?? "", fn: fn });
                 if (allowed == false) {

package/lib/client.d.ts

@@ -3,7 +3,7 @@ export * from "./Common/core/BaseTypes";
 export * from "./Common/core/common";
 export * from "./Common/core/MemoFunc";
 export * from "./Common/async/waitRun";
-export * from "./Common/async/PromiseArrayListen";
+export * from "./Common/async/promiseProgress";
 export * from "./Common/async/createIterableObject";
 export * from "./Common/data/List";
 export * from "./Common/data/ListNodeAnd";

package/lib/client.js

@@ -42,7 +42,7 @@ __exportStar(require("./Common/core/BaseTypes"), exports);
 __exportStar(require("./Common/core/common"), exports);
 __exportStar(require("./Common/core/MemoFunc"), exports);
 __exportStar(require("./Common/async/waitRun"), exports);
-__exportStar(require("./Common/async/PromiseArrayListen"), exports);
+__exportStar(require("./Common/async/promiseProgress"), exports);
 __exportStar(require("./Common/async/createIterableObject"), exports);
 __exportStar(require("./Common/data/List"), exports);
 __exportStar(require("./Common/data/ListNodeAnd"), exports);

package/lib/index.d.ts

@@ -6,18 +6,17 @@ export * from "./Common/core/common";
 export * from "./Common/core/DeepCompareKeys";
 export * from "./Common/core/MemoFunc";
 export * from "./Common/async/waitRun";
-export * from "./Common/async/PromiseArrayListen";
+export * from "./Common/async/promiseProgress";
 export * from "./Common/async/createIterableObject";
 export * from "./Common/data/List";
 export * from "./Common/data/ListNodeAnd";
 export * from "./Common/data/objectPath";
 export * from "./Common/events/Listen";
-export * as ListenNext from "./Common/events/Listen2";
 export * from "./Common/events/event";
 export * from "./Common/events/SocketBuffer";
 export * from "./Common/events/SocketServerHook";
 export * from "./Common/events/joinListens";
-export * from "./Common/events/UseListenTransform";
+export * from "./Common/events/mapListen";
 export * from "./Common/rcp/rpc-index";
 export * from "./Common/Color";
 export * from "./Common/funcTimeWait";
@@ -32,5 +31,5 @@ export * as Bars from "./Exchange/Bars";
 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 Observe from "./Common/Observe";
 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.Replay = exports.ObserveAll2 = exports.Color = exports.Time = exports.Params = exports.Bars = exports.Math = exports.ListenNext = void 0;
+exports.Replay = exports.Observe = exports.Color = exports.Time = exports.Params = exports.Bars = exports.Math = void 0;
 __exportStar(require("./Common/node_console"), exports);
 __exportStar(require("./Common/core/Decorator"), exports);
 __exportStar(require("./Common/core/BaseTypes"), exports);
@@ -45,18 +45,17 @@ __exportStar(require("./Common/core/common"), exports);
 __exportStar(require("./Common/core/DeepCompareKeys"), exports);
 __exportStar(require("./Common/core/MemoFunc"), exports);
 __exportStar(require("./Common/async/waitRun"), exports);
-__exportStar(require("./Common/async/PromiseArrayListen"), exports);
+__exportStar(require("./Common/async/promiseProgress"), exports);
 __exportStar(require("./Common/async/createIterableObject"), exports);
 __exportStar(require("./Common/data/List"), exports);
 __exportStar(require("./Common/data/ListNodeAnd"), exports);
 __exportStar(require("./Common/data/objectPath"), exports);
 __exportStar(require("./Common/events/Listen"), exports);
-exports.ListenNext = __importStar(require("./Common/events/Listen2"));
 __exportStar(require("./Common/events/event"), exports);
 __exportStar(require("./Common/events/SocketBuffer"), exports);
 __exportStar(require("./Common/events/SocketServerHook"), exports);
 __exportStar(require("./Common/events/joinListens"), exports);
-__exportStar(require("./Common/events/UseListenTransform"), exports);
+__exportStar(require("./Common/events/mapListen"), exports);
 __exportStar(require("./Common/rcp/rpc-index"), exports);
 __exportStar(require("./Common/Color"), exports);
 __exportStar(require("./Common/funcTimeWait"), exports);
@@ -71,5 +70,5 @@ exports.Bars = __importStar(require("./Exchange/Bars"));
 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.Observe = __importStar(require("./Common/Observe"));
 exports.Replay = __importStar(require("./Common/events/replay-index"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",
@@ -23,13 +23,15 @@
   },
   "exports": {
     ".": "./lib/index.js",
-    "./observe-all2": "./lib/Common/ObserveAll2/index.js",
-    "./listen2": "./lib/Common/events/Listen2.js",
+    "./observe": "./lib/Common/Observe/index.js",
     "./replay": "./lib/Common/events/replay-index.js",
     "./lib/client": "./lib/client.js",
     "./lib/server": "./lib/server.js",
     "./client": "./lib/client.js",
     "./server": "./lib/server.js",
     "./package.json": "./package.json"
+  },
+  "dependencies": {
+    "express": "^5.2.1"
   }
 }

package/lib/Common/ObserveAll2/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./reactive2";
-export * from "./store";
-export * from "./store-replay";

package/lib/Common/ObserveAll2/reactive2.d.ts

@@ -1,61 +0,0 @@
-type Fn = () => void;
-export type ReactiveChange = {
-    paths: PropertyKey[][];
-};
-type PathUpdateFn = (change: ReactiveChange) => void;
-type Drain = 'micro' | 'immediate' | number | ((flush: Fn) => void);
-export type Opts = {
-    drain?: Drain;
-    depth?: number;
-    eager?: boolean;
-};
-export declare function reactive<T extends object>(root: T, opts?: Opts): T;
-export declare function isReactive(p: any): boolean;
-export declare function toRaw<T>(p: T): T;
-export declare function onUpdate(p: any, cb: Fn): () => void;
-export declare function onUpdatePaths(p: any, cb: PathUpdateFn): () => void;
-export declare function flushReactive(p: any): Promise<void>;
-export declare function listenUpdate(p: any): {
-    func: import("../events/Listen3").Listener<[]>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: () => void) => () => void;
-    onClose: (cb: () => void) => () => void;
-    removeEventClose: (cb: () => void) => void;
-    on: import("../events/Listen3").ListenOn<[]>;
-    off: (k: (string | symbol) | import("../events/Listen3").Listener<[]> | null) => void;
-    addListen: (cb: import("../events/Listen3").Listener<[]>, opts?: {
-        cbClose?: () => void;
-        key?: string | symbol;
-    }) => () => void;
-    removeListen: (k: (string | symbol) | import("../events/Listen3").Listener<[]> | null) => void;
-    once: (cb: import("../events/Listen3").Listener<[]>, opts?: {
-        key?: string | symbol;
-    }) => () => void;
-    count: () => number;
-    readonly getAllKeys: (string | symbol)[];
-};
-export declare function listenUpdatePaths(p: any): {
-    func: import("../events/Listen3").Listener<[ReactiveChange]>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: () => void) => () => void;
-    onClose: (cb: () => void) => () => void;
-    removeEventClose: (cb: () => void) => void;
-    on: import("../events/Listen3").ListenOn<[ReactiveChange]>;
-    off: (k: (string | symbol) | import("../events/Listen3").Listener<[ReactiveChange]> | null) => void;
-    addListen: (cb: import("../events/Listen3").Listener<[ReactiveChange]>, opts?: {
-        cbClose?: () => void;
-        key?: string | symbol;
-    }) => () => void;
-    removeListen: (k: (string | symbol) | import("../events/Listen3").Listener<[ReactiveChange]> | null) => void;
-    once: (cb: import("../events/Listen3").Listener<[ReactiveChange]>, opts?: {
-        key?: string | symbol;
-    }) => () => void;
-    count: () => number;
-    readonly getAllKeys: (string | symbol)[];
-};
-export type Reactive<T extends object> = T;
-export {};

package/lib/Common/async/PromiseArrayListen.d.ts

@@ -1,14 +0,0 @@
-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;
-    listenError: (a: (...d: [error: any, i: number, countOk: number, countError: number, count: number]) => any) => () => void;
-    promise: {
-        all: () => Promise<any[]>;
-        allSettled: () => Promise<PromiseSettledResult<any>[]>;
-    };
-    getData(): Promise<any>[];
-    status(): {
-        ok: number;
-        error: number;
-        count: number;
-    };
-};

package/lib/Common/async/PromiseArrayListen.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromiseArrayListen = PromiseArrayListen;
-const Listen_1 = require("../events/Listen");
-function PromiseArrayListen(array) {
-    let ok = 0, errorCount = 0;
-    const count = array.length;
-    const t = (0, Listen_1.UseListen)();
-    const c = (0, Listen_1.UseListen)();
-    const a = (data, i) => {
-        ++ok;
-        t[0](data, i, ok, errorCount, count);
-    };
-    const b = (error, i) => {
-        ++errorCount;
-        c[0](error, i, ok, errorCount, count);
-    };
-    const wrap = (promise, i) => promise.then(r => { a(r, i); return r; }).catch((er) => { b(er, i); throw er; });
-    const arr = array.map((e, i) => e instanceof Promise ? wrap(e, i)
-        : () => wrap((async () => e())(), i));
-    const started = [];
-    const startAll = () => arr.map((x, i) => started[i] ??= (typeof x === 'function' ? x() : x));
-    return {
-        listenOk: (a) => t[1].addListen(a),
-        listenError: (a) => c[1].addListen(a),
-        promise: {
-            all: () => Promise.all(startAll()),
-            allSettled: () => Promise.allSettled(startAll()),
-        },
-        getData() {
-            return startAll();
-        },
-        status() {
-            return { ok, error: errorCount, count };
-        }
-    };
-}

package/lib/Common/events/Listen2.d.ts

@@ -1 +0,0 @@
-export * from "./Listen3";

package/lib/Common/events/UseListenTransform.d.ts

@@ -1,24 +0,0 @@
-import { funcListenCallbackBase, Listener, NormalizeTuple } from "./Listen";
-export declare function UseListenTransform<TSource extends any[], TTarget extends any[]>(sourceListen: ReturnType<typeof funcListenCallbackBase<TSource>>, transform: (...args: NormalizeTuple<TSource>) => TTarget | null, options?: {
-    addListenClose?: ReturnType<typeof funcListenCallbackBase<any>>;
-}): readonly [(...a: NormalizeTuple<TTarget>) => void, {
-    func: Listener<NormalizeTuple<TTarget>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: () => void) => () => void;
-    onClose: (cb: () => void) => () => void;
-    removeEventClose: (cb: () => void) => void;
-    on: import("./Listen3").ListenOn<NormalizeTuple<TTarget>>;
-    off: (k: (string | symbol) | Listener<NormalizeTuple<TTarget>> | null) => void;
-    addListen: (cb: Listener<NormalizeTuple<TTarget>>, opts?: {
-        cbClose?: () => void;
-        key?: string | symbol;
-    }) => () => void;
-    removeListen: (k: (string | symbol) | Listener<NormalizeTuple<TTarget>> | null) => void;
-    once: (cb: Listener<NormalizeTuple<TTarget>>, opts?: {
-        key?: string | symbol;
-    }) => () => void;
-    count: () => number;
-    readonly getAllKeys: (string | symbol)[];
-}];

package/lib/Common/events/UseListenTransform.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UseListenTransform = UseListenTransform;
-const Listen_1 = require("./Listen");
-function UseListenTransform(sourceListen, transform, options) {
-    let unsubscribeFromSource = null;
-    const [emit, targetListen] = (0, Listen_1.UseListen)({
-        event: (type, count, api) => {
-            if (type === "add" && count === 1) {
-                const sourceCallback = (...args) => {
-                    const result = transform(...args);
-                    if (result !== null) {
-                        emit(...result);
-                    }
-                };
-                unsubscribeFromSource = sourceListen.addListen(sourceCallback);
-            }
-            if (type === "remove" && count === 0) {
-                if (unsubscribeFromSource) {
-                    unsubscribeFromSource();
-                    unsubscribeFromSource = null;
-                }
-            }
-        },
-        addListenClose: options?.addListenClose
-    });
-    return [emit, targetListen];
-}

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

@@ -1 +0,0 @@
-export {};

package/lib/Common/rcp/test.js

@@ -1,79 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
-const http_1 = require("http");
-const socket_io_1 = require("socket.io");
-const socket_io_client_1 = require("socket.io-client");
-const rpc_clientHub_1 = require("./rpc-clientHub");
-const rpc_server_auto_1 = require("./rpc-server-auto");
-const Listen_1 = require("../events/Listen");
-const common_1 = require("../core/common");
-const facade = () => {
-    return {
-        math: {
-            add: async (a, b) => a + b,
-            multiply: async (a, b) => a * b,
-            callback: async (a) => {
-                for (let i = 0; i < 100; i++) {
-                    await (0, common_1.sleepAsync)(50);
-                    a.callback({ a: new Date(), b: new Date(Date.now() - 100000) }, 43);
-                }
-            },
-        },
-        greet: async (name) => {
-            console.log('get ' + name);
-            return false;
-        },
-        date: async (date) => {
-            await (0, common_1.sleepAsync)(1000);
-            return ({ msg: `Hello!`, map: new Map([['ds', 43]]), youDate: date, now: new Date() });
-        },
-    };
-};
-async function startServer(port) {
-    const app = (0, express_1.default)();
-    const httpServer = (0, http_1.createServer)(app);
-    const ioServer = new socket_io_1.Server(httpServer);
-    ioServer.on('connection', (socket) => {
-        console.log('[server] клиент подключился');
-        const [disconnect, disconnectListen] = (0, Listen_1.UseListen)();
-        socket.on('disconnect', disconnect);
-        (0, rpc_server_auto_1.createRpcServerAuto)({
-            socket: {
-                emit: (key, data) => socket.emit(key, data),
-                on: (key, cb) => socket.on(key, cb),
-            },
-            socketKey: 'rpc',
-            object: facade(),
-            disconnectListen,
-            debug: true,
-        });
-    });
-    await new Promise((resolve) => httpServer.listen(port, resolve));
-    console.log(`[server] слушает :${port}`);
-    return httpServer;
-}
-async function startClient(port) {
-    const hub = (0, rpc_clientHub_1.createRpcClientHub)(() => (0, socket_io_client_1.io)(`http://localhost:${port}`, { transports: ['websocket'], forceNew: true }), (r) => ({ api: r('rpc') }));
-    const clients = await hub.setToken(null);
-    console.log('[client] подключились, ждём схему...');
-    clients.api.api.log(true);
-    await clients.api.readyStrict();
-    console.log('[client] схема получена, schema:', clients.api.schema());
-    return { hub, clients };
-}
-async function runTest() {
-    const PORT = 4020;
-    const httpServer = await startServer(PORT);
-    const { hub, clients } = await startClient(PORT);
-    const api = clients.api.func;
-    console.log('test World');
-    const greetResult = await api.greet('World');
-    console.log('[test] greet("World") =', greetResult);
-    hub.socket?.disconnect?.();
-    httpServer.close(() => console.log('[server] остановлен'));
-}
-runTest().catch(console.error);