@solncebro/exchange-engine 0.1.2 → 0.2.0
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.
- package/CHANGELOG.md +25 -0
- package/dist/constants/binance.d.ts +4 -5
- package/dist/constants/binance.d.ts.map +1 -1
- package/dist/constants/binance.js +5 -21
- package/dist/constants/binance.js.map +1 -1
- package/dist/constants/bybit.d.ts +6 -6
- package/dist/constants/bybit.d.ts.map +1 -1
- package/dist/constants/bybit.js +7 -7
- package/dist/constants/bybit.js.map +1 -1
- package/dist/constants/mappings.d.ts +9 -0
- package/dist/constants/mappings.d.ts.map +1 -0
- package/dist/constants/mappings.js +40 -0
- package/dist/constants/mappings.js.map +1 -0
- package/dist/exchanges/BaseExchangeClient.d.ts +9 -8
- package/dist/exchanges/BaseExchangeClient.d.ts.map +1 -1
- package/dist/exchanges/BaseExchangeClient.js +26 -26
- package/dist/exchanges/BaseExchangeClient.js.map +1 -1
- package/dist/exchanges/BinanceBaseClient.d.ts +5 -5
- package/dist/exchanges/BinanceBaseClient.d.ts.map +1 -1
- package/dist/exchanges/BinanceBaseClient.js +7 -8
- package/dist/exchanges/BinanceBaseClient.js.map +1 -1
- package/dist/exchanges/BinanceFutures.d.ts +4 -2
- package/dist/exchanges/BinanceFutures.d.ts.map +1 -1
- package/dist/exchanges/BinanceFutures.js +12 -6
- package/dist/exchanges/BinanceFutures.js.map +1 -1
- package/dist/exchanges/BinanceSpot.d.ts +3 -1
- package/dist/exchanges/BinanceSpot.d.ts.map +1 -1
- package/dist/exchanges/BinanceSpot.js +5 -2
- package/dist/exchanges/BinanceSpot.js.map +1 -1
- package/dist/exchanges/BybitLinear.d.ts +8 -6
- package/dist/exchanges/BybitLinear.d.ts.map +1 -1
- package/dist/exchanges/BybitLinear.js +19 -15
- package/dist/exchanges/BybitLinear.js.map +1 -1
- package/dist/exchanges/BybitSpot.d.ts +7 -5
- package/dist/exchanges/BybitSpot.d.ts.map +1 -1
- package/dist/exchanges/BybitSpot.js +13 -9
- package/dist/exchanges/BybitSpot.js.map +1 -1
- package/dist/exchanges/Exchange.d.ts +1 -1
- package/dist/exchanges/Exchange.d.ts.map +1 -1
- package/dist/exchanges/Exchange.js +3 -2
- package/dist/exchanges/Exchange.js.map +1 -1
- package/dist/http/BaseHttpClient.d.ts.map +1 -1
- package/dist/http/BaseHttpClient.js.map +1 -1
- package/dist/http/BinanceBaseHttpClient.d.ts +7 -7
- package/dist/http/BinanceBaseHttpClient.d.ts.map +1 -1
- package/dist/http/BinanceBaseHttpClient.js.map +1 -1
- package/dist/http/BinanceFuturesHttpClient.d.ts +6 -6
- package/dist/http/BinanceFuturesHttpClient.d.ts.map +1 -1
- package/dist/http/BinanceFuturesHttpClient.js +2 -5
- package/dist/http/BinanceFuturesHttpClient.js.map +1 -1
- package/dist/http/BybitHttpClient.d.ts +14 -13
- package/dist/http/BybitHttpClient.d.ts.map +1 -1
- package/dist/http/BybitHttpClient.js.map +1 -1
- package/dist/index.d.ts +3 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -6
- package/dist/index.js.map +1 -1
- package/dist/normalizers/binanceNormalizer.d.ts +28 -19
- package/dist/normalizers/binanceNormalizer.d.ts.map +1 -1
- package/dist/normalizers/binanceNormalizer.js +47 -30
- package/dist/normalizers/binanceNormalizer.js.map +1 -1
- package/dist/normalizers/bybitNormalizer.d.ts +21 -21
- package/dist/normalizers/bybitNormalizer.d.ts.map +1 -1
- package/dist/normalizers/bybitNormalizer.js +39 -40
- package/dist/normalizers/bybitNormalizer.js.map +1 -1
- package/dist/precision/precision.d.ts +3 -3
- package/dist/precision/precision.d.ts.map +1 -1
- package/dist/precision/precision.js +4 -4
- package/dist/precision/precision.js.map +1 -1
- package/dist/types/common.d.ts +54 -21
- package/dist/types/common.d.ts.map +1 -1
- package/dist/types/common.js +40 -0
- package/dist/types/common.js.map +1 -1
- package/dist/types/exchange.d.ts +9 -7
- package/dist/types/exchange.d.ts.map +1 -1
- package/dist/types/index.d.ts +2 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/stream.d.ts +1 -2
- package/dist/types/stream.d.ts.map +1 -1
- package/dist/utils/httpParams.d.ts +2 -2
- package/dist/utils/httpParams.d.ts.map +1 -1
- package/dist/utils/httpParams.js.map +1 -1
- package/dist/ws/BinanceFuturesPublicStream.d.ts +4 -4
- package/dist/ws/BinanceFuturesPublicStream.d.ts.map +1 -1
- package/dist/ws/BinanceFuturesPublicStream.js +40 -41
- package/dist/ws/BinanceFuturesPublicStream.js.map +1 -1
- package/dist/ws/BinanceSpotPublicStream.d.ts +2 -2
- package/dist/ws/BinanceSpotPublicStream.d.ts.map +1 -1
- package/dist/ws/BinanceSpotPublicStream.js +15 -17
- package/dist/ws/BinanceSpotPublicStream.js.map +1 -1
- package/dist/ws/BinanceUserDataStream.d.ts +2 -2
- package/dist/ws/BinanceUserDataStream.d.ts.map +1 -1
- package/dist/ws/BinanceUserDataStream.js +3 -3
- package/dist/ws/BinanceUserDataStream.js.map +1 -1
- package/dist/ws/BybitPrivateStream.js +5 -5
- package/dist/ws/BybitPrivateStream.js.map +1 -1
- package/dist/ws/BybitPublicStream.d.ts.map +1 -1
- package/dist/ws/BybitPublicStream.js +9 -10
- package/dist/ws/BybitPublicStream.js.map +1 -1
- package/dist/ws/BybitTradeStream.d.ts.map +1 -1
- package/dist/ws/BybitTradeStream.js +12 -8
- package/dist/ws/BybitTradeStream.js.map +1 -1
- package/dist/ws/{binanceWsUtils.d.ts → binanceWebSocketUtils.d.ts} +1 -1
- package/dist/ws/binanceWebSocketUtils.d.ts.map +1 -0
- package/dist/ws/binanceWebSocketUtils.js +7 -0
- package/dist/ws/binanceWebSocketUtils.js.map +1 -0
- package/dist/ws/bybitWebSocketUtils.d.ts +28 -0
- package/dist/ws/bybitWebSocketUtils.d.ts.map +1 -0
- package/dist/ws/{bybitWsUtils.js → bybitWebSocketUtils.js} +3 -3
- package/dist/ws/bybitWebSocketUtils.js.map +1 -0
- package/package.json +6 -2
- package/dist/ws/binanceWsUtils.d.ts.map +0 -1
- package/dist/ws/binanceWsUtils.js +0 -13
- package/dist/ws/binanceWsUtils.js.map +0 -1
- package/dist/ws/bybitWsUtils.d.ts +0 -29
- package/dist/ws/bybitWsUtils.d.ts.map +0 -1
- package/dist/ws/bybitWsUtils.js.map +0 -1
|
@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BinanceFuturesPublicStream = void 0;
|
|
4
4
|
const websocket_engine_1 = require("@solncebro/websocket-engine");
|
|
5
5
|
const binanceNormalizer_1 = require("../normalizers/binanceNormalizer");
|
|
6
|
-
const
|
|
7
|
-
const binanceWsUtils_1 = require("./binanceWsUtils");
|
|
6
|
+
const binanceWebSocketUtils_1 = require("./binanceWebSocketUtils");
|
|
8
7
|
const MAX_STREAMS_PER_CONNECTION = 200;
|
|
9
8
|
function parseBinanceCombinedMessage(rawData) {
|
|
10
9
|
return JSON.parse(rawData.toString());
|
|
@@ -15,22 +14,22 @@ function buildKlineStreamList(klineHandlerByKey) {
|
|
|
15
14
|
const separatorIndex = key.lastIndexOf('_');
|
|
16
15
|
const symbol = key.slice(0, separatorIndex);
|
|
17
16
|
const interval = key.slice(separatorIndex + 1);
|
|
18
|
-
const binanceInterval =
|
|
17
|
+
const binanceInterval = interval;
|
|
19
18
|
streamList.push(`${symbol.toLowerCase()}_perpetual@continuousKline_${binanceInterval}`);
|
|
20
19
|
}
|
|
21
20
|
return streamList;
|
|
22
21
|
}
|
|
23
22
|
class BinanceFuturesPublicStream {
|
|
24
|
-
|
|
23
|
+
webSocketCombinedUrl;
|
|
25
24
|
logger;
|
|
26
25
|
onNotify;
|
|
27
26
|
tickerHandlerSet = new Set();
|
|
28
27
|
klineHandlerByKey = new Map();
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
connectionList = [];
|
|
29
|
+
isConnectScheduled = false;
|
|
31
30
|
subscriptionIdCounter = 1;
|
|
32
|
-
constructor(
|
|
33
|
-
this.
|
|
31
|
+
constructor(webSocketCombinedUrl, logger, onNotify) {
|
|
32
|
+
this.webSocketCombinedUrl = webSocketCombinedUrl;
|
|
34
33
|
this.logger = logger;
|
|
35
34
|
this.onNotify = onNotify;
|
|
36
35
|
}
|
|
@@ -43,12 +42,11 @@ class BinanceFuturesPublicStream {
|
|
|
43
42
|
}
|
|
44
43
|
subscribeKlines(symbol, interval, handler) {
|
|
45
44
|
const key = `${symbol}_${interval}`;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
this.
|
|
50
|
-
|
|
51
|
-
const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
|
|
45
|
+
const handlerSet = this.klineHandlerByKey.get(key) ?? new Set();
|
|
46
|
+
handlerSet.add(handler);
|
|
47
|
+
this.klineHandlerByKey.set(key, handlerSet);
|
|
48
|
+
if (this.connectionList.length > 0) {
|
|
49
|
+
const binanceInterval = interval;
|
|
52
50
|
const stream = `${symbol.toLowerCase()}_perpetual@continuousKline_${binanceInterval}`;
|
|
53
51
|
this.addStreamToConnection(stream);
|
|
54
52
|
}
|
|
@@ -65,45 +63,44 @@ class BinanceFuturesPublicStream {
|
|
|
65
63
|
handlerSet.delete(handler);
|
|
66
64
|
if (handlerSet.size === 0) {
|
|
67
65
|
this.klineHandlerByKey.delete(key);
|
|
68
|
-
const binanceInterval =
|
|
66
|
+
const binanceInterval = interval;
|
|
69
67
|
const stream = `${symbol.toLowerCase()}_perpetual@continuousKline_${binanceInterval}`;
|
|
70
68
|
this.removeStreamFromConnection(stream);
|
|
71
69
|
}
|
|
72
70
|
}
|
|
73
71
|
close() {
|
|
74
|
-
for (const connection of this.
|
|
72
|
+
for (const connection of this.connectionList) {
|
|
75
73
|
connection.webSocket.close();
|
|
76
74
|
}
|
|
77
|
-
this.
|
|
75
|
+
this.connectionList.length = 0;
|
|
78
76
|
}
|
|
79
77
|
scheduleConnect() {
|
|
80
|
-
if (this.
|
|
78
|
+
if (this.isConnectScheduled || this.connectionList.length > 0) {
|
|
81
79
|
return;
|
|
82
80
|
}
|
|
83
|
-
this.
|
|
81
|
+
this.isConnectScheduled = true;
|
|
84
82
|
queueMicrotask(() => {
|
|
85
|
-
this.
|
|
83
|
+
this.isConnectScheduled = false;
|
|
86
84
|
this.createConnections();
|
|
87
85
|
});
|
|
88
86
|
}
|
|
89
87
|
createConnections() {
|
|
90
|
-
const
|
|
91
|
-
const
|
|
92
|
-
const
|
|
93
|
-
if (
|
|
88
|
+
const tickerStreamList = this.tickerHandlerSet.size > 0 ? ['!miniTicker@arr'] : [];
|
|
89
|
+
const klineStreamList = buildKlineStreamList(this.klineHandlerByKey);
|
|
90
|
+
const allStreamList = [...tickerStreamList, ...klineStreamList];
|
|
91
|
+
if (allStreamList.length === 0) {
|
|
94
92
|
return;
|
|
95
93
|
}
|
|
96
|
-
for (let i = 0; i <
|
|
97
|
-
const
|
|
98
|
-
this.createConnection(
|
|
94
|
+
for (let i = 0; i < allStreamList.length; i += MAX_STREAMS_PER_CONNECTION) {
|
|
95
|
+
const streamChunk = allStreamList.slice(i, i + MAX_STREAMS_PER_CONNECTION);
|
|
96
|
+
this.createConnection(streamChunk, this.connectionList.length);
|
|
99
97
|
}
|
|
100
|
-
this.logger.info(`BinanceFuturesPublicStream: created ${this.
|
|
98
|
+
this.logger.info(`BinanceFuturesPublicStream: created ${this.connectionList.length} connection(s) for ${allStreamList.length} streams`);
|
|
101
99
|
}
|
|
102
|
-
createConnection(
|
|
100
|
+
createConnection(streamList, index) {
|
|
103
101
|
const label = `BinanceFuturesPublicStream-${index}`;
|
|
104
|
-
const url = `${this.
|
|
105
|
-
const
|
|
106
|
-
connection.webSocket = new websocket_engine_1.ReliableWebSocket({
|
|
102
|
+
const url = `${this.webSocketCombinedUrl}?streams=${streamList.join('/')}`;
|
|
103
|
+
const webSocket = new websocket_engine_1.ReliableWebSocket({
|
|
107
104
|
label,
|
|
108
105
|
url,
|
|
109
106
|
logger: this.logger,
|
|
@@ -114,15 +111,15 @@ class BinanceFuturesPublicStream {
|
|
|
114
111
|
pingInterval: 30000,
|
|
115
112
|
},
|
|
116
113
|
});
|
|
117
|
-
this.
|
|
114
|
+
this.connectionList.push({ webSocket, label, streamList });
|
|
118
115
|
}
|
|
119
116
|
addStreamToConnection(stream) {
|
|
120
|
-
let targetConnection = this.
|
|
117
|
+
let targetConnection = this.connectionList.find((connection) => connection.streamList.length < MAX_STREAMS_PER_CONNECTION);
|
|
121
118
|
if (!targetConnection) {
|
|
122
|
-
this.createConnection([stream], this.
|
|
119
|
+
this.createConnection([stream], this.connectionList.length);
|
|
123
120
|
return;
|
|
124
121
|
}
|
|
125
|
-
targetConnection.
|
|
122
|
+
targetConnection.streamList.push(stream);
|
|
126
123
|
try {
|
|
127
124
|
targetConnection.webSocket.sendToConnectedSocket({
|
|
128
125
|
method: 'SUBSCRIBE',
|
|
@@ -131,13 +128,14 @@ class BinanceFuturesPublicStream {
|
|
|
131
128
|
});
|
|
132
129
|
}
|
|
133
130
|
catch {
|
|
131
|
+
this.logger.warn('BinanceFuturesPublicStream: failed to subscribe, socket not connected');
|
|
134
132
|
}
|
|
135
133
|
}
|
|
136
134
|
removeStreamFromConnection(stream) {
|
|
137
|
-
for (const connection of this.
|
|
138
|
-
const index = connection.
|
|
135
|
+
for (const connection of this.connectionList) {
|
|
136
|
+
const index = connection.streamList.indexOf(stream);
|
|
139
137
|
if (index !== -1) {
|
|
140
|
-
connection.
|
|
138
|
+
connection.streamList.splice(index, 1);
|
|
141
139
|
try {
|
|
142
140
|
connection.webSocket.sendToConnectedSocket({
|
|
143
141
|
method: 'UNSUBSCRIBE',
|
|
@@ -146,6 +144,7 @@ class BinanceFuturesPublicStream {
|
|
|
146
144
|
});
|
|
147
145
|
}
|
|
148
146
|
catch {
|
|
147
|
+
this.logger.warn('BinanceFuturesPublicStream: failed to unsubscribe, socket not connected');
|
|
149
148
|
}
|
|
150
149
|
break;
|
|
151
150
|
}
|
|
@@ -167,12 +166,12 @@ class BinanceFuturesPublicStream {
|
|
|
167
166
|
if (!klineRaw) {
|
|
168
167
|
return;
|
|
169
168
|
}
|
|
170
|
-
const kline = (0, binanceNormalizer_1.
|
|
169
|
+
const kline = (0, binanceNormalizer_1.normalizeBinanceKlineWebSocketMessage)(klineRaw);
|
|
171
170
|
const continuousKlineIndex = message.stream.indexOf('@continuousKline_');
|
|
172
171
|
const symbolLower = message.stream.slice(0, continuousKlineIndex).replace(/_perpetual$/, '');
|
|
173
172
|
const symbol = symbolLower.toUpperCase();
|
|
174
173
|
const binanceInterval = message.stream.slice(continuousKlineIndex + '@continuousKline_'.length);
|
|
175
|
-
const unifiedInterval = (0,
|
|
174
|
+
const unifiedInterval = (0, binanceWebSocketUtils_1.resolveUnifiedBinanceInterval)(binanceInterval);
|
|
176
175
|
const key = `${symbol}_${unifiedInterval}`;
|
|
177
176
|
const handlerSet = this.klineHandlerByKey.get(key);
|
|
178
177
|
if (handlerSet) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinanceFuturesPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,
|
|
1
|
+
{"version":3,"file":"BinanceFuturesPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,wEAAkH;AAElH,mEAAwE;AAExE,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAavC,SAAS,2BAA2B,CAAC,OAAgB;IACnD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAA2B,CAAC;AAClE,CAAC;AAED,SAAS,oBAAoB,CAAC,iBAAiD;IAC7E,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,KAAK,MAAM,GAAG,IAAI,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QAC/C,MAAM,eAAe,GAAG,QAAQ,CAAC;QACjC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,8BAA8B,eAAe,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,0BAA0B;IACb,oBAAoB,CAAS;IAC7B,MAAM,CAAiB;IACvB,QAAQ,CAA6C;IACrD,gBAAgB,GAA2C,IAAI,GAAG,EAAE,CAAC;IACrE,iBAAiB,GAAmC,IAAI,GAAG,EAAE,CAAC;IAC9D,cAAc,GAAwB,EAAE,CAAC;IAClD,kBAAkB,GAAG,KAAK,CAAC;IAC3B,qBAAqB,GAAG,CAAC,CAAC;IAElC,YAAY,oBAA4B,EAAE,MAAsB,EAAE,QAAoD;QACpH,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,mBAAmB,CAAC,OAA0C;QAC5D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,qBAAqB,CAAC,OAA0C;QAC9D,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,eAAe,CAAC,MAAc,EAAE,QAAuB,EAAE,OAAqB;QAC5E,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;QAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,EAAgB,CAAC;QAC9E,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAE5C,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,eAAe,GAAG,QAAQ,CAAC;YACjC,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,8BAA8B,eAAe,EAAE,CAAC;YACtF,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,MAAc,EAAE,QAAuB,EAAE,OAAqB;QAC9E,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3B,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAEnC,MAAM,eAAe,GAAG,QAAQ,CAAC;YACjC,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,8BAA8B,eAAe,EAAE,CAAC;YACtF,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,KAAK;QACH,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC7C,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IACjC,CAAC;IAEO,eAAe;QACrB,IAAI,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAE/B,cAAc,CAAC,GAAG,EAAE;YAClB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;YAChC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB;QACvB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,MAAM,eAAe,GAAG,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACrE,MAAM,aAAa,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,eAAe,CAAC,CAAC;QAEhE,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,0BAA0B,EAAE,CAAC;YAC1E,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,0BAA0B,CAAC,CAAC;YAC3E,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,uCAAuC,IAAI,CAAC,cAAc,CAAC,MAAM,sBAAsB,aAAa,CAAC,MAAM,UAAU,CACtH,CAAC;IACJ,CAAC;IAEO,gBAAgB,CAAC,UAAoB,EAAE,KAAa;QAC1D,MAAM,KAAK,GAAG,8BAA8B,KAAK,EAAE,CAAC;QACpD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,oBAAoB,YAAY,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3E,MAAM,SAAS,GAAG,IAAI,oCAAiB,CAAyB;YAC9D,KAAK;YACL,GAAG;YACH,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,2BAA2B;YACzC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACnD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE;gBACb,YAAY,EAAE,KAAK;aACpB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEO,qBAAqB,CAAC,MAAc;QAC1C,IAAI,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAC7C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,0BAA0B,CAC1E,CAAC;QAEF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC5D,OAAO;QACT,CAAC;QAED,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,CAAC;YACH,gBAAgB,CAAC,SAAS,CAAC,qBAAqB,CAAC;gBAC/C,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,CAAC,MAAM,CAAC;gBAChB,EAAE,EAAE,IAAI,CAAC,qBAAqB,EAAE;aACjC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAEO,0BAA0B,CAAC,MAAc;QAC/C,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEpD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjB,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAEvC,IAAI,CAAC;oBACH,UAAU,CAAC,SAAS,CAAC,qBAAqB,CAAC;wBACzC,MAAM,EAAE,aAAa;wBACrB,MAAM,EAAE,CAAC,MAAM,CAAC;wBAChB,EAAE,EAAE,IAAI,CAAC,qBAAqB,EAAE;qBACjC,CAAC,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;gBAC9F,CAAC;gBAED,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,OAA+B;QACnD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,IAAA,2CAAuB,EAAC,OAAO,CAAC,IAA8B,CAAC,CAAC;YAEhF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC5C,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC;YAED,OAAO;QACT,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnE,MAAM,QAAQ,GAAI,OAAO,CAAC,IAAgC,CAAC,GAAG,CAA6B,CAAC;YAE5F,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,yDAAqC,EAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACzE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;YAC7F,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAChG,MAAM,eAAe,GAAG,IAAA,qDAA6B,EAAC,eAAe,CAAC,CAAC;YACvE,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,eAAe,EAAE,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAEnD,IAAI,UAAU,EAAE,CAAC;gBACf,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE,CAAC;oBACjC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAEQ,gEAA0B"}
|
|
@@ -2,13 +2,13 @@ import type { ExchangeLogger, KlineInterval, TickerBySymbol } from '../types/com
|
|
|
2
2
|
import type { KlineHandler } from '../types/exchange';
|
|
3
3
|
declare class BinanceSpotPublicStream {
|
|
4
4
|
private webSocket;
|
|
5
|
-
private readonly
|
|
5
|
+
private readonly webSocketUrl;
|
|
6
6
|
private readonly logger;
|
|
7
7
|
private readonly onNotify?;
|
|
8
8
|
private readonly tickerHandlerSet;
|
|
9
9
|
private readonly klineHandlerByKey;
|
|
10
10
|
private subscriptionIdCounter;
|
|
11
|
-
constructor(
|
|
11
|
+
constructor(webSocketUrl: string, logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
|
|
12
12
|
subscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
|
|
13
13
|
unsubscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
|
|
14
14
|
subscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinanceSpotPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"BinanceSpotPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAgBtD,cAAM,uBAAuB;IAC3B,OAAO,CAAC,SAAS,CAAgE;IACjF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;IAC/E,OAAO,CAAC,qBAAqB,CAAK;gBAEtB,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9G,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAKrE,qBAAqB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAIvE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAgBrF,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAqBvF,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;YAwBT,UAAU;IAKxB,OAAO,CAAC,aAAa;IA8BrB,OAAO,CAAC,qBAAqB;IA4B7B,OAAO,CAAC,cAAc;IAoBtB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,eAAe;CAWxB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
|
|
@@ -3,21 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BinanceSpotPublicStream = void 0;
|
|
4
4
|
const websocket_engine_1 = require("@solncebro/websocket-engine");
|
|
5
5
|
const binanceNormalizer_1 = require("../normalizers/binanceNormalizer");
|
|
6
|
-
const
|
|
7
|
-
const binanceWsUtils_1 = require("./binanceWsUtils");
|
|
6
|
+
const binanceWebSocketUtils_1 = require("./binanceWebSocketUtils");
|
|
8
7
|
function parseBinanceSpotMessage(rawData) {
|
|
9
8
|
return JSON.parse(rawData.toString());
|
|
10
9
|
}
|
|
11
10
|
class BinanceSpotPublicStream {
|
|
12
11
|
webSocket = null;
|
|
13
|
-
|
|
12
|
+
webSocketUrl;
|
|
14
13
|
logger;
|
|
15
14
|
onNotify;
|
|
16
15
|
tickerHandlerSet = new Set();
|
|
17
16
|
klineHandlerByKey = new Map();
|
|
18
17
|
subscriptionIdCounter = 1;
|
|
19
|
-
constructor(
|
|
20
|
-
this.
|
|
18
|
+
constructor(webSocketUrl, logger, onNotify) {
|
|
19
|
+
this.webSocketUrl = webSocketUrl;
|
|
21
20
|
this.logger = logger;
|
|
22
21
|
this.onNotify = onNotify;
|
|
23
22
|
}
|
|
@@ -30,12 +29,11 @@ class BinanceSpotPublicStream {
|
|
|
30
29
|
}
|
|
31
30
|
subscribeKlines(symbol, interval, handler) {
|
|
32
31
|
const key = `${symbol}_${interval}`;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
this.klineHandlerByKey.get(key).add(handler);
|
|
32
|
+
const handlerSet = this.klineHandlerByKey.get(key) ?? new Set();
|
|
33
|
+
handlerSet.add(handler);
|
|
34
|
+
this.klineHandlerByKey.set(key, handlerSet);
|
|
37
35
|
if (this.webSocket !== null) {
|
|
38
|
-
const binanceInterval =
|
|
36
|
+
const binanceInterval = interval;
|
|
39
37
|
const stream = `${symbol.toLowerCase()}@kline_${binanceInterval}`;
|
|
40
38
|
this.sendSubscribe([stream]);
|
|
41
39
|
}
|
|
@@ -53,7 +51,7 @@ class BinanceSpotPublicStream {
|
|
|
53
51
|
if (handlerSet.size === 0) {
|
|
54
52
|
this.klineHandlerByKey.delete(key);
|
|
55
53
|
if (this.webSocket !== null) {
|
|
56
|
-
const binanceInterval =
|
|
54
|
+
const binanceInterval = interval;
|
|
57
55
|
const stream = `${symbol.toLowerCase()}@kline_${binanceInterval}`;
|
|
58
56
|
this.sendUnsubscribe([stream]);
|
|
59
57
|
}
|
|
@@ -71,7 +69,7 @@ class BinanceSpotPublicStream {
|
|
|
71
69
|
}
|
|
72
70
|
this.webSocket = new websocket_engine_1.ReliableWebSocket({
|
|
73
71
|
label: 'BinanceSpotPublicStream',
|
|
74
|
-
url: this.
|
|
72
|
+
url: this.webSocketUrl,
|
|
75
73
|
logger: this.logger,
|
|
76
74
|
parseMessage: parseBinanceSpotMessage,
|
|
77
75
|
onMessage: (message) => this.handleMessage(message),
|
|
@@ -122,12 +120,12 @@ class BinanceSpotPublicStream {
|
|
|
122
120
|
if (!klineRaw) {
|
|
123
121
|
return;
|
|
124
122
|
}
|
|
125
|
-
const kline = (0, binanceNormalizer_1.
|
|
123
|
+
const kline = (0, binanceNormalizer_1.normalizeBinanceKlineWebSocketMessage)(klineRaw);
|
|
126
124
|
const atIndex = stream.indexOf('@kline_');
|
|
127
125
|
const symbolLower = stream.slice(0, atIndex);
|
|
128
126
|
const binanceInterval = stream.slice(atIndex + '@kline_'.length);
|
|
129
127
|
const symbol = symbolLower.toUpperCase();
|
|
130
|
-
const unifiedInterval = (0,
|
|
128
|
+
const unifiedInterval = (0, binanceWebSocketUtils_1.resolveUnifiedBinanceInterval)(binanceInterval);
|
|
131
129
|
const key = `${symbol}_${unifiedInterval}`;
|
|
132
130
|
const handlerSet = this.klineHandlerByKey.get(key);
|
|
133
131
|
if (handlerSet) {
|
|
@@ -145,7 +143,7 @@ class BinanceSpotPublicStream {
|
|
|
145
143
|
const separatorIndex = key.lastIndexOf('_');
|
|
146
144
|
const symbol = key.slice(0, separatorIndex);
|
|
147
145
|
const interval = key.slice(separatorIndex + 1);
|
|
148
|
-
const binanceInterval =
|
|
146
|
+
const binanceInterval = interval;
|
|
149
147
|
streamList.push(`${symbol.toLowerCase()}@kline_${binanceInterval}`);
|
|
150
148
|
}
|
|
151
149
|
if (streamList.length > 0) {
|
|
@@ -154,7 +152,7 @@ class BinanceSpotPublicStream {
|
|
|
154
152
|
}
|
|
155
153
|
sendSubscribe(streamList) {
|
|
156
154
|
try {
|
|
157
|
-
this.webSocket
|
|
155
|
+
this.webSocket?.sendToConnectedSocket({
|
|
158
156
|
method: 'SUBSCRIBE',
|
|
159
157
|
params: streamList,
|
|
160
158
|
id: this.subscriptionIdCounter++,
|
|
@@ -166,7 +164,7 @@ class BinanceSpotPublicStream {
|
|
|
166
164
|
}
|
|
167
165
|
sendUnsubscribe(streamList) {
|
|
168
166
|
try {
|
|
169
|
-
this.webSocket
|
|
167
|
+
this.webSocket?.sendToConnectedSocket({
|
|
170
168
|
method: 'UNSUBSCRIBE',
|
|
171
169
|
params: streamList,
|
|
172
170
|
id: this.subscriptionIdCounter++,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinanceSpotPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAKhE,
|
|
1
|
+
{"version":3,"file":"BinanceSpotPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ExchangeLogger } from '../types/common';
|
|
2
2
|
interface BinanceUserDataStreamArgs {
|
|
3
3
|
listenKey: string;
|
|
4
|
-
|
|
4
|
+
baseWebSocketUrl: string;
|
|
5
5
|
logger: ExchangeLogger;
|
|
6
6
|
onNotify?: (message: string) => void | Promise<void>;
|
|
7
7
|
onMessage: (event: Record<string, unknown>) => void;
|
|
@@ -10,7 +10,7 @@ declare class BinanceUserDataStream {
|
|
|
10
10
|
private webSocket;
|
|
11
11
|
private readonly logger;
|
|
12
12
|
private readonly listenKey;
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly baseWebSocketUrl;
|
|
14
14
|
private readonly onNotify?;
|
|
15
15
|
private readonly onMessageHandler;
|
|
16
16
|
constructor(args: BinanceUserDataStreamArgs);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinanceUserDataStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceUserDataStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,yBAAyB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"BinanceUserDataStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceUserDataStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,yBAAyB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACrD;AAMD,cAAM,qBAAqB;IACzB,OAAO,CAAC,SAAS,CAA2D;IAC5E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2C;gBAEhE,IAAI,EAAE,yBAAyB;IAQ3C,OAAO,IAAI,IAAI;IAmBf,KAAK,IAAI,IAAI;IAOb,WAAW,IAAI,OAAO;CAGvB;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,YAAY,EAAE,yBAAyB,EAAE,CAAC"}
|
|
@@ -9,13 +9,13 @@ class BinanceUserDataStream {
|
|
|
9
9
|
webSocket = null;
|
|
10
10
|
logger;
|
|
11
11
|
listenKey;
|
|
12
|
-
|
|
12
|
+
baseWebSocketUrl;
|
|
13
13
|
onNotify;
|
|
14
14
|
onMessageHandler;
|
|
15
15
|
constructor(args) {
|
|
16
16
|
this.logger = args.logger;
|
|
17
17
|
this.listenKey = args.listenKey;
|
|
18
|
-
this.
|
|
18
|
+
this.baseWebSocketUrl = args.baseWebSocketUrl;
|
|
19
19
|
this.onNotify = args.onNotify;
|
|
20
20
|
this.onMessageHandler = args.onMessage;
|
|
21
21
|
}
|
|
@@ -23,7 +23,7 @@ class BinanceUserDataStream {
|
|
|
23
23
|
if (this.webSocket !== null) {
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
26
|
-
const url = `${this.
|
|
26
|
+
const url = `${this.baseWebSocketUrl}/${this.listenKey}`;
|
|
27
27
|
this.webSocket = new websocket_engine_1.ReliableWebSocket({
|
|
28
28
|
label: 'BinanceUserDataStream',
|
|
29
29
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinanceUserDataStream.js","sourceRoot":"","sources":["../../src/ws/BinanceUserDataStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAYhE,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAA4B,CAAC;AACnE,CAAC;AAED,MAAM,qBAAqB;IACjB,SAAS,GAAsD,IAAI,CAAC;IAC3D,MAAM,CAAiB;IACvB,SAAS,CAAS;IAClB,
|
|
1
|
+
{"version":3,"file":"BinanceUserDataStream.js","sourceRoot":"","sources":["../../src/ws/BinanceUserDataStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAYhE,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAA4B,CAAC;AACnE,CAAC;AAED,MAAM,qBAAqB;IACjB,SAAS,GAAsD,IAAI,CAAC;IAC3D,MAAM,CAAiB;IACvB,SAAS,CAAS;IAClB,gBAAgB,CAAS;IACzB,QAAQ,CAA6C;IACrD,gBAAgB,CAA2C;IAE5E,YAAY,IAA+B;QACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC;IACzC,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAEzD,IAAI,CAAC,SAAS,GAAG,IAAI,oCAAiB,CAA0B;YAC9D,KAAK,EAAE,uBAAuB;YAC9B,GAAG;YACH,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,oBAAoB;YAClC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACtD,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACxF,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC;IACjC,CAAC;CACF;AAEQ,sDAAqB"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BybitPrivateStream = void 0;
|
|
4
4
|
const websocket_engine_1 = require("@solncebro/websocket-engine");
|
|
5
5
|
const bybit_1 = require("../constants/bybit");
|
|
6
|
-
const
|
|
6
|
+
const bybitWebSocketUtils_1 = require("./bybitWebSocketUtils");
|
|
7
7
|
function parseBybitPrivateMessage(rawData) {
|
|
8
8
|
return JSON.parse(rawData.toString());
|
|
9
9
|
}
|
|
@@ -27,15 +27,15 @@ class BybitPrivateStream {
|
|
|
27
27
|
}
|
|
28
28
|
this.webSocket = new websocket_engine_1.ReliableWebSocket({
|
|
29
29
|
label: 'BybitPrivateStream',
|
|
30
|
-
url: bybit_1.
|
|
30
|
+
url: bybit_1.BYBIT_PRIVATE_WEBSOCKET_URL,
|
|
31
31
|
logger: this.logger,
|
|
32
32
|
parseMessage: parseBybitPrivateMessage,
|
|
33
33
|
onMessage: (message) => this.handleMessage(message),
|
|
34
34
|
onOpen: (context) => this.authenticate(context),
|
|
35
35
|
onNotify: this.onNotify,
|
|
36
|
-
heartbeat:
|
|
36
|
+
heartbeat: bybitWebSocketUtils_1.BYBIT_HEARTBEAT_CONFIG,
|
|
37
37
|
configuration: {
|
|
38
|
-
pingInterval:
|
|
38
|
+
pingInterval: bybitWebSocketUtils_1.BYBIT_PING_INTERVAL,
|
|
39
39
|
},
|
|
40
40
|
});
|
|
41
41
|
}
|
|
@@ -49,7 +49,7 @@ class BybitPrivateStream {
|
|
|
49
49
|
return this.webSocket !== null;
|
|
50
50
|
}
|
|
51
51
|
async authenticate(context) {
|
|
52
|
-
await (0,
|
|
52
|
+
await (0, bybitWebSocketUtils_1.authenticateBybitWebSocket)({ context, apiKey: this.apiKey, secret: this.secret, label: 'BybitPrivateStream', logger: this.logger });
|
|
53
53
|
}
|
|
54
54
|
handleMessage(message) {
|
|
55
55
|
if (message.op === 'auth') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BybitPrivateStream.js","sourceRoot":"","sources":["../../src/ws/BybitPrivateStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,
|
|
1
|
+
{"version":3,"file":"BybitPrivateStream.js","sourceRoot":"","sources":["../../src/ws/BybitPrivateStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,8CAAiE;AACjE,+DAI+B;AAe/B,SAAS,wBAAwB,CAAC,OAAgB;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAwB,CAAC;AAC/D,CAAC;AAED,MAAM,kBAAkB;IACd,SAAS,GAAkD,IAAI,CAAC;IACvD,MAAM,CAAiB;IACvB,MAAM,CAAS;IACf,MAAM,CAAS;IACf,QAAQ,CAA6C;IACrD,gBAAgB,CAA2C;IAE5E,YAAY,IAA4B;QACtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC;IACzC,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,oCAAiB,CAAsB;YAC1D,KAAK,EAAE,oBAAoB;YAC3B,GAAG,EAAE,mCAA2B;YAChC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,wBAAwB;YACtC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACnD,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,4CAAsB;YACjC,aAAa,EAAE;gBACb,YAAY,EAAE,yCAAmB;aAClC;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAkD;QAC3E,MAAM,IAAA,gDAA0B,EAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5I,CAAC;IAEO,aAAa,CAAC,OAA4B;QAChD,IAAI,OAAO,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,OAAkC,CAAC,CAAC;IAC5D,CAAC;CACF;AAEQ,gDAAkB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BybitPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitPublicStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"BybitPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitPublicStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AA0BtD,cAAM,iBAAiB;IACrB,OAAO,CAAC,SAAS,CAAyD;IAC1E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqD;IACtF,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;IAC/E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0B;gBAEpD,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrG,mBAAmB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IAOrE,qBAAqB,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,GAAG,IAAI;IASvE,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAkBrF,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI;IAuBvF,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,aAAa;IAgCrB,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,kBAAkB;CAG3B;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.BybitPublicStream = void 0;
|
|
|
4
4
|
const websocket_engine_1 = require("@solncebro/websocket-engine");
|
|
5
5
|
const bybitNormalizer_1 = require("../normalizers/bybitNormalizer");
|
|
6
6
|
const bybit_1 = require("../constants/bybit");
|
|
7
|
-
const
|
|
7
|
+
const bybitWebSocketUtils_1 = require("./bybitWebSocketUtils");
|
|
8
8
|
function parseBybitMessage(rawData) {
|
|
9
9
|
return JSON.parse(rawData.toString());
|
|
10
10
|
}
|
|
@@ -44,10 +44,9 @@ class BybitPublicStream {
|
|
|
44
44
|
}
|
|
45
45
|
subscribeKlines(symbol, interval, handler) {
|
|
46
46
|
const key = `${symbol}_${interval}`;
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
this.klineHandlerByKey.get(key).add(handler);
|
|
47
|
+
const handlerSet = this.klineHandlerByKey.get(key) ?? new Set();
|
|
48
|
+
handlerSet.add(handler);
|
|
49
|
+
this.klineHandlerByKey.set(key, handlerSet);
|
|
51
50
|
const bybitInterval = bybit_1.BYBIT_KLINE_INTERVAL[interval];
|
|
52
51
|
const topic = `kline.${bybitInterval}.${symbol}`;
|
|
53
52
|
this.activeSubscriptionSet.add(topic);
|
|
@@ -93,9 +92,9 @@ class BybitPublicStream {
|
|
|
93
92
|
onMessage: (message) => this.handleMessage(message),
|
|
94
93
|
onReconnectSuccess: () => this.resubscribeAll(),
|
|
95
94
|
onNotify: this.onNotify,
|
|
96
|
-
heartbeat:
|
|
95
|
+
heartbeat: bybitWebSocketUtils_1.BYBIT_HEARTBEAT_CONFIG,
|
|
97
96
|
configuration: {
|
|
98
|
-
pingInterval:
|
|
97
|
+
pingInterval: bybitWebSocketUtils_1.BYBIT_PING_INTERVAL,
|
|
99
98
|
},
|
|
100
99
|
});
|
|
101
100
|
this.resubscribeAll();
|
|
@@ -138,7 +137,7 @@ class BybitPublicStream {
|
|
|
138
137
|
if (!handlerSet || dataList.length === 0) {
|
|
139
138
|
return;
|
|
140
139
|
}
|
|
141
|
-
const kline = (0, bybitNormalizer_1.
|
|
140
|
+
const kline = (0, bybitNormalizer_1.normalizeBybitKlineWebSocketMessage)(dataList[0]);
|
|
142
141
|
for (const handler of handlerSet) {
|
|
143
142
|
handler(symbol, kline);
|
|
144
143
|
}
|
|
@@ -151,7 +150,7 @@ class BybitPublicStream {
|
|
|
151
150
|
}
|
|
152
151
|
sendSubscribe(topicList) {
|
|
153
152
|
try {
|
|
154
|
-
this.webSocket
|
|
153
|
+
this.webSocket?.sendToConnectedSocket({ op: 'subscribe', args: topicList });
|
|
155
154
|
}
|
|
156
155
|
catch {
|
|
157
156
|
this.logger.warn('BybitPublicStream: failed to subscribe, socket not connected');
|
|
@@ -159,7 +158,7 @@ class BybitPublicStream {
|
|
|
159
158
|
}
|
|
160
159
|
sendUnsubscribe(topicList) {
|
|
161
160
|
try {
|
|
162
|
-
this.webSocket
|
|
161
|
+
this.webSocket?.sendToConnectedSocket({ op: 'unsubscribe', args: topicList });
|
|
163
162
|
}
|
|
164
163
|
catch {
|
|
165
164
|
this.logger.warn('BybitPublicStream: failed to unsubscribe, socket not connected');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BybitPublicStream.js","sourceRoot":"","sources":["../../src/ws/BybitPublicStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,
|
|
1
|
+
{"version":3,"file":"BybitPublicStream.js","sourceRoot":"","sources":["../../src/ws/BybitPublicStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,oEAA4G;AAE5G,8CAA0D;AAC1D,+DAAoF;AAQpF,SAAS,iBAAiB,CAAC,OAAgB;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAA0B,CAAC;AACjE,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,4BAAoB,CAAC,EAAE,CAAC;QACpE,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;YAC5B,OAAO,OAAwB,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,iBAAiB;IACb,SAAS,GAAoD,IAAI,CAAC;IACzD,GAAG,CAAS;IACZ,MAAM,CAAiB;IACvB,QAAQ,CAA6C;IACrD,gBAAgB,GAA2C,IAAI,GAAG,EAAE,CAAC;IACrE,iBAAiB,GAAmC,IAAI,GAAG,EAAE,CAAC;IAC9D,qBAAqB,GAAgB,IAAI,GAAG,EAAE,CAAC;IAEhE,YAAY,GAAW,EAAE,MAAsB,EAAE,QAAoD;QACnG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,mBAAmB,CAAC,OAA0C;QAC5D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED,qBAAqB,CAAC,OAA0C;QAC9D,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxC,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,eAAe,CAAC,MAAc,EAAE,QAAuB,EAAE,OAAqB;QAC5E,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;QAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,EAAgB,CAAC;QAC9E,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAE5C,MAAM,aAAa,GAAG,4BAAoB,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,SAAS,aAAa,IAAI,MAAM,EAAE,CAAC;QACjD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEtC,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,iBAAiB,CAAC,MAAc,EAAE,QAAuB,EAAE,OAAqB;QAC9E,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE3B,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAEnC,MAAM,aAAa,GAAG,4BAAoB,CAAC,QAAQ,CAAC,CAAC;YACrD,MAAM,KAAK,GAAG,SAAS,aAAa,IAAI,MAAM,EAAE,CAAC;YACjD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEzC,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;gBAC5B,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YAEvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,eAAe;QACrB,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,oCAAiB,CAAwB;YAC5D,KAAK,EAAE,mBAAmB;YAC1B,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,iBAAiB;YAC/B,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;YACnD,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE;YAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,4CAAsB;YACjC,aAAa,EAAE;gBACb,YAAY,EAAE,yCAAmB;aAClC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAEO,aAAa,CAAC,OAA8B;QAClD,IAAI,OAAO,CAAC,EAAE,KAAK,WAAW,IAAI,OAAO,CAAC,EAAE,KAAK,aAAa,EAAE,CAAC;YAC/D,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC5E,CAAC;YAED,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,IAAA,uCAAqB,EAAC,OAAO,CAAC,IAAwB,CAAC,CAAC;YAExE,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC5C,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC;YAED,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAgC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,KAAa,EAAE,QAAkC;QAC1E,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3C,MAAM,eAAe,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,eAAe,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,CAAC,UAAU,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,qDAAmC,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/D,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE,CAAC;YACjC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAEO,cAAc;QACpB,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAEzD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,SAAmB;QACvC,IAAI,CAAC;YACH,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9E,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,SAAmB;QACzC,IAAI,CAAC;YACH,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAChF,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAEO,kBAAkB;QACxB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC;IACzE,CAAC;CACF;AAEQ,8CAAiB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BybitTradeStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitTradeStream.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAa7D,UAAU,oBAAoB;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAcD,cAAM,gBAAgB;IACpB,OAAO,CAAC,SAAS,CAAqD;IACtE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA0C;IACpF,OAAO,CAAC,cAAc,CAA8B;gBAExC,IAAI,EAAE,oBAAoB;IAQhC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"BybitTradeStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitTradeStream.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAa7D,UAAU,oBAAoB;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAcD,cAAM,gBAAgB;IACpB,OAAO,CAAC,SAAS,CAAqD;IACtE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA4C;IACtE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA0C;IACpF,OAAO,CAAC,cAAc,CAA8B;gBAExC,IAAI,EAAE,oBAAoB;IAQhC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IA6BvE,UAAU,IAAI,IAAI;IAelB,WAAW,IAAI,OAAO;YAIR,eAAe;IAkB7B,OAAO,CAAC,cAAc;YA+BR,YAAY;IAI1B,OAAO,CAAC,aAAa;CAuBtB;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAC5B,YAAY,EAAE,oBAAoB,EAAE,CAAC"}
|