hedgequantx 2.6.34 → 2.6.35

package/package.json

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

package/src/services/rithmic/connection.js

@@ -117,11 +117,14 @@ class RithmicConnection extends EventEmitter {
    * Fast send - bypasses some ws overhead for hot path
    * Use for time-critical order messages
    * @param {Buffer} buffer - Pre-encoded protobuf buffer
+   * @returns {boolean} true if sent, false if connection not open
    */
   fastSend(buffer) {
     if (this.ws && this.ws.readyState === WebSocket.OPEN) {
       this.ws.send(buffer);
+      return true;
     }
+    return false;
   }
 
   /**

package/src/services/rithmic/orders.js

@@ -48,7 +48,7 @@ const OrderPool = {
     quantity: 0,
     transactionType: 1,
     duration: 1,
-    orderType: 1,
+    priceType: 2,       // FIXED: was 'orderType: 1' - priceType 2 = MARKET order
     manualOrAuto: 2,
   },
   
@@ -102,11 +102,20 @@ const fastEntry = (service, orderData) => {
   }
 
   try {
+    // FIXED: Use account-specific fcmId/ibId if available (some prop firms have different IDs per account)
+    const account = service.accounts?.find(a => 
+      a.accountId === orderData.accountId || a.rithmicAccountId === orderData.accountId
+    );
+    const effectiveLoginInfo = {
+      fcmId: account?.fcmId || service.loginInfo.fcmId,
+      ibId: account?.ibId || service.loginInfo.ibId,
+    };
+    
     // OPTIMIZED: Use pre-allocated order object
-    const order = OrderPool.fill(orderTag, service.loginInfo, orderData);
+    const order = OrderPool.fill(orderTag, effectiveLoginInfo, orderData);
     
     // DEBUG: Log order details
-    console.log(`[ORDER] Sending: ${orderTag} | ${orderData.side === 0 ? 'BUY' : 'SELL'} ${orderData.size}x ${orderData.symbol} | acct=${orderData.accountId}`);
+    console.log(`[ORDER] Sending: ${orderTag} | ${orderData.side === 0 ? 'BUY' : 'SELL'} ${orderData.size}x ${orderData.symbol} | acct=${orderData.accountId} | fcm=${effectiveLoginInfo.fcmId} ib=${effectiveLoginInfo.ibId}`);
     
     // OPTIMIZED: Use fastEncode with cached type
     const buffer = proto.fastEncode('RequestNewOrder', order);
@@ -167,8 +176,17 @@ const fastExit = (service, orderData) => {
   }
 
   try {
+    // FIXED: Use account-specific fcmId/ibId if available
+    const account = service.accounts?.find(a => 
+      a.accountId === orderData.accountId || a.rithmicAccountId === orderData.accountId
+    );
+    const effectiveLoginInfo = {
+      fcmId: account?.fcmId || service.loginInfo.fcmId,
+      ibId: account?.ibId || service.loginInfo.ibId,
+    };
+    
     // OPTIMIZED: Use pre-allocated order object
-    const order = OrderPool.fill(orderTag, service.loginInfo, orderData);
+    const order = OrderPool.fill(orderTag, effectiveLoginInfo, orderData);
     
     // OPTIMIZED: Use fastEncode with cached type
     const buffer = proto.fastEncode('RequestNewOrder', order);
@@ -210,18 +228,23 @@ const placeOrder = async (service, orderData) => {
   }
 
   try {
+    // FIXED: Use account-specific fcmId/ibId if available
+    const account = service.accounts?.find(a => 
+      a.accountId === orderData.accountId || a.rithmicAccountId === orderData.accountId
+    );
+    
     service.orderConn.send('RequestNewOrder', {
       templateId: REQ.NEW_ORDER,
       userMsg: ['HQX'],
-      fcmId: service.loginInfo.fcmId,
-      ibId: service.loginInfo.ibId,
+      fcmId: account?.fcmId || service.loginInfo.fcmId,
+      ibId: account?.ibId || service.loginInfo.ibId,
       accountId: orderData.accountId,
       symbol: orderData.symbol,
       exchange: orderData.exchange || 'CME',
       quantity: orderData.size,
       transactionType: orderData.side === 0 ? 1 : 2, // 1=Buy, 2=Sell
       duration: 1, // DAY
-      orderType: orderData.type === 2 ? 1 : 2, // 1=Market, 2=Limit
+      priceType: orderData.type === 2 ? 2 : 1, // FIXED: was 'orderType' with inverted logic. priceType: 1=Limit, 2=Market
       price: orderData.price || 0,
     });