wenay-common 1.0.48 → 1.0.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,26 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FuncTimeWait = exports.funcTimeW = void 0;
|
|
4
4
|
function funcTimeW() {
|
|
5
|
-
const
|
|
5
|
+
const dStatic = {};
|
|
6
6
|
const data = [];
|
|
7
7
|
return {
|
|
8
8
|
data: data,
|
|
9
9
|
add(data) {
|
|
10
|
-
if (!
|
|
11
|
-
|
|
12
|
-
if (
|
|
13
|
-
|
|
10
|
+
if (!dStatic[data.type])
|
|
11
|
+
dStatic[data.type] = [];
|
|
12
|
+
if (dStatic[data.type])
|
|
13
|
+
dStatic[data.type]?.push([data.timeStamp ?? Date.now(), data.weight]);
|
|
14
14
|
},
|
|
15
15
|
cleanByTime(type, ms = 60 * 1000) {
|
|
16
|
-
const [arr, timeStamp] = [
|
|
16
|
+
const [arr, timeStamp] = [dStatic[type], Date.now()];
|
|
17
17
|
if (arr[0][0] > timeStamp - ms) {
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
20
|
},
|
|
21
21
|
weight(type, ms = 60 * 1000) {
|
|
22
|
-
if (!
|
|
22
|
+
if (!dStatic[type])
|
|
23
23
|
return 0;
|
|
24
|
-
const [arr, timeStamp] = [
|
|
24
|
+
const [arr, timeStamp] = [dStatic[type], Date.now()];
|
|
25
25
|
let [sum, i] = [0, arr.length - 1];
|
|
26
26
|
for (; i >= 0; i--) {
|
|
27
27
|
const [_time, _weight] = arr[i];
|
|
@@ -33,9 +33,9 @@ function funcTimeW() {
|
|
|
33
33
|
return sum;
|
|
34
34
|
},
|
|
35
35
|
byWeight(type, weight = 50000) {
|
|
36
|
-
if (!
|
|
36
|
+
if (!dStatic[type])
|
|
37
37
|
return 0;
|
|
38
|
-
const [arr, timeStamp] = [
|
|
38
|
+
const [arr, timeStamp] = [dStatic[type], Date.now()];
|
|
39
39
|
let [sum, i] = [0, arr.length - 1];
|
|
40
40
|
for (; i >= 0; i--) {
|
|
41
41
|
sum += arr[i][1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funcTimeWait.js","sourceRoot":"","sources":["../../src/Common/funcTimeWait.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"funcTimeWait.js","sourceRoot":"","sources":["../../src/Common/funcTimeWait.ts"],"names":[],"mappings":";;;AAYA,SAAgB,SAAS;IAGrB,MAAM,OAAO,GAAQ,EAAE,CAAA;IAEvB,MAAM,IAAI,GAAU,EAAE,CAAA;IACtB,OAAO;QACH,IAAI,EAAE,IAAI;QAEV,GAAG,CAAC,IAAW;YACX,IAAI,CAAC,OAAO,CAAE,IAAI,CAAC,IAAI,CAAE;gBAAE,OAAO,CAAE,IAAI,CAAC,IAAI,CAAE,GAAG,EAAE,CAAC;YACrD,IAAI,OAAO,CAAE,IAAI,CAAC,IAAI,CAAE;gBAAE,OAAO,CAAE,IAAI,CAAC,IAAI,CAAE,EAAE,IAAI,CAAC,CAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvG,CAAC;QACD,WAAW,CAAC,IAAW,EAAE,EAAE,GAAG,EAAE,GAAC,IAAI;YACjC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAE,OAAO,CAAE,IAAI,CAAE,EAAE,IAAI,CAAC,GAAG,EAAa,CAAC,CAAA;YAClE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,EAAE,EAAE;gBAC5B,OAAO;aACV;QAIL,CAAC;QAED,MAAM,CAAC,IAAW,EAAE,EAAE,GAAG,EAAE,GAAC,IAAI;YAC5B,IAAI,CAAC,OAAO,CAAE,IAAI,CAAE;gBAAE,OAAO,CAAC,CAAA;YAC9B,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAE,OAAO,CAAE,IAAI,CAAE,EAAE,IAAI,CAAC,GAAG,EAAa,CAAC,CAAA;YASlE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBAChB,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAQ,GAAG,CAAC,CAAC,CAAC,CAAA;gBACpC,IAAI,KAAK,GAAG,SAAS,GAAG,EAAE;oBAAE,MAAK;gBACjC,GAAG,IAAI,OAAO,CAAA;aACjB;YACD,GAAG,CAAC,MAAM,CAAC,CAAC,EAAC,CAAC,CAAC,CAAA;YACf,OAAO,GAAG,CAAA;QACd,CAAC;QAeD,QAAQ,CAAC,IAAW,EAAE,MAAM,GAAG,KAAK;YAChC,IAAI,CAAC,OAAO,CAAE,IAAI,CAAE;gBAAE,OAAO,CAAC,CAAA;YAC9B,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAE,OAAO,CAAE,IAAI,CAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;YACvD,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBAChB,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAChB,IAAI,GAAG,GAAG,MAAM;oBAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;aAC9C;YACD,OAAO,CAAC,CAAA;QACZ,CAAC;KACJ,CAAA;AACL,CAAC;AArED,8BAqEC;AAIY,QAAA,YAAY,GAAG,SAAS,EAAE,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { TF } from "../Common/Time";
|
|
3
|
-
import { CBar } from "./Bars";
|
|
3
|
+
import type { CBar } from "./Bars";
|
|
4
4
|
type RequestInfo = any;
|
|
5
5
|
type RequestInit = any;
|
|
6
6
|
type Response = any;
|
|
@@ -49,6 +49,7 @@ type tBinanceLoadBase<Bar> = {
|
|
|
49
49
|
time: TF;
|
|
50
50
|
name: string;
|
|
51
51
|
}[];
|
|
52
|
+
nameKey?: string;
|
|
52
53
|
};
|
|
53
54
|
export declare function LoadQuoteBase<Bar>(setting: tBinanceLoadBase<Bar>, data?: {
|
|
54
55
|
fetch?: tFetch3;
|
package/lib/Exchange/LoadBase.js
CHANGED
|
@@ -2,26 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LoadQuoteBase = void 0;
|
|
4
4
|
const Common_1 = require("../Common/Common");
|
|
5
|
+
const funcTimeWait_1 = require("../Common/funcTimeWait");
|
|
5
6
|
function LoadQuoteBase(setting, data) {
|
|
6
7
|
const { base, maxLoadBars, countConnect, intervalToName } = setting;
|
|
7
8
|
const maxLoadBars2 = setting.maxLoadBars2 ?? maxLoadBars;
|
|
8
9
|
const date = [Date.now()];
|
|
9
10
|
const startMap = new Map();
|
|
10
11
|
let count = 0;
|
|
12
|
+
const keyName = setting.nameKey ?? "loadKey";
|
|
13
|
+
const time = setting.time ?? 60000;
|
|
11
14
|
async function waitLimit() {
|
|
12
15
|
++count;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
break;
|
|
18
|
-
}
|
|
19
|
-
else if (date.length < countConnect - 2) {
|
|
20
|
-
date.push(Date.now());
|
|
21
|
-
break;
|
|
22
|
-
}
|
|
23
|
-
await (0, Common_1.sleepAsync)(1000);
|
|
24
|
-
}
|
|
16
|
+
const t1 = funcTimeWait_1.FuncTimeWait.byWeight(keyName, setting.maxLoadBars) - (Date.now() - time);
|
|
17
|
+
funcTimeWait_1.FuncTimeWait.add({ type: keyName, weight: 1 });
|
|
18
|
+
if (t1 > 0)
|
|
19
|
+
await (0, Common_1.sleepAsync)(t1);
|
|
25
20
|
--count;
|
|
26
21
|
}
|
|
27
22
|
function searchTF(info) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadBase.js","sourceRoot":"","sources":["../../src/Exchange/LoadBase.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;
|
|
1
|
+
{"version":3,"file":"LoadBase.js","sourceRoot":"","sources":["../../src/Exchange/LoadBase.ts"],"names":[],"mappings":"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"}
|
package/lib/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,0CAAwB;AACxB,gFAA8D"}
|