bybit-api 4.1.7 → 4.1.9
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/README.md +77 -54
- package/lib/index.d.ts +1 -0
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/types/request/v5-market.d.ts +1 -0
- package/lib/types/response/v5-position.d.ts +1 -0
- package/lib/types/response/v5-preupgrade.d.ts +1 -0
- package/lib/types/response/v5-trade.d.ts +1 -0
- package/lib/types/websockets/ws-api.d.ts +2 -1
- package/lib/types/websockets/ws-events.d.ts +7 -0
- package/lib/util/BaseWSClient.d.ts +3 -3
- package/lib/util/BaseWSClient.js +15 -7
- package/lib/util/BaseWSClient.js.map +1 -1
- package/lib/util/logger.d.ts +1 -0
- package/lib/util/logger.js.map +1 -1
- package/lib/util/websockets/WsStore.d.ts +4 -1
- package/lib/util/websockets/WsStore.js +27 -3
- package/lib/util/websockets/WsStore.js.map +1 -1
- package/lib/util/websockets/WsStore.types.d.ts +3 -1
- package/lib/util/websockets/WsStore.types.js +1 -1
- package/lib/util/websockets/WsStore.types.js.map +1 -1
- package/lib/websocket-api-client.d.ts +110 -0
- package/lib/websocket-api-client.js +144 -0
- package/lib/websocket-api-client.js.map +1 -0
- package/lib/websocket-client.d.ts +3 -3
- package/lib/websocket-client.js +29 -3
- package/lib/websocket-client.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Node.js & JavaScript SDK for Bybit REST API &
|
|
1
|
+
# Node.js & JavaScript SDK for Bybit REST API, WebSocket API & WebSocket Events
|
|
2
2
|
|
|
3
3
|
[](https://github.com/tiagosiebler/bybit-api/actions/workflows/e2etest.yml)
|
|
4
4
|
[][1]
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
|
|
20
20
|
[1]: https://www.npmjs.com/package/bybit-api
|
|
21
21
|
|
|
22
|
-
Professional Node.js, JavaScript & TypeScript SDK for the Bybit REST APIs
|
|
22
|
+
Professional Node.js, JavaScript & TypeScript SDK for the Bybit REST APIs, WebSocket APIs & WebSocket Events:
|
|
23
23
|
|
|
24
24
|
- Complete integration with all Bybit REST APIs & WebSockets, including the WebSocket API.
|
|
25
25
|
- Actively maintained with a modern, promise-driven interface.
|
|
@@ -29,22 +29,22 @@ Professional Node.js, JavaScript & TypeScript SDK for the Bybit REST APIs and We
|
|
|
29
29
|
- Proxy support via axios integration.
|
|
30
30
|
- Robust WebSocket consumer integration with configurable heartbeats & automatic reconnect then resubscribe workflows.
|
|
31
31
|
- Event driven messaging
|
|
32
|
-
- Smart
|
|
32
|
+
- Smart WebSocket persistence
|
|
33
33
|
- Automatically handle silent websocket disconnections through timed heartbeats, including the scheduled 24hr disconnect.
|
|
34
34
|
- Automatically handle authentication.
|
|
35
35
|
- Emit `reconnected` event when dropped connection is restored.
|
|
36
36
|
- WebSocket API integration, with two design patterns to choose from:
|
|
37
|
-
|
|
37
|
+
1. Asynchronous **promise**-driven responses:
|
|
38
38
|
- Make requests like a REST API, using the WebSocket API. No need to subscribe to asynchronous events.
|
|
39
|
-
-
|
|
40
|
-
|
|
41
|
-
-
|
|
42
|
-
|
|
43
|
-
|
|
39
|
+
- Import the `WebsocketAPIClient` and use it like the REST API client. Call functions and await responses.
|
|
40
|
+
- See example for more details: [examples/ws-api-client.ts](./examples/ws-api-client.ts).
|
|
41
|
+
- Prefer something more raw? Use the `sendWSAPIRequest(...)` method and await responses
|
|
42
|
+
- See example for more details: [examples/ws-api-raw-promises.ts](./examples/ws-api-raw-promises.ts)
|
|
43
|
+
2. Asynchronous **event**-driven responses:
|
|
44
44
|
- Subscribe to `response` and `error` events from WebsocketClient's event emitter.
|
|
45
|
-
- Send commands with the sendWSAPIRequest(...) method.
|
|
46
|
-
- Responses to commands will arrive via the `response` and `error` events.
|
|
47
|
-
- See example for more details: [examples/ws-api-events.ts](./examples/ws-api-events.ts)
|
|
45
|
+
- Send commands with the `sendWSAPIRequest(...)` method.
|
|
46
|
+
- Responses to commands will arrive via the `response` and `error` events emitted by the client.
|
|
47
|
+
- See example for more details: [examples/ws-api-raw-events.ts](./examples/ws-api-raw-events.ts)
|
|
48
48
|
- Active community support & collaboration in telegram: [Node.js Algo Traders](https://t.me/nodetraders).
|
|
49
49
|
|
|
50
50
|
# Table of Contents
|
|
@@ -153,6 +153,7 @@ Here are the available REST clients and the corresponding API groups described i
|
|
|
153
153
|
| [ **V5 API** ] | The new unified V5 APIs (successor to previously fragmented APIs for all API groups). |
|
|
154
154
|
| [RestClientV5](src/rest-client-v5.ts) | Unified V5 all-in-one REST client for all [V5 REST APIs](https://bybit-exchange.github.io/docs/v5/intro) |
|
|
155
155
|
| [WebsocketClient](src/websocket-client.ts) | All WebSocket features (Public & Private consumers for all API categories & the WebSocket API) |
|
|
156
|
+
| [WebsocketAPIClient](src/websocket-api-client.ts) | Use the WebSocket API like a REST API. Call functions and await responses, powered by WebSockets. |
|
|
156
157
|
|
|
157
158
|
|
|
158
159
|
## REST API Usage
|
|
@@ -303,7 +304,7 @@ const wsConfig = {
|
|
|
303
304
|
*
|
|
304
305
|
* Refer to the examples folder on GitHub for a more detailed demonstration.
|
|
305
306
|
*/
|
|
306
|
-
// demoTrading
|
|
307
|
+
// demoTrading: true,
|
|
307
308
|
|
|
308
309
|
// recv window size for websocket authentication (higher latency connections
|
|
309
310
|
// (VPN) can cause authentication to fail if the recv window is too small)
|
|
@@ -398,36 +399,41 @@ ws.on('reconnected', (data) => {
|
|
|
398
399
|
|
|
399
400
|
## Websocket API - Sending orders via WebSockets
|
|
400
401
|
|
|
401
|
-
Bybit supports sending, amending and cancelling orders over a WebSocket connection. The [WebsocketClient](./src/WebsocketClient.ts) fully supports Bybit's WebSocket API via the `sendWSAPIRequest(...)` method.
|
|
402
|
+
Bybit supports sending, amending and cancelling orders over a WebSocket connection. The [WebsocketClient](./src/WebsocketClient.ts) fully supports Bybit's WebSocket API via the `sendWSAPIRequest(...)` method. There is also a dedicated [WebsocketAPIClient](./src/websocket-api-client.ts), built over the WSClient's sendWSAPIRequest mechanism for a simpler experience.
|
|
402
403
|
|
|
403
404
|
Links for reference:
|
|
404
405
|
- [Bybit WebSocket API Documentation](https://bybit-exchange.github.io/docs/v5/websocket/trade/guideline)
|
|
405
|
-
- [
|
|
406
|
+
- [WebsocketAPIClient example, use the Websocket API like a REST API](./examples/ws-api-client.ts)
|
|
407
|
+
- [Raw Asynchronous Websocket API Node.js/TypeScript/JavaScript example](./examples/ws-api-raw-promises.ts)
|
|
406
408
|
|
|
407
409
|
Note: as of January 2025, the demo trading environment does not support the WebSocket API.
|
|
408
410
|
|
|
409
411
|
There are two ways to use the WS API, depending on individual preference:
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
412
|
+
1. event-driven:
|
|
413
|
+
- send requests via `client.sendWSAPIRequest(wsKey, operation, params)`, fire and forget
|
|
414
|
+
- handle async replies via event handlers on `client.on('exception', cb)` and `client.on('response', cb)`
|
|
415
|
+
- See example for more details: [examples/ws-api-raw-events.ts](./examples/ws-api-raw-events.ts)
|
|
416
|
+
2. promise-driven:
|
|
417
|
+
- import the `WebsocketAPIClient` and use it much like a REST API.
|
|
418
|
+
- make an instance & call the Websocket API with a function.
|
|
419
|
+
- await responses, much like a REST API.
|
|
420
|
+
- use try/catch blocks to handle promise rejections
|
|
421
|
+
- See example for more details: [examples/ws-api-client.ts](./examples/ws-api-client.ts)
|
|
422
|
+
|
|
423
|
+
The below example demonstrates the promise-driven approach, which behaves similar to a REST API. The WebSocket API even accepts the same parameters as the corresponding REST API endpoints, so this approach should be compatible with existing REST implementations.
|
|
424
|
+
|
|
425
|
+
Connectivity, authentication and connecting requests & responses to promises - these are all handled automatically without additional configuration by the WebsocketClient. The WebsocketAPIClient is a wrapper built on top of this, providing dedicated methods for every available Websocket API command. Each method has fully typed requests & responses. Benefit from the capabilities of the WebSocket API without the complexity of managing asynchronous messaging over WebSockets.
|
|
421
426
|
|
|
422
427
|
```javascript
|
|
423
|
-
const { WS_KEY_MAP,
|
|
428
|
+
const { WS_KEY_MAP, WebsocketAPIClient } = require('bybit-api');
|
|
424
429
|
|
|
425
430
|
// or
|
|
426
|
-
// import { WS_KEY_MAP,
|
|
431
|
+
// import { WS_KEY_MAP, WebsocketAPIClient } from 'bybit-api';
|
|
427
432
|
|
|
428
|
-
// Create an instance of the
|
|
429
|
-
//
|
|
430
|
-
|
|
433
|
+
// Create an instance of the WebsocketAPIClient. This is built on
|
|
434
|
+
// top of the WebsocketClient and will automatically handle WebSocket
|
|
435
|
+
// persistence and authentication for you.
|
|
436
|
+
const wsClient = new WebsocketAPIClient(
|
|
431
437
|
{
|
|
432
438
|
key: 'yourApiKeyHere',
|
|
433
439
|
secret: 'yourApiSecretHere',
|
|
@@ -440,6 +446,10 @@ const wsClient = new WebsocketClient(
|
|
|
440
446
|
// Note: As of Jan 2025, demo trading only supports consuming events, it does
|
|
441
447
|
// NOT support the WS API.
|
|
442
448
|
// demoTrading: false,
|
|
449
|
+
|
|
450
|
+
// If you want your own event handlers instead of the default ones with logs,
|
|
451
|
+
// disable this setting and see ws-api-client example for more details.
|
|
452
|
+
// attachEventListeners: false
|
|
443
453
|
}
|
|
444
454
|
);
|
|
445
455
|
|
|
@@ -452,32 +462,47 @@ async function main() {
|
|
|
452
462
|
* This is not necessary and will happen automatically when
|
|
453
463
|
* sending a command, if you aren't connected/authenticated yet.
|
|
454
464
|
*/
|
|
455
|
-
// await wsClient.connectWSAPI();
|
|
465
|
+
// await wsClient.getWSClient().connectWSAPI();
|
|
456
466
|
|
|
457
467
|
try {
|
|
458
468
|
console.log('Step 1: Create an order');
|
|
469
|
+
const response = await wsClient.submitNewOrder({
|
|
470
|
+
category: 'linear',
|
|
471
|
+
symbol: 'BTCUSDT',
|
|
472
|
+
orderType: 'Limit',
|
|
473
|
+
qty: '0.001',
|
|
474
|
+
side: 'Buy',
|
|
475
|
+
price: '50000',
|
|
476
|
+
});
|
|
477
|
+
console.log('submitNewOrder response: ', response);
|
|
478
|
+
} catch (e) {
|
|
479
|
+
console.log('submitNewOrder error: ', e);
|
|
480
|
+
}
|
|
459
481
|
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
const
|
|
463
|
-
|
|
464
|
-
'
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
console.log(
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
482
|
+
try {
|
|
483
|
+
console.log('Step 2: Amend an order');
|
|
484
|
+
const response = await wsClient.amendOrder({
|
|
485
|
+
category: 'linear',
|
|
486
|
+
symbol: 'BTCUSDT',
|
|
487
|
+
orderId: 'b4b9e205-793c-4777-8112-0bf3c2d26b6e',
|
|
488
|
+
qty: '0.001',
|
|
489
|
+
price: '60000',
|
|
490
|
+
});
|
|
491
|
+
console.log('amendOrder response: ', response);
|
|
492
|
+
} catch (e) {
|
|
493
|
+
console.log('amendOrder error: ', e);
|
|
494
|
+
}
|
|
495
|
+
|
|
496
|
+
try {
|
|
497
|
+
console.log('Step 3: Cancel an order');
|
|
498
|
+
const response = await wsClient.cancelOrder({
|
|
499
|
+
category: 'linear',
|
|
500
|
+
symbol: 'BTCUSDT',
|
|
501
|
+
orderId: 'b4b9e205-793c-4777-8112-0bf3c2d26b6e',
|
|
502
|
+
});
|
|
503
|
+
console.log('cancelOrder response: ', response);
|
|
479
504
|
} catch (e) {
|
|
480
|
-
console.
|
|
505
|
+
console.log('cancelOrder error: ', e);
|
|
481
506
|
}
|
|
482
507
|
}
|
|
483
508
|
|
|
@@ -486,8 +511,6 @@ main();
|
|
|
486
511
|
|
|
487
512
|
```
|
|
488
513
|
|
|
489
|
-
See the [examples/ws-api-promises.ts](./examples/ws-api-promises.ts) example for a more detailed explanation.
|
|
490
|
-
|
|
491
514
|
---
|
|
492
515
|
|
|
493
516
|
### Balancing load across multiple connections
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./rest-client-v5"), exports);
|
|
18
18
|
__exportStar(require("./spot-client-v3"), exports);
|
|
19
19
|
__exportStar(require("./websocket-client"), exports);
|
|
20
|
+
__exportStar(require("./websocket-api-client"), exports);
|
|
20
21
|
__exportStar(require("./util/logger"), exports);
|
|
21
22
|
__exportStar(require("./util"), exports);
|
|
22
23
|
__exportStar(require("./types"), exports);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,mDAAiC;AACjC,qDAAmC;AACnC,gDAA8B;AAC9B,yCAAuB;AACvB,0CAAwB;AACxB,mDAAiC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,mDAAiC;AACjC,qDAAmC;AACnC,yDAAuC;AACvC,gDAA8B;AAC9B,yCAAuB;AACvB,0CAAwB;AACxB,mDAAiC"}
|
|
@@ -20,7 +20,7 @@ export interface WSAPIRequest<TRequestParams = undefined, TWSOperation extends W
|
|
|
20
20
|
};
|
|
21
21
|
args: [TRequestParams];
|
|
22
22
|
}
|
|
23
|
-
export interface WSAPIResponse<TResponseData extends object = object, TOperation extends WSAPIOperation = WSAPIOperation> {
|
|
23
|
+
export interface WSAPIResponse<TResponseData extends object = object, TOperation extends WSAPIOperation = WSAPIOperation, TResponseExtInfo = {}> {
|
|
24
24
|
wsKey: WsKey;
|
|
25
25
|
/** Auto-generated */
|
|
26
26
|
reqId: string;
|
|
@@ -28,6 +28,7 @@ export interface WSAPIResponse<TResponseData extends object = object, TOperation
|
|
|
28
28
|
retMsg: 'OK' | string;
|
|
29
29
|
op: TOperation;
|
|
30
30
|
data: TResponseData;
|
|
31
|
+
retExtInfo: TResponseExtInfo;
|
|
31
32
|
header?: {
|
|
32
33
|
'X-Bapi-Limit': string;
|
|
33
34
|
'X-Bapi-Limit-Status': string;
|
|
@@ -352,3 +352,10 @@ export interface WSSpreadExecutionV5 {
|
|
|
352
352
|
seq: number;
|
|
353
353
|
}
|
|
354
354
|
export type WSSpreadExecutionEventV5 = WSPrivateTopicEventV5<'spread.execution', WSSpreadExecutionV5[]>;
|
|
355
|
+
export interface WSInsuranceV5 {
|
|
356
|
+
coin: string;
|
|
357
|
+
symbols: string;
|
|
358
|
+
balance: string;
|
|
359
|
+
updateTime: string;
|
|
360
|
+
}
|
|
361
|
+
export type WSInsuranceEventV5 = WSPublicTopicEventV5<'insurance.USDT' | 'insurance.USDC' | 'insurance.inverse', 'snapshot' | 'delta', WSInsuranceV5[]>;
|
|
@@ -86,7 +86,7 @@ TWSKey extends string, TWSRequestEvent extends object> extends EventEmitter {
|
|
|
86
86
|
* State store to track a list of topics (topic requests) we are expected to be subscribed to if reconnected
|
|
87
87
|
*/
|
|
88
88
|
private wsStore;
|
|
89
|
-
|
|
89
|
+
logger: typeof DefaultLogger;
|
|
90
90
|
protected options: WebsocketClientOptions;
|
|
91
91
|
private wsApiRequestId;
|
|
92
92
|
private timeOffsetMs;
|
|
@@ -151,7 +151,7 @@ TWSKey extends string, TWSRequestEvent extends object> extends EventEmitter {
|
|
|
151
151
|
* @param wsRequests array of topics to subscribe to
|
|
152
152
|
* @param wsKey ws key referring to the ws connection these topics should be subscribed on
|
|
153
153
|
*/
|
|
154
|
-
protected subscribeTopicsForWsKey(wsTopicRequests: WsTopicRequestOrStringTopic<string>[], wsKey: TWSKey): Promise<
|
|
154
|
+
protected subscribeTopicsForWsKey(wsTopicRequests: WsTopicRequestOrStringTopic<string>[], wsKey: TWSKey): Promise<boolean | WSConnectedResult | Awaited<TWSRequestEvent>[] | undefined>;
|
|
155
155
|
protected unsubscribeTopicsForWsKey(wsTopicRequests: WsTopicRequestOrStringTopic<string>[], wsKey: TWSKey): Promise<unknown>;
|
|
156
156
|
/**
|
|
157
157
|
* Splits topic requests into two groups, public & private topic requests
|
|
@@ -165,7 +165,7 @@ TWSKey extends string, TWSRequestEvent extends object> extends EventEmitter {
|
|
|
165
165
|
/**
|
|
166
166
|
* Request connection to a specific websocket, instead of waiting for automatic connection.
|
|
167
167
|
*/
|
|
168
|
-
connect(wsKey: TWSKey): Promise<WSConnectedResult | undefined>;
|
|
168
|
+
connect(wsKey: TWSKey, customUrl?: string | undefined, throwOnError?: boolean): Promise<WSConnectedResult | undefined>;
|
|
169
169
|
private connectToWsUrl;
|
|
170
170
|
private parseWsError;
|
|
171
171
|
/** Get a signature, build the auth request and send it */
|
package/lib/util/BaseWSClient.js
CHANGED
|
@@ -163,7 +163,7 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
163
163
|
*/
|
|
164
164
|
this.logger.trace('WS not connected - requests queued for retry once connected.', Object.assign(Object.assign({}, websockets_1.WS_LOGGER_CATEGORY), { wsKey,
|
|
165
165
|
wsTopicRequests }));
|
|
166
|
-
return;
|
|
166
|
+
return isConnectionInProgress;
|
|
167
167
|
}
|
|
168
168
|
// We're connected. Check if auth is needed and if already authenticated
|
|
169
169
|
const isPrivateConnection = this.isPrivateWsKey(wsKey);
|
|
@@ -254,9 +254,9 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
254
254
|
/**
|
|
255
255
|
* Request connection to a specific websocket, instead of waiting for automatic connection.
|
|
256
256
|
*/
|
|
257
|
-
connect(wsKey) {
|
|
257
|
+
connect(wsKey, customUrl, throwOnError) {
|
|
258
258
|
return __awaiter(this, void 0, void 0, function* () {
|
|
259
|
-
var _a;
|
|
259
|
+
var _a, _b;
|
|
260
260
|
try {
|
|
261
261
|
if (this.wsStore.isWsOpen(wsKey)) {
|
|
262
262
|
this.logger.error('Refused to connect to ws with existing active connection', Object.assign(Object.assign({}, websockets_1.WS_LOGGER_CATEGORY), { wsKey }));
|
|
@@ -264,7 +264,7 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
264
264
|
}
|
|
265
265
|
if (this.wsStore.isConnectionState(wsKey, websockets_1.WsConnectionStateEnum.CONNECTING)) {
|
|
266
266
|
this.logger.error('Refused to connect to ws, connection attempt already active', Object.assign(Object.assign({}, websockets_1.WS_LOGGER_CATEGORY), { wsKey }));
|
|
267
|
-
return;
|
|
267
|
+
return (_a = this.wsStore.getConnectionInProgressPromise(wsKey)) === null || _a === void 0 ? void 0 : _a.promise;
|
|
268
268
|
}
|
|
269
269
|
if (!this.wsStore.getConnectionState(wsKey) ||
|
|
270
270
|
this.wsStore.isConnectionState(wsKey, websockets_1.WsConnectionStateEnum.INITIAL)) {
|
|
@@ -273,14 +273,17 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
273
273
|
if (!this.wsStore.getConnectionInProgressPromise(wsKey)) {
|
|
274
274
|
this.wsStore.createConnectionInProgressPromise(wsKey, false);
|
|
275
275
|
}
|
|
276
|
-
const url = yield this.getWsUrl(wsKey);
|
|
276
|
+
const url = customUrl || (yield this.getWsUrl(wsKey));
|
|
277
277
|
const ws = this.connectToWsUrl(url, wsKey);
|
|
278
278
|
this.wsStore.setWs(wsKey, ws);
|
|
279
|
-
return (
|
|
279
|
+
return (_b = this.wsStore.getConnectionInProgressPromise(wsKey)) === null || _b === void 0 ? void 0 : _b.promise;
|
|
280
280
|
}
|
|
281
281
|
catch (err) {
|
|
282
282
|
this.parseWsError('Connection failed', err, wsKey);
|
|
283
283
|
this.reconnectWithDelay(wsKey, this.options.reconnectTimeout);
|
|
284
|
+
if (throwOnError) {
|
|
285
|
+
throw err;
|
|
286
|
+
}
|
|
284
287
|
}
|
|
285
288
|
});
|
|
286
289
|
}
|
|
@@ -293,6 +296,7 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
293
296
|
ws.onmessage = (event) => this.onWsMessage(event, wsKey, ws);
|
|
294
297
|
ws.onerror = (event) => this.parseWsError('Websocket onWsError', event, wsKey);
|
|
295
298
|
ws.onclose = (event) => this.onWsClose(event, wsKey);
|
|
299
|
+
ws.wsKey = wsKey;
|
|
296
300
|
return ws;
|
|
297
301
|
}
|
|
298
302
|
parseWsError(context, error, wsKey) {
|
|
@@ -347,11 +351,13 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
347
351
|
if (!this.wsStore.isConnectionAttemptInProgress(wsKey)) {
|
|
348
352
|
this.setWsState(wsKey, websockets_1.WsConnectionStateEnum.RECONNECTING);
|
|
349
353
|
}
|
|
354
|
+
this.logger.info('Reconnecting to websocket with delay...', Object.assign(Object.assign({}, websockets_1.WS_LOGGER_CATEGORY), { wsKey,
|
|
355
|
+
connectionDelayMs }));
|
|
350
356
|
if ((_a = this.wsStore.get(wsKey)) === null || _a === void 0 ? void 0 : _a.activeReconnectTimer) {
|
|
351
357
|
this.clearReconnectTimer(wsKey);
|
|
352
358
|
}
|
|
353
359
|
this.wsStore.get(wsKey, true).activeReconnectTimer = setTimeout(() => {
|
|
354
|
-
this.logger.info('Reconnecting to websocket', Object.assign(Object.assign({}, websockets_1.WS_LOGGER_CATEGORY), { wsKey }));
|
|
360
|
+
this.logger.info('Reconnecting to websocket now', Object.assign(Object.assign({}, websockets_1.WS_LOGGER_CATEGORY), { wsKey }));
|
|
355
361
|
this.clearReconnectTimer(wsKey);
|
|
356
362
|
this.connect(wsKey);
|
|
357
363
|
}, connectionDelayMs);
|
|
@@ -699,6 +705,8 @@ class BaseWebsocketClient extends events_1.default {
|
|
|
699
705
|
this.logger.trace(`onWsClose(${wsKey}): rejecting all deferred promises...`);
|
|
700
706
|
this.getWsStore().rejectAllDeferredPromises(wsKey, 'disconnected');
|
|
701
707
|
this.setWsState(wsKey, websockets_1.WsConnectionStateEnum.INITIAL);
|
|
708
|
+
// This was an intentional close, delete all state for this connection, as if it never existed:
|
|
709
|
+
this.wsStore.delete(wsKey);
|
|
702
710
|
this.emit('close', { wsKey, event });
|
|
703
711
|
}
|
|
704
712
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseWSClient.js","sourceRoot":"","sources":["../../src/util/BaseWSClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4BAA4B;AAC5B,uDAAuD;AACvD,oDAAkC;AAClC,kEAAsC;AAEtC,qCAAyC;AACzC,oCAMkB;AAClB,kDAA+C;AAC/C,6CAQsB;AAwFtB;;GAEG;AACH,4EAA4E;AAC5E,MAAsB,mBAMpB,SAAQ,gBAAY;IAuBpB,YACE,OAAqC,EACrC,MAA6B;QAE7B,KAAK,EAAE,CAAC;QAjBF,mBAAc,GAAW,CAAC,CAAC;QAE3B,iBAAY,GAAW,CAAC,CAAC;QAEjC;;;WAGG;QACK,qCAAgC,GAGpC,EAAE,CAAC;QAQL,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,sBAAa,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAExC,IAAI,CAAC,OAAO;YACV,iBAAiB;YACjB,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK;YAElB,uDAAuD;YACvD,MAAM,EAAE,IAAI,EAEZ,WAAW,EAAE,IAAI,EACjB,YAAY,EAAE,KAAK,EACnB,gBAAgB,EAAE,GAAG,EACrB,UAAU,EAAE,IAAI;YAEhB,iGAAiG;YACjG,6FAA6F;YAC7F,wBAAwB,EAAE,KAAK;YAE/B,qGAAqG;YACrG,+BAA+B,EAAE,IAAI;YACrC,uEAAuE;YACvE,mBAAmB,EAAE,KAAK,IAEvB,OAAO,CACX,CAAC;IACJ,CAAC;IAqDS,cAAc,CAAC,KAAa;QACpC,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,gGAAgG;IACtF,eAAe;QACvB,OAAO,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;IACpC,CAAC;IAcM,eAAe;QACpB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAEM,eAAe,CAAC,SAAiB;QACtC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;IAChC,CAAC;IAEO,gCAAgC,CAAC,KAAa;QACpD,IAAI,CAAC,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACpD,CAAC;QAED,OAAO,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAE,CAAC;IACvD,CAAC;IAES,mCAAmC,CAC3C,KAAa,EACb,WAAqD;QAErD,6FAA6F;QAC7F,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;QAE1C,uNAAuN;QAEvN,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,OAAO,CAChB,CACE,QAA6D,EAC7D,QAA6D,EAC7D,EAAE;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;YACpE,cAAc,CAAC,UAAU,CAAC,GAAG;gBAC3B,WAAW,EAAE,WAAW,CAAC,YAAY;gBACrC,QAAQ;gBACR,QAAQ;aACT,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAES,8BAA8B,CAAC,KAAa,EAAE,UAAkB;QACxE,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;QACpE,OAAO,cAAc,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAEO,+BAA+B,CACrC,KAAa,EACb,SAAkB,EAClB,YAAoB;QAEpB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,cAAc,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;YAEpE,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE,CAAC;gBACxC,MAAM,OAAO,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;gBAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mCAAmC,KAAK,KAAK,SAAS,KAAK,YAAY,KAAK,UAAU,6BAA6B,IAAI,CAAC,SAAS,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,EAAE,CAAC,EAAE,CAChK,CAAC;gBACF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACO,oCAAoC,CAC5C,KAAa,EACb,UAAkB,EAClB,GAAW,EACX,+BAAwC;QAExC,MAAM,oBAAoB,GAAG,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;QAC1E,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACpE,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,IAAI,+BAA+B,EAAE,CAAC;YACpC,0BAA0B,CAAC,QAAQ,CACjC,0BAA0B,CAAC,WAAW,CACvC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+CAA+C,KAAK,KAAK,UAAU,KAAK,GAAG,KAAK,+BAA+B,KAAK,EACpH,GAAG,CACJ,CAAC;YACF,IAAI,CAAC;gBACH,0BAA0B,CAAC,QAAQ,CACjC,0BAA0B,CAAC,WAAW,EACtC,GAAG,CACJ,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,IAAI,CAAC,8BAA8B,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;IAED;;;;;;;;;;;;OAYG;IACa,uBAAuB,CACrC,eAAsD,EACtD,KAAa;;;YAEb,MAAM,uBAAuB,GAAG,IAAA,uCAA0B,EAAC,eAAe,CAAC,CAAC;YAE5E,oHAAoH;YACpH,KAAK,MAAM,KAAK,IAAI,uBAAuB,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACtC,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAChD,KAAK,EACL,kCAAqB,CAAC,SAAS,CAChC,CAAC;YAEF,MAAM,sBAAsB,GAC1B,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;YAEpD,qGAAqG;YACrG,IAAI,CAAC,WAAW,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YAED,8GAA8G;YAC9G,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB;;mBAEG;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,8DAA8D,kCAEzD,+BAAkB,KACrB,KAAK;oBACL,eAAe,IAElB,CAAC;gBACF,OAAO;YACT,CAAC;YAED,wEAAwE;YACxE,MAAM,mBAAmB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,eAAe,CAAC;YACjE,IAAI,mBAAmB,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC5C;;;;mBAIG;gBACH,OAAO,KAAK,CAAC;YACf,CAAC;YAED,iFAAiF;YACjF,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;QACrE,CAAC;KAAA;IAEe,yBAAyB,CACvC,eAAsD,EACtD,KAAa;;;YAEb,MAAM,uBAAuB,GAAG,IAAA,uCAA0B,EAAC,eAAe,CAAC,CAAC;YAE5E,oHAAoH;YACpH,KAAK,MAAM,KAAK,IAAI,uBAAuB,EAAE,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAChD,KAAK,EACL,kCAAqB,CAAC,SAAS,CAChC,CAAC;YAEF,+CAA+C;YAC/C,kGAAkG;YAClG,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO;YACT,CAAC;YAED,wEAAwE;YACxE,MAAM,mBAAmB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACvD,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,eAAe,CAAC;YACjE,IAAI,mBAAmB,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC5C;;;mBAGG;gBACH,OAAO;YACT,CAAC;YAED,iFAAiF;YACjF,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;QACvE,CAAC;KAAA;IAED;;OAEG;IACK,kCAAkC,CACxC,eAAyC,EACzC,KAAa;QAKb,MAAM,mBAAmB,GAA6B,EAAE,CAAC;QACzD,MAAM,oBAAoB,GAA6B,EAAE,CAAC;QAE1D,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC7C,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACN,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,OAAO;YACL,UAAU,EAAE,mBAAmB;YAC/B,WAAW,EAAE,oBAAoB;SAClC,CAAC;IACJ,CAAC;IAED,sDAAsD;IAC/C,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,KAAa,EAAE,KAAe;QACzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,kCAAO,+BAAkB,KAAE,KAAK,IAAG,CAAC;QACzE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,kCAAqB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7B,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,KAAK,EAAE,CAAC;QACZ,IAAI,KAAK,EAAE,CAAC;YACV,IAAA,4BAAe,EAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAEM,QAAQ,CAAC,KAAe;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAEpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,WAAW,CAAC,KAAa;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CACnC,KAAK,EACL,kCAAqB,CAAC,SAAS,CAChC,CAAC;IACJ,CAAC;IAED;;OAEG;IACU,OAAO,CAAC,KAAa;;;YAChC,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,0DAA0D,kCACrD,+BAAkB,KAAE,KAAK,IAC/B,CAAC;oBACF,OAAO,EAAE,KAAK,EAAE,CAAC;gBACnB,CAAC;gBAED,IACE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,kCAAqB,CAAC,UAAU,CAAC,EACvE,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6DAA6D,kCACxD,+BAAkB,KAAE,KAAK,IAC/B,CAAC;oBACF,OAAO;gBACT,CAAC;gBAED,IACE,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC;oBACvC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,EAAE,kCAAqB,CAAC,OAAO,CAAC,EACpE,CAAC;oBACD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,kCAAqB,CAAC,UAAU,CAAC,CAAC;gBAC3D,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxD,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAC/D,CAAC;gBAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACvC,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAE3C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAE9B,OAAO,MAAA,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,KAAK,CAAC,0CAAE,OAAO,CAAC;YACrE,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gBACnD,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAiB,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;KAAA;IAEO,cAAc,CAAC,GAAW,EAAE,KAAa;;QAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,kCACnD,+BAAkB,KACrB,KAAK,IACL,CAAC;QAEH,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,cAAc,0CAAE,KAAK,CAAC;QACjD,MAAM,EAAE,GAAG,IAAI,uBAAS,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAExE,EAAE,CAAC,MAAM,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACxD,EAAE,CAAC,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAClE,EAAE,CAAC,OAAO,GAAG,CAAC,KAAU,EAAE,EAAE,CAC1B,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACzD,EAAE,CAAC,OAAO,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE1D,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,YAAY,CAAC,OAAe,EAAE,KAAU,EAAE,KAAa;QAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACjE,IAAI,CAAC,IAAI,CAAC,UAAU,kCAAO,KAAK,KAAE,KAAK,IAAG,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,WAAW,kCAAO,KAAK,KAAE,KAAK,IAAG,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,QAAQ,KAAK,CAAC,OAAO,EAAE,CAAC;YACtB,KAAK,iCAAiC;gBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,oCAAoC,kCAC3D,+BAAkB,KACrB,KAAK,IACL,CAAC;gBACH,MAAM;YAER;gBACE,IACE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC;oBACtC,kCAAqB,CAAC,OAAO,EAC7B,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,GAAG,OAAO,uCACR,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,MAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAA,IAAI,KAClC,GAAG,kCACE,+BAAkB,KAAE,KAAK,EAAE,KAAK,IACtC,CAAC;oBACF,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAC;gBAC/D,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,KAAK,gDAAgD,CACzD,CAAC;gBACJ,CAAC;gBACD,MAAM;QACV,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,OAAO,KAAK,KAAK,KAAK,KAAK,IAAI,EAAE,KAAK,CAAC,CAAC;QAE1E,IAAI,CAAC,IAAI,CAAC,UAAU,kCAAO,KAAK,KAAE,KAAK,IAAG,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,WAAW,kCAAO,KAAK,KAAE,KAAK,IAAG,CAAC;IAC9C,CAAC;IAED,0DAA0D;IAC5C,eAAe,CAAC,KAAa;;;YACzC,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,kCACtC,+BAAkB,KACrB,KAAK,IACL,CAAC;gBAEH,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAEpC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC5D,IAAI,CAAC,OAAO,CAAC,qCAAqC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBACnE,CAAC;gBAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;gBAExD,uCAAuC;gBAEvC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAE/C,OAAO,MAAA,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,KAAK,CAAC,0CAAE,OAAO,CAAC;YACzE,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,kCAAO,+BAAkB,KAAE,KAAK,IAAG,CAAC;YACzD,CAAC;QACH,CAAC;KAAA;IAEO,kBAAkB,CAAC,KAAa,EAAE,iBAAyB;;QACjE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,KAAK,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,kCAAqB,CAAC,YAAY,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,oBAAoB,EAAE,CAAC;YAClD,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,oBAAoB,GAAG,UAAU,CAAC,GAAG,EAAE;YACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,kCACvC,+BAAkB,KACrB,KAAK,IACL,CAAC;YACH,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACxB,CAAC;IAEO,IAAI,CAAC,KAAa;QACxB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,kCAAO,+BAAkB,KAAE,KAAK,IAAG,CAAC;QACpE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QAE5C,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kCAAkC,KAAK,yBAAyB,CACjE,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAE9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,eAAe,GAAG,UAAU,CACxD,GAAG,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,cAAc,CAAC,EAC3D,IAAI,CAAC,OAAO,CAAC,WAAW,CACzB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,yBAAyB,CAAC,KAAa,EAAE,MAAc;QAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,gCAAgC,kCACrD,+BAAkB,KACrB,KAAK;YACL,MAAM,IACN,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE7C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAE7B,IAAI,EAAE,EAAE,CAAC;YACP,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,IAAA,4BAAe,EAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,MAAM,wDAAwD,kCAE5D,+BAAkB,KACrB,KAAK;gBACL,MAAM,IAET,CAAC;YACF,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,KAAa;QAC/B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,2BAA2B;IACnB,cAAc,CAAC,KAAa;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE,CAAC;YAC7B,aAAa,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACvC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;QACtC,CAAC;IACH,CAAC;IAED,oCAAoC;IAC5B,cAAc,CAAC,KAAa;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EAAE,CAAC;YAC7B,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACtC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;YACpC,4DAA4D;QAC9D,CAAC;aAAM,CAAC;YACN,4DAA4D;QAC9D,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,KAAa;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oBAAoB,EAAE,CAAC;YAClC,YAAY,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAC3C,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;QAC3C,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACa,6BAA6B,CAC3C,MAAgC,EAChC,KAAa,EACb,SAAsB;;YAEtB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,2DAA2D;YAC3D,MAAM,aAAa,GAA+C,EAAE,CAAC;YACrE,MAAM,MAAM,GAAa,KAAK,CAAC;YAE/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;YACpE,IACE,iBAAiB;gBACjB,iBAAiB,KAAK,IAAI;gBAC1B,MAAM,CAAC,MAAM,GAAG,iBAAiB,EACjC,CAAC;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,iBAAiB,EAAE,CAAC;oBAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,CAAC;oBACrD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1D,MAAM,EACN,SAAS,EACT,KAAK,EACL,KAAK,CACN,CAAC;oBAEF,aAAa,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;gBAChD,CAAC;gBAED,OAAO,aAAa,CAAC;YACvB,CAAC;YAED,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAC1D,MAAM,EACN,SAAS,EACT,MAAM,EACN,KAAK,CACN,CAAC;YAEF,OAAO,sBAAsB,CAAC;QAChC,CAAC;KAAA;IAED;;;;OAIG;IACW,sBAAsB,CAClC,KAAa,EACb,eAAyC;;YAEzC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YAED,gEAAgE;YAChE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAClE,eAAe,EACf,KAAK,EACL,WAAW,CACZ,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kBAAkB,eAAe,CAAC,MAAM,KAAK,KAAK,eAAe,mBAAmB,CAAC,MAAM,WAAW,CACvG,CAAC;YAEF,0EAA0E;YAE1E,MAAM,QAAQ,GAA+B,EAAE,CAAC;YAEhD,KAAK,MAAM,gBAAgB,IAAI,mBAAmB,EAAE,CAAC;gBACnD,MAAM,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC;gBAEhD,IAAI,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;oBAC1C,QAAQ,CAAC,IAAI,CACX,IAAI,CAAC,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAClE,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+BAA+B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAC5D,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2BAA2B,eAAe,CAAC,MAAM,KAAK,KAAK,eAAe,mBAAmB,CAAC,MAAM,WAAW,CAChH,CAAC;YAEF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;KAAA;IAED;;;;OAIG;IACW,wBAAwB,CACpC,KAAa,EACb,eAAyC;;YAEzC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YAED,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAClE,eAAe,EACf,KAAK,EACL,aAAa,CACd,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,oBAAoB,eAAe,CAAC,MAAM,KAAK,KAAK,eAAe,mBAAmB,CAAC,MAAM,sBAAsB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CACtJ,CAAC;YAEF,MAAM,QAAQ,GAA+B,EAAE,CAAC;YAEhD,KAAK,MAAM,gBAAgB,IAAI,mBAAmB,EAAE,CAAC;gBACnD,MAAM,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC;gBAEhD,IAAI,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;oBAC1C,QAAQ,CAAC,IAAI,CACX,IAAI,CAAC,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAClE,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,SAAS,GAAG,CAAC,CAAC;gBAC/D,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YACnD,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6BAA6B,eAAe,CAAC,MAAM,KAAK,KAAK,eAAe,mBAAmB,CAAC,MAAM,WAAW,CAClH,CAAC;YAEF,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;KAAA;IAED;;OAEG;IACI,SAAS,CACd,KAAa,EACb,SAAiB,EACjB,eAAyB;QAEzB,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,kCAC5C,+BAAkB,KACrB,SAAS;gBACT,KAAK,IACL,CAAC;YACH,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;YACJ,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,mGAAmG,CAC5G,CAAC;YACJ,CAAC;YACD,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,kCACxC,+BAAkB,KACrB,SAAS;gBACT,KAAK,EACL,SAAS,EAAE,CAAC,IACZ,CAAC;YACH,IAAI,eAAe,EAAE,CAAC;gBACpB,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAEa,QAAQ,CAAC,KAAU,EAAE,KAAa;;YAC9C,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAC7D,KAAK,EACL,kCAAqB,CAAC,UAAU,CACjC,CAAC;YAEF,MAAM,qBAAqB,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAC1D,KAAK,EACL,kCAAqB,CAAC,YAAY,CACnC,CAAC;YAEF,IAAI,wBAAwB,EAAE,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,kCACjC,+BAAkB,KACrB,KAAK,EACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,EACtC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,IAC3B,CAAC;gBAEH,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACtC,CAAC;iBAAM,IAAI,qBAAqB,EAAE,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,kCACnC,+BAAkB,KACrB,KAAK,EACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,IAAI,EACtC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,IAC3B,CAAC;gBAEH,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,kCAAqB,CAAC,SAAS,CAAC,CAAC;YAExD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,kCAAO,+BAAkB,KAAE,KAAK,IAAG,CAAC;YAC1E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAE,CAAC,eAAe,GAAG,WAAW,CAC1D,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EACtB,IAAI,CAAC,OAAO,CAAC,YAAY,CAC1B,CAAC;YAEF,sEAAsE;YACtE,IAAI,CAAC;gBACH,MAAM,2BAA2B,GAC/B,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;gBACrD,IAAI,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,OAAO,EAAE,CAAC;oBACzC,2BAA2B,CAAC,OAAO,CAAC;wBAClC,KAAK;qBACN,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4DAA4D,EAC5D,CAAC,CACF,CAAC;YACJ,CAAC;YAED,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;YAEtD,gDAAgD;YAChD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,kCAAkC,CACzE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAClC,KAAK,CACN,CAAC;YAEF,uCAAuC;YACvC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACvD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,0DAA0D,KAAK,KAAK,EACpE,UAAU,EACV,CAAC,CACF,CAAC;YACJ,CAAC;YAED,iEAAiE;YACjE,yEAAyE;YACzE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC;gBAClD,IAAI,CAAC;oBACH,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2DAA2D,KAAK,IAAI,EACpE,WAAW,EACX,CAAC,CACF,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,iFAAiF;YACjF,IACE,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAC5C,CAAC;gBACD,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;KAAA;IAED;;;;OAIG;IACK,iBAAiB,CAAC,KAAa,EAAE,KAAc;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9C,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;QAE/B,sEAAsE;QACtE,IAAI,CAAC;YACH,MAAM,iBAAiB,GACrB,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,KAAK,CAAC,CAAC;YAEzD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,EAAE,CAAC;gBAC/B,iBAAiB,CAAC,OAAO,CAAC;oBACxB,KAAK;oBACL,KAAK;iBACN,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4DAA4D,EAC5D,CAAC,CACF,CAAC;QACJ,CAAC;QAED,iEAAiE;QACjE,IAAI,CAAC,OAAO,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC;QAE1D,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAC5C,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CACzC,CAAC;YAEF,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;gBACzB,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,KAAc,EAAE,KAAa,EAAE,EAAa;QAC9D,IAAI,CAAC;YACH,sDAAsD;YACtD,yFAAyF;YACzF,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAE3B,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,kCAC5B,+BAAkB,KACrB,KAAK,EACL,KAAK,EAAG,KAAa,aAAb,KAAK,uBAAL,KAAK,CAAU,IAAI,IAC3B,CAAC;gBACH,OAAO;YACT,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,kCAC5B,+BAAkB,KACrB,KAAK;oBACL,KAAK,IACL,CAAC;gBACH,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC9B,OAAO;YACT,CAAC;YAED,IAAI,IAAA,sBAAc,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;gBACxB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE5B,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAElE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;oBAC5B,mEAAmE;oBACnE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,sEAAsE,kCAEjE,+BAAkB,KACrB,OAAO,EAAE,IAAI,IAAI,YAAY,EAC7B,QAAQ;wBACR,KAAK;wBACL,KAAK,IAER,CAAC;oBAEF,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,kCAAO,KAAK,KAAE,KAAK,IAAG,CAAC;gBAClD,CAAC;gBAED,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;oBACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,kCAC7B,+BAAkB,KACrB,KAAK;4BACL,IAAI,IACJ,CAAC;wBACH,SAAS;oBACX,CAAC;oBACD,MAAM,mBAAmB,mCACpB,SAAS,CAAC,KAAK,KAClB,KAAK,EACL,eAAe,EAAE,SAAS,CAAC,eAAe,GAC3C,CAAC;oBAEF,IAAI,SAAS,CAAC,SAAS,KAAK,eAAe,EAAE,CAAC;wBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,kCACzC,+BAAkB,KACrB,KAAK;4BACL,SAAS,IACT,CAAC;wBACH,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;wBACpD,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;wBAC/C,SAAS;oBACX,CAAC;oBAED,qBAAqB;oBACrB,kDAAkD;oBAClD,yBAAyB;oBACzB,KAAK;oBACL,IAAI,CAAC;wBACH,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;oBACtD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,mCAAmC,SAAS,CAAC,SAAS,YAAY,EAClE,CAAC,CACF,CAAC;oBACJ,CAAC;oBACD,qBAAqB;oBACrB,yDAAyD;oBACzD,yBAAyB;oBACzB,KAAK;gBACP,CAAC;gBAED,OAAO;YACT,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qEAAqE,kCAEhE,+BAAkB,KACrB,OAAO,EAAE,KAAK,IAAI,YAAY,EAC9B,KAAK;gBACL,KAAK,IAER,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,kCAC/C,+BAAkB,KACrB,KAAK,EAAE,CAAC,EACR,KAAK;gBACL,KAAK,IACL,CAAC;QACL,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,KAAc,EAAE,KAAa;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,kCACzC,+BAAkB,KACrB,KAAK,IACL,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9C,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC;QAEhC,IACE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,kCAAqB,CAAC,OAAO,EACxE,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,aAAa,KAAK,uCAAuC,CAC1D,CAAC;YACF,oDAAoD;YACpD,IAAI,CAAC,UAAU,EAAE,CAAC,yBAAyB,CACzC,KAAK,EACL,+BAA+B,CAChC,CAAC;YAEF,IAAI,CAAC,+BAA+B,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YAE/D,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,kCAAqB,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAiB,CAAC,CAAC;YAC/D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,oDAAoD;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,aAAa,KAAK,uCAAuC,CAC1D,CAAC;YACF,IAAI,CAAC,UAAU,EAAE,CAAC,yBAAyB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACnE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,kCAAqB,CAAC,OAAO,CAAC,CAAC;YACtD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,KAAa;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAEO,UAAU,CAAC,KAAa,EAAE,KAA4B;QAC5D,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACU,iBAAiB,CAAC,KAAa;;YAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACrD,KAAK,EACL,kCAAqB,CAAC,SAAS,CAChC,CAAC;YAEF,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,iBAAiB,GACrB,IAAI,CAAC,UAAU,EAAE,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;gBAE1D,sDAAsD;gBACtD,IAAI,iBAAiB,EAAE,CAAC;oBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;oBACtD,MAAM,iBAAiB,CAAC,OAAO,CAAC;oBAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBACrD,OAAO,iBAAiB,CAAC,OAAO,CAAC;gBACnC,CAAC;gBAED,oEAAoE;gBACpE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBAExD,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAE1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;KAAA;IAED;;OAEG;IACU,qBAAqB,CAAC,KAAa;;;YAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACrD,KAAK,EACL,kCAAqB,CAAC,SAAS,CAChC,CAAC;YAEF,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC;YAED,MAAM,iBAAiB,GACrB,IAAI,CAAC,UAAU,EAAE,CAAC,kCAAkC,CAAC,KAAK,CAAC,CAAC;YAE9D,sDAAsD;YACtD,IAAI,iBAAiB,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAC1D,MAAM,iBAAiB,CAAC,OAAO,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC7D,OAAO;YACT,CAAC;YAED,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,eAAe,CAAC;YACjE,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBACjD,OAAO;YACT,CAAC;YAED,wEAAwE;YACxE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAEhE,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAElC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACrE,CAAC;KAAA;CACF;AAlsCD,kDAksCC"}
|
|
1
|
+
{"version":3,"file":"BaseWSClient.js","sourceRoot":"","sources":["../../src/util/BaseWSClient.ts"],"names":[],"mappings":"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"}
|
package/lib/util/logger.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type LogParams = null | any;
|
|
2
|
+
export type DefaultLogger = typeof DefaultLogger;
|
|
2
3
|
export declare const DefaultLogger: {
|
|
3
4
|
/** Ping/pong events and other raw messages that might be noisy. Enable this while troubleshooting. */
|
|
4
5
|
trace: (..._params: LogParams) => void;
|
package/lib/util/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";;;AAOa,QAAA,aAAa,GAAG;IAC3B,sGAAsG;IACtG,KAAK,EAAE,CAAC,GAAG,OAAkB,EAAQ,EAAE;QACrC,wBAAwB;IAC1B,CAAC;IACD,IAAI,EAAE,CAAC,GAAG,MAAiB,EAAQ,EAAE;QACnC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,KAAK,EAAE,CAAC,GAAG,MAAiB,EAAQ,EAAE;QACpC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;CACF,CAAC"}
|
|
@@ -13,7 +13,7 @@ type DeferredPromiseRef = (typeof DEFERRED_PROMISE_REF)[keyof typeof DEFERRED_PR
|
|
|
13
13
|
export declare class WsStore<WsKey extends string, TWSTopicSubscribeEventArgs extends string | object> {
|
|
14
14
|
private wsState;
|
|
15
15
|
private logger;
|
|
16
|
-
constructor(logger:
|
|
16
|
+
constructor(logger: DefaultLogger);
|
|
17
17
|
/** Get WS stored state for key, optionally create if missing */
|
|
18
18
|
get(key: WsKey, createIfMissing?: true): WsStoredState<TWSTopicSubscribeEventArgs>;
|
|
19
19
|
get(key: WsKey, createIfMissing?: false): WsStoredState<TWSTopicSubscribeEventArgs> | undefined;
|
|
@@ -23,6 +23,9 @@ export declare class WsStore<WsKey extends string, TWSTopicSubscribeEventArgs ex
|
|
|
23
23
|
hasExistingActiveConnection(key: WsKey): boolean;
|
|
24
24
|
getWs(key: WsKey): WebSocket | undefined;
|
|
25
25
|
setWs(key: WsKey, wsConnection: WebSocket): WebSocket;
|
|
26
|
+
/**
|
|
27
|
+
* deferred promises
|
|
28
|
+
*/
|
|
26
29
|
getDeferredPromise<TSuccessResult = any>(wsKey: WsKey, promiseRef: string | DeferredPromiseRef): DeferredPromise<TSuccessResult> | undefined;
|
|
27
30
|
createDeferredPromise<TSuccessResult = any>(wsKey: WsKey, promiseRef: string | DeferredPromiseRef, throwIfExists: boolean): DeferredPromise<TSuccessResult>;
|
|
28
31
|
resolveDeferredPromise(wsKey: WsKey, promiseRef: string | DeferredPromiseRef, value: unknown, removeAfter: boolean): void;
|
|
@@ -78,6 +78,9 @@ class WsStore {
|
|
|
78
78
|
this.get(key, true).ws = wsConnection;
|
|
79
79
|
return wsConnection;
|
|
80
80
|
}
|
|
81
|
+
/**
|
|
82
|
+
* deferred promises
|
|
83
|
+
*/
|
|
81
84
|
getDeferredPromise(wsKey, promiseRef) {
|
|
82
85
|
const storeForKey = this.get(wsKey);
|
|
83
86
|
if (!storeForKey) {
|
|
@@ -122,8 +125,13 @@ class WsStore {
|
|
|
122
125
|
rejectDeferredPromise(wsKey, promiseRef, value, removeAfter) {
|
|
123
126
|
const promise = this.getDeferredPromise(wsKey, promiseRef);
|
|
124
127
|
if (promise === null || promise === void 0 ? void 0 : promise.reject) {
|
|
125
|
-
this.logger.trace(`rejectDeferredPromise(): rejecting ${wsKey}/${promiseRef}
|
|
126
|
-
|
|
128
|
+
this.logger.trace(`rejectDeferredPromise(): rejecting ${wsKey}/${promiseRef}`, value);
|
|
129
|
+
if (typeof value === 'string') {
|
|
130
|
+
promise.reject(new Error(value));
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
promise.reject(value);
|
|
134
|
+
}
|
|
127
135
|
}
|
|
128
136
|
if (removeAfter) {
|
|
129
137
|
this.removeDeferredPromise(wsKey, promiseRef);
|
|
@@ -156,6 +164,7 @@ class WsStore {
|
|
|
156
164
|
continue;
|
|
157
165
|
}
|
|
158
166
|
try {
|
|
167
|
+
this.logger.trace(`rejectAllDeferredPromises(): rejecting ${wsKey}/${promiseRef}/${reason}`);
|
|
159
168
|
this.rejectDeferredPromise(wsKey, promiseRef, reason, true);
|
|
160
169
|
}
|
|
161
170
|
catch (e) {
|
|
@@ -199,6 +208,7 @@ class WsStore {
|
|
|
199
208
|
}
|
|
200
209
|
setConnectionState(key, state) {
|
|
201
210
|
this.get(key, true).connectionState = state;
|
|
211
|
+
this.get(key, true).connectionStateChangedAt = new Date();
|
|
202
212
|
}
|
|
203
213
|
isConnectionState(key, state) {
|
|
204
214
|
return this.getConnectionState(key) === state;
|
|
@@ -211,6 +221,21 @@ class WsStore {
|
|
|
211
221
|
isConnectionAttemptInProgress(key) {
|
|
212
222
|
const isConnectionInProgress = this.isConnectionState(key, WsStore_types_1.WsConnectionStateEnum.CONNECTING) ||
|
|
213
223
|
this.isConnectionState(key, WsStore_types_1.WsConnectionStateEnum.RECONNECTING);
|
|
224
|
+
if (isConnectionInProgress) {
|
|
225
|
+
const wsState = this.get(key, true);
|
|
226
|
+
const stateLastChangedAt = wsState === null || wsState === void 0 ? void 0 : wsState.connectionStateChangedAt;
|
|
227
|
+
const stateChangedAtTimestamp = stateLastChangedAt === null || stateLastChangedAt === void 0 ? void 0 : stateLastChangedAt.getTime();
|
|
228
|
+
if (stateChangedAtTimestamp) {
|
|
229
|
+
const timestampNow = new Date().getTime();
|
|
230
|
+
const stateChangedTimeAgo = timestampNow - stateChangedAtTimestamp;
|
|
231
|
+
const stateChangeTimeout = 15000; // allow a max 15 second timeout since the last state change before assuming stuck;
|
|
232
|
+
if (stateChangedTimeAgo >= stateChangeTimeout) {
|
|
233
|
+
const msg = 'State change timed out, reconnect workflow stuck?';
|
|
234
|
+
this.logger.error(msg, { key, wsState });
|
|
235
|
+
this.setConnectionState(key, WsStore_types_1.WsConnectionStateEnum.ERROR);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
214
239
|
return isConnectionInProgress;
|
|
215
240
|
}
|
|
216
241
|
/* subscribed topics */
|
|
@@ -224,7 +249,6 @@ class WsStore {
|
|
|
224
249
|
}
|
|
225
250
|
return result;
|
|
226
251
|
}
|
|
227
|
-
// Since topics are objects we can't rely on the set to detect duplicates
|
|
228
252
|
/**
|
|
229
253
|
* Find matching "topic" request from the store
|
|
230
254
|
* @param key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WsStore.js","sourceRoot":"","sources":["../../../src/util/websockets/WsStore.ts"],"names":[],"mappings":";;;AAcA,8CAkBC;AA7BD,sCAA0C;AAC1C,mDAKyB;AAEzB;;GAEG;AACH,SAAgB,iBAAiB,CAAC,OAAgB,EAAE,OAAgB;IAClE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC/D,OAAO,OAAO,KAAK,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAI,OAAe,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,MAAM,GAAI,OAAe,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAEY,QAAA,oBAAoB,GAAG;IAClC,sBAAsB,EAAE,wBAAwB;IAChD,0BAA0B,EAAE,4BAA4B;CAChD,CAAC;AAKX,MAAa,OAAO;IASlB,YAAY,
|
|
1
|
+
{"version":3,"file":"WsStore.js","sourceRoot":"","sources":["../../../src/util/websockets/WsStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,8 @@ export declare enum WsConnectionStateEnum {
|
|
|
4
4
|
CONNECTING = 1,
|
|
5
5
|
CONNECTED = 2,
|
|
6
6
|
CLOSING = 3,
|
|
7
|
-
RECONNECTING = 4
|
|
7
|
+
RECONNECTING = 4,
|
|
8
|
+
ERROR = 5
|
|
8
9
|
}
|
|
9
10
|
export interface DeferredPromise<TSuccess = any, TError = any> {
|
|
10
11
|
resolve?: (value: TSuccess) => TSuccess;
|
|
@@ -19,6 +20,7 @@ export interface WsStoredState<TWSTopicSubscribeEvent extends string | object> {
|
|
|
19
20
|
ws?: WebSocket;
|
|
20
21
|
/** The current lifecycle state of the connection (enum) */
|
|
21
22
|
connectionState?: WsConnectionStateEnum;
|
|
23
|
+
connectionStateChangedAt?: Date;
|
|
22
24
|
/** A timer that will send an upstream heartbeat (ping) when it expires */
|
|
23
25
|
activePingTimer?: ReturnType<typeof setTimeout> | undefined;
|
|
24
26
|
/** A timer tracking that an upstream heartbeat was sent, expecting a reply before it expires */
|
|
@@ -9,6 +9,6 @@ var WsConnectionStateEnum;
|
|
|
9
9
|
WsConnectionStateEnum[WsConnectionStateEnum["CLOSING"] = 3] = "CLOSING";
|
|
10
10
|
WsConnectionStateEnum[WsConnectionStateEnum["RECONNECTING"] = 4] = "RECONNECTING";
|
|
11
11
|
// ERROR_RECONNECTING = 5,
|
|
12
|
-
|
|
12
|
+
WsConnectionStateEnum[WsConnectionStateEnum["ERROR"] = 5] = "ERROR";
|
|
13
13
|
})(WsConnectionStateEnum || (exports.WsConnectionStateEnum = WsConnectionStateEnum = {}));
|
|
14
14
|
//# sourceMappingURL=WsStore.types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WsStore.types.js","sourceRoot":"","sources":["../../../src/util/websockets/WsStore.types.ts"],"names":[],"mappings":";;;AAGA,IAAY,qBAQX;AARD,WAAY,qBAAqB;IAC/B,uEAAW,CAAA;IACX,6EAAc,CAAA;IACd,2EAAa,CAAA;IACb,uEAAW,CAAA;IACX,iFAAgB,CAAA;IAChB,0BAA0B;IAC1B,
|
|
1
|
+
{"version":3,"file":"WsStore.types.js","sourceRoot":"","sources":["../../../src/util/websockets/WsStore.types.ts"],"names":[],"mappings":";;;AAGA,IAAY,qBAQX;AARD,WAAY,qBAAqB;IAC/B,uEAAW,CAAA;IACX,6EAAc,CAAA;IACd,2EAAa,CAAA;IACb,uEAAW,CAAA;IACX,iFAAgB,CAAA;IAChB,0BAA0B;IAC1B,mEAAS,CAAA;AACX,CAAC,EARW,qBAAqB,qCAArB,qBAAqB,QAQhC"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { AmendOrderParamsV5, BatchAmendOrderParamsV5, BatchAmendOrderResultV5, BatchCancelOrderParamsV5, BatchCancelOrderResultV5, BatchCreateOrderResultV5, BatchOrderParamsV5, BatchOrdersRetExtInfoV5, CancelOrderParamsV5, OrderParamsV5, OrderResultV5 } from './types';
|
|
2
|
+
import { WSAPIResponse } from './types/websockets/ws-api';
|
|
3
|
+
import { WSClientConfigurableOptions } from './types/websockets/ws-general';
|
|
4
|
+
import { DefaultLogger } from './util';
|
|
5
|
+
import { WebsocketClient } from './websocket-client';
|
|
6
|
+
/**
|
|
7
|
+
* Configurable options specific to only the REST-like WebsocketAPIClient
|
|
8
|
+
*/
|
|
9
|
+
export interface WSAPIClientConfigurableOptions {
|
|
10
|
+
/**
|
|
11
|
+
* Default: true
|
|
12
|
+
*
|
|
13
|
+
* Attach default event listeners, which will console log any high level
|
|
14
|
+
* events (opened/reconnecting/reconnected/etc).
|
|
15
|
+
*
|
|
16
|
+
* If you disable this, you should set your own event listeners
|
|
17
|
+
* on the embedded WS Client `wsApiClient.getWSClient().on(....)`.
|
|
18
|
+
*/
|
|
19
|
+
attachEventListeners: boolean;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* This is a minimal Websocket API wrapper around the WebsocketClient.
|
|
23
|
+
*
|
|
24
|
+
* Some methods support passing in a custom "wsKey". This is a reference to which WS connection should
|
|
25
|
+
* be used to transmit that message. This is only useful if you wish to use an alternative wss
|
|
26
|
+
* domain that is supported by the SDK.
|
|
27
|
+
*
|
|
28
|
+
* Note: To use testnet, don't set the wsKey - use `testnet: true` in
|
|
29
|
+
* the constructor instead.
|
|
30
|
+
*
|
|
31
|
+
* Note: You can also directly use the sendWSAPIRequest() method to make WS API calls, but some
|
|
32
|
+
* may find the below methods slightly more intuitive.
|
|
33
|
+
*
|
|
34
|
+
* Refer to the WS API promises example for a more detailed example on using sendWSAPIRequest() directly:
|
|
35
|
+
* https://github.com/tiagosiebler/bybit-api/blob/master/examples/ws-api-raw-promises.ts
|
|
36
|
+
*/
|
|
37
|
+
export declare class WebsocketAPIClient {
|
|
38
|
+
private wsClient;
|
|
39
|
+
private logger;
|
|
40
|
+
private options;
|
|
41
|
+
constructor(options?: WSClientConfigurableOptions & Partial<WSAPIClientConfigurableOptions>, logger?: DefaultLogger);
|
|
42
|
+
getWSClient(): WebsocketClient;
|
|
43
|
+
setTimeOffsetMs(newOffset: number): void;
|
|
44
|
+
/**
|
|
45
|
+
* Submit a new order
|
|
46
|
+
*
|
|
47
|
+
* @param params
|
|
48
|
+
* @returns
|
|
49
|
+
*/
|
|
50
|
+
submitNewOrder(params: OrderParamsV5): Promise<WSAPIResponse<OrderResultV5, 'order.create'>>;
|
|
51
|
+
/**
|
|
52
|
+
* Amend an order
|
|
53
|
+
*
|
|
54
|
+
* @param params
|
|
55
|
+
* @returns
|
|
56
|
+
*/
|
|
57
|
+
amendOrder(params: AmendOrderParamsV5): Promise<WSAPIResponse<OrderResultV5, 'order.amend'>>;
|
|
58
|
+
/**
|
|
59
|
+
* Cancel an order
|
|
60
|
+
*
|
|
61
|
+
* @param params
|
|
62
|
+
* @returns
|
|
63
|
+
*/
|
|
64
|
+
cancelOrder(params: CancelOrderParamsV5): Promise<WSAPIResponse<OrderResultV5, 'order.cancel'>>;
|
|
65
|
+
/**
|
|
66
|
+
* Batch submit orders
|
|
67
|
+
*
|
|
68
|
+
* @param params
|
|
69
|
+
* @returns
|
|
70
|
+
*/
|
|
71
|
+
batchSubmitOrders(category: 'option' | 'linear', orders: BatchOrderParamsV5[]): Promise<WSAPIResponse<{
|
|
72
|
+
list: BatchCreateOrderResultV5[];
|
|
73
|
+
}, 'order.create-batch', BatchOrdersRetExtInfoV5>>;
|
|
74
|
+
/**
|
|
75
|
+
* Batch amend orders
|
|
76
|
+
*
|
|
77
|
+
* @param params
|
|
78
|
+
* @returns
|
|
79
|
+
*/
|
|
80
|
+
batchAmendOrder(category: 'option' | 'linear', orders: BatchAmendOrderParamsV5[]): Promise<WSAPIResponse<{
|
|
81
|
+
list: BatchAmendOrderResultV5[];
|
|
82
|
+
}, 'order.amend-batch', BatchOrdersRetExtInfoV5>>;
|
|
83
|
+
/**
|
|
84
|
+
* Batch cancel orders
|
|
85
|
+
*
|
|
86
|
+
* @param params
|
|
87
|
+
* @returns
|
|
88
|
+
*/
|
|
89
|
+
batchCancelOrder(category: 'option' | 'linear', orders: BatchCancelOrderParamsV5[]): Promise<WSAPIResponse<{
|
|
90
|
+
list: BatchCancelOrderResultV5[];
|
|
91
|
+
}, 'order.cancel-batch', BatchOrdersRetExtInfoV5>>;
|
|
92
|
+
/**
|
|
93
|
+
*
|
|
94
|
+
*
|
|
95
|
+
*
|
|
96
|
+
*
|
|
97
|
+
*
|
|
98
|
+
*
|
|
99
|
+
*
|
|
100
|
+
* Private methods for handling some of the convenience/automation provided by the WS API Client
|
|
101
|
+
*
|
|
102
|
+
*
|
|
103
|
+
*
|
|
104
|
+
*
|
|
105
|
+
*
|
|
106
|
+
*
|
|
107
|
+
*
|
|
108
|
+
*/
|
|
109
|
+
private setupDefaultEventListeners;
|
|
110
|
+
}
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WebsocketAPIClient = void 0;
|
|
4
|
+
const websocket_util_1 = require("./util/websockets/websocket-util");
|
|
5
|
+
const websocket_client_1 = require("./websocket-client");
|
|
6
|
+
/**
|
|
7
|
+
* This is a minimal Websocket API wrapper around the WebsocketClient.
|
|
8
|
+
*
|
|
9
|
+
* Some methods support passing in a custom "wsKey". This is a reference to which WS connection should
|
|
10
|
+
* be used to transmit that message. This is only useful if you wish to use an alternative wss
|
|
11
|
+
* domain that is supported by the SDK.
|
|
12
|
+
*
|
|
13
|
+
* Note: To use testnet, don't set the wsKey - use `testnet: true` in
|
|
14
|
+
* the constructor instead.
|
|
15
|
+
*
|
|
16
|
+
* Note: You can also directly use the sendWSAPIRequest() method to make WS API calls, but some
|
|
17
|
+
* may find the below methods slightly more intuitive.
|
|
18
|
+
*
|
|
19
|
+
* Refer to the WS API promises example for a more detailed example on using sendWSAPIRequest() directly:
|
|
20
|
+
* https://github.com/tiagosiebler/bybit-api/blob/master/examples/ws-api-raw-promises.ts
|
|
21
|
+
*/
|
|
22
|
+
class WebsocketAPIClient {
|
|
23
|
+
constructor(options, logger) {
|
|
24
|
+
this.wsClient = new websocket_client_1.WebsocketClient(options, logger);
|
|
25
|
+
this.options = Object.assign({ attachEventListeners: true }, options);
|
|
26
|
+
this.logger = this.wsClient.logger;
|
|
27
|
+
this.setupDefaultEventListeners();
|
|
28
|
+
}
|
|
29
|
+
getWSClient() {
|
|
30
|
+
return this.wsClient;
|
|
31
|
+
}
|
|
32
|
+
setTimeOffsetMs(newOffset) {
|
|
33
|
+
return this.getWSClient().setTimeOffsetMs(newOffset);
|
|
34
|
+
}
|
|
35
|
+
/*
|
|
36
|
+
* Bybit WebSocket API Methods
|
|
37
|
+
* https://bybit-exchange.github.io/docs/v5/websocket/trade/guideline
|
|
38
|
+
*/
|
|
39
|
+
/**
|
|
40
|
+
* Submit a new order
|
|
41
|
+
*
|
|
42
|
+
* @param params
|
|
43
|
+
* @returns
|
|
44
|
+
*/
|
|
45
|
+
submitNewOrder(params) {
|
|
46
|
+
return this.wsClient.sendWSAPIRequest(websocket_util_1.WS_KEY_MAP.v5PrivateTrade, 'order.create', params);
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Amend an order
|
|
50
|
+
*
|
|
51
|
+
* @param params
|
|
52
|
+
* @returns
|
|
53
|
+
*/
|
|
54
|
+
amendOrder(params) {
|
|
55
|
+
return this.wsClient.sendWSAPIRequest(websocket_util_1.WS_KEY_MAP.v5PrivateTrade, 'order.amend', params);
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Cancel an order
|
|
59
|
+
*
|
|
60
|
+
* @param params
|
|
61
|
+
* @returns
|
|
62
|
+
*/
|
|
63
|
+
cancelOrder(params) {
|
|
64
|
+
return this.wsClient.sendWSAPIRequest(websocket_util_1.WS_KEY_MAP.v5PrivateTrade, 'order.cancel', params);
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Batch submit orders
|
|
68
|
+
*
|
|
69
|
+
* @param params
|
|
70
|
+
* @returns
|
|
71
|
+
*/
|
|
72
|
+
batchSubmitOrders(category, orders) {
|
|
73
|
+
return this.wsClient.sendWSAPIRequest(websocket_util_1.WS_KEY_MAP.v5PrivateTrade, 'order.create-batch', {
|
|
74
|
+
category,
|
|
75
|
+
request: orders,
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Batch amend orders
|
|
80
|
+
*
|
|
81
|
+
* @param params
|
|
82
|
+
* @returns
|
|
83
|
+
*/
|
|
84
|
+
batchAmendOrder(category, orders) {
|
|
85
|
+
return this.wsClient.sendWSAPIRequest(websocket_util_1.WS_KEY_MAP.v5PrivateTrade, 'order.amend-batch', {
|
|
86
|
+
category,
|
|
87
|
+
request: orders,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Batch cancel orders
|
|
92
|
+
*
|
|
93
|
+
* @param params
|
|
94
|
+
* @returns
|
|
95
|
+
*/
|
|
96
|
+
batchCancelOrder(category, orders) {
|
|
97
|
+
return this.wsClient.sendWSAPIRequest(websocket_util_1.WS_KEY_MAP.v5PrivateTrade, 'order.cancel-batch', {
|
|
98
|
+
category,
|
|
99
|
+
request: orders,
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
*
|
|
104
|
+
*
|
|
105
|
+
*
|
|
106
|
+
*
|
|
107
|
+
*
|
|
108
|
+
*
|
|
109
|
+
*
|
|
110
|
+
* Private methods for handling some of the convenience/automation provided by the WS API Client
|
|
111
|
+
*
|
|
112
|
+
*
|
|
113
|
+
*
|
|
114
|
+
*
|
|
115
|
+
*
|
|
116
|
+
*
|
|
117
|
+
*
|
|
118
|
+
*/
|
|
119
|
+
setupDefaultEventListeners() {
|
|
120
|
+
if (this.options.attachEventListeners) {
|
|
121
|
+
/**
|
|
122
|
+
* General event handlers for monitoring the WebsocketClient
|
|
123
|
+
*/
|
|
124
|
+
this.wsClient
|
|
125
|
+
.on('open', (data) => {
|
|
126
|
+
console.log(new Date(), 'ws connected', data.wsKey);
|
|
127
|
+
})
|
|
128
|
+
.on('reconnect', ({ wsKey }) => {
|
|
129
|
+
console.log(new Date(), 'ws automatically reconnecting.... ', wsKey);
|
|
130
|
+
})
|
|
131
|
+
.on('reconnected', (data) => {
|
|
132
|
+
console.log(new Date(), 'ws has reconnected ', data === null || data === void 0 ? void 0 : data.wsKey);
|
|
133
|
+
})
|
|
134
|
+
.on('authenticated', (data) => {
|
|
135
|
+
console.info(new Date(), 'ws has authenticated ', data === null || data === void 0 ? void 0 : data.wsKey);
|
|
136
|
+
})
|
|
137
|
+
.on('exception', (data) => {
|
|
138
|
+
console.error(new Date(), 'ws exception: ', JSON.stringify(data));
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
exports.WebsocketAPIClient = WebsocketAPIClient;
|
|
144
|
+
//# sourceMappingURL=websocket-api-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"websocket-api-client.js","sourceRoot":"","sources":["../src/websocket-api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,9 +92,9 @@ export declare class WebsocketClient extends BaseWebsocketClient<WsKey, WsReques
|
|
|
92
92
|
* @returns Promise - tries to resolve with async WS API response. Rejects if disconnected or exception is seen in async WS API response
|
|
93
93
|
*/
|
|
94
94
|
sendWSAPIRequest<TWSKey extends keyof WsAPIWsKeyTopicMap, TWSOperation extends WsAPIWsKeyTopicMap[TWSKey], TWSParams extends Exact<WsAPITopicRequestParamMap[TWSOperation]>>(wsKey: TWSKey, operation: TWSOperation, ...params: TWSParams extends undefined ? [] : [TWSParams]): Promise<WsAPIOperationResponseMap[TWSOperation]>;
|
|
95
|
-
sendWSAPIRequest<
|
|
96
|
-
sendWSAPIRequest<
|
|
97
|
-
sendWSAPIRequest<
|
|
95
|
+
sendWSAPIRequest<TWSOperation extends WSAPIOperation = 'order.create'>(wsKey: typeof WS_KEY_MAP.v5PrivateTrade, operation: TWSOperation, params: WsAPITopicRequestParamMap[TWSOperation]): Promise<WsAPIOperationResponseMap[TWSOperation]>;
|
|
96
|
+
sendWSAPIRequest<TWSOperation extends WSAPIOperation = 'order.amend'>(wsKey: typeof WS_KEY_MAP.v5PrivateTrade, operation: TWSOperation, params: WsAPITopicRequestParamMap[TWSOperation]): Promise<WsAPIOperationResponseMap[TWSOperation]>;
|
|
97
|
+
sendWSAPIRequest<TWSOperation extends WSAPIOperation = 'order.cancel'>(wsKey: typeof WS_KEY_MAP.v5PrivateTrade, operation: TWSOperation, params: WsAPITopicRequestParamMap[TWSOperation]): Promise<WsAPIOperationResponseMap[TWSOperation]>;
|
|
98
98
|
/**
|
|
99
99
|
*
|
|
100
100
|
*
|
package/lib/websocket-client.js
CHANGED
|
@@ -190,16 +190,18 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
|
|
|
190
190
|
}
|
|
191
191
|
sendWSAPIRequest() {
|
|
192
192
|
return __awaiter(this, arguments, void 0, function* (wsKey = util_1.WS_KEY_MAP.v5PrivateTrade, operation, params) {
|
|
193
|
+
var _a;
|
|
193
194
|
this.logger.trace(`sendWSAPIRequest(): assert "${wsKey}" is connected`);
|
|
194
195
|
yield this.assertIsConnected(wsKey);
|
|
195
196
|
this.logger.trace('sendWSAPIRequest()->assertIsConnected() ok');
|
|
196
197
|
yield this.assertIsAuthenticated(wsKey);
|
|
197
198
|
this.logger.trace('sendWSAPIRequest()->assertIsAuthenticated() ok');
|
|
199
|
+
const timestampMs = Date.now() + (this.getTimeOffsetMs() || 0);
|
|
198
200
|
const requestEvent = {
|
|
199
201
|
reqId: this.getNewRequestId(),
|
|
200
202
|
header: {
|
|
201
203
|
'X-BAPI-RECV-WINDOW': `${this.options.recvWindow}`,
|
|
202
|
-
'X-BAPI-TIMESTAMP': `${
|
|
204
|
+
'X-BAPI-TIMESTAMP': `${timestampMs}`,
|
|
203
205
|
Referer: util_1.APIID,
|
|
204
206
|
},
|
|
205
207
|
op: operation,
|
|
@@ -210,10 +212,34 @@ class WebsocketClient extends BaseWSClient_1.BaseWebsocketClient {
|
|
|
210
212
|
// Store deferred promise, resolved within the "resolveEmittableEvents" method while parsing incoming events
|
|
211
213
|
const promiseRef = (0, util_1.getPromiseRefForWSAPIRequest)(requestEvent);
|
|
212
214
|
const deferredPromise = this.getWsStore().createDeferredPromise(wsKey, promiseRef, false);
|
|
215
|
+
// Enrich returned promise with request context for easier debugging
|
|
216
|
+
(_a = deferredPromise.promise) === null || _a === void 0 ? void 0 : _a.then((res) => {
|
|
217
|
+
if (!Array.isArray(res)) {
|
|
218
|
+
res.request = Object.assign({ wsKey }, signedEvent);
|
|
219
|
+
}
|
|
220
|
+
return res;
|
|
221
|
+
}).catch((e) => {
|
|
222
|
+
if (typeof e === 'string') {
|
|
223
|
+
this.logger.error('Unexpected string thrown without Error object:', {
|
|
224
|
+
e,
|
|
225
|
+
wsKey,
|
|
226
|
+
signedEvent,
|
|
227
|
+
});
|
|
228
|
+
return e;
|
|
229
|
+
}
|
|
230
|
+
e.request = {
|
|
231
|
+
wsKey,
|
|
232
|
+
operation,
|
|
233
|
+
params: params,
|
|
234
|
+
};
|
|
235
|
+
// throw e;
|
|
236
|
+
return e;
|
|
237
|
+
});
|
|
213
238
|
this.logger.trace(`sendWSAPIRequest(): sending raw request: ${JSON.stringify(signedEvent, null, 2)}`);
|
|
214
239
|
// Send event
|
|
215
|
-
|
|
216
|
-
this.
|
|
240
|
+
const throwExceptions = false;
|
|
241
|
+
this.tryWsSend(wsKey, JSON.stringify(signedEvent), throwExceptions);
|
|
242
|
+
this.logger.trace(`sendWSAPIRequest(): sent "${operation}" event with promiseRef(${promiseRef})`);
|
|
217
243
|
// Return deferred promise, so caller can await this call
|
|
218
244
|
return deferredPromise.promise;
|
|
219
245
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"websocket-client.js","sourceRoot":"","sources":["../src/websocket-client.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED