@solncebro/exchange-engine 0.1.1 → 0.1.2

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.
Files changed (125) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/README.md +7 -7
  3. package/dist/auth/binanceAuth.js +3 -6
  4. package/dist/auth/binanceAuth.js.map +1 -1
  5. package/dist/auth/bybitAuth.d.ts +0 -1
  6. package/dist/auth/bybitAuth.d.ts.map +1 -1
  7. package/dist/auth/bybitAuth.js +2 -9
  8. package/dist/auth/bybitAuth.js.map +1 -1
  9. package/dist/constants/binance.d.ts +5 -1
  10. package/dist/constants/binance.d.ts.map +1 -1
  11. package/dist/constants/binance.js +7 -4
  12. package/dist/constants/binance.js.map +1 -1
  13. package/dist/constants/bybit.d.ts +3 -5
  14. package/dist/constants/bybit.d.ts.map +1 -1
  15. package/dist/constants/bybit.js +6 -9
  16. package/dist/constants/bybit.js.map +1 -1
  17. package/dist/exchanges/BaseExchangeClient.d.ts +36 -0
  18. package/dist/exchanges/BaseExchangeClient.d.ts.map +1 -0
  19. package/dist/exchanges/BaseExchangeClient.js +91 -0
  20. package/dist/exchanges/BaseExchangeClient.js.map +1 -0
  21. package/dist/exchanges/BinanceBaseClient.d.ts +21 -0
  22. package/dist/exchanges/BinanceBaseClient.d.ts.map +1 -0
  23. package/dist/exchanges/BinanceBaseClient.js +65 -0
  24. package/dist/exchanges/BinanceBaseClient.js.map +1 -0
  25. package/dist/exchanges/BinanceFutures.d.ts +7 -21
  26. package/dist/exchanges/BinanceFutures.d.ts.map +1 -1
  27. package/dist/exchanges/BinanceFutures.js +17 -94
  28. package/dist/exchanges/BinanceFutures.js.map +1 -1
  29. package/dist/exchanges/BinanceSpot.d.ts +7 -21
  30. package/dist/exchanges/BinanceSpot.d.ts.map +1 -1
  31. package/dist/exchanges/BinanceSpot.js +14 -95
  32. package/dist/exchanges/BinanceSpot.js.map +1 -1
  33. package/dist/exchanges/BybitLinear.d.ts +15 -18
  34. package/dist/exchanges/BybitLinear.d.ts.map +1 -1
  35. package/dist/exchanges/BybitLinear.js +58 -67
  36. package/dist/exchanges/BybitLinear.js.map +1 -1
  37. package/dist/exchanges/BybitSpot.d.ts +13 -17
  38. package/dist/exchanges/BybitSpot.d.ts.map +1 -1
  39. package/dist/exchanges/BybitSpot.js +36 -62
  40. package/dist/exchanges/BybitSpot.js.map +1 -1
  41. package/dist/http/BaseHttpClient.d.ts +10 -1
  42. package/dist/http/BaseHttpClient.d.ts.map +1 -1
  43. package/dist/http/BaseHttpClient.js +27 -5
  44. package/dist/http/BaseHttpClient.js.map +1 -1
  45. package/dist/http/BinanceBaseHttpClient.d.ts +49 -0
  46. package/dist/http/BinanceBaseHttpClient.d.ts.map +1 -0
  47. package/dist/http/BinanceBaseHttpClient.js +86 -0
  48. package/dist/http/BinanceBaseHttpClient.js.map +1 -0
  49. package/dist/http/BinanceFuturesHttpClient.d.ts +11 -40
  50. package/dist/http/BinanceFuturesHttpClient.d.ts.map +1 -1
  51. package/dist/http/BinanceFuturesHttpClient.js +36 -180
  52. package/dist/http/BinanceFuturesHttpClient.js.map +1 -1
  53. package/dist/http/BinanceSpotHttpClient.d.ts +5 -24
  54. package/dist/http/BinanceSpotHttpClient.d.ts.map +1 -1
  55. package/dist/http/BinanceSpotHttpClient.js +15 -90
  56. package/dist/http/BinanceSpotHttpClient.js.map +1 -1
  57. package/dist/http/BybitHttpClient.d.ts +81 -134
  58. package/dist/http/BybitHttpClient.d.ts.map +1 -1
  59. package/dist/http/BybitHttpClient.js +61 -94
  60. package/dist/http/BybitHttpClient.js.map +1 -1
  61. package/dist/index.d.ts +3 -1
  62. package/dist/index.d.ts.map +1 -1
  63. package/dist/index.js +6 -1
  64. package/dist/index.js.map +1 -1
  65. package/dist/normalizers/binanceNormalizer.d.ts +2 -1
  66. package/dist/normalizers/binanceNormalizer.d.ts.map +1 -1
  67. package/dist/normalizers/binanceNormalizer.js +8 -5
  68. package/dist/normalizers/binanceNormalizer.js.map +1 -1
  69. package/dist/normalizers/bybitNormalizer.d.ts +7 -1
  70. package/dist/normalizers/bybitNormalizer.d.ts.map +1 -1
  71. package/dist/normalizers/bybitNormalizer.js +21 -5
  72. package/dist/normalizers/bybitNormalizer.js.map +1 -1
  73. package/dist/types/common.d.ts +4 -2
  74. package/dist/types/common.d.ts.map +1 -1
  75. package/dist/types/exchange.d.ts +6 -2
  76. package/dist/types/exchange.d.ts.map +1 -1
  77. package/dist/types/stream.d.ts +10 -0
  78. package/dist/types/stream.d.ts.map +1 -0
  79. package/dist/types/stream.js +3 -0
  80. package/dist/types/stream.js.map +1 -0
  81. package/dist/utils/crypto.d.ts +2 -0
  82. package/dist/utils/crypto.d.ts.map +1 -0
  83. package/dist/utils/crypto.js +11 -0
  84. package/dist/utils/crypto.js.map +1 -0
  85. package/dist/utils/httpParams.d.ts +3 -0
  86. package/dist/utils/httpParams.d.ts.map +1 -0
  87. package/dist/utils/httpParams.js +15 -0
  88. package/dist/utils/httpParams.js.map +1 -0
  89. package/dist/utils/klineLoader.d.ts +10 -0
  90. package/dist/utils/klineLoader.d.ts.map +1 -0
  91. package/dist/utils/klineLoader.js +19 -0
  92. package/dist/utils/klineLoader.js.map +1 -0
  93. package/dist/ws/BinanceFuturesPublicStream.d.ts +6 -5
  94. package/dist/ws/BinanceFuturesPublicStream.d.ts.map +1 -1
  95. package/dist/ws/BinanceFuturesPublicStream.js +27 -56
  96. package/dist/ws/BinanceFuturesPublicStream.js.map +1 -1
  97. package/dist/ws/BinanceSpotPublicStream.d.ts +7 -5
  98. package/dist/ws/BinanceSpotPublicStream.d.ts.map +1 -1
  99. package/dist/ws/BinanceSpotPublicStream.js +17 -22
  100. package/dist/ws/BinanceSpotPublicStream.js.map +1 -1
  101. package/dist/ws/BinanceUserDataStream.d.ts +1 -1
  102. package/dist/ws/BinanceUserDataStream.d.ts.map +1 -1
  103. package/dist/ws/BinanceUserDataStream.js +7 -7
  104. package/dist/ws/BinanceUserDataStream.js.map +1 -1
  105. package/dist/ws/BybitPrivateStream.d.ts +1 -1
  106. package/dist/ws/BybitPrivateStream.d.ts.map +1 -1
  107. package/dist/ws/BybitPrivateStream.js +11 -28
  108. package/dist/ws/BybitPrivateStream.js.map +1 -1
  109. package/dist/ws/BybitPublicStream.d.ts +5 -4
  110. package/dist/ws/BybitPublicStream.d.ts.map +1 -1
  111. package/dist/ws/BybitPublicStream.js +14 -19
  112. package/dist/ws/BybitPublicStream.js.map +1 -1
  113. package/dist/ws/BybitTradeStream.d.ts +4 -2
  114. package/dist/ws/BybitTradeStream.d.ts.map +1 -1
  115. package/dist/ws/BybitTradeStream.js +24 -40
  116. package/dist/ws/BybitTradeStream.js.map +1 -1
  117. package/dist/ws/binanceWsUtils.d.ts +4 -0
  118. package/dist/ws/binanceWsUtils.d.ts.map +1 -0
  119. package/dist/ws/binanceWsUtils.js +13 -0
  120. package/dist/ws/binanceWsUtils.js.map +1 -0
  121. package/dist/ws/bybitWsUtils.d.ts +29 -0
  122. package/dist/ws/bybitWsUtils.d.ts.map +1 -0
  123. package/dist/ws/bybitWsUtils.js +29 -0
  124. package/dist/ws/bybitWsUtils.js.map +1 -0
  125. package/package.json +17 -3
