wenay-common2 1.0.45 → 1.0.46

package/lib/Common/Color.js

@@ -69,7 +69,7 @@ function* colorGenerator2(data) {
 }
 function colorGeneratorByCount2(value = 180, count = 100, index = 1) {
     const step = Math.floor(value * 6 * index / count);
-    const p = Math.floor(step / value);
+    const p = Math.floor(step / value) % 6;
     const z = Math.floor(step % value);
     const r = (p == 0 || p == 5) ? value : (p == 1) ? value - z : (p == 4) ? z : 0;
     const g = (p == 1 || p == 2) ? value : (p == 3) ? value - z : (p == 0) ? z : 0;
@@ -108,8 +108,12 @@ function isValidAlphaValue(value) {
 function toColorString(str) { if (colorStringToRGBA(str))
     return str; throw `the string '${str}' is not valid 'rgb' or 'rgba' string`; }
 function isSimilarColors(color1, color2, maxDelta = 32) {
-    let [r1, g1, b1] = typeof color1 == "string" ? colorStringToRGBA(color1) : color1;
-    let [r2, g2, b2] = typeof color2 == "string" ? colorStringToRGBA(color2) : color2;
+    let c1 = typeof color1 == "string" ? colorStringToRGBA(color1) : color1;
+    let c2 = typeof color2 == "string" ? colorStringToRGBA(color2) : color2;
+    if (!c1 || !c2)
+        return false;
+    let [r1, g1, b1] = c1;
+    let [r2, g2, b2] = c2;
     let delta = Math.abs(r1 - r2) + Math.abs(g1 - g2) + Math.abs(b1 - b2);
     return delta <= maxDelta;
 }

package/lib/Common/async/PromiseArrayListen.js

@@ -14,7 +14,6 @@ function PromiseArrayListen(array) {
     const b = (error, i) => {
         ++errorCount;
         c[0](error, i, ok, errorCount, count);
-        throw error;
     };
     const arr = array.map((e, i) => e instanceof Promise ? e.then(r => a(r, i)).catch((er) => b(er, i))
         : () => (async () => e())().then(r => a(r, i)).catch((er) => b(er, i)));

package/lib/Common/async/createIterableObject.js

@@ -12,7 +12,7 @@ function createIterableObject(options) {
         },
         set(_, key, value) {
             if (!onChange || typeof key !== "string")
-                return false;
+                return true;
             onChange("set", key, value);
             return true;
         },

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

@@ -10,7 +10,7 @@ export declare function createAsyncQueue(concurrency?: number): {
 export declare function enhancedQueueRun(maxParallelTasks?: number): {
     readonly queueSize: number;
     enqueue: (task: () => Promise<any>) => void;
-    enqueueAndRun: (task: () => Promise<any>) => void;
+    enqueueAndRun: (task: () => Promise<any>) => Promise<any>;
     runAll: () => Promise<void>;
 };
 export declare function waitRun(): {

package/lib/Common/async/waitRun.js

@@ -74,7 +74,7 @@ function enhancedQueueRun(maxParallelTasks = 5) {
     return {
         get queueSize() { return q.getQueueSize(); },
         enqueue: (task) => { q.enqueue(task); },
-        enqueueAndRun: (task) => { q.enqueue(task); },
+        enqueueAndRun: (task) => q.enqueue(task),
         runAll: () => q.onIdle(),
     };
 }

package/lib/Common/core/Decorator.js

@@ -20,12 +20,13 @@ function enhancedDecorator(fn, opt) {
             })
                 .catch((err) => {
                 optAsync?.onCatch?.(err);
+                throw err;
             })
                 .finally(() => optAsync?.onFinally?.());
         }
         else {
             opt?.onResult?.(rawResult);
-            return opt?.modifyResult?.(rawResult) || rawResult;
+            return opt?.modifyResult?.(rawResult) ?? rawResult;
         }
     };
 }

package/lib/Common/core/DeepCompareKeys.js

@@ -24,6 +24,8 @@ function DeepCompareKeys2(obj1, keys, func) {
         return obj1;
     if (CompareKeys2(obj1, keys))
         return func(obj1);
+    if (Array.isArray(obj1))
+        return obj1.map((v) => DeepCompareKeys2(v, keys, func));
     return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, DeepCompareKeys2(v, keys, func)]));
 }
 function DeepCompareKeys(obj1, obj2, func) {
@@ -32,5 +34,7 @@ function DeepCompareKeys(obj1, obj2, func) {
     const keys = Object.keys(obj2);
     if (CompareKeys2(obj1, keys))
         return func(obj1);
+    if (Array.isArray(obj1))
+        return obj1.map((v) => DeepCompareKeys2(v, keys, func));
     return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, DeepCompareKeys2(v, keys, func)]));
 }

