hedgequantx 2.9.242 → 2.9.244

package/package.json

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

package/src/services/daemon/index.js

@@ -309,14 +309,13 @@ async function startDaemonBackground() {
   // Install daemon to isolated directory first
   const installed = installDaemon();
   if (!installed) {
-    log.error('Failed to install daemon');
-    return false;
+    log.warn('Failed to install daemon to isolated dir, using direct mode');
+    return startDaemonDirect();
   }
   
   // Check if isolated daemon entry exists
   if (!fs.existsSync(DAEMON_ENTRY)) {
-    log.error('Daemon entry not found', { path: DAEMON_ENTRY });
-    // Fallback to direct execution
+    log.warn('Daemon entry not found, using direct mode', { path: DAEMON_ENTRY });
     return startDaemonDirect();
   }
   
@@ -338,7 +337,7 @@ async function startDaemonBackground() {
     let attempts = 0;
     const maxAttempts = 30;
     
-    const check = setInterval(() => {
+    const check = setInterval(async () => {
       attempts++;
       
       if (isDaemonRunning()) {
@@ -347,8 +346,10 @@ async function startDaemonBackground() {
         resolve(true);
       } else if (attempts >= maxAttempts) {
         clearInterval(check);
-        log.error('Daemon failed to start');
-        resolve(false);
+        log.warn('Isolated daemon failed to start, trying direct mode');
+        // Fallback to direct mode
+        const directResult = await startDaemonDirect();
+        resolve(directResult);
       }
     }, 100);
   });

package/src/services/rithmic/handlers.js

@@ -222,19 +222,20 @@ const handleNewOrderResponse = (service, data) => {
     debug('New order response:', JSON.stringify(res));
     
     // Emit as orderNotification for the placeOrder listener
-    if (res.basketId || res.orderId) {
-      const order = {
-        basketId: res.basketId || res.orderId,
-        accountId: res.accountId,
-        symbol: res.symbol,
-        exchange: res.exchange || 'CME',
-        status: res.rpCode?.[0] === '0' ? 2 : 5, // 2=Working, 5=Rejected
-        notifyType: res.rpCode?.[0] === '0' ? 1 : 0, // 1=Accepted
-        rpCode: res.rpCode,
-        userMsg: res.userMsg,
-      };
-      service.emit('orderNotification', order);
-    }
+    // Even if no basketId, emit for rejection handling
+    const isRejected = res.rpCode?.[0] !== '0';
+    const order = {
+      basketId: res.basketId || res.orderId || res.userMsg?.[0] || 'unknown',
+      accountId: res.accountId,
+      symbol: res.symbol,
+      exchange: res.exchange || 'CME',
+      status: isRejected ? 5 : 2, // 2=Working, 5=Rejected
+      notifyType: isRejected ? 0 : 1, // 1=Accepted
+      rpCode: res.rpCode,
+      rqHandlerRpCode: res.rqHandlerRpCode, // Also include request handler response code
+      userMsg: res.userMsg,
+    };
+    service.emit('orderNotification', order);
     
     // Also emit specific event
     service.emit('newOrderResponse', res);

package/src/services/rithmic/orders.js

@@ -145,18 +145,27 @@ const placeOrder = async (service, orderData) => {
             orderTag,
           });
         } else if (status === 5 || status === 6) {
-          // Extract rejection reason from rpCode[1] if available
+          // Extract rejection reason from rpCode[1] or rqHandlerRpCode[1]
           const rpCode = order.rpCode;
+          const rqCode = order.rqHandlerRpCode;
           let errorMsg = `Order rejected: status ${status}`;
+          
+          // Try rpCode first, then rqHandlerRpCode
           if (rpCode && Array.isArray(rpCode) && rpCode.length > 1 && rpCode[1]) {
-            errorMsg = `Order rejected: ${rpCode[1]}`;
+            errorMsg = `Rejected: ${rpCode[1]}`;
+          } else if (rqCode && Array.isArray(rqCode) && rqCode.length > 1 && rqCode[1]) {
+            errorMsg = `Rejected: ${rqCode[1]}`;
+          } else if (rpCode && Array.isArray(rpCode) && rpCode[0] && rpCode[0] !== '0') {
+            errorMsg = `Rejected: code ${rpCode[0]}`;
           }
+          
           resolve({
             success: false,
             error: errorMsg,
             orderId: order.basketId,
             orderTag,
             rpCode,
+            rqHandlerRpCode: rqCode,
           });
         }
       }