hedgequantx 2.4.3 → 2.4.5

package/package.json

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

package/src/lib/data.js

@@ -118,7 +118,7 @@ class MarketDataFeed extends EventEmitter {
   async connect(userToken, propfirm, contractId = null) {
     try {
       const endpoints = PROPFIRM_RTC_ENDPOINTS[propfirm] || DEFAULT_ENDPOINTS;
-      console.log(`[MARKET] Connecting to ${propfirm} RTC: ${endpoints.market}`);
+      // // console.log(`[MARKET] Connecting to ${propfirm} RTC: ${endpoints.market}`);
       
       // Build URL with access_token query parameter
       const urlWithToken = `${endpoints.market}?access_token=${encodeURIComponent(userToken)}`;
@@ -140,24 +140,24 @@ class MarketDataFeed extends EventEmitter {
       this._setupMarketEventHandlers();
       
       // Start connection
-      console.log(`[MARKET] Starting SignalR connection...`);
+      // // console.log(`[MARKET] Starting SignalR connection...`);
       await this.marketConnection.start();
-      console.log(`[MARKET] Connected! State: ${this.marketConnection.state}`);
+      // // console.log(`[MARKET] Connected! State: ${this.marketConnection.state}`);
       
       // IMMEDIATELY subscribe if contractId provided - don't wait!
       if (contractId && this.marketConnection.state === 'Connected') {
-        console.log(`[MARKET] Immediate subscribe to ${contractId}`);
+        // // console.log(`[MARKET] Immediate subscribe to ${contractId}`);
         try {
           await this.marketConnection.invoke('SubscribeContractQuotes', contractId);
-          console.log(`[MARKET] Quotes OK`);
+          // // console.log(`[MARKET] Quotes OK`);
           await this.marketConnection.invoke('SubscribeContractTrades', contractId);
-          console.log(`[MARKET] Trades OK`);
+          // // console.log(`[MARKET] Trades OK`);
           
           const subscriptionKey = `${contractId}:${contractId}`;
           this.subscriptions.add(subscriptionKey);
           this.dataBuffers.set(subscriptionKey, []);
         } catch (subError) {
-          console.log(`[MARKET] Immediate subscribe failed: ${subError.message}`);
+          // // console.log(`[MARKET] Immediate subscribe failed: ${subError.message}`);
         }
       }
       
@@ -168,7 +168,7 @@ class MarketDataFeed extends EventEmitter {
       return true;
       
     } catch (error) {
-      console.log(`[MARKET] Connection error: ${error.message}`);
+      // // console.log(`[MARKET] Connection error: ${error.message}`);
       this.emit('error', error);
       throw error;
     }
@@ -195,23 +195,23 @@ class MarketDataFeed extends EventEmitter {
     
     // Gateway logout - server is kicking us out
     this.marketConnection.on('GatewayLogout', (...args) => {
-      console.log(`[MARKET] GatewayLogout received:`, args);
+      // // console.log(`[MARKET] GatewayLogout received:`, args);
     });
     
     // Also handle lowercase version
     this.marketConnection.on('gatewaylogout', (...args) => {
-      console.log(`[MARKET] gatewaylogout received:`, args);
+      // // console.log(`[MARKET] gatewaylogout received:`, args);
     });
     
     // Connection state changes
     this.marketConnection.onreconnecting((error) => {
-      console.log(`[MARKET] Reconnecting... Error: ${error?.message || 'none'}`);
+      // // console.log(`[MARKET] Reconnecting... Error: ${error?.message || 'none'}`);
       this.isConnected = false;
       this.emit('reconnecting', { error: error?.message });
     });
     
     this.marketConnection.onreconnected((connectionId) => {
-      console.log(`[MARKET] Reconnected! ConnectionId: ${connectionId}`);
+      // // console.log(`[MARKET] Reconnected! ConnectionId: ${connectionId}`);
       this.isConnected = true;
       this.emit('reconnected', { connectionId });
       // Resubscribe to all symbols
@@ -219,7 +219,7 @@ class MarketDataFeed extends EventEmitter {
     });
     
     this.marketConnection.onclose((error) => {
-      console.log(`[MARKET] Connection CLOSED! Error: ${error?.message || 'none'}`);
+      // // console.log(`[MARKET] Connection CLOSED! Error: ${error?.message || 'none'}`);
       this.isConnected = false;
       this.emit('disconnected', { error: error?.message });
     });
@@ -230,7 +230,7 @@ class MarketDataFeed extends EventEmitter {
    * Implements retry logic for connection race conditions
    */
   async subscribe(symbol, contractId, retryCount = 0) {
-    console.log(`[MARKET] Subscribe called - symbol: ${symbol}, contractId: ${contractId}`);
+    // // console.log(`[MARKET] Subscribe called - symbol: ${symbol}, contractId: ${contractId}`);
     
     const subscriptionKey = `${symbol}:${contractId}`;
     
@@ -240,15 +240,15 @@ class MarketDataFeed extends EventEmitter {
     
     // Check connection state
     const state = this.marketConnection?.state;
-    console.log(`[MARKET] Connection state: ${state}`);
+    // // console.log(`[MARKET] Connection state: ${state}`);
     
     if (state !== 'Connected') {
       if (retryCount < 5) {
-        console.log(`[MARKET] Not connected, waiting 500ms and retrying... (${retryCount + 1}/5)`);
+        // // console.log(`[MARKET] Not connected, waiting 500ms and retrying... (${retryCount + 1}/5)`);
         await new Promise(resolve => setTimeout(resolve, 500));
         return this.subscribe(symbol, contractId, retryCount + 1);
       } else {
-        console.log(`[MARKET] ERROR: Connection not available after 5 retries`);
+        // // console.log(`[MARKET] ERROR: Connection not available after 5 retries`);
         this.emit('error', new Error('Connection not available'));
         return false;
       }
@@ -256,13 +256,13 @@ class MarketDataFeed extends EventEmitter {
     
     try {
       // Subscribe to quotes - do it immediately, no delay
-      console.log(`[MARKET] Subscribing to ${contractId}...`);
+      // // console.log(`[MARKET] Subscribing to ${contractId}...`);
       await this.marketConnection.invoke('SubscribeContractQuotes', contractId);
-      console.log(`[MARKET] Quotes subscribed`);
+      // // console.log(`[MARKET] Quotes subscribed`);
       
       // Subscribe to trades
       await this.marketConnection.invoke('SubscribeContractTrades', contractId);
-      console.log(`[MARKET] Trades subscribed`);
+      // // console.log(`[MARKET] Trades subscribed`);
       
       this.subscriptions.add(subscriptionKey);
       this.dataBuffers.set(subscriptionKey, []);
@@ -272,11 +272,11 @@ class MarketDataFeed extends EventEmitter {
       return true;
       
     } catch (error) {
-      console.log(`[MARKET] Subscribe ERROR: ${error.message}`);
+      // // console.log(`[MARKET] Subscribe ERROR: ${error.message}`);
       
       // If connection was closed, try to reconnect
       if (error.message.includes('not in the') && retryCount < 3) {
-        console.log(`[MARKET] Connection lost, will retry on reconnect`);
+        // // console.log(`[MARKET] Connection lost, will retry on reconnect`);
         this.isConnected = false;
       }
       
@@ -332,7 +332,7 @@ class MarketDataFeed extends EventEmitter {
     if (!this._quoteCount) this._quoteCount = 0;
     this._quoteCount++;
     if (this._quoteCount % 100 === 1) {
-      console.log(`[MARKET] Quote #${this._quoteCount}:`, JSON.stringify(args).substring(0, 200));
+      // // console.log(`[MARKET] Quote #${this._quoteCount}:`, JSON.stringify(args).substring(0, 200));
     }
     
     const contractId = args[0];
@@ -407,7 +407,7 @@ class MarketDataFeed extends EventEmitter {
     if (!this._tradeCount) this._tradeCount = 0;
     this._tradeCount++;
     if (this._tradeCount % 50 === 1) {
-      console.log(`[MARKET] Trade #${this._tradeCount}:`, JSON.stringify(args).substring(0, 200));
+      // // console.log(`[MARKET] Trade #${this._tradeCount}:`, JSON.stringify(args).substring(0, 200));
     }
     
     const contractId = args[0];

package/src/pages/algo/one-account.js

@@ -313,7 +313,8 @@ const launchAlgo = async (service, account, contract, config) => {
   // Connect to market data
   try {
     const token = service.token || service.getToken?.();
-    await marketFeed.connect(token, account.propfirm, contractId);
+    const propfirmKey = (account.propfirm || 'topstep').toLowerCase().replace(/\s+/g, '_');
+    await marketFeed.connect(token, propfirmKey, contractId);
     await marketFeed.subscribe(symbolName, contractId);
   } catch (e) {
     ui.addLog('error', `Failed to connect: ${e.message}`);