package/lib/Common/core/MemoFunc.js

@@ -16,7 +16,7 @@ function MemoFunc(a) {
         eventUpdate?.();
     }
     function evictOldest(map) {
-        const keep = Math.floor(maxLimits / 2);
+        const keep = Math.max(1, Math.floor(maxLimits / 2));
         const entries = [...map.entries()].sort((a, b) => a[1].time - b[1].time);
         const toRemove = entries.slice(0, entries.length - keep);
         for (const [key] of toRemove) {
@@ -25,7 +25,7 @@ function MemoFunc(a) {
         eventUpdate?.();
     }
     function evictOldestFuncs() {
-        const keep = Math.floor(maxLimits / 2);
+        const keep = Math.max(1, Math.floor(maxLimits / 2));
         const entries = [...memo.entries()].sort((a, b) => {
             const maxTimeA = Math.max(...[...a[1].values()].map(e => e.time ?? 0));
             const maxTimeB = Math.max(...[...b[1].values()].map(e => e.time ?? 0));

package/lib/Common/core/common.js

@@ -290,9 +290,9 @@ function BSearchValueInRange(from, to, precision, compare, matchMode) {
     if (precision == 0)
         throw new Error("precision=0");
     let count = Math.round((to - from) / precision) + 1;
-    const sortMode = count >= 0 ? 1 : -1;
+    const sortMode = precision > 0 ? E_SORTMODE.ASCEND : E_SORTMODE.DESCEND;
     count = Math.abs(count);
-    let i = BSearchIndex(count, (index) => compare(from + precision * index), matchMode);
+    let i = BSearchIndex(count, (index) => compare(from + precision * index), matchMode, sortMode);
     if (i == -1)
         return null;
     return from + precision * i;
@@ -311,7 +311,7 @@ function _BSearchNearest(array, searchValue, arrayGetValue, maxDelta) {
     let indexes = [];
     if (i == -1)
         i = array.length - 1;
-    else if (i >= 0)
+    else if (i > 0)
         indexes.push(i - 1);
     indexes.push(i);
     let delta = maxDelta ?? Number.MAX_VALUE;
@@ -506,7 +506,7 @@ class __MyMap {
     Set(key, value) { this.map[key.valueOf()] = { key, value }; this.keys = null; this.OnModify?.(key); }
     Get(key) { let pair = this.map[key.valueOf()]; return pair ? pair.value : undefined; }
     Contains(key) { return this.map[key.valueOf()] != undefined; }
-    TryAdd(key, value) { if (!this.Contains(key))
+    TryAdd(key, value) { if (this.Contains(key))
         return false; this.Set(key, value); return true; }
     Add(key, value) { if (!this.TryAdd(key, value))
         throw new Error(`Key ${key} is already exists for ${typeof value}`); }

package/lib/Common/data/ByteStream.js

@@ -73,18 +73,9 @@ class ByteStreamW {
                 }
             }
     }
-    _setInt8(pos, value) { if ((value & 1 << 7) != 0)
-        this._view.setInt8(pos, value);
-    else
-        this._view.setUint8(pos, value); }
-    _setInt16(pos, value) { if ((value & 1 << 15) != 0)
-        this._view.setInt16(pos, value);
-    else
-        this._view.setUint16(pos, value); }
-    _setInt32(pos, value) { if ((value & 1 << 31) != 0)
-        this._view.setInt32(pos, value);
-    else
-        this._view.setUint32(pos, value); }
+    _setInt8(pos, value) { this._view.setInt8(pos, value); }
+    _setInt16(pos, value) { this._view.setInt16(pos, value); }
+    _setInt32(pos, value) { this._view.setInt32(pos, value); }
     _push(value, bytes, isInteger) {
         let pos = this._pos;
         this._ensureAllocation(bytes);
@@ -110,11 +101,11 @@ class ByteStreamW {
                     break;
                 case 6:
                     this._setInt32(pos, value);
-                    this._setInt16(pos + 4, value / 0x10000000);
+                    this._setInt16(pos + 4, Math.floor(value / 0x100000000));
                     break;
                 case 8:
                     this._setInt32(pos, value);
-                    this._setInt32(pos + 4, value / 0x10000000);
+                    this._setInt32(pos + 4, Math.floor(value / 0x100000000));
                     break;
                 default: throw ("Wrong byte length: " + bytes);
             }
@@ -259,10 +250,10 @@ class ByteStreamR_ {
                     switch (bytes) {
                         case 1: return view.getInt8(pos);
                         case 2: return view.getInt16(pos);
-                        case 3: return view.getInt16(pos) | (view.getInt8(pos + 2) << 16);
+                        case 3: return view.getUint16(pos) + (view.getInt8(pos + 2) << 16);
                         case 4: return view.getInt32(pos);
-                        case 6: return view.getInt32(pos) | view.getInt16(pos + 4) * 0x10000000;
-                        case 8: return view.getInt32(pos) | view.getInt32(pos + 4) * 0x10000000;
+                        case 6: return view.getUint32(pos) + view.getInt16(pos + 4) * 0x100000000;
+                        case 8: return view.getUint32(pos) + view.getInt32(pos + 4) * 0x100000000;
                     }
                 }
                 else {
@@ -271,8 +262,8 @@ class ByteStreamR_ {
                         case 2: return view.getUint16(pos);
                         case 3: return view.getUint16(pos) | (view.getUint8(pos + 2) << 16);
                         case 4: return view.getUint32(pos);
-                        case 6: return view.getUint32(pos) | view.getUint16(pos + 4) * 0x10000000;
-                        case 8: return view.getUint32(pos) | view.getUint32(pos + 4) * 0x10000000;
+                        case 6: return view.getUint32(pos) + view.getUint16(pos + 4) * 0x100000000;
+                        case 8: return view.getUint32(pos) + view.getUint32(pos + 4) * 0x100000000;
                     }
                 }
             }

package/lib/Common/data/List.d.ts

@@ -30,7 +30,7 @@ export declare class CList<T, TNode extends ListNode<T> = ListNode<T>> implement
     values(): Generator<T, void, unknown>;
     reversedNodes(): Generator<TNode, void, unknown>;
     reversedValues(): Generator<T, void, unknown>;
-    entries(): Generator<never, () => Generator<TNode, void, unknown>, unknown>;
+    entries(): Generator<readonly [number, T], void, unknown>;
     next(node: ListNode<T>): TNode | undefined;
     prev(node: ListNode<T>): TNode | undefined;
     find(value: T): TNode | undefined;

package/lib/Common/data/List.js

@@ -29,7 +29,8 @@ class CList {
         yield node; }
     *reversedValues() { for (let node of this.reversedNodes())
         yield node.value; }
-    *entries() { return this.nodes; }
+    *entries() { let i = 0; for (let node of this.nodes())
+        yield [i++, node.value]; }
     next(node) { return this.validateNode(node) ? node.next : (() => { throw "Wrong node list"; })(); }
     ;
     prev(node) { return this.validateNode(node) ? node.prev : (() => { throw "Wrong node list"; })(); }
@@ -102,7 +103,16 @@ class CList {
         let newNode = this.newNode(value);
         newNode.next = node.next;
         newNode.prev = node.prev;
+        if (node.prev)
+            node.prev.next = newNode;
+        else
+            this._first = newNode;
+        if (node.next)
+            node.next.prev = newNode;
+        else
+            this._last = newNode;
         node.list = undefined;
+        node.next = node.prev = undefined;
         this._immutableList = undefined;
         return newNode;
     }
@@ -135,7 +145,10 @@ class CList {
         this.delete(this._last); }
     clear() {
         for (let node = this._first; node != null; node = node.next)
-            this.delete(node);
+            node.list = undefined;
+        this._first = this._last = undefined;
+        this._count = 0;
+        this._immutableList = undefined;
     }
     validateNode(node) {
         if (!(node instanceof CListNode))

package/lib/Common/data/ListNodeAnd.js

@@ -73,7 +73,7 @@ class CListNodeAnd extends CBaseList {
     AddEnd(a) { return this._stop ? this.AddPrev(a) : this._End().AddNext(a); }
     AddStart(a) { return this._stop ? this.AddNext(a) : this._First().AddPrev(a); }
     forEach(el) {
-        for (let buf = this.First(); buf?.data && !buf.isForbidden();) {
+        for (let buf = this.First(); buf && !buf.isForbidden();) {
             let t = buf.Next();
             el(buf.data, buf);
             buf = t;

package/lib/Common/events/SocketBuffer.js

@@ -19,6 +19,7 @@ function funcListenCallbackSnapshot({ func, memo = {}, callbackSave, snapshot })
             if (type == "remove" && count == 0) {
                 api.close();
                 d?.();
+                d = null;
             }
             if (type == "add" && count == 1)
                 api.run();

package/lib/Common/events/event.js

@@ -16,15 +16,20 @@ class CObjectEventsArr {
             }
             console.error("элемент уже был удален");
             console.trace();
-            data.OnDel?.();
             console.log(this.count());
         };
     }
     AddStart(data) { this.data.unshift(data); this.setup(this.data[0]); }
     AddEnd(data) { this.setup(this.data[this.data.push(data) - 1]); }
     Add(data) { this.setup(this.data[this.data.push(data) - 1]); }
-    OnEvent(data) { [...this.data].forEach((e) => { e.func?.(data); e.func2?.(data); }); }
-    OnSpecEvent(f) { [...this.data].forEach((e) => { const l = e.func?.(); l && f(l); e.func2?.(); }); }
+    OnEvent(data) { [...this.data].forEach((e) => { e.func?.(data); if (e.func2) {
+        e.func2(data);
+        e.del?.();
+    } }); }
+    OnSpecEvent(f) { [...this.data].forEach((e) => { const l = e.func?.(); l && f(l); if (e.func2) {
+        e.func2();
+        e.del?.();
+    } }); }
     Clean() {
         const a = [...this.data];
         this.data = [];
@@ -62,10 +67,16 @@ class CObjectEventsList {
     AddStart(data) { this.setup(this.data.AddStart(data)); }
     AddEnd(data) { this.setup(this.data.AddEnd(data)); }
     Add(data) { this.setup(this.data.AddEnd(data)); }
-    OnEvent(data) { this.data.forEach(e => { e.func?.(data); e.func2?.(data); }); }
-    OnSpecEvent(f) { this.data.forEach((e) => { const l = e.func?.(); if (l) {
+    OnEvent(data) { const a = []; this.data.forEach(e => a.push(e)); a.forEach(e => { e.func?.(data); if (e.func2) {
+        e.func2(data);
+        e.del?.();
+    } }); }
+    OnSpecEvent(f) { const a = []; this.data.forEach(e => a.push(e)); a.forEach((e) => { const l = e.func?.(); if (l) {
         f(l);
-    } e.func2?.(); }); }
+    } if (e.func2) {
+        e.func2();
+        e.del?.();
+    } }); }
     Clean() { let r = this.data.First(); while (r) {
         const buf = r;
         r = r?.Next();

package/lib/Common/events/joinListens.js

@@ -21,14 +21,17 @@ function joinListens(listens, keyExtractor) {
         bucket.clear();
         set(result, tid);
     };
+    const unsubs = [];
     const bindPort = (portId, listener) => {
-        listener.addListen((...data) => {
+        const cb = (...data) => {
             const tid = getKey(data[0]);
             if (!buckets.has(tid))
                 buckets.set(tid, new Map());
             buckets.get(tid).set(portId, data.length <= 1 ? data[0] : data);
             tryFire(tid);
-        });
+        };
+        listener.addListen(cb);
+        unsubs.push(() => listener.removeListen(cb));
     };
     for (const portId of keys) {
         bindPort(portId, map[portId]);
@@ -39,7 +42,11 @@ function joinListens(listens, keyExtractor) {
         clear: (tid) => {
             tid ? buckets.delete(tid) : buckets.clear();
         },
-        destroy: (tid) => {
+        destroy: (_tid) => {
+            for (const u of unsubs)
+                u();
+            unsubs.length = 0;
+            buckets.clear();
         },
         addListen: (listener, key) => {
             const portId = isArray ? String(keys.length) : (key ?? String(keys.length));

package/lib/Common/funcTimeWait.d.ts

@@ -13,7 +13,6 @@ export declare function funcTimeW(): {
     add(item: tFunc): void;
     cleanByTime(type: tType, ms?: number): void;
     weight(type: tType, ms?: number): number;
-    weightNow(type: tType, ms?: number): number;
     byWeight(type: tType, weight?: number): number;
     byWeightTimeNow(type: tType, timeNow?: number, weight?: number): number;
 };
@@ -25,7 +24,6 @@ export declare const FuncTimeWait: {
     add(item: tFunc): void;
     cleanByTime(type: tType, ms?: number): void;
     weight(type: tType, ms?: number): number;
-    weightNow(type: tType, ms?: number): number;
     byWeight(type: tType, weight?: number): number;
     byWeightTimeNow(type: tType, timeNow?: number, weight?: number): number;
 };

package/lib/Common/funcTimeWait.js

@@ -47,24 +47,6 @@ function funcTimeW() {
             }
             return sum;
         },
-        weightNow(type, ms = 60 * 1000) {
-            const arr = dStatic[type];
-            if (!arr || arr.length === 0)
-                return 0;
-            const timeStamp = Date.now();
-            let sum = 0;
-            let i = arr.length - 1;
-            for (; i >= 0; i--) {
-                const [_time, _weight] = arr[i];
-                if (_time < timeStamp - ms)
-                    break;
-                sum += _weight;
-            }
-            if (i >= 0) {
-                arr.splice(0, i + 1);
-            }
-            return sum;
-        },
         byWeight(type, weight = 50000) {
             const arr = dStatic[type];
             if (!arr || arr.length === 0)
@@ -75,7 +57,7 @@ function funcTimeW() {
             for (; i >= 0; i--) {
                 sum += arr[i][1];
                 if (sum > weight) {
-                    result = arr[i + 1]?.[0] ?? 0;
+                    result = arr[i + 1]?.[0] ?? arr[i][0];
                     break;
                 }
             }
@@ -100,7 +82,7 @@ function funcTimeW() {
             for (; i >= 0; i--) {
                 sum += arr[i][1];
                 if (sum > weight) {
-                    result = arr[i + 1]?.[0] ?? 0;
+                    result = arr[i + 1]?.[0] ?? arr[i][0];
                     break;
                 }
             }

package/lib/Common/id-pool.js

@@ -3,10 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIdPool = void 0;
 const createIdPool = () => {
     const s = [];
+    const free = new Set();
     let n = 0;
     return {
-        next: () => s.length > 0 ? s.pop() : ++n,
-        release(id) { s.push(id); }
+        next: () => {
+            const id = s.length > 0 ? s.pop() : ++n;
+            free.delete(id);
+            return id;
+        },
+        release(id) {
+            if (id < 1 || id > n || free.has(id))
+                return;
+            free.add(id);
+            s.push(id);
+        }
     };
 };
 exports.createIdPool = createIdPool;

package/lib/Common/inputAutoStep.js

@@ -30,14 +30,14 @@ function SetAutoStepForElement(element, params = { maxStep: 1 }) {
         _digits = digits;
         _step = step;
         if (_min != null) {
-            if (Math.abs(_min) % step != 0)
+            if (Math.abs(_min) % step > 1e-9 && step - Math.abs(_min) % step > 1e-9)
                 _min = Math.floor(Math.abs(_min) / step) * step * Math.sign(minDefault);
             element.min = _min + "";
         }
         element.step = step + "";
         return step;
     }
-    let modeAuto = !_step || (_step < 1 && Math.log10(_step - Math.trunc(_step)) % 1 == 0);
+    let modeAuto = !_step || (_step < 1 && Math.abs(Math.log10(_step) - Math.round(Math.log10(_step))) < 1e-9);
     const modeAuto0 = modeAuto;
     if (modeAuto) {
         calculateStep((_step ? (Math.round(parseFloat(element.value) / _step) * _step) : element.value) + "");

package/lib/Common/math/Math.d.ts

@@ -5,6 +5,7 @@ type tCorrelationByBuffer = {
 export declare function CorrelationRollingByBuffer(data: tCorrelationByBuffer): {
     init(data: tCorrelationByBuffer): void;
     clear(data?: tCorrelationByBuffer): void;
+    remove(key1: any, key2?: any): void;
     corr2(val1: number, val2: number, key1: any, key2: any): {
         corr: number;
     };

package/lib/Common/math/Math.js

@@ -26,8 +26,14 @@ function CorrelationRollingByBuffer(data) {
             if (data)
                 this.init(data);
         },
+        remove(key1, key2) {
+            if (key2 === undefined)
+                map.delete(key1);
+            else
+                map.get(key1)?.delete(key2);
+        },
         corr2(val1, val2, key1, key2) {
-            const buffer = setting.bufferOn ? getBuffer(key1, key2) : defBuf();
+            const buffer = getBuffer(key1, key2);
             buffer.history1.push(val1);
             buffer.history2.push(val2);
             let dropped1 = 0;

package/lib/Common/math/other.js

@@ -1,6 +1,7 @@
 "use strict";
 function PriceTOSumPercent(price) {
-    return price.map(e => e / price[0]);
+    const base = price[0];
+    return base ? price.map(e => e / base) : price.map(() => 0);
 }
 function strategyStepOfStepAll(symbols_) {
     const symbols = symbols_.map(e => ({ price: PriceTOSumPercent(e.price), key: e.key }));

package/lib/Common/math/scoreLana.js

@@ -22,7 +22,8 @@ function strategyStepOfStepAllL(symbols) {
     return result;
 }
 function PriceTOSumPercentL(price) {
-    return price.map(e => e / price[0]);
+    const base = price[0];
+    return base ? price.map(e => e / base) : price.map(() => 0);
 }
 function strategyStepOfStepL({ t1, t2, minK: _minK, percentM: _percentM, onlyBuy: _onlyBuy }) {
     const onlyBuy = !!_onlyBuy;
@@ -62,6 +63,6 @@ function strategyStepOfStepL({ t1, t2, minK: _minK, percentM: _percentM, onlyBuy
         }
     }
     const k1 = day.profitDays / result1.length;
-    const k2 = day.profit / ((day.profit + day.loss) || 1);
+    const k2 = day.profit / ((day.profit + Math.abs(day.loss)) || 1);
     return k1 * k2;
 }

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

@@ -30,12 +30,7 @@ function deepMapByKeysList(obj1, keys, func) {
     return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, deepMapByKeysList(v, keys, func)]));
 }
 function deepMapByKeys(obj1, obj2, func) {
-    if (isLeafValue(obj1))
-        return obj1;
-    const keys = Object.keys(obj2);
-    if (matchKeysList(obj1, keys))
-        return func(obj1);
-    return Object.fromEntries(Object.entries(obj1).map(([k, v]) => [k, deepMapByKeysList(v, keys, func)]));
+    return deepMapByKeysList(obj1, Object.keys(obj2), func);
 }
 const NOOP_LISTEN = (0, Listen_1.funcListenCallbackBase)((_e) => { });
 function deepListenFirst(obj, data) {

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

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

package/lib/Common/rcp/test.js

@@ -1 +1,79 @@
 "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);

package/lib/Exchange/Bars.js

@@ -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,6 +350,8 @@ 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)
@@ -370,7 +372,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")

package/lib/Exchange/CParams.js

@@ -37,7 +37,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") {

package/lib/Exchange/MarketData.js

@@ -256,7 +256,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))

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"));
@@ -61,6 +61,19 @@ const saveSubscribers = (subs) => {
     Queue.enqueue(() => fs.promises.writeFile(SUBSCRIBERS_FILE, JSON.stringify(obj, null, 2), 'utf-8'));
 };
 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 +103,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 +130,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);

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.46",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.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;
-    }
-};