@clonegod/ttd-core 2.0.78 → 2.0.80

package/dist/ws/ws_client.d.ts

@@ -14,6 +14,7 @@ export declare class WebSocketClient {
     private onMessageCallback;
     private onOpenCallback;
     private keepAliveTimer;
+    private isReconnecting;
     constructor(url: string, options?: WebSocketClientOptions);
     connect(): void;
     private reconnect;
@@ -24,5 +25,5 @@ export declare class WebSocketClient {
     isConnected(): boolean;
     private startKeepAlive;
     private stopKeepAlive;
-    private setupGlobalErrorHandlers;
+    private forceCleanup;
 }

package/dist/ws/ws_client.js

@@ -21,9 +21,9 @@ class WebSocketClient {
         this.onMessageCallback = null;
         this.onOpenCallback = null;
         this.keepAliveTimer = null;
+        this.isReconnecting = false;
         this.url = url;
         this.options = Object.assign({ reconnectInterval: 3000, rejectUnauthorized: false, keepAlive: false, keepAliveInterval: 30000 }, options);
-        this.setupGlobalErrorHandlers();
         (0, dist_1.log_info)(`WebSocketClient constructor, url: ${this.url}`, this.options);
     }
     connect() {
@@ -32,6 +32,7 @@ class WebSocketClient {
             this.ws = new ws_1.default(this.url, { headers: this.options.headers });
             this.ws.on('open', () => {
                 (0, dist_1.log_info)('ws connected');
+                this.isReconnecting = false;
                 this.startKeepAlive();
                 if (this.onOpenCallback)
                     this.onOpenCallback();
@@ -62,9 +63,13 @@ class WebSocketClient {
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, dist_1.log_warn)(`Reconnecting in ${this.options.reconnectInterval}ms`);
+            if (this.isReconnecting) {
+                return;
+            }
+            this.isReconnecting = true;
+            (0, dist_1.log_info)(`Reconnecting in ${this.options.reconnectInterval}ms`);
             yield (0, dist_1.sleep)(this.options.reconnectInterval);
-            this.disconnect();
+            this.forceCleanup();
             this.connect();
         });
     }
@@ -86,10 +91,11 @@ class WebSocketClient {
     }
     disconnect() {
         this.stopKeepAlive();
+        this.isReconnecting = false;
         if (this.ws) {
             this.ws.removeAllListeners();
             try {
-                if (this.ws.readyState === ws_1.default.OPEN) {
+                if (this.ws.readyState === ws_1.default.OPEN || this.ws.readyState === ws_1.default.CONNECTING) {
                     this.ws.close();
                 }
             }
@@ -123,13 +129,24 @@ class WebSocketClient {
             (0, dist_1.log_info)('KeepAlive stopped');
         }
     }
-    setupGlobalErrorHandlers() {
-        process.on('uncaughtException', (error) => {
-            (0, dist_1.log_error)('Uncaught Exception in WebSocketClient:', error);
-        });
-        process.on('unhandledRejection', (reason, promise) => {
-            (0, dist_1.log_error)('Unhandled Rejection in WebSocketClient:', reason instanceof Error ? reason : new Error(String(reason)));
-        });
+    forceCleanup() {
+        this.stopKeepAlive();
+        this.isReconnecting = false;
+        if (this.ws) {
+            this.ws.removeAllListeners('open');
+            this.ws.removeAllListeners('message');
+            this.ws.removeAllListeners('close');
+            this.ws.removeAllListeners('error');
+            this.ws.removeAllListeners();
+            try {
+                if (this.ws.readyState !== ws_1.default.CLOSED) {
+                    this.ws.close();
+                }
+            }
+            catch (error) {
+            }
+            this.ws = null;
+        }
     }
 }
 exports.WebSocketClient = WebSocketClient;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "2.0.78",
+    "version": "2.0.80",
     "description": "Common types and utilities for trading systems - use `npm run push` to publish",
     "main": "dist/index.js",
     "types": "types/index.d.ts",