wenay-common2 1.0.46 → 1.0.49

package/lib/Exchange/CParams.d.ts

@@ -218,5 +218,7 @@ export type SimpleParamsMutable<T> = T extends const_Date ? const_Date : Mutable
 };
 export type SimpleParams<T = IParams> = ReadonlyFull<SimpleParamsMutable<T>>;
 export declare function GetSimpleParams<T extends ReadonlyFull<IParams>>(params: T): SimpleParamsMutable<T>;
+export declare const toValues: typeof GetSimpleParams;
 export declare function mergeParamValuesToInfos<TParams extends IParamsReadonly | IParams, TParams2 extends IParamsReadonly | IParams>(srcObj: TParams, valuesObj: SimpleParams<TParams2> | TParams2): TParams;
+export declare const fromValues: typeof mergeParamValuesToInfos;
 export {};

package/lib/Exchange/CParams.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CParamsReadonly = exports.CParams = void 0;
+exports.fromValues = exports.toValues = exports.CParamsReadonly = exports.CParams = void 0;
 exports.isParamBase = isParamBase;
 exports.isParamGroupOrArray = isParamGroupOrArray;
 exports.isParamGroup = isParamGroup;
@@ -11,12 +11,11 @@ exports.enableAllParams = enableAllParams;
 exports.GetSimpleParams = GetSimpleParams;
 exports.mergeParamValuesToInfos = mergeParamValuesToInfos;
 const common_1 = require("../Common/core/common");