@@ -4,6 +4,7 @@ exports.BinanceFuturesPublicStream = void 0;
4
4
  const websocket_engine_1 = require("@solncebro/websocket-engine");
5
5
  const binanceNormalizer_1 = require("../normalizers/binanceNormalizer");
6
6
  const binance_1 = require("../constants/binance");
7
+ const binanceWsUtils_1 = require("./binanceWsUtils");
7
8
  const MAX_STREAMS_PER_CONNECTION = 200;
8
9
  function parseBinanceCombinedMessage(rawData) {
9
10
  return JSON.parse(rawData.toString());
@@ -19,15 +20,8 @@ function buildKlineStreamList(klineHandlerByKey) {
19
20
  }
20
21
  return streamList;
21
22
  }
22
- function resolveUnifiedInterval(binanceInterval) {
23
- for (const [unified, binance] of Object.entries(binance_1.BINANCE_KLINE_INTERVAL)) {
24
- if (binance === binanceInterval) {
25
- return unified;
26
- }
27
- }
28
- return '1m';
29
- }
30
23
  class BinanceFuturesPublicStream {
24
+ wsCombinedUrl;
31
25
  logger;
32
26
  onNotify;
33
27
  tickerHandlerSet = new Set();
@@ -35,7 +29,8 @@ class BinanceFuturesPublicStream {
35
29
  connections = [];
36
30
  connectScheduled = false;
37
31
  subscriptionIdCounter = 1;
38
- constructor(logger, onNotify) {
32
+ constructor(wsCombinedUrl, logger, onNotify) {
33
+ this.wsCombinedUrl = wsCombinedUrl;
39
34
  this.logger = logger;
40
35
  this.onNotify = onNotify;
41
36
  }
@@ -76,8 +71,8 @@ class BinanceFuturesPublicStream {
76
71
  }
77
72
  }
78
73
  close() {
79
- for (const conn of this.connections) {
80
- conn.ws.close();
74
+ for (const connection of this.connections) {
75
+ connection.webSocket.close();
81
76
  }
82
77
  this.connections.length = 0;
83
78
  }
@@ -100,86 +95,62 @@ class BinanceFuturesPublicStream {
100
95
  }
101
96
  for (let i = 0; i < allStreams.length; i += MAX_STREAMS_PER_CONNECTION) {
102
97
  const chunk = allStreams.slice(i, i + MAX_STREAMS_PER_CONNECTION);
103
- this.createConnection(chunk);
98
+ this.createConnection(chunk, this.connections.length);
104
99
  }
105
100
  this.logger.info(`BinanceFuturesPublicStream: created ${this.connections.length} connection(s) for ${allStreams.length} streams`);
106
101
  }
107
- createConnection(streams) {
108
- const conn = { ws: null, streams };
109
- conn.ws = new websocket_engine_1.ReliableWebSocket({
110
- label: 'BinanceFuturesPublicStream',
111
- url: binance_1.BINANCE_FUTURES_WS_COMBINED_URL,
102
+ createConnection(streams, index) {
103
+ const label = `BinanceFuturesPublicStream-${index}`;
104
+ const url = `${this.wsCombinedUrl}?streams=${streams.join('/')}`;
105
+ const connection = { webSocket: null, label, streams };
106
+ connection.webSocket = new websocket_engine_1.ReliableWebSocket({
107
+ label,
108
+ url,
112
109
  logger: this.logger,
113
110
  parseMessage: parseBinanceCombinedMessage,
114
111
  onMessage: (message) => this.handleMessage(message),
115
- onOpen: async () => {
116
- this.logger.info(`BinanceFuturesPublicStream connected (${conn.streams.length} streams)`);
117
- this.sendSubscribe(conn);
118
- },
119
- onReconnectSuccess: () => this.sendSubscribe(conn),
120
112
  onNotify: this.onNotify,
121
- heartbeat: {
122
- buildPayload: () => ({ method: 'PING' }),
123
- isResponse: (message) => {
124
- const raw = message;
125
- return raw['id'] !== undefined && raw['result'] === null;
126
- },
127
- },
128
113
  configuration: {
129
114
  pingInterval: 30000,
130
115
  },
131
116
  });
132
- this.connections.push(conn);
117
+ this.connections.push(connection);
133
118
  }
134
119
  addStreamToConnection(stream) {
135
- let targetConn = this.connections.find((c) => c.streams.length < MAX_STREAMS_PER_CONNECTION);
136
- if (!targetConn) {
137
- this.createConnection([stream]);
120
+ let targetConnection = this.connections.find((connection) => connection.streams.length < MAX_STREAMS_PER_CONNECTION);
121
+ if (!targetConnection) {
122
+ this.createConnection([stream], this.connections.length);
138
123
  return;
139
124
  }
140
- targetConn.streams.push(stream);
125
+ targetConnection.streams.push(stream);
141
126
  try {
142
- targetConn.ws.sendToConnectedSocket({
127
+ targetConnection.webSocket.sendToConnectedSocket({
143
128
  method: 'SUBSCRIBE',
144
129
  params: [stream],
145
130
  id: this.subscriptionIdCounter++,
146
131
  });
147
132
  }
148
133
  catch {
149
- // Will be subscribed on reconnect
150
134
  }
151
135
  }
152
136
  removeStreamFromConnection(stream) {
153
- for (const conn of this.connections) {
154
- const idx = conn.streams.indexOf(stream);
155
- if (idx !== -1) {
156
- conn.streams.splice(idx, 1);
137
+ for (const connection of this.connections) {
138
+ const index = connection.streams.indexOf(stream);
139
+ if (index !== -1) {
140
+ connection.streams.splice(index, 1);
157
141
  try {
158
- conn.ws.sendToConnectedSocket({
142
+ connection.webSocket.sendToConnectedSocket({
159
143
  method: 'UNSUBSCRIBE',
160
144
  params: [stream],
161
145
  id: this.subscriptionIdCounter++,
162
146
  });
163
147
  }
164
148
  catch {
165
- // Will be reflected on reconnect
166
149
  }
167
150
  break;
168
151
  }
169
152
  }
170
153
  }
171
- sendSubscribe(conn) {
172
- try {
173
- conn.ws.sendToConnectedSocket({
174
- method: 'SUBSCRIBE',
175
- params: conn.streams,
176
- id: this.subscriptionIdCounter++,
177
- });
178
- }
179
- catch {
180
- this.logger.warn('BinanceFuturesPublicStream: failed to subscribe, socket not connected');
181
- }
182
- }
183
154
  handleMessage(message) {
184
155
  if (message.data === undefined) {
185
156
  return;
@@ -201,12 +172,12 @@ class BinanceFuturesPublicStream {
201
172
  const symbolLower = message.stream.slice(0, continuousKlineIndex).replace(/_perpetual$/, '');
202
173
  const symbol = symbolLower.toUpperCase();
203
174
  const binanceInterval = message.stream.slice(continuousKlineIndex + '@continuousKline_'.length);
204
- const unifiedInterval = resolveUnifiedInterval(binanceInterval);
175
+ const unifiedInterval = (0, binanceWsUtils_1.resolveUnifiedBinanceInterval)(binanceInterval);
205
176
  const key = `${symbol}_${unifiedInterval}`;
206
177
  const handlerSet = this.klineHandlerByKey.get(key);
207
178
  if (handlerSet) {
208
179
  for (const handler of handlerSet) {
209
- handler(kline);
180
+ handler(symbol, kline);
210
181
  }
211
182
  }
212
183
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BinanceFuturesPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BinanceFuturesPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceFuturesPublicStream.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,18 @@
1
- import type { ExchangeLogger, Kline, KlineInterval, TickerBySymbol } from '../types/common';
1
+ import type { ExchangeLogger, KlineInterval, TickerBySymbol } from '../types/common';
2
+ import type { KlineHandler } from '../types/exchange';
2
3
  declare class BinanceSpotPublicStream {
3
- private ws;
4
+ private webSocket;
5
+ private readonly wsUrl;
4
6
  private readonly logger;
5
7
  private readonly onNotify?;
6
8
  private readonly tickerHandlerSet;
7
9
  private readonly klineHandlerByKey;
8
10
  private subscriptionIdCounter;
9
- constructor(logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
11
+ constructor(wsUrl: string, logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
10
12
  subscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
11
13
  unsubscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
12
- subscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
13
- unsubscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
14
+ subscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
15
+ unsubscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
14
16
  close(): void;
15
17
  private ensureConnected;
16
18
  private handleOpen;
@@ -1 +1 @@
1
- {"version":3,"file":"BinanceSpotPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA0B5F,cAAM,uBAAuB;IAC3B,OAAO,CAAC,EAAE,CAAyD;IACnE,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,CAAuD;IACzF,OAAO,CAAC,qBAAqB,CAAK;gBAEtB,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxF,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,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAkB/F,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAqBjG,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"}
1
+ {"version":3,"file":"BinanceSpotPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAS,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAiBtD,cAAM,uBAAuB;IAC3B,OAAO,CAAC,SAAS,CAAyD;IAC1E,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,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,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvG,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;IAkBrF,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"}
@@ -4,25 +4,20 @@ exports.BinanceSpotPublicStream = void 0;
4
4
  const websocket_engine_1 = require("@solncebro/websocket-engine");
5
5
  const binanceNormalizer_1 = require("../normalizers/binanceNormalizer");
6
6
  const binance_1 = require("../constants/binance");
7
+ const binanceWsUtils_1 = require("./binanceWsUtils");
7
8
  function parseBinanceSpotMessage(rawData) {
8
9
  return JSON.parse(rawData.toString());
9
10
  }
10
- function resolveUnifiedInterval(binanceInterval) {
11
- for (const [unified, binance] of Object.entries(binance_1.BINANCE_KLINE_INTERVAL)) {
12
- if (binance === binanceInterval) {
13
- return unified;
14
- }
15
- }
16
- return '1m';
17
- }
18
11
  class BinanceSpotPublicStream {
19
- ws = null;
12
+ webSocket = null;
13
+ wsUrl;
20
14
  logger;
21
15
  onNotify;
22
16
  tickerHandlerSet = new Set();
23
17
  klineHandlerByKey = new Map();
24
18
  subscriptionIdCounter = 1;
25
- constructor(logger, onNotify) {
19
+ constructor(wsUrl, logger, onNotify) {
20
+ this.wsUrl = wsUrl;
26
21
  this.logger = logger;
27
22
  this.onNotify = onNotify;
28
23
  }
@@ -39,7 +34,7 @@ class BinanceSpotPublicStream {
39
34
  this.klineHandlerByKey.set(key, new Set());
40
35
  }
41
36
  this.klineHandlerByKey.get(key).add(handler);
42
- if (this.ws !== null) {
37
+ if (this.webSocket !== null) {
43
38
  const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
44
39
  const stream = `${symbol.toLowerCase()}@kline_${binanceInterval}`;
45
40
  this.sendSubscribe([stream]);
@@ -57,7 +52,7 @@ class BinanceSpotPublicStream {
57
52
  handlerSet.delete(handler);
58
53
  if (handlerSet.size === 0) {
59
54
  this.klineHandlerByKey.delete(key);
60
- if (this.ws !== null) {
55
+ if (this.webSocket !== null) {
61
56
  const binanceInterval = binance_1.BINANCE_KLINE_INTERVAL[interval];
62
57
  const stream = `${symbol.toLowerCase()}@kline_${binanceInterval}`;
63
58
  this.sendUnsubscribe([stream]);
@@ -65,18 +60,18 @@ class BinanceSpotPublicStream {
65
60
  }
66
61
  }
67
62
  close() {
68
- if (this.ws !== null) {
69
- this.ws.close();
70
- this.ws = null;
63
+ if (this.webSocket !== null) {
64
+ this.webSocket.close();
65
+ this.webSocket = null;
71
66
  }
72
67
  }
73
68
  ensureConnected() {
74
- if (this.ws !== null) {
69
+ if (this.webSocket !== null) {
75
70
  return;
76
71
  }
77
- this.ws = new websocket_engine_1.ReliableWebSocket({
72
+ this.webSocket = new websocket_engine_1.ReliableWebSocket({
78
73
  label: 'BinanceSpotPublicStream',
79
- url: binance_1.BINANCE_SPOT_WS_STREAM_URL,
74
+ url: this.wsUrl,
80
75
  logger: this.logger,
81
76
  parseMessage: parseBinanceSpotMessage,
82
77
  onMessage: (message) => this.handleMessage(message),
@@ -132,12 +127,12 @@ class BinanceSpotPublicStream {
132
127
  const symbolLower = stream.slice(0, atIndex);
133
128
  const binanceInterval = stream.slice(atIndex + '@kline_'.length);
134
129
  const symbol = symbolLower.toUpperCase();
135
- const unifiedInterval = resolveUnifiedInterval(binanceInterval);
130
+ const unifiedInterval = (0, binanceWsUtils_1.resolveUnifiedBinanceInterval)(binanceInterval);
136
131
  const key = `${symbol}_${unifiedInterval}`;
137
132
  const handlerSet = this.klineHandlerByKey.get(key);
138
133
  if (handlerSet) {
139
134
  for (const handler of handlerSet) {
140
- handler(kline);
135
+ handler(symbol, kline);
141
136
  }
142
137
  }
143
138
  }
@@ -159,7 +154,7 @@ class BinanceSpotPublicStream {
159
154
  }
160
155
  sendSubscribe(streamList) {
161
156
  try {
162
- this.ws.sendToConnectedSocket({
157
+ this.webSocket.sendToConnectedSocket({
163
158
  method: 'SUBSCRIBE',
164
159
  params: streamList,
165
160
  id: this.subscriptionIdCounter++,
@@ -171,7 +166,7 @@ class BinanceSpotPublicStream {
171
166
  }
172
167
  sendUnsubscribe(streamList) {
173
168
  try {
174
- this.ws.sendToConnectedSocket({
169
+ this.webSocket.sendToConnectedSocket({
175
170
  method: 'UNSUBSCRIBE',
176
171
  params: streamList,
177
172
  id: this.subscriptionIdCounter++,
@@ -1 +1 @@
1
- {"version":3,"file":"BinanceSpotPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BinanceSpotPublicStream.js","sourceRoot":"","sources":["../../src/ws/BinanceSpotPublicStream.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ interface BinanceUserDataStreamArgs {
7
7
  onMessage: (event: Record<string, unknown>) => void;
8
8
  }
9
9
  declare class BinanceUserDataStream {
10
- private ws;
10
+ private webSocket;
11
11
  private readonly logger;
12
12
  private readonly listenKey;
13
13
  private readonly baseWsUrl;
@@ -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,SAAS,EAAE,MAAM,CAAC;IAClB,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,EAAE,CAA2D;IACrE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,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"}
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,SAAS,EAAE,MAAM,CAAC;IAClB,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,SAAS,CAAS;IACnC,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"}
@@ -6,7 +6,7 @@ function parseUserDataMessage(rawData) {
6
6
  return JSON.parse(rawData.toString());
7
7
  }
8
8
  class BinanceUserDataStream {
9
- ws = null;
9
+ webSocket = null;
10
10
  logger;
11
11
  listenKey;
12
12
  baseWsUrl;
@@ -20,11 +20,11 @@ class BinanceUserDataStream {
20
20
  this.onMessageHandler = args.onMessage;
21
21
  }
22
22
  connect() {
23
- if (this.ws !== null) {
23
+ if (this.webSocket !== null) {
24
24
  return;
25
25
  }
26
26
  const url = `${this.baseWsUrl}/${this.listenKey}`;
27
- this.ws = new websocket_engine_1.ReliableWebSocket({
27
+ this.webSocket = new websocket_engine_1.ReliableWebSocket({
28
28
  label: 'BinanceUserDataStream',
29
29
  url,
30
30
  logger: this.logger,
@@ -35,13 +35,13 @@ class BinanceUserDataStream {
35
35
  this.logger.info(`BinanceUserDataStream connected with listenKey: ${this.listenKey}`);
36
36
  }
37
37
  close() {
38
- if (this.ws !== null) {
39
- this.ws.close();
40
- this.ws = null;
38
+ if (this.webSocket !== null) {
39
+ this.webSocket.close();
40
+ this.webSocket = null;
41
41
  }
42
42
  }
43
43
  isConnected() {
44
- return this.ws !== null;
44
+ return this.webSocket !== null;
45
45
  }
46
46
  }
47
47
  exports.BinanceUserDataStream = BinanceUserDataStream;
@@ -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,EAAE,GAAsD,IAAI,CAAC;IACpD,MAAM,CAAiB;IACvB,SAAS,CAAS;IAClB,SAAS,CAAS;IAClB,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,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,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,EAAE,KAAK,IAAI,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAElD,IAAI,CAAC,EAAE,GAAG,IAAI,oCAAiB,CAA0B;YACvD,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,EAAE,KAAK,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC;IAC1B,CAAC;CACF;AAEQ,sDAAqB"}
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,SAAS,CAAS;IAClB,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,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,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,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAElD,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"}
@@ -7,7 +7,7 @@ interface BybitPrivateStreamArgs {
7
7
  onMessage: (event: Record<string, unknown>) => void;
8
8
  }
9
9
  declare class BybitPrivateStream {
10
- private ws;
10
+ private webSocket;
11
11
  private readonly logger;
12
12
  private readonly apiKey;
13
13
  private readonly secret;
@@ -1 +1 @@
1
- {"version":3,"file":"BybitPrivateStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitPrivateStream.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAYtD,UAAU,sBAAsB;IAC9B,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;IACrD,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACrD;AAUD,cAAM,kBAAkB;IACtB,OAAO,CAAC,EAAE,CAAuD;IACjE,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,gBAAgB,CAA2C;gBAEhE,IAAI,EAAE,sBAAsB;IAQxC,OAAO,IAAI,IAAI;IAuBf,KAAK,IAAI,IAAI;IAOb,WAAW,IAAI,OAAO;YAIR,YAAY;IAoB1B,OAAO,CAAC,aAAa;CAOtB;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAC9B,YAAY,EAAE,sBAAsB,EAAE,CAAC"}
1
+ {"version":3,"file":"BybitPrivateStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitPrivateStream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAatD,UAAU,sBAAsB;IAC9B,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;IACrD,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACrD;AAMD,cAAM,kBAAkB;IACtB,OAAO,CAAC,SAAS,CAAuD;IACxE,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,gBAAgB,CAA2C;gBAEhE,IAAI,EAAE,sBAAsB;IAQxC,OAAO,IAAI,IAAI;IAoBf,KAAK,IAAI,IAAI;IAOb,WAAW,IAAI,OAAO;YAIR,YAAY;IAI1B,OAAO,CAAC,aAAa;CAOtB;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAC9B,YAAY,EAAE,sBAAsB,EAAE,CAAC"}
@@ -1,20 +1,14 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.BybitPrivateStream = void 0;
7
- const node_crypto_1 = __importDefault(require("node:crypto"));
8
4
  const websocket_engine_1 = require("@solncebro/websocket-engine");
9
5
  const bybit_1 = require("../constants/bybit");
6
+ const bybitWsUtils_1 = require("./bybitWsUtils");
10
7
  function parseBybitPrivateMessage(rawData) {
11
8
  return JSON.parse(rawData.toString());
12
9
  }
13
- function isBybitPongResponse(message) {
14
- return message.op === 'pong' || message.ret_msg === 'pong';
15
- }
16
10
  class BybitPrivateStream {
17
- ws = null;
11
+ webSocket = null;
18
12
  logger;
19
13
  apiKey;
20
14
  secret;
@@ -28,10 +22,10 @@ class BybitPrivateStream {
28
22
  this.onMessageHandler = args.onMessage;
29
23
  }
30
24
  connect() {
31
- if (this.ws !== null) {
25
+ if (this.webSocket !== null) {
32
26
  return;
33
27
  }
34
- this.ws = new websocket_engine_1.ReliableWebSocket({
28
+ this.webSocket = new websocket_engine_1.ReliableWebSocket({
35
29
  label: 'BybitPrivateStream',
36
30
  url: bybit_1.BYBIT_PRIVATE_WS_URL,
37
31
  logger: this.logger,
@@ -39,34 +33,23 @@ class BybitPrivateStream {
39
33
  onMessage: (message) => this.handleMessage(message),
40
34
  onOpen: (context) => this.authenticate(context),
41
35
  onNotify: this.onNotify,
42
- heartbeat: {
43
- buildPayload: () => ({ op: 'ping' }),
44
- isResponse: isBybitPongResponse,
45
- },
36
+ heartbeat: bybitWsUtils_1.BYBIT_HEARTBEAT_CONFIG,
46
37
  configuration: {
47
- pingInterval: 20000,
38
+ pingInterval: bybitWsUtils_1.BYBIT_PING_INTERVAL,
48
39
  },
49
40
  });
50
41
  }
51
42
  close() {
52
- if (this.ws !== null) {
53
- this.ws.close();
54
- this.ws = null;
43
+ if (this.webSocket !== null) {
44
+ this.webSocket.close();
45
+ this.webSocket = null;
55
46
  }
56
47
  }
57
48
  isConnected() {
58
- return this.ws !== null;
49
+ return this.webSocket !== null;
59
50
  }
60
51
  async authenticate(context) {
61
- const timestamp = Date.now();
62
- const payload = `GET/realtime${timestamp}`;
63
- const signature = node_crypto_1.default.createHmac('sha256', this.secret).update(payload).digest('hex');
64
- context.send({
65
- op: 'auth',
66
- args: [this.apiKey, timestamp, signature],
67
- });
68
- await context.waitForMessage((message) => message.op === 'auth' && message.success === true, 10000);
69
- this.logger.info('BybitPrivateStream authenticated');
52
+ await (0, bybitWsUtils_1.authenticateBybitWs)({ context, apiKey: this.apiKey, secret: this.secret, label: 'BybitPrivateStream', logger: this.logger });
70
53
  }
71
54
  handleMessage(message) {
72
55
  if (message.op === 'auth') {
@@ -1 +1 @@
1
- {"version":3,"file":"BybitPrivateStream.js","sourceRoot":"","sources":["../../src/ws/BybitPrivateStream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BybitPrivateStream.js","sourceRoot":"","sources":["../../src/ws/BybitPrivateStream.ts"],"names":[],"mappings":";;;AACA,kEAAgE;AAIhE,8CAA0D;AAC1D,iDAIwB;AAexB,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,4BAAoB;YACzB,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,qCAAsB;YACjC,aAAa,EAAE;gBACb,YAAY,EAAE,kCAAmB;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,kCAAmB,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;IACrI,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,6 +1,7 @@
1
- import type { ExchangeLogger, Kline, KlineInterval, TickerBySymbol } from '../types/common';
1
+ import type { ExchangeLogger, KlineInterval, TickerBySymbol } from '../types/common';
2
+ import type { KlineHandler } from '../types/exchange';
2
3
  declare class BybitPublicStream {
3
- private ws;
4
+ private webSocket;
4
5
  private readonly url;
5
6
  private readonly logger;
6
7
  private readonly onNotify?;
@@ -10,8 +11,8 @@ declare class BybitPublicStream {
10
11
  constructor(url: string, logger: ExchangeLogger, onNotify?: (message: string) => void | Promise<void>);
11
12
  subscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
12
13
  unsubscribeAllTickers(handler: (tickers: TickerBySymbol) => void): void;
13
- subscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
14
- unsubscribeKlines(symbol: string, interval: KlineInterval, handler: (kline: Kline) => void): void;
14
+ subscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
15
+ unsubscribeKlines(symbol: string, interval: KlineInterval, handler: KlineHandler): void;
15
16
  close(): void;
16
17
  private ensureConnected;
17
18
  private handleMessage;
@@ -1 +1 @@
1
- {"version":3,"file":"BybitPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitPublicStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAiC5F,cAAM,iBAAiB;IACrB,OAAO,CAAC,EAAE,CAAkD;IAC5D,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,CAAuD;IACzF,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,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAoB/F,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAuBjG,KAAK,IAAI,IAAI;IAQb,OAAO,CAAC,eAAe;IAyBvB,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"}
1
+ {"version":3,"file":"BybitPublicStream.d.ts","sourceRoot":"","sources":["../../src/ws/BybitPublicStream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAS,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AA0BtD,cAAM,iBAAiB;IACrB,OAAO,CAAC,SAAS,CAAkD;IACnE,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;IAoBrF,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"}