hedgequantx 1.2.58 → 1.2.60

package/package.json

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

package/src/pages/algo.js

@@ -331,8 +331,30 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     console.clear();
   };
   
+  // Check market hours
+  const checkMarketStatus = () => {
+    const now = new Date();
+    const utcDay = now.getUTCDay();
+    const utcHour = now.getUTCHours();
+    const isDST = (() => {
+      const jan = new Date(now.getFullYear(), 0, 1);
+      const jul = new Date(now.getFullYear(), 6, 1);
+      return now.getTimezoneOffset() < Math.max(jan.getTimezoneOffset(), jul.getTimezoneOffset());
+    })();
+    const ctOffset = isDST ? 5 : 6;
+    const ctHour = (utcHour - ctOffset + 24) % 24;
+    const ctDay = utcHour < ctOffset ? (utcDay + 6) % 7 : utcDay;
+
+    if (ctDay === 6) return { isOpen: false, message: 'Market closed (Saturday)' };
+    if (ctDay === 0 && ctHour < 17) return { isOpen: false, message: 'Market opens Sunday 5:00 PM CT' };
+    if (ctDay === 5 && ctHour >= 16) return { isOpen: false, message: 'Market closed (Friday after 4PM CT)' };
+    if (ctHour === 16 && ctDay >= 1 && ctDay <= 4) return { isOpen: false, message: 'Daily maintenance (4:00-5:00 PM CT)' };
+    return { isOpen: true, message: 'Market OPEN' };
+  };
+
   const displayUI = () => {
     clearScreen();
+    const marketStatus = checkMarketStatus();
     console.log();
     console.log(chalk.gray(getSeparator()));
     console.log(chalk.cyan.bold('  HQX Ultra-Scalping Algo'));
@@ -341,7 +363,8 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     console.log(chalk.white(`  Account:   ${chalk.cyan(accountName)}`));
     console.log(chalk.white(`  Symbol:    ${chalk.cyan(symbolName)}`));
     console.log(chalk.white(`  Contracts: ${chalk.cyan(numContracts)}`));
-    console.log(chalk.white(`  Mode:      ${hqxConnected ? chalk.green('LIVE') : chalk.yellow('OFFLINE')}`));
+    console.log(chalk.white(`  Server:    ${hqxConnected ? chalk.green('CONNECTED') : chalk.red('DISCONNECTED')}`));
+    console.log(chalk.white(`  Market:    ${marketStatus.isOpen ? chalk.green(marketStatus.message) : chalk.red(marketStatus.message)}`));
     console.log(chalk.gray(getSeparator()));
 
     // Risk Management
@@ -558,9 +581,55 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   // Stop algo
   if (!stopReason) {
     addLog('warning', 'Stopping algo...');
-    displayUI();
   }
   
+  // Cancel all pending orders and close positions
+  addLog('info', 'Cancelling pending orders...');
+  displayUI();
+  
+  try {
+    // Cancel all orders
+    const cancelResult = await service.cancelAllOrders(account.accountId);
+    if (cancelResult.success) {
+      addLog('success', 'All pending orders cancelled');
+    } else {
+      addLog('warning', 'No pending orders to cancel');
+    }
+  } catch (e) {
+    addLog('warning', 'Could not cancel orders: ' + e.message);
+  }
+  
+  displayUI();
+  
+  // Close all positions for this symbol
+  addLog('info', 'Closing open positions...');
+  displayUI();
+  
+  try {
+    const positions = await service.getPositions(account.accountId);
+    if (positions.success && positions.positions) {
+      const symbolPos = positions.positions.find(p => 
+        p.symbol === symbol || 
+        p.contractId === (contract.id || contract.contractId)
+      );
+      
+      if (symbolPos && symbolPos.quantity !== 0) {
+        const closeResult = await service.closePosition(account.accountId, symbolPos.contractId || symbolPos.symbol);
+        if (closeResult.success) {
+          addLog('success', `Position closed: ${Math.abs(symbolPos.quantity)} ${symbol}`);
+        } else {
+          addLog('error', 'Failed to close position: ' + (closeResult.error || 'Unknown'));
+        }
+      } else {
+        addLog('info', 'No open position to close');
+      }
+    }
+  } catch (e) {
+    addLog('warning', 'Could not close positions: ' + e.message);
+  }
+  
+  displayUI();
+  
   if (hqxConnected && algoRunning) {
     hqxServer.stopAlgo();
   }

package/src/services/projectx.js

@@ -311,6 +311,43 @@ class ProjectXService {
     }
   }
 
+  /**
+   * Cancels all pending orders for an account
+   * @param {number|string} accountId - Account ID
+   * @returns {Promise<{success: boolean, cancelled?: number, error?: string}>}
+   */
+  async cancelAllOrders(accountId) {
+    try {
+      const id = validateAccountId(accountId);
+      
+      // First get all pending orders
+      const ordersResult = await this.getOrders(id);
+      if (!ordersResult.success || !ordersResult.orders) {
+        return { success: true, cancelled: 0 };
+      }
+      
+      // Filter pending orders (status = working/pending)
+      const pendingOrders = ordersResult.orders.filter(o => 
+        o.status === 'Working' || o.status === 'Pending' || o.status === 0 || o.status === 1
+      );
+      
+      if (pendingOrders.length === 0) {
+        return { success: true, cancelled: 0 };
+      }
+      
+      // Cancel each order
+      let cancelled = 0;
+      for (const order of pendingOrders) {
+        const result = await this.cancelOrder(order.orderId || order.id);
+        if (result.success) cancelled++;
+      }
+      
+      return { success: true, cancelled };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
   /**
    * Closes a position
    * @param {number|string} accountId - Account ID