-{
+function _typeCheck_DateTimeStr() {
     let ts = "2025-06-01 16:25:25";
+    return ts;
 }
-{
-    let x = { value: 5, range: [5, 6] };
-}
+function _typeCheck_IParamEnum2() { let x = { value: 5, range: [5, 6] }; return x; }
 let dd;
 function isParamBase(param) {
     return typeof param == "object" && !Array.isArray(param) && !(param instanceof Date);
@@ -89,11 +88,14 @@ function enableAllParams(params, enabled = true) {
     }
     return paramsInfoClone;
 }
-class C extends CParams {
-    lastBar = { name: "Last_Bar", value: 0, range: { defaultMin: -10000, max: 0, step: 1 } };
+function _typeCheck_CParamsReadonly() {
+    class C extends CParams {
+        lastBar = { name: "Last_Bar", value: 0, range: { defaultMin: -10000, max: 0, step: 1 } };
+    }
+    let xxx = {};
+    let bbb = xxx;
+    return bbb;
 }
-let xxx = {};
-let bbb = xxx;
 const param = {
     p0: { name: "MA0", value: [10, 20], range: [10, 20, 30] },
     p1: { name: "MA1", commentary: ["fgf"], value: 20, range: { min: 10, max: 20, step: 2 } },
@@ -178,11 +180,15 @@ function GetSimpleParams(params) {
     }
     return simpleParams;
 }
-let p = GetSimpleParams(new Test());
-let p0 = p.p1;
-let p3 = p.p3;
-let p4 = p.p4;
-let p5 = p.p5?.p1;
+exports.toValues = GetSimpleParams;
+function _typeCheck_GetSimpleParams() {
+    let p = GetSimpleParams(new Test());
+    let p0 = p.p1;
+    let p3 = p.p3;
+    let p4 = p.p4;
+    let p5 = p.p5?.p1;
+    return [p0, p3, p4, p5];
+}
 function convert_(valuesObj, srcObj) {
     let resObj = {};
     if (srcObj instanceof Array)
@@ -232,6 +238,7 @@ function convert_(valuesObj, srcObj) {
 function mergeParamValuesToInfos(srcObj, valuesObj) {
     return convert_(isSimpleParams(valuesObj) ? valuesObj : GetSimpleParams(valuesObj), srcObj);
 }
+exports.fromValues = mergeParamValuesToInfos;
 function test() {
     {
         const p = new Test();

package/lib/Exchange/MarketData.d.ts

@@ -45,6 +45,7 @@ export declare class CQuotesHistory {
     private _Bars;
     protected _GetBars(tf: TF): IBars | null;
     Bars(tf: TF): IBarsImmutable | null;
+    get(tf: TF): IBarsImmutable | null;
 }
 export declare class CQuotesHistoryMutable extends CQuotesHistory {
     private _endTickTime?;
@@ -52,12 +53,17 @@ export declare class CQuotesHistoryMutable extends CQuotesHistory {
     constructor(name?: string);
     AddEndBars(bars: IBars): boolean;
     AddEndBars(bars: readonly CBar[] | CBar, tf: TF): boolean;
+    append(bars: IBars): boolean;
+    append(bars: readonly CBar[] | CBar, tf: TF): boolean;
     AddStartBars(bars: IBars): boolean;
     AddStartBars(bars: readonly CBar[] | CBar, tf: TF): boolean;
+    prepend(bars: IBars): boolean;
+    prepend(bars: readonly CBar[] | CBar, tf: TF): boolean;
     private checkBars;
     protected _AddBarsExt(Bars: readonly CBar[] | CBar | IBars, tf: TF | undefined, toEnd: boolean): boolean;
     AddTicks(ticks: readonly ITick[]): boolean;
     AddTick(tick: ITick): boolean;
+    addTicks(ticks: readonly ITick[]): boolean;
     private getOrSetMutableBars;
     AddNewTicks(ticks: readonly ITick[]): void;
     AddNewTick(tick: ITick): void;

package/lib/Exchange/MarketData.js

@@ -189,6 +189,7 @@ class CQuotesHistory {
             bars.Mutable = false;
         return bars;
     }
+    get(tf) { return this.Bars(tf); }
 }
 exports.CQuotesHistory = CQuotesHistory;
 class CQuotesHistoryMutable extends CQuotesHistory {
@@ -198,7 +199,9 @@ class CQuotesHistoryMutable extends CQuotesHistory {
         super([], name);
     }
     AddEndBars(bars, tf) { return this._AddBarsExt(bars, tf, true); }
+    append(bars, tf) { return this._AddBarsExt(bars, tf, true); }
     AddStartBars(bars, tf) { return this._AddBarsExt(bars, tf, false); }
+    prepend(bars, tf) { return this._AddBarsExt(bars, tf, false); }
     checkBars(bars, tf) {
         let period = new Bars_1.Period(tf);
         for (let i = 1; i < bars.length; i++)
@@ -265,6 +268,7 @@ class CQuotesHistoryMutable extends CQuotesHistory {
         return this.AddEndBars(newbars);
     }
     AddTick(tick) { return this.AddTicks([tick]); }
+    addTicks(ticks) { return this.AddTicks(ticks); }
     getOrSetMutableBars(tf) {
         let bars = this._GetBars(tf) ?? new CBarsInternal(tf);
         let mutableBars;

package/lib/index.d.ts

@@ -12,6 +12,7 @@ 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";
@@ -31,3 +32,4 @@ 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";

package/lib/index.js

@@ -36,7 +36,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Color = exports.Time = exports.Params = exports.Bars = exports.Math = void 0;
+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);
@@ -51,6 +51,7 @@ __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);
@@ -70,3 +71,4 @@ 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"));

package/lib/server/WebHook3.js

@@ -56,9 +56,14 @@ const loadSubscribers = () => {
     }
 };
 const Queue = (0, waitRun_1.createAsyncQueue)(1);
+let _tmpSeq = 0;
 const saveSubscribers = (subs) => {
     const obj = Object.fromEntries([...subs].map(([k, s]) => [k, { url: s.url, tag: s.tag, expireAt: s.expireAt }]));
-    Queue.enqueue(() => fs.promises.writeFile(SUBSCRIBERS_FILE, JSON.stringify(obj, null, 2), 'utf-8'));
+    Queue.enqueue(async () => {
+        const tmp = `${SUBSCRIBERS_FILE}.${++_tmpSeq}.tmp`;
+        await fs.promises.writeFile(tmp, JSON.stringify(obj, null, 2), 'utf-8');
+        await fs.promises.rename(tmp, SUBSCRIBERS_FILE);
+    });
 };
 const normalizeIP = (ip) => ip?.startsWith('::ffff:') ? ip.slice(7) : ip;
 const buildSelfWebhookUrl = (clientIp, raw) => {
@@ -175,6 +180,8 @@ const createWebhookClient = (options) => {
         app.use(express_1.default.json());
     const activeTags = new Set();
     const timers = new Map();
+    const handlers = new Map();
+    const registeredPaths = new Set();
     const headers = { authorization: authToken };
     const makeUrl = (tag) => `:${clientPort}/webHook_${tag}`;
     const connect = async (tag, handler) => {
@@ -183,7 +190,19 @@ const createWebhookClient = (options) => {
             return;
         }
         const path = `/webHook_${tag}`;
-        app.post(path, (req, res) => { handler(req.body); res.end(); });
+        handlers.set(tag, handler);
+        if (!registeredPaths.has(path)) {
+            registeredPaths.add(path);
+            app.post(path, (req, res) => {
+                const h = handlers.get(tag);
+                if (!h) {
+                    res.status(404).end();
+                    return;
+                }
+                h(req.body);
+                res.end();
+            });
+        }
         await axios_1.default.post(`${serverUrl}/webHook_subscribe`, { url: makeUrl(tag), tag }, { headers });
         activeTags.add(tag);
         if (autoRenew) {
@@ -203,13 +222,7 @@ const createWebhookClient = (options) => {
                 clearInterval(t);
                 timers.delete(tag);
             }
-            const stack = app._router?.stack;
-            if (stack) {
-                const path = `/webHook_${tag}`;
-                const idx = stack.findIndex((layer) => layer.route?.path === path);
-                if (idx !== -1)
-                    stack.splice(idx, 1);
-            }
+            handlers.delete(tag);
         }));
     };
     const getMySubscriptions = async () => (await axios_1.default.get(`${serverUrl}/webHook_client_subscriptions`, { headers })).data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.46",
+  "version": "1.0.49",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",
@@ -23,6 +23,8 @@
   },
   "exports": {
     ".": "./lib/index.js",
+    "./observe-all2": "./lib/Common/ObserveAll2/index.js",
+    "./listen2": "./lib/Common/events/Listen2.js",
     "./lib/client": "./lib/client.js",
     "./lib/server": "./lib/server.js",
     "./client": "./lib/client.js",