wenay-common 1.0.77 → 1.0.79

package/lib/Common/commonsServer.d.ts

@@ -71,6 +71,9 @@ export type typeNoVoid2<T> = {
         [P in keyof T]: T[P] extends (any: any) => any ? ReturnType<T[P]> extends void ? never : P : never;
     }[keyof T]>]: T[P];
 };
+export type UnAwaited<T extends Promise<any>> = T extends Promise<infer R> ? R : never;
+export type UnAwaitedArr<T extends Promise<any>[]> = T extends Promise<infer R>[] ? R[] : never;
+export type tElArr<T extends any[]> = T extends (infer R)[] ? R : never;
 export declare function CreatAPIFacadeClient<T extends object>({ socketKey, socket }: {
     socket: any;
     socketKey: string;

package/lib/Exchange/LoadBase.d.ts

@@ -40,7 +40,11 @@ export type tLoadFist<IntervalNameT extends (number | string)> = {
 export type tSetHistoryData = CBar & {
     tf?: TF;
 };
-type tBinanceLoadBase<Bar, maxLoadBarType extends (number | Date), IntervalNameT extends (number | string)> = {
+type tBinanceLoadBase<Bar extends {
+    time?: number;
+} | {
+    time?: Date;
+} | object, maxLoadBarType extends (number | Date), IntervalNameT extends (number | string)> = {
     base: string;
     maxLoadBars: maxLoadBarType;
     maxLoadBars2?: maxLoadBarType;
@@ -54,10 +58,15 @@ type tBinanceLoadBase<Bar, maxLoadBarType extends (number | Date), IntervalNameT
     }[];
     nameKey?: string;
 };
-export declare function LoadQuoteBase<Bar, T extends (number | Date), T2 extends (number | string)>(setting: tBinanceLoadBase<Bar, T, T2> & {
+export declare function LoadQuoteBase<Bar extends {
+    time?: number;
+} | {
+    time?: Date;
+} | object, T extends (number | Date), T2 extends (number | string)>(setting: tBinanceLoadBase<Bar, T, T2> & {
     maxLoadBars: T;
 }, data?: {
     fetch?: tFetch3;
     error?: boolean;
+    reverseControl?: boolean;
 }): (info: tInfoForLoadHistory) => Promise<Bar[]>;
 export {};

package/lib/Exchange/LoadBase.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoadQuoteBase = void 0;
 const Common_1 = require("../Common/Common");
+const Time_1 = require("../Common/Time");
 const funcTimeWait_1 = require("../Common/funcTimeWait");
 function LoadQuoteBase(setting, data) {
     const { base, maxLoadBars, countConnect, intervalToName } = setting;
@@ -9,6 +10,7 @@ function LoadQuoteBase(setting, data) {
     const startMap = new Map();
     const keyName = setting.nameKey ?? "loadKey";
     const time = setting.time ?? 60000;
+    const other = data;
     async function waitLimit(weight = 1) {
         const t1 = funcTimeWait_1.FuncTimeWait.byWeight(keyName, setting.countConnect) - (Date.now() - time) + 1;
         if (t1 > 0) {
@@ -20,7 +22,7 @@ function LoadQuoteBase(setting, data) {
         }
     }
     const mapTimeToName = new Map(intervalToName.map((e) => [e.time.sec, e]));
-    const _fetch = data?.fetch ?? fetch;
+    const _fetch = other?.fetch ?? fetch;
     return async (info) => {
         const infoTF = mapTimeToName.get(info.tf.sec);
         if (!_fetch)
@@ -39,6 +41,7 @@ function LoadQuoteBase(setting, data) {
         if (time2 <= time1) {
             return [];
         }
+        const [t1, t2] = info.right ? [time1, time2] : [time2, time1];
         const arr = [];
         const interval = infoTF.time.valueOf();
         const map = [];
@@ -46,7 +49,6 @@ function LoadQuoteBase(setting, data) {
             const [step1] = [
                 maxLoadBars.valueOf()
             ];
-            const [t1, t2] = info.right ? [time1, time2] : [time2, time1];
             arr.push(lastTime = t1);
             let barsTime = (t1 - t2);
             if (barsTime <= maxLoadBars.valueOf())
@@ -60,11 +62,10 @@ function LoadQuoteBase(setting, data) {
                     arr.push(t2);
             }
         }
-        else if (maxLoadBars instanceof Number) {
+        else if (typeof maxLoadBars == "number") {
             const [step1] = [
                 maxLoadBars * interval,
             ];
-            const [t1, t2] = info.right ? [time1, time2] : [time2, time1];
             arr.push(lastTime = t1);
             let bars = (t1 - t2) / interval;
             if (bars <= maxLoadBars)
@@ -95,15 +96,26 @@ function LoadQuoteBase(setting, data) {
                     waitLimit
                 };
                 await waitLimit();
-                return setting.funcLoad(data);
+                const res = await setting.funcLoad(data);
+                if (res.length && res[0].time && (other?.reverseControl !== false)) {
+                    let t1, t2;
+                    if (typeof res[0].time == "object")
+                        [t1, t2] = [res[0].time.valueOf(), res.at(-1).time?.valueOf()];
+                    else
+                        [t1, t2] = [res[0].time, res.at(-1).time];
+                    if (t1 > t2)
+                        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")
+            if (el.status == "fulfilled") {
                 result.push(...el.value);
+            }
             if (el.status == "rejected") {
                 console.error(el.reason);
                 if (data?.error === true)
@@ -114,3 +126,32 @@ function LoadQuoteBase(setting, data) {
     };
 }
 exports.LoadQuoteBase = LoadQuoteBase;
+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-common",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "math math math",
   "strict": true,
   "main": "lib/index.js",