hedgequantx 2.9.29 → 2.9.31

package/package.json

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

package/src/config/propfirms.js

@@ -15,14 +15,6 @@ const PROPFIRMS = {
     rithmicSystem: 'Apex',
     wsEndpoint: 'wss://ritpa11120.11.rithmic.com:443',
   },
-  rithmic_paper: {
-    id: 'rithmic-paper',
-    name: 'Rithmic Paper Trading',
-    displayName: 'Rithmic Paper Trading',
-    platform: 'Rithmic',
-    rithmicSystem: 'Rithmic Paper Trading',
-    wsEndpoint: 'wss://ritpa11120.11.rithmic.com:443',
-  },
   topsteptrader: {
     id: 'topsteptrader',
     name: 'TopstepTrader',
@@ -142,6 +134,14 @@ const PROPFIRMS = {
     platform: 'Rithmic',
     rithmicSystem: 'tradesea',
     wsEndpoint: 'wss://ritpa11120.11.rithmic.com:443'
+  },
+  rithmic_paper: {
+    id: 'rithmic-paper',
+    name: 'Rithmic Paper Trading',
+    displayName: 'Rithmic Paper Trading',
+    platform: 'Rithmic',
+    rithmicSystem: 'Rithmic Paper Trading',
+    wsEndpoint: 'wss://ritpa11120.11.rithmic.com:443'
   }
 };
 
@@ -154,15 +154,17 @@ const PROPFIRM_CHOICES = Object.entries(PROPFIRMS)
     // Apex always first
     if (a.name === 'Apex') return -1;
     if (b.name === 'Apex') return 1;
-    // Rithmic Paper Trading second
-    if (a.name === 'Rithmic Paper Trading') return -1;
-    if (b.name === 'Rithmic Paper Trading') return 1;
-    // 4PropTrader and 10XFutures always last
-    const lastItems = ['4PropTrader', '10XFutures'];
+    // 4PropTrader, 10XFutures, Rithmic Paper Trading always last
+    const lastItems = ['4PropTrader', '10XFutures', 'Rithmic Paper Trading'];
     const aIsLast = lastItems.includes(a.name);
     const bIsLast = lastItems.includes(b.name);
     if (aIsLast && !bIsLast) return 1;
     if (!aIsLast && bIsLast) return -1;
+    // If both are last items, order them: 10XFutures, 4PropTrader, Rithmic Paper Trading
+    if (aIsLast && bIsLast) {
+      const order = ['10XFutures', '4PropTrader', 'Rithmic Paper Trading'];
+      return order.indexOf(a.name) - order.indexOf(b.name);
+    }
     // Then alphabetical
     return a.name.localeCompare(b.name);
   });

package/src/services/rithmic/connection.js

@@ -5,9 +5,25 @@
 
 const WebSocket = require('ws');
 const EventEmitter = require('events');
+const os = require('os');
 const { proto } = require('./protobuf');
 const { REQ, RES, INFRA_TYPE } = require('./constants');
 
+/**
+ * Get MAC address from network interfaces
+ */
+function getMacAddress() {
+  const interfaces = os.networkInterfaces();
+  for (const name of Object.keys(interfaces)) {
+    for (const iface of interfaces[name]) {
+      if (!iface.internal && iface.mac !== '00:00:00:00:00:00') {
+        return iface.mac;
+      }
+    }
+  }
+  return '00:00:00:00:00:00';
+}
+
 class RithmicConnection extends EventEmitter {
   constructor() {
     super();
@@ -108,6 +124,9 @@ class RithmicConnection extends EventEmitter {
       appVersion: this.config.appVersion || '1.0.0',
       systemName: this.config.systemName,
       infraType: INFRA_TYPE[infraType],
+      macAddr: [getMacAddress()],
+      osVersion: os.release(),
+      osPlatform: os.platform(),
     });
   }
 

package/src/services/rithmic/index.js

@@ -42,6 +42,8 @@ const PROPFIRM_CONFIGS = {
   lucidtrading: { name: 'Lucid Trading', systemName: RITHMIC_SYSTEMS.LUCID_TRADING, gateway: RITHMIC_ENDPOINTS.CHICAGO },
   thrivetrading: { name: 'Thrive Trading', systemName: RITHMIC_SYSTEMS.THRIVE_TRADING, gateway: RITHMIC_ENDPOINTS.CHICAGO },
   legendstrading: { name: 'Legends Trading', systemName: RITHMIC_SYSTEMS.LEGENDS_TRADING, gateway: RITHMIC_ENDPOINTS.CHICAGO },
+  // Rithmic Paper Trading - uses dedicated PAPER endpoint
+  rithmic_paper: { name: 'Rithmic Paper Trading', systemName: RITHMIC_SYSTEMS.PAPER, gateway: RITHMIC_ENDPOINTS.PAPER },
 };
 
 /**

package/src/services/rithmic/protobuf.js

@@ -331,46 +331,59 @@ class ProtobufHandler {
   }
 
   /**
-   * Encode a message to Buffer
+   * Encode a message to Buffer with 4-byte length prefix
    */
   encode(typeName, data) {
     if (!this.root) throw new Error('Proto not loaded');
 
     const Type = this.root.lookupType(typeName);
     const msg = Type.create(data);
-    return Buffer.from(Type.encode(msg).finish());
+    const serialized = Buffer.from(Type.encode(msg).finish());
+    
+    // Add 4-byte length prefix (big-endian, signed)
+    const lengthPrefix = Buffer.alloc(4);
+    lengthPrefix.writeInt32BE(serialized.length, 0);
+    
+    return Buffer.concat([lengthPrefix, serialized]);
   }
 
   /**
-   * Decode a Buffer to object
+   * Decode a Buffer to object (skip 4-byte length prefix)
    */
   decode(typeName, buffer) {
     if (!this.root) throw new Error('Proto not loaded');
 
+    // Skip 4-byte length prefix if present
+    const data = buffer.length > 4 ? buffer.slice(4) : buffer;
+    
     const Type = this.root.lookupType(typeName);
-    return Type.decode(buffer);
+    return Type.decode(data);
   }
 
   /**
    * Get template ID from buffer (manual decode for large field IDs)
+   * Skips 4-byte length prefix if present
    */
   getTemplateId(buffer) {
     const TEMPLATE_ID_FIELD = 154467;
 
+    // Skip 4-byte length prefix
+    const data = buffer.length > 4 ? buffer.slice(4) : buffer;
+    
     let offset = 0;
-    while (offset < buffer.length) {
+    while (offset < data.length) {
       try {
-        const [tag, newOffset] = readVarint(buffer, offset);
+        const [tag, newOffset] = readVarint(data, offset);
         const fieldNumber = tag >>> 3;
         const wireType = tag & 0x7;
         offset = newOffset;
 
         if (fieldNumber === TEMPLATE_ID_FIELD && wireType === 0) {
-          const [templateId] = readVarint(buffer, offset);
+          const [templateId] = readVarint(data, offset);
           return templateId;
         }
 
-        offset = skipField(buffer, offset, wireType);
+        offset = skipField(data, offset, wireType);
       } catch (e) {
         break;
       }
@@ -380,7 +393,7 @@ class ProtobufHandler {
     if (this.root) {
       try {
         const Base = this.root.lookupType('Base');
-        const base = Base.decode(buffer);
+        const base = Base.decode(data);
         return base.templateId;
       } catch (e) {
         return -1;