wenay-common2 1.0.39 → 1.0.41

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

@@ -14,11 +14,6 @@ function createClient(socket, key, opts) {
     let strictData = {};
     let strictWaiters = [];
     let debug = false;
-    const unpackResult = (v) => {
-        if (!v)
-            return v;
-        return v;
-    };
     socket.on(key, (msg) => {
         if (!Array.isArray(msg))
             return;
@@ -33,11 +28,11 @@ function createClient(socket, key, opts) {
                     callbacks.delete(cbId);
                     pool.release(cbId);
                 }
-                msg[3] ? req.fail(msg[3]) : req.ok(unpackResult(msg[2]));
+                msg[3] ? req.fail(msg[3]) : req.ok((0, rpc_walk_1.unpackResult)(msg[2]));
                 break;
             }
             case rpc_protocol_1.Pkt.CB: {
-                callbacks.get(msg[1])?.(...(msg[2] || []));
+                callbacks.get(msg[1])?.(...(msg[2] || []).map(rpc_walk_1.unpackResult));
                 break;
             }
             case rpc_protocol_1.Pkt.CB_END: {

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

@@ -189,7 +189,7 @@ function createServer(socket, key, target, hooks, limits) {
                     send([rpc_protocol_1.Pkt.RESP, reqId, (0, rpc_walk_1.packResult)(current)]);
             }
             else {
-                const args = (0, rpc_walk_1.unpack)(rawArgsOrSteps, (cbId, cbArgs) => send([rpc_protocol_1.Pkt.CB, cbId, cbArgs]), (cbId) => send([rpc_protocol_1.Pkt.CB_END, cbId]), lim);
+                const args = (0, rpc_walk_1.unpack)(rawArgsOrSteps, (cbId, cbArgs) => send([rpc_protocol_1.Pkt.CB, cbId, cbArgs.map(rpc_walk_1.packResult)]), (cbId) => send([rpc_protocol_1.Pkt.CB_END, cbId]), lim);
                 const res = await fn.apply(ctx, args);
                 if (wait)
                     send([rpc_protocol_1.Pkt.RESP, reqId, (0, rpc_walk_1.packResult)(res)]);

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

@@ -38,6 +38,8 @@ function walk(val, onLeaf, lim, depth = 0) {
     }
     if (val == null || typeof val !== "object")
         return onLeaf(val);
+    if (val instanceof Date || val instanceof Map || val instanceof Set || val instanceof RegExp)
+        return onLeaf(val);
     if (ALL_MARKERS.has(Object.keys(val)[0]))
         return onLeaf(val);
     if (Array.isArray(val)) {

package/lib/Common/rcp/test.js

@@ -0,0 +1 @@
+"use strict";

package/lib/Exchange/LoadBase.js

@@ -1,26 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadQuoteBase = LoadQuoteBase;
-const Time_1 = require("../Common/Time");
 const funcTimeWait_1 = require("../Common/funcTimeWait");
 const common_1 = require("../Common/core/common");
 function LoadQuoteBase(setting, data) {
-    const { base, maxLoadBars, countConnect, intervalToName } = setting;
-    const maxLoadBars2 = setting.maxLoadBars2 ?? maxLoadBars;
+    const { base, maxLoadBars, intervalToName } = setting;
     const startMap = new Map();
     const keyName = setting.nameKey ?? "loadKey";
     const time = setting.time ?? 60000;
     const other = data;
     const getDataEl = (a) => setting.controlTimeToNumber?.(a);
     async function waitLimit(weight = 1) {
-        const t1 = funcTimeWait_1.FuncTimeWait.byWeight(keyName, setting.countConnect) - (Date.now() - time) + 1;
+        const oldestTs = funcTimeWait_1.FuncTimeWait.byWeight(keyName, setting.countConnect);
+        const t1 = oldestTs > 0 ? oldestTs - Date.now() + time + 1 : 0;
         if (t1 > 0) {
-            funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() + t1 });
             await (0, common_1.sleepAsync)(t1);
         }
-        else {
-            funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() });
-        }
+        funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: weight, timeStamp: Date.now() });
     }
     const mapTimeToName = new Map(intervalToName.map((e) => [e.time.sec, e]));
     const _fetch = other?.fetch ?? fetch;
