@paraswap/dex-lib 3.11.1 → 3.11.2

package/build/executor/fixtures/executor02/routes/price-route-simpleSwap-sushiv3-balancerv1-eth-usdc.json

@@ -0,0 +1,114 @@
+{
+    "blockNumber": 18813344,
+    "network": 1,
+    "srcToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+    "srcDecimals": 18,
+    "srcAmount": "10000000000000000000",
+    "destToken": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+    "destDecimals": 6,
+    "destAmount": "20291711255",
+    "bestRoute": [
+        {
+            "percent": 100,
+            "swaps": [
+                {
+                    "srcToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                    "srcDecimals": 18,
+                    "destToken": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+                    "destDecimals": 6,
+                    "swapExchanges": [
+                        {
+                            "exchange": "SushiSwapV3",
+                            "srcAmount": "3200000000000000000",
+                            "destAmount": "6479000712",
+                            "percent": 32,
+                            "poolAddresses": ["0x763d3b7296e7c9718ad5b058ac2692a19e5b3638"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "tokenOut": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+                                        "fee": "3000",
+                                        "currentFee": "3000"
+                                    }
+                                ],
+                                "gasUSD": "38.394826"
+                            }
+                        },
+                        {
+                            "exchange": "SushiSwapV3",
+                            "srcAmount": "2200000000000000000",
+                            "destAmount": "4461472292",
+                            "percent": 22,
+                            "poolAddresses": ["0x35644fb61afbc458bf92b15add6abc1996be5014"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "tokenOut": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+                                        "fee": "500",
+                                        "currentFee": "500"
+                                    }
+                                ],
+                                "gasUSD": "38.394826"
+                            }
+                        },
+                        {
+                            "exchange": "BalancerV1",
+                            "srcAmount": "4600000000000000000",
+                            "destAmount": "9351238251",
+                            "percent": 46,
+                            "poolAddresses": [
+                                "0x69d460e01070a7ba1bc363885bc8f4f0daa19bf5",
+                                "0x1373e57f764a7944bdd7a4bd5ca3007d496934da",
+                                "0x2257aaac34bcb27900291f7b84ee2565a6cbac57",
+                                "0x8a649274e4d777ffc6851f13d23a86bbfa2f2fbf"
+                            ],
+                            "data": {
+                                "swaps": [
+                                    {
+                                        "pool": "0x69d460e01070a7ba1bc363885bc8f4f0daa19bf5",
+                                        "tokenInParam": "3000000000000000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    },
+                                    {
+                                        "pool": "0x1373e57f764a7944bdd7a4bd5ca3007d496934da",
+                                        "tokenInParam": "400000000000000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    },
+                                    {
+                                        "pool": "0x2257aaac34bcb27900291f7b84ee2565a6cbac57",
+                                        "tokenInParam": "600000000000000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    },
+                                    {
+                                        "pool": "0x8a649274e4d777ffc6851f13d23a86bbfa2f2fbf",
+                                        "tokenInParam": "600000000000000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    }
+                                ],
+                                "gasUSD": "138.567792"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "gasCostUSD": "241.800793",
+    "gasCost": "837600",
+    "side": "SELL",
+    "tokenTransferProxy": "0x216b4b4ba9f3e719726886d34a177484278bfcae",
+    "contractAddress": "0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57",
+    "contractMethod": "simpleSwap",
+    "partnerFee": 0,
+    "srcUSD": "21543.5000000000",
+    "destUSD": "20312.0029662550",
+    "partner": "any",
+    "maxImpactReached": false,
+    "hmac": "e1ea6f74a416960e7f4a046937267af5debc442c"
+}

package/build/executor/fixtures/executor02/routes/price-route-simpleSwap-sushiv3-balancerv1-usdc-eth.json

@@ -0,0 +1,114 @@
+{
+    "blockNumber": 18813358,
+    "network": 1,
+    "srcToken": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+    "srcDecimals": 6,
+    "srcAmount": "20000000000",
+    "destToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+    "destDecimals": 18,
+    "destAmount": "8847819568532017033",
+    "bestRoute": [
+        {
+            "percent": 100,
+            "swaps": [
+                {
+                    "srcToken": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+                    "srcDecimals": 6,
+                    "destToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                    "destDecimals": 18,
+                    "swapExchanges": [
+                        {
+                            "exchange": "SushiSwapV3",
+                            "srcAmount": "6400000000",
+                            "destAmount": "2822713151313845207",
+                            "percent": 32,
+                            "poolAddresses": ["0x763d3b7296e7c9718ad5b058ac2692a19e5b3638"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+                                        "tokenOut": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "fee": "3000",
+                                        "currentFee": "3000"
+                                    }
+                                ],
+                                "gasUSD": "23.952063"
+                            }
+                        },
+                        {
+                            "exchange": "SushiSwapV3",
+                            "srcAmount": "4800000000",
+                            "destAmount": "2124755058853577592",
+                            "percent": 24,
+                            "poolAddresses": ["0x35644fb61afbc458bf92b15add6abc1996be5014"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+                                        "tokenOut": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "fee": "500",
+                                        "currentFee": "500"
+                                    }
+                                ],
+                                "gasUSD": "29.225912"
+                            }
+                        },
+                        {
+                            "exchange": "BalancerV1",
+                            "srcAmount": "8800000000",
+                            "destAmount": "3900351358364594234",
+                            "percent": 44,
+                            "poolAddresses": [
+                                "0x69d460e01070a7ba1bc363885bc8f4f0daa19bf5",
+                                "0x2257aaac34bcb27900291f7b84ee2565a6cbac57",
+                                "0x8a649274e4d777ffc6851f13d23a86bbfa2f2fbf",
+                                "0x9b208194acc0a8ccb2a8dcafeacfbb7dcc093f81"
+                            ],
+                            "data": {
+                                "swaps": [
+                                    {
+                                        "pool": "0x69d460e01070a7ba1bc363885bc8f4f0daa19bf5",
+                                        "tokenInParam": "5600000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    },
+                                    {
+                                        "pool": "0x2257aaac34bcb27900291f7b84ee2565a6cbac57",
+                                        "tokenInParam": "1200000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    },
+                                    {
+                                        "pool": "0x8a649274e4d777ffc6851f13d23a86bbfa2f2fbf",
+                                        "tokenInParam": "1200000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    },
+                                    {
+                                        "pool": "0x9b208194acc0a8ccb2a8dcafeacfbb7dcc093f81",
+                                        "tokenInParam": "800000000",
+                                        "tokenOutParam": "0",
+                                        "maxPrice": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+                                    }
+                                ],
+                                "gasUSD": "105.476976"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "gasCostUSD": "173.861215",
+    "gasCost": "791200",
+    "side": "SELL",
+    "tokenTransferProxy": "0x216b4b4ba9f3e719726886d34a177484278bfcae",
+    "contractAddress": "0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57",
+    "contractMethod": "simpleSwap",
+    "partnerFee": 0,
+    "srcUSD": "20000.0000000000",
+    "destUSD": "19061.3000874670",
+    "partner": "any",
+    "maxImpactReached": false,
+    "hmac": "23d86ccff7cebd1ff83f5981e0a4b5868f1fc1c7"
+}

package/build/executor/fixtures/executor02/routes/price-route-simpleSwap-sushiv3-univ3-eth-sushi.json

@@ -0,0 +1,55 @@
+{
+    "blockNumber": 18813324,
+    "network": 1,
+    "srcToken": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+    "srcDecimals": 18,
+    "srcAmount": "3000000000000000000000",
+    "destToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+    "destDecimals": 18,
+    "destAmount": "1462165766112784720",
+    "bestRoute": [
+        {
+            "percent": 100,
+            "swaps": [
+                {
+                    "srcToken": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+                    "srcDecimals": 18,
+                    "destToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                    "destDecimals": 18,
+                    "swapExchanges": [
+                        {
+                            "exchange": "SushiSwapV3",
+                            "srcAmount": "3000000000000000000000",
+                            "destAmount": "1462165766112784720",
+                            "percent": 100,
+                            "poolAddresses": ["0x87c7056bbe6084f03304196be51c6b90b6d85aa2"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+                                        "tokenOut": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "fee": "3000",
+                                        "currentFee": "3000"
+                                    }
+                                ],
+                                "gasUSD": "26.076336"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "gasCostUSD": "37.569854",
+    "gasCost": "226200",
+    "side": "SELL",
+    "tokenTransferProxy": "0x216b4b4ba9f3e719726886d34a177484278bfcae",
+    "contractAddress": "0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57",
+    "contractMethod": "simpleSwap",
+    "partnerFee": 0,
+    "srcUSD": "3330.0000000000",
+    "destUSD": "3153.9354224783",
+    "partner": "any",
+    "maxImpactReached": false,
+    "hmac": "74d10f84bc9f54e07bc2a642011ccd335f90bc34"
+}

package/build/executor/fixtures/executor02/routes/price-route-simpleSwap-sushiv3-univ3-sushi-eth.json

@@ -0,0 +1,73 @@
+{
+    "blockNumber": 18813323,
+    "network": 1,
+    "srcToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+    "srcDecimals": 18,
+    "srcAmount": "4000000000000000000",
+    "destToken": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+    "destDecimals": 18,
+    "destAmount": "7097049665124498485140",
+    "bestRoute": [
+        {
+            "percent": 100,
+            "swaps": [
+                {
+                    "srcToken": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
+                    "srcDecimals": 18,
+                    "destToken": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+                    "destDecimals": 18,
+                    "swapExchanges": [
+                        {
+                            "exchange": "UniswapV3",
+                            "srcAmount": "2080000000000000000",
+                            "destAmount": "3666930750962393744865",
+                            "percent": 52,
+                            "poolAddresses": ["0x73a6a761fe483ba19debb8f56ac5bbf14c0cdad1"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "tokenOut": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+                                        "fee": "3000",
+                                        "currentFee": "3000"
+                                    }
+                                ],
+                                "gasUSD": "93.841590"
+                            }
+                        },
+                        {
+                            "exchange": "SushiSwapV3",
+                            "srcAmount": "1920000000000000000",
+                            "destAmount": "3430118914162104740275",
+                            "percent": 48,
+                            "poolAddresses": ["0x87c7056bbe6084f03304196be51c6b90b6d85aa2"],
+                            "data": {
+                                "path": [
+                                    {
+                                        "tokenIn": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                                        "tokenOut": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
+                                        "fee": "3000",
+                                        "currentFee": "3000"
+                                    }
+                                ],
+                                "gasUSD": "22.090144"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "gasCostUSD": "131.145698",
+    "gasCost": "789600",
+    "side": "SELL",
+    "tokenTransferProxy": "0x216b4b4ba9f3e719726886d34a177484278bfcae",
+    "contractAddress": "0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57",
+    "contractMethod": "simpleSwap",
+    "partnerFee": 0,
+    "srcUSD": "8628.1200000000",
+    "destUSD": "7877.7251282882",
+    "partner": "any",
+    "maxImpactReached": false,
+    "hmac": "252d803fc8ca53537c22905da85ed276ae827eb4"
+}

package/build/executor/fixtures/executor02/routes/price-route-simpleSwap-univ3-curvev1-usdt-dai.json

@@ -0,0 +1,82 @@
+{
+    "blockNumber": 18813366,
+    "network": 1,
+    "srcToken": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+    "srcDecimals": 6,
+    "srcAmount": "10000500000000",
+    "destToken": "0x6b175474e89094c44da98b954eedeac495271d0f",
+    "destDecimals": 18,
+    "destAmount": "9986733042911056529251220",
+    "bestRoute": [
+        {
+            "percent": 100,
+            "swaps": [
+                {
+                    "srcToken": "0xdac17f958d2ee523a2206206994597c13d831ec7",
+                    "srcDecimals": 6,
+                    "destToken": "0x6b175474e89094c44da98b954eedeac495271d0f",
+                    "destDecimals": 18,
+                    "swapExchanges": [
+                        {
+                            "exchange": "CurveV1",
+                            "srcAmount": "200010000000",
+                            "destAmount": "199724930804948075871073",
+                            "percent": 2,
+                            "poolAddresses": ["0xa5407eae9ba41422680e2e00537571bcc53efbfd"],
+                            "data": {
+                                "exchange": "0xa5407eae9ba41422680e2e00537571bcc53efbfd",
+                                "i": 2,
+                                "j": 0,
+                                "underlyingSwap": true,
+                                "deadline": 0,
+                                "gasUSD": "59.460060"
+                            }
+                        },
+                        {
+                            "exchange": "CurveV1",
+                            "srcAmount": "8800440000000",
+                            "destAmount": "8788481925522943324040552",
+                            "percent": 88,
+                            "poolAddresses": ["0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7"],
+                            "data": {
+                                "exchange": "0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7",
+                                "i": 2,
+                                "j": 0,
+                                "underlyingSwap": false,
+                                "deadline": 0,
+                                "gasUSD": "59.460060"
+                            }
+                        },
+                        {
+                            "exchange": "CurveV1",
+                            "srcAmount": "1000050000000",
+                            "destAmount": "998526186583165129339595",
+                            "percent": 10,
+                            "poolAddresses": ["0xdebf20617708857ebe4f679508e7b7863a8a8eee"],
+                            "data": {
+                                "exchange": "0xdebf20617708857ebe4f679508e7b7863a8a8eee",
+                                "i": 2,
+                                "j": 0,
+                                "underlyingSwap": true,
+                                "deadline": 0,
+                                "gasUSD": "101.082102"
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "gasCostUSD": "253.180935",
+    "gasCost": "851600",
+    "side": "SELL",
+    "tokenTransferProxy": "0x216b4b4ba9f3e719726886d34a177484278bfcae",
+    "contractAddress": "0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57",
+    "contractMethod": "simpleSwap",
+    "partnerFee": 0,
+    "srcUSD": "9991539.5520000000",
+    "destUSD": "9986303.5135228809",
+    "partner": "any",
+    "maxImpactReached": false,
+    "hmac": "062b93a127ea430933d4eaf5ffc56e0106414e69"
+}

package/build/lib/fetcher/wsFetcher.d.ts

@@ -18,17 +18,21 @@ export declare type RequestInfoWithHandler<T> = {
 export declare class WebSocketFetcher<T> {
     private logger;
     private requests;
+    private timeoutInterval;
+    private reconnectDelay;
+    private pingTimeout;
     lastFetchSucceeded: boolean;
     private stop;
-    private ws;
     private connection;
-    constructor(requestsInfo: RequestInfoWithHandler<T>, logger: Logger);
+    constructor(requestsInfo: RequestInfoWithHandler<T>, logger: Logger, timeoutInterval?: number, reconnectDelay?: number);
     private connected;
-    private connectFailed;
+    private heartbeat;
     private onClose;
     private onError;
     private onMessage;
     private connect;
+    reconnectWithDelay(): void;
+    reconnect(): void;
     startPolling(): void;
     stopPolling(): void;
     isPolling(): boolean;

package/build/lib/fetcher/wsFetcher.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketFetcher = exports.SkippingRequest = void 0;
-const websocket_1 = require("websocket");
+const ws_1 = __importDefault(require("ws"));
 class SkippingRequest {
     constructor(message = '') {
         this.message = message;
@@ -9,61 +12,55 @@ class SkippingRequest {
 }
 exports.SkippingRequest = SkippingRequest;
 class WebSocketFetcher {
-    constructor(requestsInfo, logger) {
+    constructor(requestsInfo, logger, timeoutInterval = 10000, reconnectDelay = 5000) {
         this.logger = logger;
+        this.pingTimeout = undefined;
         this.lastFetchSucceeded = false;
         this.stop = true;
-        this.ws = new websocket_1.client();
         this.connection = null;
         this.requests = requestsInfo;
-        this.ws.on('connect', this.connected.bind(this));
-        this.ws.on('connectFailed', this.connectFailed.bind(this));
+        this.timeoutInterval = timeoutInterval;
+        this.reconnectDelay = reconnectDelay;
     }
-    connected(connection) {
-        this.connection = connection;
+    connected() {
         this.logger.info(`Connected to ${this.requests.info.requestOptions.url}`);
-        this.connection.on('error', this.onError.bind(this));
-        this.connection.on('close', this.onClose.bind(this));
-        this.connection.on('message', this.onMessage.bind(this));
+        this.heartbeat();
     }
-    connectFailed(error) {
-        this.logger.error(`Connect Error: ${error.toString()}. Reconnecting...`);
-        // reconnect on errors / failures
-        setTimeout(() => {
-            this.startPolling();
-        }, 3000);
+    heartbeat() {
+        clearTimeout(this.pingTimeout);
+        this.pingTimeout = setTimeout(() => {
+            this.logger.warn('No heartbeat. Terminating Connection...');
+            this?.connection?.terminate();
+        }, this.timeoutInterval);
     }
     onClose() {
-        this.logger.info(`Connection closed. Reconnecting...`);
-        // reconnect on errors / failures
-        setTimeout(() => {
-            this.startPolling();
-        }, 3000);
+        this.logger.info(`Connection closed.`);
+        // Do not reconnect if polling is stopped
+        if (this.stop) {
+            clearTimeout(this.pingTimeout);
+            return;
+        }
+        this.logger.info(`Unexpected closure, Reconnecting...`);
+        this.reconnectWithDelay();
     }
     onError(error) {
-        this.logger.error(`Connection Error: ${error.toString()}. Stopping & Reconnecting...`);
-        this.stopPolling();
-        // reconnect on errors / failures
-        setTimeout(() => {
-            this.startPolling();
-        }, 3000);
+        this.logger.error(`Websocket Error: ${error.toString()}. Stopping & Reconnecting...`);
+        this?.connection?.terminate();
     }
-    onMessage(message) {
-        if (message.type === 'utf8') {
-            const response = JSON.parse(message.utf8Data);
-            const reqInfo = this.requests;
-            const info = reqInfo.info;
-            const options = reqInfo.info.requestOptions;
-            this.logger.debug(`(${options.url}) received new data`);
-            try {
-                const parsedData = info.caster(response);
-                reqInfo.handler(parsedData);
-            }
-            catch (e) {
-                this.logger.info(e);
-                this.logger.info(`(${options.url}) received incorrect data ${JSON.stringify(response).replace(/(?:\r\n|\r|\n)/g, ' ')}`, e);
-                return;
-            }
+    onMessage(data) {
+        this.heartbeat();
+        const reqInfo = this.requests;
+        const info = reqInfo.info;
+        const options = reqInfo.info.requestOptions;
+        this.logger.debug(`(${options.url}) received new data`);
+        try {
+            const parsedData = info.caster(data);
+            reqInfo.handler(parsedData);
+        }
+        catch (e) {
+            this.logger.info(e);
+            this.logger.info(`(${options.url}) received incorrect data ${JSON.stringify(data).replace(/(?:\r\n|\r|\n)/g, ' ')}`, e);
+            return;
         }
     }
     connect() {
@@ -76,21 +73,37 @@ class WebSocketFetcher {
             throw new Error('Name header is not a string');
         }
         this.logger.info(`Connecting to ${this.requests.info.requestOptions.url}...`);
-        this.ws.connect(this.requests.info.requestOptions.url, undefined, undefined, {
-            Authorization: authorization,
-            name: name,
+        const ws = new ws_1.default(this.requests.info.requestOptions.url, {
+            headers: {
+                Authorization: authorization,
+                name: name,
+            },
         });
+        ws.on('open', this.connected.bind(this));
+        ws.on('message', this.onMessage.bind(this));
+        ws.on('error', this.onError.bind(this));
+        ws.on('close', this.onClose.bind(this));
+        this.connection = ws;
     }
-    startPolling() {
-        this.stop = false;
+    reconnectWithDelay() {
+        this.logger.info(`Waiting ${this.reconnectDelay}ms before reconnecting...`);
+        clearTimeout(this.pingTimeout);
+        setTimeout(() => {
+            this.reconnect();
+        }, this.reconnectDelay);
+    }
+    reconnect() {
+        clearTimeout(this.pingTimeout);
         this.connect();
         this.logger.info(`Connection started for ${this.requests.info.requestOptions.url}`);
     }
+    startPolling() {
+        this.stop = false;
+        this.reconnect();
+    }
     stopPolling() {
-        if (this.connection) {
-            this.connection.close();
-        }
         this.stop = true;
+        this.connection?.terminate();
         this.logger.info(`Connection stopped for ${this.requests.info.requestOptions.url}`);
     }
     isPolling() {

package/build/lib/fetcher/wsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"wsFetcher.js","sourceRoot":"","sources":["../../../src/lib/fetcher/wsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wsFetcher.js","sourceRoot":"","sources":["../../../src/lib/fetcher/wsFetcher.ts"],"names":[],"mappings":"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"}