hedgequantx 2.9.148 → 2.9.150

package/package.json

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

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

@@ -326,14 +326,17 @@ 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) {
+      try {
+        rithmicCredentials = await service.getRithmicCredentialsAsync();
+      } catch (credErr) {
+        throw new Error(`Broker error: ${credErr.message} - try "hqx login"`);
+      }
     }
+    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,17 @@ 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) {
+      try {
+        rithmicCredentials = await leadService.getRithmicCredentialsAsync();
+      } catch (credErr) {
+        throw new Error(`Broker error: ${credErr.message} - try "hqx login"`);
+      }
+    }
     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,16 @@ 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) {
+      try {
+        rithmicCredentials = await service.getRithmicCredentialsAsync();
+      } catch (credErr) {
+        throw new Error(`Broker error: ${credErr.message} - try "hqx login"`);
+      }
+    }
+    if (!rithmicCredentials) throw new Error('Rithmic credentials not available - try "hqx login"');
     
     if (service.disconnectTicker) await service.disconnectTicker();
     await marketFeed.connect(rithmicCredentials);

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

@@ -249,9 +249,14 @@ class RithmicBrokerClient extends EventEmitter {
 
   /**
    * Get async Rithmic credentials from daemon
+   * @returns {Object|null} Credentials object or null
+   * @throws {Error} If daemon returns error
    */
   async getRithmicCredentialsAsync() {
     const result = await this._request('getRithmicCredentials', { propfirmKey: this.propfirmKey });
+    if (result.error) {
+      throw new Error(result.error);
+    }
     return result.payload || null;
   }
 

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

@@ -332,8 +332,20 @@ class RithmicBrokerDaemon {
 
   _handleGetCredentials(payload, requestId) {
     const conn = this.connections.get(payload.propfirmKey);
-    if (!conn?.service) return { error: 'Not connected', requestId };
-    return { type: 'credentials', payload: conn.service.getRithmicCredentials?.() || null, requestId };
+    if (!conn) {
+      log('WARN', 'getCredentials: propfirm not found', { propfirm: payload.propfirmKey });
+      return { error: `Propfirm "${payload.propfirmKey}" not connected - run "hqx login"`, requestId };
+    }
+    if (!conn.service) {
+      log('WARN', 'getCredentials: service is null', { propfirm: payload.propfirmKey, status: conn.status });
+      return { error: `Connection lost for "${payload.propfirmKey}" - run "hqx login"`, requestId };
+    }
+    const creds = conn.service.getRithmicCredentials?.();
+    if (!creds) {
+      log('WARN', 'getCredentials: credentials null', { propfirm: payload.propfirmKey });
+      return { error: `Credentials not available for "${payload.propfirmKey}"`, requestId };
+    }
+    return { type: 'credentials', payload: creds, requestId };
   }
 
   /**

package/src/services/session.js

@@ -146,6 +146,17 @@ const connections = {
         const accountsResult = await client.getTradingAccounts();
         client.accounts = accountsResult.accounts || [];
         
+        // Cache credentials locally for sync access (fetch from daemon)
+        try {
+          const creds = await client.getRithmicCredentialsAsync();
+          if (creds && creds.userId && creds.password) {
+            client.credentials = { username: creds.userId, password: creds.password };
+            client.propfirm = { name: conn.propfirmKey, systemName: creds.systemName, gateway: creds.gateway };
+          }
+        } catch (e) {
+          log.warn('Failed to cache credentials', { propfirm: conn.propfirmKey, error: e.message });
+        }
+        
         this.services.push({
           type: 'rithmic',
           service: client,
@@ -153,7 +164,7 @@ const connections = {
           propfirmKey: conn.propfirmKey,
           connectedAt: new Date(conn.connectedAt),
         });
-        log.debug('Restored from broker', { propfirm: conn.propfirmKey });
+        log.debug('Restored from broker', { propfirm: conn.propfirmKey, hasCreds: !!client.credentials });
       }
       
       return this.services.length > 0;