hedgequantx 2.9.147 → 2.9.149

package/package.json

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

package/src/pages/algo/algo-executor.js

@@ -326,14 +326,11 @@ const executeAlgo = async ({ service, account, contract, config, strategy: strat
   marketFeed.on('disconnected', () => { stats.connected = false; ui.addLog('error', 'Market disconnected'); });
   
   try {
-    const rithmicCredentials = service.getRithmicCredentials?.();
-    if (!rithmicCredentials) {
-      throw new Error('Rithmic credentials not available');
-    }
-    // Disconnect service's TICKER_PLANT to avoid conflict (Rithmic allows only 1 TICKER connection per user)
-    if (service.disconnectTicker) {
-      await service.disconnectTicker();
-    }
+    // Try sync (RithmicService) then async (BrokerClient)
+    let rithmicCredentials = service.getRithmicCredentials?.();
+    if (!rithmicCredentials && service.getRithmicCredentialsAsync) rithmicCredentials = await service.getRithmicCredentialsAsync();
+    if (!rithmicCredentials) throw new Error('Rithmic credentials not available - try "hqx login"');
+    if (service.disconnectTicker) await service.disconnectTicker(); // Avoid TICKER conflict
     await marketFeed.connect(rithmicCredentials);
     await marketFeed.subscribe(symbolCode, contract.exchange || 'CME');
     

package/src/pages/algo/copy-executor.js

@@ -188,9 +188,13 @@ const launchCopyTrading = async (config) => {
   
   // Connect to market data (Rithmic TICKER_PLANT)
   try {
-    const rithmicCredentials = leadService.getRithmicCredentials?.();
+    // Try sync first (RithmicService), then async (RithmicBrokerClient)
+    let rithmicCredentials = leadService.getRithmicCredentials?.();
+    if (!rithmicCredentials && leadService.getRithmicCredentialsAsync) {
+      rithmicCredentials = await leadService.getRithmicCredentialsAsync();
+    }
     if (!rithmicCredentials) {
-      throw new Error('Rithmic credentials not available');
+      throw new Error('Rithmic credentials not available - try "hqx login"');
     }
     await marketFeed.connect(rithmicCredentials);
     await marketFeed.subscribe(symbolName, contract.exchange || 'CME');

package/src/pages/algo/multi-symbol-executor.js

@@ -267,8 +267,12 @@ const executeMultiSymbol = async ({ service, account, contracts, config, strateg
   
   // Connect and subscribe to all symbols
   try {
-    const rithmicCredentials = service.getRithmicCredentials?.();
-    if (!rithmicCredentials) throw new Error('Rithmic credentials not available');
+    // Try sync first (RithmicService), then async (RithmicBrokerClient)
+    let rithmicCredentials = service.getRithmicCredentials?.();
+    if (!rithmicCredentials && service.getRithmicCredentialsAsync) {
+      rithmicCredentials = await service.getRithmicCredentialsAsync();
+    }
+    if (!rithmicCredentials) throw new Error('Rithmic credentials not available - try "hqx login"');
     
     if (service.disconnectTicker) await service.disconnectTicker();
     await marketFeed.connect(rithmicCredentials);

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

@@ -302,6 +302,9 @@ const oneAccountMenu = async (service) => {
 const selectMultipleSymbols = async (service, account) => {
   const spinner = ora({ text: 'Loading symbols...', color: 'yellow' }).start();
   
+  // Debug: log service type
+  const serviceType = service.constructor?.name || 'Unknown';
+  
   // Ensure we have a logged-in service
   if (!service.loginInfo && service.credentials) {
     spinner.text = 'Reconnecting to broker...';
@@ -312,19 +315,24 @@ const selectMultipleSymbols = async (service, account) => {
     }
   }
   
-  const contractsResult = await service.getContracts();
+  let contractsResult;
+  try {
+    contractsResult = await service.getContracts();
+  } catch (err) {
+    spinner.fail(`getContracts exception: ${err.message}`);
+    console.log(chalk.gray(`  Service: ${serviceType} | Tip: Try "hqx login"`));
+    return null;
+  }
   if (!contractsResult.success || !contractsResult.contracts?.length) {
     spinner.fail(`Failed to load contracts: ${contractsResult.error || 'No contracts'}`);
+    console.log(chalk.gray(`  Service: ${serviceType} | Tip: Try "hqx login"`));
     return null;
   }
   
   const contracts = sortContracts(contractsResult.contracts);
   spinner.succeed(`Found ${contracts.length} contracts`);
-  
-  console.log();
-  console.log(chalk.cyan('  Select up to 5 symbols (one at a time)'));
-  console.log(chalk.gray('  Select "Done" when finished'));
-  console.log();
+  console.log(chalk.cyan('\n  Select up to 5 symbols (one at a time)'));
+  console.log(chalk.gray('  Select "Done" when finished\n'));
   
   const selectedContracts = [];
   const maxSymbols = 5;
@@ -356,30 +364,17 @@ const selectMultipleSymbols = async (service, account) => {
       : `Select Symbol ${selectedContracts.length + 1}/${maxSymbols} (${remaining} remaining):`;
     
     const selection = await prompts.selectOption(chalk.yellow(promptText), options);
-    
-    if (selection === 'back' || selection === null) {
-      return null;
-    }
-    if (selection === 'done') {
-      break;
-    }
-    
+    if (selection === 'back' || selection === null) return null;
+    if (selection === 'done') break;
     selectedContracts.push(selection);
     console.log(chalk.green(`  ✓ Added: ${selection.symbol}`));
   }
-  
-  if (selectedContracts.length === 0) {
-    return null;
-  }
+  if (selectedContracts.length === 0) return null;
   
   // Display summary
+  console.log(chalk.cyan(`\n  Selected ${selectedContracts.length} symbol(s):`));
+  for (const c of selectedContracts) console.log(chalk.white(`    - ${c.symbol} (${c.baseSymbol || c.name})`));
   console.log();
-  console.log(chalk.cyan(`  Selected ${selectedContracts.length} symbol(s):`));
-  for (const c of selectedContracts) {
-    console.log(chalk.white(`    - ${c.symbol} (${c.baseSymbol || c.name})`));
-  }
-  console.log();
-  
   return selectedContracts;
 };
 
@@ -389,6 +384,9 @@ const selectMultipleSymbols = async (service, account) => {
 const selectSymbol = async (service, account) => {
   const spinner = ora({ text: 'Loading symbols...', color: 'yellow' }).start();
   
+  // Debug: log service type
+  const serviceType = service.constructor?.name || 'Unknown';
+  
   // Ensure we have a logged-in service (for direct RithmicService, not BrokerClient)
   if (!service.loginInfo && service.credentials && typeof service.login === 'function') {
     spinner.text = 'Reconnecting to broker...';
@@ -399,12 +397,17 @@ const selectSymbol = async (service, account) => {
     }
   }
   
-  const contractsResult = await service.getContracts();
-  
+  let contractsResult;
+  try {
+    contractsResult = await service.getContracts();
+  } catch (err) {
+    spinner.fail(`getContracts exception: ${err.message}`);
+    console.log(chalk.gray(`  Service: ${serviceType} | Tip: Try "hqx login"`));
+    return null;
+  }
   if (!contractsResult.success || !contractsResult.contracts?.length) {
-    const errorMsg = contractsResult.error || 'No contracts available';
-    spinner.fail(`Failed to load contracts: ${errorMsg}`);
-    console.log(chalk.gray('  Tip: Try reconnecting with "hqx login"'));
+    spinner.fail(`Failed to load contracts: ${contractsResult.error || 'No contracts available'}`);
+    console.log(chalk.gray(`  Service: ${serviceType} | Tip: Try "hqx login"`));
     return null;
   }
   

package/src/services/rithmic-broker/client.js

@@ -211,7 +211,13 @@ class RithmicBrokerClient extends EventEmitter {
    */
   async getContracts() {
     const result = await this._request('getContracts', { propfirmKey: this.propfirmKey });
-    if (result.error) return { success: false, contracts: [], error: result.error };
+    if (result.error) {
+      // Debug: show exactly what error came from daemon
+      if (process.env.HQX_DEBUG === '1') {
+        console.log('[BrokerClient] getContracts error:', result.error, 'propfirmKey:', this.propfirmKey);
+      }
+      return { success: false, contracts: [], error: result.error };
+    }
     return result.payload || { success: true, contracts: [] };
   }
 

package/src/services/rithmic-broker/daemon.js

@@ -299,13 +299,27 @@ class RithmicBrokerDaemon {
 
   async _handleGetContracts(payload, requestId) {
     const conn = this.connections.get(payload.propfirmKey);
-    if (!conn?.service) return { error: 'Not connected to broker', requestId };
+    if (!conn?.service) {
+      log('WARN', 'getContracts: Not connected', { propfirm: payload.propfirmKey, hasConn: !!conn });
+      return { error: 'Not connected to broker', requestId };
+    }
+    
+    // Log service state for debugging
+    const hasCredentials = !!conn.service.credentials;
+    const hasTickerConn = !!conn.service.tickerConn;
+    log('DEBUG', 'getContracts request', { propfirm: payload.propfirmKey, hasCredentials, hasTickerConn });
     
     try {
       const result = await conn.service.getContracts();
+      log('DEBUG', 'getContracts result', { 
+        propfirm: payload.propfirmKey, 
+        success: result.success, 
+        count: result.contracts?.length || 0,
+        error: result.error 
+      });
       return { type: 'contracts', payload: result, requestId };
     } catch (err) {
-      log('ERROR', 'getContracts failed', { propfirm: payload.propfirmKey, error: err.message });
+      log('ERROR', 'getContracts exception', { propfirm: payload.propfirmKey, error: err.message, stack: err.stack?.split('\n')[1] });
       return { type: 'contracts', payload: { success: false, error: err.message, contracts: [] }, requestId };
     }
   }