@@ -30,128 +26,82 @@ function LoadQuoteBase(setting, data) {
             throw "_fetch - не определен";
         if (!infoTF)
             throw "нет такого таймфрейма";
-        let lastTime;
         const nameForMap = info.exchangeName + info.symbol + infoTF.name;
         let leftTime = startMap.get(nameForMap);
         if (!leftTime) {
             await waitLimit();
-            leftTime = await setting.funcFistTime({ symbol: info.symbol, baseURL: base, interval: infoTF.name, fetch: _fetch, intervalTF: info.tf, waitLimit });
+            leftTime = await setting.funcFistTime({
+                symbol: info.symbol, baseURL: base, interval: infoTF.name,
+                fetch: _fetch, intervalTF: info.tf, waitLimit
+            });
             startMap.set(nameForMap, leftTime);
         }
-        const [time1, time2] = [Math.max(info.time1.valueOf(), leftTime.valueOf()), info.time2.valueOf()];
+        const time1 = Math.max(info.time1.valueOf(), leftTime.valueOf());
+        const time2 = info.time2.valueOf();
         if (time2 <= time1) {
             return [];
         }
-        const [t1, t2] = info.right ? [time1, time2] : [time2, time1];
+        const [tNewer, tOlder] = info.right ? [time2, time1] : [time2, time1];
         const arr = [];
         const interval = infoTF.time.valueOf();
-        const map = [];
         if (maxLoadBars instanceof Date) {
-            const [step1] = [
-                maxLoadBars.valueOf()
-            ];
-            arr.push(lastTime = t1);
-            let barsTime = (t1 - t2);
-            if (barsTime <= maxLoadBars.valueOf())
-                arr.push(t2);
-            else {
-                barsTime -= maxLoadBars.valueOf();
-                arr.push(lastTime = lastTime - step1);
-                for (; barsTime > 0; barsTime -= maxLoadBars.valueOf())
-                    arr.push(lastTime = lastTime - step1);
-                if (barsTime < 0)
-                    arr.push(t2);
+            const step = maxLoadBars.valueOf();
+            arr.push(tNewer);
+            let span = tNewer - tOlder;
+            while (span > step) {
+                arr.push(arr[arr.length - 1] - step);
+                span -= step;
             }
+            if (arr[arr.length - 1] > tOlder)
+                arr.push(tOlder);
         }
-        else if (typeof maxLoadBars == "number") {
-            const [step1] = [
-                maxLoadBars * interval,
-            ];
-            arr.push(lastTime = t1);
-            let bars = (t1 - t2) / interval;
-            if (bars <= maxLoadBars)
-                arr.push(t2);
-            else {
+        else if (typeof maxLoadBars === "number") {
+            const step = maxLoadBars * interval;
+            arr.push(tNewer);
+            let bars = (tNewer - tOlder) / interval;
+            while (bars > maxLoadBars) {
+                arr.push(arr[arr.length - 1] - step);
                 bars -= maxLoadBars;
-                arr.push(lastTime = lastTime - step1);
-                for (; bars > 0; bars -= maxLoadBars)
-                    arr.push(lastTime = lastTime - step1);
-                if (bars < 0)
-                    arr.push(t2);
             }
+            if (arr[arr.length - 1] > tOlder)
+                arr.push(tOlder);
         }
-        for (let i = 1; i < arr.length; i++) {
-            if (arr[i].valueOf() >= arr[i - 1].valueOf())
+        const result = [];
+        for (let i = 0; i < arr.length - 1; i++) {
+            const endTime = arr[i];
+            const startTime = arr[i + 1];
+            if (startTime >= endTime)
                 continue;
-            map.push((async () => {
-                const data = {
-                    maxLoadBars: maxLoadBars,
-                    fetch: _fetch,
-                    baseURL: base,
-                    symbol: info.symbol,
-                    interval: infoTF.name,
-                    startTime: new Date(arr[i]),
-                    endTime: new Date(arr[i - 1]),
-                    limit: maxLoadBars,
-                    intervalTF: info.tf,
-                    waitLimit
-                };
-                await waitLimit();
-                let res = await setting.funcLoad(data);
-                if (setting.controlTimeToNumber && res.length) {
-                    let [t1, t2] = [
-                        getDataEl(res[0]),
-                        getDataEl(res.at(-1))
-                    ];
-                    if (t1 && t2 && t1 > t2) {
+            await waitLimit();
+            const reqData = {
+                maxLoadBars,
+                fetch: _fetch,
+                baseURL: base,
+                symbol: info.symbol,
+                interval: infoTF.name,
+                startTime: new Date(startTime),
+                endTime: new Date(endTime),
+                limit: maxLoadBars,
+                intervalTF: info.tf,
+                waitLimit
+            };
+            try {
+                let res = await setting.funcLoad(reqData);
+                if (setting.controlTimeToNumber && res.length > 0) {
+                    const t1 = getDataEl(res[0]);
+                    const t2 = getDataEl(res.at(-1));
+                    if (t1 != null && t2 != null && t1 > t2) {
                         res = res.reverse();
                     }
                 }
-                return res;
-            })());
-        }
-        const resulI = await Promise.allSettled(map);
-        const result = [];
-        for (let i = resulI.length - 1; i >= 0; i--) {
-            const el = resulI[i];
-            if (el.status == "fulfilled") {
-                result.push(...el.value);
+                result.unshift(...res);
             }
-            if (el.status == "rejected") {
-                console.error(el.reason);
+            catch (e) {
+                console.error(e);
                 if (data?.error === true)
-                    throw el.reason;
+                    throw e;
             }
         }
         return result;
     };
 }
-async function test() {
-    const arr = [];
-    for (let i = 0; i < 10000; i++) {
-        arr[i] = { time: Date.now() - i * Time_1.TF.H1.msec, price: i };
-    }
-    let ress = [];
-    const tt = LoadQuoteBase({
-        base: "",
-        countConnect: 2,
-        funcFistTime: async ({}) => {
-            const time = new Date(arr.at(-1).time);
-            console.log("funcFistTime: ", time);
-            return time;
-        },
-        nameKey: "cd",
-        maxLoadBars: 100,
-        time: 50,
-        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: 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.39",
+  "version": "1.0.41",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",