hedgequantx 2.9.127 → 2.9.128

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.9.127",
+  "version": "2.9.128",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/lib/data.js

@@ -28,9 +28,11 @@ class MarketDataFeed extends EventEmitter {
     
     this.connection = null;
     this.connected = false;
+    this.connecting = false;  // Prevent multiple simultaneous connects
     this.subscriptions = new Set();
     this.credentials = null;
     this.config = null;
+    this._reconnectTimer = null;
   }
 
   /**
@@ -39,9 +41,18 @@ class MarketDataFeed extends EventEmitter {
    * @param {number} retries - Number of connection retries (default: 2)
    */
   async connect(rithmicCredentials, retries = 2) {
-    if (this.connected) return;
+    // Prevent multiple simultaneous connection attempts
+    if (this.connected || this.connecting) return;
+    this.connecting = true;
+    
+    // Clear any pending reconnect
+    if (this._reconnectTimer) {
+      clearTimeout(this._reconnectTimer);
+      this._reconnectTimer = null;
+    }
 
     if (!rithmicCredentials || !rithmicCredentials.userId || !rithmicCredentials.password) {
+      this.connecting = false;
       throw new Error('Rithmic credentials required (userId, password, systemName, gateway)');
     }
 
@@ -67,32 +78,42 @@ class MarketDataFeed extends EventEmitter {
           await new Promise(r => setTimeout(r, 2000)); // Wait 2s before retry
         }
         
+        // Clean up previous connection if any
+        if (this.connection) {
+          this.connection.removeAllListeners();
+          try { await this.connection.disconnect(); } catch (_) {}
+        }
+        
         this.connection = new RithmicConnection();
         
-        // Connection timeout handler
+        // Connection error handler
         this.connection.on('error', (err) => {
-          this.emit('debug', `TICKER_PLANT connection error: ${err.message}`);
+          this.emit('debug', `TICKER_PLANT error: ${err.message}`);
         });
         
         await this.connection.connect(this.config);
-        this.emit('debug', `TICKER_PLANT WebSocket connected to ${this.config.uri}`);
 
         // Setup message handler for market data
         this.connection.on('message', (msg) => this._handleMessage(msg));
         
-        // Handle disconnection for auto-reconnect
-        this.connection.on('disconnected', ({ code, reason }) => {
+        // Handle disconnection for auto-reconnect (only once per connection)
+        this.connection.once('disconnected', ({ code, reason }) => {
           this.connected = false;
+          this.connecting = false;
+          this.emit('debug', `TICKER_PLANT closed: code=${code} reason=${reason || 'none'}`);
           this.emit('disconnected', { code, reason });
-          // Auto-reconnect if not manual close
-          if (code !== 1000 && this.credentials) {
-            this.emit('debug', 'TICKER_PLANT disconnected, will reconnect in 3s...');
-            setTimeout(() => this.connect(this.credentials, 1), 3000);
+          // Auto-reconnect if not manual close and not already reconnecting
+          // Skip reconnect if code 1000 (normal) or 1008 (policy violation - likely duplicate login)
+          if (code !== 1000 && code !== 1008 && this.credentials && !this._reconnectTimer) {
+            this._reconnectTimer = setTimeout(() => {
+              this._reconnectTimer = null;
+              this.connect(this.credentials, 1).catch(() => {});
+            }, 5000);  // Wait 5s to avoid rapid reconnect loops
           }
         });
 
         // Login to TICKER_PLANT
-        return await new Promise((resolve, reject) => {
+        const result = await new Promise((resolve, reject) => {
           const timeout = setTimeout(() => {
             reject(new Error('TICKER_PLANT login timeout'));
           }, 15000);
@@ -100,6 +121,7 @@ class MarketDataFeed extends EventEmitter {
           this.connection.once('loggedIn', () => {
             clearTimeout(timeout);
             this.connected = true;
+            this.connecting = false;
             this.emit('connected');
             resolve(true);
           });
@@ -111,10 +133,13 @@ class MarketDataFeed extends EventEmitter {
 
           this.connection.login('TICKER_PLANT');
         });
+        
+        return result;
       } catch (e) {
         lastError = e;
         this.emit('debug', `TICKER_PLANT attempt ${attempt + 1} failed: ${e.message}`);
         if (this.connection) {
+          this.connection.removeAllListeners();
           try { await this.connection.disconnect(); } catch (_) {}
           this.connection = null;
         }
@@ -122,6 +147,7 @@ class MarketDataFeed extends EventEmitter {
     }
 
     // All retries failed
+    this.connecting = false;
     this.emit('error', lastError);
     throw lastError;
   }