wenay-common2 1.0.45 → 1.0.48

package/lib/Exchange/Bars.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CTimeSeries = exports.CTimeSeriesBase = exports.CBarsMutableExt = exports.CBarsMutable = exports.CBarsMutableBase = exports.CBars = exports.CBarsBase = exports.IBars = exports.CTick = exports.CBar = exports.CBarBase = exports.OHLC = void 0;
+exports.CTimeSeries = exports.CTimeSeriesBase = exports.createRandomBars = exports.CBarsMutableExt = exports.CBarsMutable = exports.CBarsMutableBase = exports.CBars = exports.CBarsBase = exports.IBars = exports.CTick = exports.CBar = exports.CBarBase = exports.OHLC = void 0;
 exports.CreateRandomBars = CreateRandomBars;
 exports.findBarsShallow = findBarsShallow;
 const lib = __importStar(require("../Common/core/common"));
@@ -159,7 +159,7 @@ class IBars {
             return;
         let ibar = timeStart ? this.indexOf(timeStart, "greatOrEqual") : 0;
         timeEnd ??= this.lastTime;
-        for (let i = ibar; this.data[i].time <= timeEnd; i++)
+        for (let i = ibar; i < this.length && this.data[i].time <= timeEnd; i++)
             yield this.data[i];
     }
     getArray(startTime, lastTime) {
@@ -193,7 +193,7 @@ class IBars {
         let ilast = 0;
         let n = 0;
         for (let i = 1; i <= count; i++) {
-            let bartime = i < count ? src.time(i) : new Date(2100, 1, 1);
+            let bartime = i < count ? src.time(i) : new Date(2100, 0, 1);
             if (endDayTime_s && bartime.valueOf() % Time_1.D1_MS >= endDayTime_s * 1000 % Time_1.D1_MS)
                 continue;
             if (bartime >= nextPeriodTime) {
@@ -350,11 +350,15 @@ class CBarsMutableBase extends CBarsBase {
             this._data = [];
         Object.freeze(bar);
         this.data[i] = bar;
+        if (this._tickSizeAuto)
+            this._ticksize = 0;
         return true;
     }
     AddTicks(ticks) { for (let tick of ticks)
         if (!this.AddTick(tick))
             return false; return true; }
+    addTick(tick) { return this.AddTick(tick); }
+    addTicks(ticks) { return this.AddTicks(ticks); }
 }
 exports.CBarsMutableBase = CBarsMutableBase;
 class CBarsMutable extends CBarsMutableBase {
@@ -370,7 +374,7 @@ function CreateRandomBars(tf, startTime, endTimeOrCount, startPrice = 100, volat
     if (!tf || tf.msec == 0)
         return null;
     console.log("Creating bars with parameters: ", ...([...arguments].map(arg => arg instanceof Time_1.TF ? arg.name : arg)));
-    const tickSizeNum = tickSize ?? 10 ** Math.min(Math.round(Math.log10(startPrice) - 4), 0);
+    const tickSizeNum = tickSize ?? 10 ** Math.min(Math.round(Math.log10(startPrice > 0 ? startPrice : 1) - 4), 0);
     let period = new Time_1.Period(tf);
     let count;
     if (typeof endTimeOrCount == "number")
@@ -401,6 +405,7 @@ function CreateRandomBars(tf, startTime, endTimeOrCount, startPrice = 100, volat
     }
     return new CBars(tf, bars);
 }
+exports.createRandomBars = CreateRandomBars;
 class CTimeSeriesBase {
     time(i) { return this.points[i]?.time ?? (() => { throw "Wrong index i=" + i + " of " + this.length; })(); }
     value(i) { return this.points[i]?.value ?? (() => { throw "Wrong index i=" + i + " of " + this.length; })(); }

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);
@@ -37,7 +36,7 @@ function isSimpleParams2(params) {
     let t = false;
     for (let key in params) {
         const tr = params[key]["value"];
-        if (!tr)
+        if (tr == null)
             return true;
         else {
             if (typeof tr == "object") {
@@ -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++)
@@ -256,7 +259,7 @@ class CQuotesHistoryMutable extends CQuotesHistory {
         let tf = Bars_1.TF.S1;
         let oldBars = this._GetBars(tf);
         let newbarsArr;
-        if (oldBars && oldBars.count > 0 && Bars_1.Period.StartTime(tf, time) == oldBars.lastTime)
+        if (oldBars && oldBars.count > 0 && Bars_1.Period.StartTime(tf, time).valueOf() == oldBars.lastTime.valueOf())
             newbarsArr = [oldBars.last];
         let newbars = new Bars_1.CBarsMutable(tf, newbarsArr);
         if (!newbars.AddTicks(ticks))
@@ -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

@@ -31,3 +31,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/reactive2";

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 = void 0;
 __exportStar(require("./Common/node_console"), exports);
 __exportStar(require("./Common/core/Decorator"), exports);
 __exportStar(require("./Common/core/BaseTypes"), exports);
@@ -70,3 +70,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/reactive2"));

package/lib/server/WebHook3.d.ts

@@ -12,6 +12,7 @@ interface WebhookClientOptions {
     renewIntervalMs?: number;
     app?: Express;
 }
+export declare const buildSelfWebhookUrl: (clientIp: string, raw: unknown) => string | null;
 export declare const apiSaveData: {
     loadSubscribers: () => Map<string, Subscriber>;
     saveSubscribers: (subs: Map<string, Subscriber>) => void;

package/lib/server/WebHook3.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createWebhookClient = exports.createWebhookServer = exports.apiSaveData = void 0;
+exports.createWebhookClient = exports.createWebhookServer = exports.apiSaveData = exports.buildSelfWebhookUrl = void 0;
 const express_1 = __importDefault(require("express"));
 const axios_1 = __importDefault(require("axios"));
 const fs = __importStar(require("fs"));
@@ -56,11 +56,29 @@ 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) => {
+    if (typeof raw !== 'string' || !raw)
+        return null;
+    let u;
+    try {
+        u = new URL('http://' + clientIp + raw);
+    }
+    catch {
+        return null;
+    }
+    return u.hostname === clientIp ? u.toString() : null;
+};
+exports.buildSelfWebhookUrl = buildSelfWebhookUrl;
 exports.apiSaveData = { loadSubscribers, saveSubscribers };
 const createWebhookServer = (params) => {
     const app = params.app ?? (0, express_1.default)();
@@ -90,24 +108,23 @@ const createWebhookServer = (params) => {
     const renewExpiry = () => new Date(Date.now() + 3 * 24 * 3600_000);
     app.post('/webHook_subscribe', checkAuth, (req, res) => {
         const { tag } = req.body;
-        if (!req.body.url || typeof req.body.url !== 'string' || typeof tag !== 'string') {
+        const url = (0, exports.buildSelfWebhookUrl)(normalizeIP(req.ip ?? '127.0.0.1'), req.body.url);
+        if (!url || typeof tag !== 'string') {
             res.status(400).json({ error: 'Неверный запрос' });
             return;
         }
         purgeExpired();
-        const url = new URL(clientAddr(req) + req.body.url).toString();
         subscribers.set(url, { url, tag, expireAt: renewExpiry() });
         file.saveSubscribers(subscribers);
         res.json({ message: 'Подписка оформлена' });
     });
     app.get('/webHook_status', checkAuth, (req, res) => {
-        const rawUrl = req.query['url'];
-        if (!rawUrl || typeof rawUrl !== 'string') {
+        const url = (0, exports.buildSelfWebhookUrl)(normalizeIP(req.ip ?? '127.0.0.1'), req.query['url']);
+        if (!url) {
             res.status(400).json({ error: 'Неверный запрос' });
             return;
         }
         purgeExpired();
-        const url = new URL(clientAddr(req) + rawUrl).toString();
         const subscriber = Array.from(subscribers.values()).find(s => s.url === url);
         if (!subscriber) {
             res.json({ subscribed: false });
@@ -118,7 +135,11 @@ const createWebhookServer = (params) => {
         res.json({ subscribed: true, expireAt: subscriber.expireAt });
     });
     app.delete('/webHook_unsubscribe', checkAuth, (req, res) => {
-        const url = new URL(clientAddr(req) + req.body.url).toString();
+        const url = (0, exports.buildSelfWebhookUrl)(normalizeIP(req.ip ?? '127.0.0.1'), req.body.url);
+        if (!url) {
+            res.status(400).json({ error: 'Неверный запрос' });
+            return;
+        }
         const key = Array.from(subscribers.keys()).find(k => subscribers.get(k)?.url === url);
         if (key && subscribers.delete(key)) {
             file.saveSubscribers(subscribers);
@@ -159,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) => {
@@ -167,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) {
@@ -187,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/lib/server/fsKeyVolume.js

@@ -57,20 +57,37 @@ function saveKeyValue({ dirDef = "", key: _key = "" }) {
             .then(() => true)
             .catch(() => false);
     }
+    let _tmpSeq = 0;
     async function set({ key = _key, obj, path = "" }) {
         const filePath = await resolvePath(path, key);
-        await fs.promises.writeFile(filePath, obj);
+        const tmp = `${filePath}.${++_tmpSeq}.tmp`;
+        await fs.promises.writeFile(tmp, obj);
+        await fs.promises.rename(tmp, filePath);
     }
     async function setElMap({ key = _key, keyEl, valueEl, path = "" }) {
         const exists = await has({ key, path });
-        const data = exists ? JSON.parse(await get({ key, path })) : {};
+        let data = {};
+        if (exists) {
+            try {
+                data = JSON.parse(await get({ key, path }));
+            }
+            catch {
+                data = {};
+            }
+        }
         data[keyEl] = valueEl;
         await set({ key, obj: JSON.stringify(data), path });
     }
     async function delEl({ key = _key, keyEl, path = "" }) {
         if (!(await has({ key, path })))
             throw new Error(`Файл не найден: ${path}${key}`);
-        const data = JSON.parse(await get({ key, path }));
+        let data = {};
+        try {
+            data = JSON.parse(await get({ key, path }));
+        }
+        catch {
+            data = {};
+        }
         delete data[keyEl];
         await set({ key, obj: JSON.stringify(data), path });
         return true;

package/lib/toError/myThrow.d.ts

@@ -1,5 +1,24 @@
+export declare class MyError<D = unknown> extends Error {
+    readonly code: string;
+    readonly data: D;
+    name: string;
+    constructor(message: string, code?: string, data?: D, cause?: unknown);
+    toJSON(): {
+        name: string;
+        message: string;
+        code: string;
+        data: D;
+        stack: string | undefined;
+    };
+    static wrap(e: unknown): Error;
+    static fromWire<D>(w: tWire<D>): MyError<D> & {
+        name: string;
+        stack: string | undefined;
+    };
+}
+export type tWire<D = unknown> = ReturnType<MyError<D>['toJSON']>;
 export declare const toError: {
     convert: any;
-    throw(e: any): never;
+    throw(e: any): void;
     convertToMsg(e: any): any;
 };

package/lib/toError/myThrow.js

@@ -1,23 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toError = void 0;
-exports.toError = {
-    set convert(e) {
-        if (e instanceof Error) {
-            throw e;
-        }
-        throw new Error(JSON.stringify(e));
-    },
-    throw(e) {
-        if (e instanceof Error) {
-            throw e;
-        }
-        throw new Error(JSON.stringify(e));
-    },
-    convertToMsg(e) {
-        if (e instanceof Error) {
-            return e;
-        }
-        return e;
+exports.toError = exports.MyError = void 0;
+class MyError extends Error {
+    code;
+    data;
+    name = 'MyError';
+    constructor(message, code = 'ERR', data = {}, cause) {
+        super(message);
+        this.code = code;
+        this.data = data;
+        if (cause != undefined)
+            this.cause = cause;
+    }
+    toJSON() {
+        const { name, message, code, data, stack } = this;
+        return { name, message, code, data, stack };
+    }
+    static wrap(e) {
+        return e instanceof Error ? e : new MyError(typeof e == 'string' ? e : JSON.stringify(e), 'ERR', { value: e });
     }
+    static fromWire(w) {
+        return Object.assign(new MyError(w.message, w.code, w.data), { name: w.name, stack: w.stack });
+    }
+}
+exports.MyError = MyError;
+const legacyThrow = (e) => {
+    if (e instanceof Error)
+        throw e;
+    throw new Error(JSON.stringify(e));
+};
+exports.toError = {
+    set convert(e) { legacyThrow(e); },
+    throw(e) { legacyThrow(e); },
+    convertToMsg(e) { return e; },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common2",
-  "version": "1.0.45",
+  "version": "1.0.48",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",
@@ -23,6 +23,7 @@
   },
   "exports": {
     ".": "./lib/index.js",
+    "./observe-all2": "./lib/Common/ObserveAll2/reactive2.js",
     "./lib/client": "./lib/client.js",
     "./lib/server": "./lib/server.js",
     "./client": "./lib/client.js",

package/lib/Common/Error/myThrow.d.ts

@@ -1,5 +0,0 @@
-export declare const toError: {
-    convert: any;
-    throw(e: any): never;
-    convertToMsg(e: any): any;
-};

package/lib/Common/Error/myThrow.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toError = void 0;
-exports.toError = {
-    set convert(e) {
-        if (e instanceof Error) {
-            throw e;
-        }
-        throw new Error(JSON.stringify(e));
-    },
-    throw(e) {
-        if (e instanceof Error) {
-            throw e;
-        }
-        throw new Error(JSON.stringify(e));
-    },
-    convertToMsg(e) {
-        if (e instanceof Error) {
-            return e;
-        }
-        return e;
-    }
-};