@clonegod/ttd-core 2.0.75 → 2.0.77

package/dist/ws/ws_client.d.ts

@@ -3,7 +3,6 @@ export interface WebSocketClientOptions {
         [key: string]: string;
     };
     reconnectInterval?: number;
-    maxReconnectAttempts?: number;
     rejectUnauthorized?: boolean;
     keepAlive?: boolean;
     keepAliveInterval?: number;
@@ -14,17 +13,14 @@ export declare class WebSocketClient {
     private ws;
     private onMessageCallback;
     private onOpenCallback;
-    private reconnectAttempts;
-    private maxReconnectAttempts;
     private keepAliveTimer;
     constructor(url: string, options?: WebSocketClientOptions);
     connect(): void;
+    private reconnect;
     onMessage(callback: (data: any) => void): void;
     onOpen(callback: () => void): void;
     send(data: string): boolean;
     disconnect(): void;
-    private handleReconnect;
-    private cleanup;
     isConnected(): boolean;
     private startKeepAlive;
     private stopKeepAlive;

package/dist/ws/ws_client.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -11,41 +20,51 @@ class WebSocketClient {
         this.ws = null;
         this.onMessageCallback = null;
         this.onOpenCallback = null;
-        this.reconnectAttempts = 0;
-        this.maxReconnectAttempts = 10;
         this.keepAliveTimer = null;
         this.url = url;
-        this.options = Object.assign({ reconnectInterval: 3000, maxReconnectAttempts: 10, rejectUnauthorized: false, keepAlive: false, keepAliveInterval: 30000 }, options);
-        this.maxReconnectAttempts = this.options.maxReconnectAttempts;
+        this.options = Object.assign({ reconnectInterval: 3000, rejectUnauthorized: false, keepAlive: false, keepAliveInterval: 30000 }, options);
         (0, dist_1.log_info)(`WebSocketClient constructor, url: ${this.url}`, this.options);
     }
     connect() {
         (0, dist_1.log_info)(`Connecting to ${this.url}`);
-        this.ws = new ws_1.default(this.url, { headers: this.options.headers });
-        this.ws.on('open', () => {
-            (0, dist_1.log_info)('ws connected');
-            this.reconnectAttempts = 0;
-            this.startKeepAlive();
-            if (this.onOpenCallback)
-                this.onOpenCallback();
-        });
-        this.ws.on('message', (message) => {
-            try {
-                const data = JSON.parse(message.toString());
-                if (this.onMessageCallback)
-                    this.onMessageCallback(data);
-            }
-            catch (err) {
-                (0, dist_1.log_error)('Invalid message format:', err);
-            }
-        });
-        this.ws.on('close', (code, reason) => {
-            (0, dist_1.log_warn)(`ws disconnected: ${code} - ${reason.toString()}`);
-            this.handleReconnect();
-        });
-        this.ws.on('error', (err) => {
-            (0, dist_1.log_error)('ws error:', err);
-            this.handleReconnect();
+        try {
+            this.ws = new ws_1.default(this.url, { headers: this.options.headers });
+            this.ws.on('open', () => {
+                (0, dist_1.log_info)('ws connected');
+                this.startKeepAlive();
+                if (this.onOpenCallback)
+                    this.onOpenCallback();
+            });
+            this.ws.on('message', (message) => {
+                try {
+                    const data = JSON.parse(message.toString());
+                    if (this.onMessageCallback)
+                        this.onMessageCallback(data);
+                }
+                catch (err) {
+                    (0, dist_1.log_error)('Invalid message format:', err);
+                }
+            });
+            this.ws.on('close', (code, reason) => {
+                (0, dist_1.log_warn)(`ws disconnected: ${code} - ${reason.toString()}`);
+                this.reconnect();
+            });
+            this.ws.on('error', (err) => {
+                (0, dist_1.log_error)('ws error:', err);
+                this.reconnect();
+            });
+        }
+        catch (error) {
+            (0, dist_1.log_error)('Failed to create WebSocket:', error);
+            this.reconnect();
+        }
+    }
+    reconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, dist_1.log_warn)(`Reconnecting in ${this.options.reconnectInterval}ms`);
+            yield (0, dist_1.sleep)(this.options.reconnectInterval);
+            this.disconnect();
+            this.connect();
         });
     }
     onMessage(callback) {
@@ -65,31 +84,16 @@ class WebSocketClient {
         }
     }
     disconnect() {
-        this.cleanup();
-    }
-    handleReconnect() {
-        if (this.reconnectAttempts >= this.maxReconnectAttempts) {
-            (0, dist_1.log_warn)(`Max reconnection attempts (${this.maxReconnectAttempts}) reached!`);
-            return;
-        }
-        this.reconnectAttempts++;
-        (0, dist_1.log_warn)(`Reconnecting in ${this.options.reconnectInterval}ms (attempt ${this.reconnectAttempts}/${this.maxReconnectAttempts})`);
-        setTimeout(() => {
-            this.cleanup();
-            this.connect();
-        }, this.options.reconnectInterval);
-    }
-    cleanup() {
         this.stopKeepAlive();
         if (this.ws) {
             this.ws.removeAllListeners();
             try {
-                if (this.ws.readyState === ws_1.default.OPEN || this.ws.readyState === ws_1.default.CONNECTING) {
+                if (this.ws.readyState === ws_1.default.OPEN) {
                     this.ws.close();
                 }
             }
             catch (error) {
-                (0, dist_1.log_warn)(`Error closing WebSocket connection: ${error.message}`);
+                (0, dist_1.log_warn)(`Error closing WebSocket: ${error.message}`);
             }
             this.ws = null;
         }

package/package.json

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