hedgequantx 2.9.166 → 2.9.168

package/package.json

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

package/src/services/rithmic/contracts.js

@@ -85,17 +85,23 @@ const fetchAllFrontMonths = (service) => {
 
   const tickerState = service.tickerConn.connectionState;
   const tickerConnected = service.tickerConn.isConnected;
-  log.debug('fetchAllFrontMonths starting', { tickerState, tickerConnected });
+  
+  // Direct console.log for daemon broker.log (always visible)
+  const brokerLog = (msg, data) => console.log(`[CONTRACTS] ${msg}`, JSON.stringify(data));
+  
+  brokerLog('fetchAllFrontMonths starting', { tickerState, tickerConnected });
 
   return new Promise((resolve) => {
     const contracts = new Map();
     const productsToCheck = new Map();
     let msgCount = 0;
+    let productMsgCount = 0;
 
     // Handler for ProductCodes responses
     const productHandler = (msg) => {
       msgCount++;
       if (msg.templateId !== 112) return;
+      productMsgCount++;
       
       const decoded = decodeProductCodes(msg.data);
       if (!decoded.productCode || !decoded.exchange) return;
@@ -135,23 +141,28 @@ const fetchAllFrontMonths = (service) => {
     service.tickerConn.on('message', frontMonthHandler);
 
     // Request all product codes
-    log.debug('Sending RequestProductCodes');
+    brokerLog('Sending RequestProductCodes', { templateId: 111 });
     try {
       service.tickerConn.send('RequestProductCodes', {
         templateId: 111,
         userMsg: ['get-products'],
       });
+      brokerLog('RequestProductCodes sent OK', {});
     } catch (err) {
-      log.warn('Failed to send RequestProductCodes', { error: err.message });
+      brokerLog('FAILED to send RequestProductCodes', { error: err.message });
     }
 
     // After timeout, request front months
     setTimeout(() => {
       service.tickerConn.removeListener('message', productHandler);
-      log.debug('Collected products', { count: productsToCheck.size, totalMsgs: msgCount });
+      brokerLog('ProductCodes phase complete', { 
+        productsFound: productsToCheck.size, 
+        totalMsgs: msgCount,
+        productMsgs: productMsgCount 
+      });
 
       if (productsToCheck.size === 0) {
-        log.warn('No products collected - TICKER may not be working');
+        brokerLog('WARNING: No products collected - TICKER may not be responding', {});
       }
 
       for (const product of productsToCheck.values()) {
@@ -163,7 +174,7 @@ const fetchAllFrontMonths = (service) => {
             exchange: product.exchange,
           });
         } catch (err) {
-          log.warn('Failed to send RequestFrontMonthContract', { product: product.productCode, error: err.message });
+          brokerLog('Failed to send RequestFrontMonthContract', { product: product.productCode, error: err.message });
         }
       }
 
@@ -191,7 +202,7 @@ const fetchAllFrontMonths = (service) => {
         // Sort alphabetically by base symbol
         results.sort((a, b) => a.baseSymbol.localeCompare(b.baseSymbol));
 
-        log.debug('Got contracts from API', { count: results.length, totalMsgs: msgCount });
+        brokerLog('FrontMonth phase complete', { contractsFound: results.length, totalMsgs: msgCount });
         resolve(results);
       }, TIMEOUTS.RITHMIC_PRODUCTS);
     }, TIMEOUTS.RITHMIC_CONTRACTS);

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

@@ -359,53 +359,12 @@ class RithmicBrokerDaemon {
         error: result.error 
       });
       
-      // If no contracts found, return fallback list for common futures
-      if (!result.success || result.contracts?.length === 0) {
-        log('WARN', 'Using fallback contracts list');
-        const fallbackContracts = this._getFallbackContracts();
-        return { type: 'contracts', payload: { success: true, contracts: fallbackContracts, source: 'fallback' }, requestId };
-      }
-      
       return { type: 'contracts', payload: result, requestId };
     } catch (err) {
       log('ERROR', 'getContracts exception', { propfirm: payload.propfirmKey, error: err.message, stack: err.stack?.split('\n')[1] });
-      // Return fallback on error
-      log('WARN', 'Using fallback contracts due to error');
-      const fallbackContracts = this._getFallbackContracts();
-      return { type: 'contracts', payload: { success: true, contracts: fallbackContracts, source: 'fallback' }, requestId };
+      return { type: 'contracts', payload: { success: false, error: err.message, contracts: [] }, requestId };
     }
   }
-  
-  /**
-   * Get fallback contracts list when TICKER_PLANT fails
-   * These are common futures that most prop firms support
-   */
-  _getFallbackContracts() {
-    const now = new Date();
-    const month = now.getMonth();
-    const year = now.getFullYear();
-    
-    // Determine front month code (H=Mar, M=Jun, U=Sep, Z=Dec for indices)
-    const monthCodes = ['H', 'H', 'H', 'M', 'M', 'M', 'U', 'U', 'U', 'Z', 'Z', 'Z'];
-    const frontMonth = monthCodes[month];
-    const yearCode = String(year).slice(-1);
-    const suffix = frontMonth + yearCode;
-    
-    return [
-      { symbol: `MNQ${suffix}`, baseSymbol: 'MNQ', name: 'Micro E-mini Nasdaq-100', exchange: 'CME', tickSize: 0.25 },
-      { symbol: `MES${suffix}`, baseSymbol: 'MES', name: 'Micro E-mini S&P 500', exchange: 'CME', tickSize: 0.25 },
-      { symbol: `NQ${suffix}`, baseSymbol: 'NQ', name: 'E-mini Nasdaq-100', exchange: 'CME', tickSize: 0.25 },
-      { symbol: `ES${suffix}`, baseSymbol: 'ES', name: 'E-mini S&P 500', exchange: 'CME', tickSize: 0.25 },
-      { symbol: `MCL${suffix}`, baseSymbol: 'MCL', name: 'Micro WTI Crude Oil', exchange: 'NYMEX', tickSize: 0.01 },
-      { symbol: `MGC${suffix}`, baseSymbol: 'MGC', name: 'Micro Gold', exchange: 'COMEX', tickSize: 0.10 },
-      { symbol: `M2K${suffix}`, baseSymbol: 'M2K', name: 'Micro E-mini Russell 2000', exchange: 'CME', tickSize: 0.10 },
-      { symbol: `MYM${suffix}`, baseSymbol: 'MYM', name: 'Micro E-mini Dow', exchange: 'CBOT', tickSize: 0.50 },
-      { symbol: `RTY${suffix}`, baseSymbol: 'RTY', name: 'E-mini Russell 2000', exchange: 'CME', tickSize: 0.10 },
-      { symbol: `YM${suffix}`, baseSymbol: 'YM', name: 'E-mini Dow', exchange: 'CBOT', tickSize: 1.00 },
-      { symbol: `CL${suffix}`, baseSymbol: 'CL', name: 'Crude Oil', exchange: 'NYMEX', tickSize: 0.01 },
-      { symbol: `GC${suffix}`, baseSymbol: 'GC', name: 'Gold', exchange: 'COMEX', tickSize: 0.10 },
-    ];
-  }
 
   async _handleSearchContracts(payload, requestId) {
     const conn = this.connections.get(payload.propfirmKey);