wenay-common2 1.0.43 → 1.0.45

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

@@ -1,6 +1,7 @@
 export type Listener<T extends any[]> = (...r: T) => void;
 export type NormalizeTuple<T> = T extends any[] ? T : [T];
-export declare function funcListenCallbackBase<T>(b: (e: Listener<NormalizeTuple<T>>) => (void | (() => void)), data?: {
+type key = string;
+export declare function funcListenCallbackBase<T>(b: (e: Listener<NormalizeTuple<T>>) => (void | (() => void)), { fast, event, addListenClose }?: {
     event?: (type: "add" | "remove", count: number, api: ReturnType<typeof funcListenCallbackBase<T>>) => void;
     fast?: boolean;
     addListenClose?: ReturnType<typeof funcListenCallbackBase<any>>;
@@ -10,11 +11,14 @@ export declare function funcListenCallbackBase<T>(b: (e: Listener<NormalizeTuple
     run: () => void;
     close: () => void;
     eventClose: (cb: () => void) => () => void;
-    removeEventClose: (cb: () => void) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: () => void) => () => void;
-    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
+    removeEventClose: (cb: (() => void)) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>, { cbClose, key }?: {
+        cbClose?: () => void;
+        key?: key;
+    }) => () => void;
+    removeListen: (k: Listener<NormalizeTuple<T>> | null | key) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
+    readonly getAllKeys: (Listener<NormalizeTuple<T>> | key)[];
 };
 export declare function funcListenCallbackFast<T>(a: (e: (Listener<NormalizeTuple<T>> | null)) => (void | (() => void))): {
     func: Listener<NormalizeTuple<T>>;
@@ -23,23 +27,15 @@ export declare function funcListenCallbackFast<T>(a: (e: (Listener<NormalizeTupl
     close: () => void;
     eventClose: (cb: () => void) => () => void;
     removeEventClose: (cb: () => void) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: (() => void) | undefined) => () => void;
-    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
-    count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<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;
-    eventClose: (cb: () => void) => () => void;
-    removeEventClose: (cb: () => void) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: (() => void) | undefined) => () => void;
-    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>, { cbClose, key }?: {
+        cbClose?: (() => void) | undefined;
+        key?: key;
+    }) => () => void;
+    removeListen: (k: string | Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
+    readonly getAllKeys: (string | Listener<NormalizeTuple<T>>)[];
 };
+export declare const funcListenCallback: typeof funcListenCallbackBase;
 export declare function UseListen<T>(data?: Parameters<typeof funcListenCallbackBase<T>>[1]): readonly [(...a: NormalizeTuple<T>) => void, {
     func: Listener<NormalizeTuple<T>>;
     isRun: () => boolean;
@@ -47,9 +43,13 @@ export declare function UseListen<T>(data?: Parameters<typeof funcListenCallback
     close: () => void;
     eventClose: (cb: () => void) => () => void;
     removeEventClose: (cb: () => void) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, cbClose?: (() => void) | undefined) => () => void;
-    removeListen: (cb: Listener<NormalizeTuple<T>> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<T>>, { cbClose, key }?: {
+        cbClose?: (() => void) | undefined;
+        key?: key;
+    }) => () => void;
+    removeListen: (k: string | Listener<NormalizeTuple<T>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<T>>[];
+    readonly getAllKeys: (string | Listener<NormalizeTuple<T>>)[];
 }];
 export declare function isListenCallback(obj: any): obj is ReturnType<typeof funcListenCallbackBase>;
+export {};

package/lib/Common/events/Listen.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.funcListenCallback = void 0;
 exports.funcListenCallbackBase = funcListenCallbackBase;
 exports.funcListenCallbackFast = funcListenCallbackFast;
-exports.funcListenCallback = funcListenCallback;
 exports.UseListen = UseListen;
 exports.isListenCallback = isListenCallback;
-function funcListenCallbackBase(b, data) {
-    const { fast = true, event, addListenClose } = data ?? {};
+function funcListenCallbackBase(b, { fast = true, event, addListenClose } = {}) {
     const obj = new Map();
     const evClose = new Map();
     const sinh = new Map();
@@ -75,31 +74,32 @@ function funcListenCallbackBase(b, data) {
             sinh.delete(cb);
             evClose.delete(cb);
         },
-        addListen: (cb, cbClose) => {
-            obj.set(cb, cb);
+        addListen: (cb, { cbClose, key } = {}) => {
+            const k = key ?? cb;
+            obj.set(k, cb);
             if (cbClose) {
-                if (evClose.has(cb)) {
-                    const r = evClose.get(cb);
+                if (evClose.has(k)) {
+                    const r = evClose.get(k);
                     if (r !== cbClose) {
                         evClose.delete(r);
-                        evClose.delete(cb);
+                        evClose.delete(k);
                         sinh.delete(r);
                     }
                 }
-                evClose.set(cb, cbClose);
+                evClose.set(k, cbClose);
                 sinh.set(cbClose, cb);
             }
             if (fast)
                 rebuild();
             event?.("add", obj.size, api);
-            return () => api.removeListen(cb);
+            return () => api.removeListen(k);
         },
-        removeListen: (cb) => {
-            obj.delete(cb);
-            const e = evClose.get(cb);
+        removeListen: (k) => {
+            obj.delete(k);
+            const e = evClose.get(k);
             if (fast)
                 rebuild();
-            evClose.delete(cb);
+            evClose.delete(k);
             if (e) {
                 evClose.delete(e);
                 sinh.delete(e);
@@ -114,9 +114,7 @@ function funcListenCallbackBase(b, data) {
 function funcListenCallbackFast(a) {
     return funcListenCallbackBase(a, { fast: true });
 }
-function funcListenCallback(a, event, fast = true) {
-    return funcListenCallbackBase(a, { event, fast });
-}
+exports.funcListenCallback = funcListenCallbackBase;
 function UseListen(data = { fast: true }) {
     let t;
     const a = funcListenCallbackBase((e) => { t = e; }, { fast: true, ...data });

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

@@ -18,7 +18,10 @@ export declare function funcListenCallbackSnapshot<T extends realSocket2<any | a
     memo: T4;
     snapshot?: (memo: T4) => T3;
 }): {
-    run: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>, cbClose?: (() => void) | undefined) => () => void;
+    run: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>, params_1?: {
+        cbClose?: (() => void) | undefined;
+        key?: string;
+    } | undefined) => () => void;
     snapshot: () => T3 | undefined;
     memo: T4;
     listenA: {
@@ -28,10 +31,13 @@ export declare function funcListenCallbackSnapshot<T extends realSocket2<any | a
         close: () => void;
         eventClose: (cb: () => void) => () => void;
         removeEventClose: (cb: () => void) => void;
-        addListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>, cbClose?: (() => void) | undefined) => () => void;
-        removeListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]> | null) => void;
+        addListen: (cb: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>, { cbClose, key }?: {
+            cbClose?: (() => void) | undefined;
+            key?: string;
+        }) => () => void;
+        removeListen: (k: string | import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]> | null) => void;
         count: () => number;
-        readonly getAllKeys: import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>[];
+        readonly getAllKeys: (string | import("./Listen").Listener<[data: getTypeCallback<T>, memo: T3]>)[];
     };
     connect: () => void;
     readonly disconnect: ((a: Omit<Parameters<T>[0], "callback"> & {

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

@@ -11,10 +11,13 @@ export declare function SocketServerHook(opt?: {
             close: () => void;
             eventClose: (cb: () => void) => () => void;
             removeEventClose: (cb: () => void) => void;
-            addListen: (cb: import("./Listen").Listener<[unknown]>, cbClose?: (() => void) | undefined) => () => void;
-            removeListen: (cb: import("./Listen").Listener<[unknown]> | null) => void;
+            addListen: (cb: import("./Listen").Listener<[unknown]>, { cbClose, key }?: {
+                cbClose?: (() => void) | undefined;
+                key?: string;
+            }) => () => void;
+            removeListen: (k: string | import("./Listen").Listener<[unknown]> | null) => void;
             count: () => number;
-            readonly getAllKeys: import("./Listen").Listener<[unknown]>[];
+            readonly getAllKeys: (string | import("./Listen").Listener<[unknown]>)[];
         }];
     };
     get(tag: string): readonly [(a_0: unknown) => void, {
@@ -24,10 +27,13 @@ export declare function SocketServerHook(opt?: {
         close: () => void;
         eventClose: (cb: () => void) => () => void;
         removeEventClose: (cb: () => void) => void;
-        addListen: (cb: import("./Listen").Listener<[unknown]>, cbClose?: (() => void) | undefined) => () => void;
-        removeListen: (cb: import("./Listen").Listener<[unknown]> | null) => void;
+        addListen: (cb: import("./Listen").Listener<[unknown]>, { cbClose, key }?: {
+            cbClose?: (() => void) | undefined;
+            key?: string;
+        }) => () => void;
+        removeListen: (k: string | import("./Listen").Listener<[unknown]> | null) => void;
         count: () => number;
-        readonly getAllKeys: import("./Listen").Listener<[unknown]>[];
+        readonly getAllKeys: (string | import("./Listen").Listener<[unknown]>)[];
     }];
     provider: (tag: string, data: any) => void;
 };

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

@@ -8,8 +8,11 @@ export declare function UseListenTransform<TSource extends any[], TTarget extend
     close: () => void;
     eventClose: (cb: () => void) => () => void;
     removeEventClose: (cb: () => void) => void;
-    addListen: (cb: Listener<NormalizeTuple<TTarget>>, cbClose?: (() => void) | undefined) => () => void;
-    removeListen: (cb: Listener<NormalizeTuple<TTarget>> | null) => void;
+    addListen: (cb: Listener<NormalizeTuple<TTarget>>, { cbClose, key }?: {
+        cbClose?: (() => void) | undefined;
+        key?: string;
+    }) => () => void;
+    removeListen: (k: string | Listener<NormalizeTuple<TTarget>> | null) => void;
     count: () => number;
-    readonly getAllKeys: Listener<NormalizeTuple<TTarget>>[];
+    readonly getAllKeys: (string | Listener<NormalizeTuple<TTarget>>)[];
 }];

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

@@ -71,7 +71,7 @@ function listenSocket(e, d) {
             }
             inner(...a);
         };
-        addListen(active, removeCallback);
+        addListen(active, { cbClose: removeCallback });
         addListenClose?.addListen(removeCallback);
         return new Promise((resolve) => {
             resolveWait = () => { resolve(); };

package/lib/Exchange/LoadBase.d.ts

@@ -1,4 +1,5 @@
-import { CBar, TF } from "wenay-common2";
+import { TF } from "../Common/Time";
+import { CBar } from "./Bars";
 type RequestInfo = any;
 type RequestInit = any;
 type Response = any;

package/lib/Exchange/LoadBase.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadQuoteBase = LoadQuoteBase;
-const wenay_common2_1 = require("wenay-common2");
 const funcTimeWait_1 = require("../Common/funcTimeWait");
+const Time_1 = require("../Common/Time");
+const common_1 = require("../Common/core/common");
 function LoadQuoteBase(setting, data) {
     const { base, maxLoadBars, countConnect, intervalToName } = setting;
     const maxLoadBars2 = setting.maxLoadBars2 ?? maxLoadBars;
@@ -15,7 +16,7 @@ function LoadQuoteBase(setting, data) {
         const t1 = funcTimeWait_1.FuncTimeWait.byWeight(keyName, setting.countConnect) - (Date.now() - time) + 1;
         if (t1 > 0) {
             funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() + t1 });
-            await (0, wenay_common2_1.sleepAsync)(t1);
+            await (0, common_1.sleepAsync)(t1);
         }
         else {
             funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() });
@@ -136,7 +137,7 @@ function LoadQuoteBase(setting, data) {
 async function test() {
     const arr = [];
     for (let i = 0; i < 10000; i++) {
-        arr[i] = { time: Date.now() - i * wenay_common2_1.TF.H1.msec, price: i };
+        arr[i] = { time: Date.now() - i * Time_1.TF.H1.msec, price: i };
     }
     let ress = [];
     const tt = LoadQuoteBase({
@@ -150,14 +151,14 @@ async function test() {
         nameKey: "cd",
         maxLoadBars: 100,
         time: 50,
-        intervalToName: [{ name: "1", time: wenay_common2_1.TF.H1 }],
+        intervalToName: [{ name: "1", time: Time_1.TF.H1 }],
         funcLoad: (data) => {
             ress.push(data.startTime);
             ress.push(data.endTime);
             return (async () => [{ time: 5 }])();
         }
     });
-    const res = await tt({ symbol: "s", time2: new Date(), tf: wenay_common2_1.TF.H1, time1: new Date(2015) });
+    const res = await tt({ symbol: "s", time2: new Date(), tf: Time_1.TF.H1, time1: new Date(2015) });
     ress.sort((a, b) => a.valueOf() - b.valueOf());
     console.log(ress);
     console.log(res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",