hedgequantx 1.2.50 → 1.2.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.2.50",
+  "version": "1.2.53",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {

package/src/app.js

@@ -158,9 +158,10 @@ const loginPrompt = async (propfirmName) => {
       }
     },
     {
-      type: 'input',
+      type: 'password',
       name: 'password',
       message: chalk.white.bold('Password:'),
+      mask: '*',
       validate: (input) => {
         try {
           validatePassword(input);

package/src/pages/stats.js

@@ -117,27 +117,33 @@ const showStats = async (service) => {
     const ordResult = await svc.getOrders(account.accountId);
     if (ordResult.success) totalOpenOrders += ordResult.orders.filter(o => o.status === 1).length;
     
-    // Lifetime stats
-    const lifetimeResult = await svc.getLifetimeStats(account.accountId);
-    if (lifetimeResult.success && lifetimeResult.stats) {
-      account.lifetimeStats = lifetimeResult.stats;
+    // Lifetime stats (if available)
+    if (typeof svc.getLifetimeStats === 'function') {
+      const lifetimeResult = await svc.getLifetimeStats(account.accountId);
+      if (lifetimeResult.success && lifetimeResult.stats) {
+        account.lifetimeStats = lifetimeResult.stats;
+      }
     }
     
-    // Daily stats
-    const dailyResult = await svc.getDailyStats(account.accountId);
-    if (dailyResult.success && dailyResult.stats) {
-      account.dailyStats = dailyResult.stats;
-      allDailyStats = allDailyStats.concat(dailyResult.stats);
+    // Daily stats (if available)
+    if (typeof svc.getDailyStats === 'function') {
+      const dailyResult = await svc.getDailyStats(account.accountId);
+      if (dailyResult.success && dailyResult.stats) {
+        account.dailyStats = dailyResult.stats;
+        allDailyStats = allDailyStats.concat(dailyResult.stats);
+      }
     }
     
-    // Trade history
-    const tradesResult = await svc.getTradeHistory(account.accountId, 30);
-    if (tradesResult.success && tradesResult.trades.length > 0) {
-      allTrades = allTrades.concat(tradesResult.trades.map(t => ({
-        ...t,
-        accountName: account.accountName,
-        propfirm: account.propfirm
-      })));
+    // Trade history (if available)
+    if (typeof svc.getTradeHistory === 'function') {
+      const tradesResult = await svc.getTradeHistory(account.accountId, 30);
+      if (tradesResult.success && tradesResult.trades.length > 0) {
+        allTrades = allTrades.concat(tradesResult.trades.map(t => ({
+          ...t,
+          accountName: account.accountName,
+          propfirm: account.propfirm
+        })));
+      }
     }
   }
 

package/src/services/rithmic/index.js

@@ -578,6 +578,139 @@ class RithmicService extends EventEmitter {
     });
   }
 
+  /**
+   * Get lifetime stats (stub for Rithmic - not available via API)
+   */
+  async getLifetimeStats(accountId) {
+    return { success: true, stats: null };
+  }
+
+  /**
+   * Get daily stats (stub for Rithmic - not available via API)
+   */
+  async getDailyStats(accountId) {
+    return { success: true, stats: [] };
+  }
+
+  /**
+   * Get trade history (stub for Rithmic)
+   */
+  async getTradeHistory(accountId, days = 30) {
+    return { success: true, trades: [] };
+  }
+
+  /**
+   * Get market status
+   */
+  async getMarketStatus(accountId) {
+    const marketHours = this.checkMarketHours();
+    return {
+      success: true,
+      isOpen: marketHours.isOpen,
+      message: marketHours.message,
+    };
+  }
+
+  /**
+   * Get token (stub - Rithmic uses WebSocket, not tokens)
+   */
+  getToken() {
+    return this.loginInfo ? 'connected' : null;
+  }
+
+  /**
+   * Search contracts (stub - would need TICKER_PLANT)
+   */
+  async searchContracts(searchText) {
+    // Common futures contracts
+    const contracts = [
+      { symbol: 'ESH5', name: 'E-mini S&P 500 Mar 2025', exchange: 'CME' },
+      { symbol: 'NQH5', name: 'E-mini NASDAQ-100 Mar 2025', exchange: 'CME' },
+      { symbol: 'CLH5', name: 'Crude Oil Mar 2025', exchange: 'NYMEX' },
+      { symbol: 'GCG5', name: 'Gold Feb 2025', exchange: 'COMEX' },
+      { symbol: 'MESH5', name: 'Micro E-mini S&P 500 Mar 2025', exchange: 'CME' },
+      { symbol: 'MNQH5', name: 'Micro E-mini NASDAQ-100 Mar 2025', exchange: 'CME' },
+    ];
+    const search = searchText.toUpperCase();
+    return contracts.filter(c => c.symbol.includes(search) || c.name.toUpperCase().includes(search));
+  }
+
+  /**
+   * Place order via ORDER_PLANT
+   */
+  async placeOrder(orderData) {
+    if (!this.orderConn || !this.loginInfo) {
+      return { success: false, error: 'Not connected' };
+    }
+
+    try {
+      this.orderConn.send('RequestNewOrder', {
+        templateId: REQ.NEW_ORDER,
+        userMsg: ['HQX'],
+        fcmId: this.loginInfo.fcmId,
+        ibId: this.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
+        price: orderData.price || 0,
+      });
+
+      return { success: true, message: 'Order submitted' };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  /**
+   * Cancel order
+   */
+  async cancelOrder(orderId) {
+    if (!this.orderConn || !this.loginInfo) {
+      return { success: false, error: 'Not connected' };
+    }
+
+    try {
+      this.orderConn.send('RequestCancelOrder', {
+        templateId: REQ.CANCEL_ORDER,
+        userMsg: ['HQX'],
+        fcmId: this.loginInfo.fcmId,
+        ibId: this.loginInfo.ibId,
+        orderId: orderId,
+      });
+
+      return { success: true };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  /**
+   * Close position (market order to flatten)
+   */
+  async closePosition(accountId, symbol) {
+    // Get current position
+    const positions = Array.from(this.positions.values());
+    const position = positions.find(p => p.accountId === accountId && p.symbol === symbol);
+
+    if (!position) {
+      return { success: false, error: 'Position not found' };
+    }
+
+    // Place opposite order
+    return this.placeOrder({
+      accountId,
+      symbol,
+      exchange: position.exchange,
+      size: Math.abs(position.quantity),
+      side: position.quantity > 0 ? 1 : 0, // Sell if long, Buy if short
+      type: 2, // Market
+    });
+  }
+
   /**
    * Get order history
    * Uses RequestShowOrderHistorySummary (template 324)

package/src/services/session.js

@@ -8,6 +8,8 @@ const path = require('path');
 const os = require('os');
 const { encrypt, decrypt, maskSensitive } = require('../security');
 const { ProjectXService } = require('./projectx');
+const { RithmicService } = require('./rithmic');
+const { TradovateService } = require('./tradovate');
 
 const SESSION_DIR = path.join(os.homedir(), '.hedgequantx');
 const SESSION_FILE = path.join(SESSION_DIR, 'session.enc');
@@ -107,11 +109,22 @@ const connections = {
    * Saves all sessions to encrypted storage
    */
   saveToStorage() {
-    const sessions = this.services.map(conn => ({
-      type: conn.type,
-      propfirm: conn.propfirm,
-      token: conn.service.token || conn.token
-    }));
+    const sessions = this.services.map(conn => {
+      const session = {
+        type: conn.type,
+        propfirm: conn.propfirm,
+        propfirmKey: conn.service.propfirmKey || conn.propfirmKey,
+      };
+      
+      if (conn.type === 'projectx') {
+        session.token = conn.service.token || conn.token;
+      } else if (conn.type === 'rithmic' || conn.type === 'tradovate') {
+        // Save encrypted credentials for reconnection
+        session.credentials = conn.service.credentials;
+      }
+      
+      return session;
+    });
     storage.save(sessions);
   },
 
@@ -125,7 +138,7 @@ const connections = {
     for (const session of sessions) {
       try {
         if (session.type === 'projectx' && session.token) {
-          const propfirmKey = session.propfirm.toLowerCase().replace(/ /g, '_');
+          const propfirmKey = session.propfirmKey || session.propfirm.toLowerCase().replace(/ /g, '_');
           const service = new ProjectXService(propfirmKey);
           service.token = session.token;
 
@@ -136,10 +149,41 @@ const connections = {
               type: session.type,
               service,
               propfirm: session.propfirm,
+              propfirmKey: propfirmKey,
               token: session.token,
               connectedAt: new Date()
             });
           }
+        } else if (session.type === 'rithmic' && session.credentials) {
+          const propfirmKey = session.propfirmKey || 'apex_rithmic';
+          const service = new RithmicService(propfirmKey);
+          
+          // Try to reconnect
+          const result = await service.login(session.credentials.username, session.credentials.password);
+          if (result.success) {
+            this.services.push({
+              type: session.type,
+              service,
+              propfirm: session.propfirm,
+              propfirmKey: propfirmKey,
+              connectedAt: new Date()
+            });
+          }
+        } else if (session.type === 'tradovate' && session.credentials) {
+          const propfirmKey = session.propfirmKey || 'tradovate';
+          const service = new TradovateService(propfirmKey);
+          
+          // Try to reconnect
+          const result = await service.login(session.credentials.username, session.credentials.password);
+          if (result.success) {
+            this.services.push({
+              type: session.type,
+              service,
+              propfirm: session.propfirm,
+              propfirmKey: propfirmKey,
+              connectedAt: new Date()
+            });
+          }
         }
       } catch (e) {
         // Invalid session - skip

package/src/services/tradovate/index.js

@@ -22,6 +22,7 @@ class TradovateService extends EventEmitter {
     this.isDemo = true; // Default to demo
     this.ws = null;
     this.renewalTimer = null;
+    this.credentials = null; // Store for session restore
   }
 
   /**
@@ -71,6 +72,7 @@ class TradovateService extends EventEmitter {
       this.userId = result.userId;
       this.tokenExpiration = new Date(result.expirationTime);
       this.user = { userName: result.name, userId: result.userId };
+      this.credentials = { username, password }; // Store for session restore
 
       // Setup token renewal
       this.setupTokenRenewal();
@@ -257,6 +259,105 @@ class TradovateService extends EventEmitter {
     return this.user;
   }
 
+  /**
+   * Get market status
+   */
+  async getMarketStatus(accountId) {
+    const marketHours = this.checkMarketHours();
+    return {
+      success: true,
+      isOpen: marketHours.isOpen,
+      message: marketHours.message,
+    };
+  }
+
+  /**
+   * Get token
+   */
+  getToken() {
+    return this.accessToken;
+  }
+
+  /**
+   * Get orders for an account
+   */
+  async getOrders(accountId) {
+    try {
+      const orders = await this._request(API_PATHS.ORDER_LIST, 'GET');
+      const filtered = accountId 
+        ? orders.filter(o => o.accountId === accountId)
+        : orders;
+      return { 
+        success: true, 
+        orders: filtered.map(o => ({
+          orderId: o.id,
+          accountId: o.accountId,
+          symbol: o.contractId,
+          side: o.action === 'Buy' ? 0 : 1,
+          quantity: o.orderQty,
+          filledQuantity: o.filledQty || 0,
+          price: o.price,
+          status: o.ordStatus === 'Working' ? 1 : (o.ordStatus === 'Filled' ? 2 : 0),
+          orderType: o.orderType,
+        }))
+      };
+    } catch (error) {
+      return { success: false, error: error.message, orders: [] };
+    }
+  }
+
+  /**
+   * Get order history
+   */
+  async getOrderHistory(days = 30) {
+    try {
+      const orders = await this._request(API_PATHS.ORDER_LIST, 'GET');
+      return { success: true, orders };
+    } catch (error) {
+      return { success: false, error: error.message, orders: [] };
+    }
+  }
+
+  /**
+   * Get lifetime stats (stub - Tradovate doesn't provide this directly)
+   */
+  async getLifetimeStats(accountId) {
+    return { success: true, stats: null };
+  }
+
+  /**
+   * Get daily stats (stub - Tradovate doesn't provide this directly)
+   */
+  async getDailyStats(accountId) {
+    return { success: true, stats: [] };
+  }
+
+  /**
+   * Get trade history
+   */
+  async getTradeHistory(accountId, days = 30) {
+    try {
+      const fills = await this.getFills();
+      const filtered = accountId 
+        ? fills.filter(f => f.accountId === accountId)
+        : fills;
+      return { 
+        success: true, 
+        trades: filtered.map(f => ({
+          tradeId: f.id,
+          accountId: f.accountId,
+          symbol: f.contractId,
+          side: f.action === 'Buy' ? 0 : 1,
+          quantity: f.qty,
+          price: f.price,
+          timestamp: f.timestamp,
+        }))
+      };
+    } catch (error) {
+      return { success: false, error: error.message, trades: [] };
+    }
+  }
+
   /**
    * Check market hours (same logic as ProjectX)
    */
@@ -430,6 +531,7 @@ class TradovateService extends EventEmitter {
     this.mdAccessToken = null;
     this.accounts = [];
     this.user = null;
+    this.credentials = null;
   }
 
   /**