hedgequantx 1.2.65 → 1.2.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.2.65",
+  "version": "1.2.67",
   "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

@@ -306,8 +306,8 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   let hqxConnected = false;
   let algoRunning = false;
   let stopReason = null;
+  let latency = 0;
   
-  // Activity logs
   // Stats
   let stats = {
     trades: 0,
@@ -401,7 +401,9 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     // Info Box
     console.log(chalk.cyan('  ╔════════════════════════════════════════════════════════════════════╗'));
     console.log(chalk.cyan('  ║') + chalk.white(` Account:   ${chalk.cyan(accountName.padEnd(25))} Symbol: ${chalk.yellow(symbolName.padEnd(10))} Qty: ${chalk.cyan(numContracts.toString().padEnd(3))}`) + chalk.cyan('║'));
-    console.log(chalk.cyan('  ║') + chalk.white(` Target:    ${chalk.green(('$' + dailyTarget.toFixed(2)).padEnd(12))} Risk: ${chalk.red(('$' + maxRisk.toFixed(2)).padEnd(12))} Server: ${hqxConnected ? chalk.green('ON ') : chalk.red('OFF')}       `) + chalk.cyan('║'));
+    const latencyStr = hqxConnected ? (latency > 0 ? `${latency}ms` : '---') : '---';
+    const latencyColor = latency < 100 ? chalk.green : (latency < 300 ? chalk.yellow : chalk.red);
+    console.log(chalk.cyan('  ║') + chalk.white(` Target:    ${chalk.green(('$' + dailyTarget.toFixed(2)).padEnd(12))} Risk: ${chalk.red(('$' + maxRisk.toFixed(2)).padEnd(12))} Server: ${hqxConnected ? chalk.green('ON') : chalk.red('OFF')} ${latencyColor(latencyStr.padEnd(6))}`) + chalk.cyan('║'));
     
     // Stats line
     const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
@@ -463,6 +465,11 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   }
   
   // Setup event handlers - logs scroll down naturally
+  hqxServer.on('latency', (data) => {
+    latency = data.latency || 0;
+    displayUI(); // Refresh UI with new latency
+  });
+  
   hqxServer.on('log', (data) => {
     printLog(data.type || 'info', data.message);
   });
@@ -554,32 +561,45 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   
   // Wait for X key OR auto-stop (target/risk reached)
   await new Promise((resolve) => {
+    let resolved = false;
+    
+    const cleanup = () => {
+      if (resolved) return;
+      resolved = true;
+      clearInterval(checkInterval);
+      if (process.stdin.isTTY) {
+        try {
+          process.stdin.setRawMode(false);
+          process.stdin.removeAllListeners('keypress');
+        } catch (e) {}
+      }
+      resolve();
+    };
+    
     // Check for auto-stop every 500ms
     const checkInterval = setInterval(() => {
       if (!algoRunning || stopReason) {
-        clearInterval(checkInterval);
-        if (process.stdin.isTTY && process.stdin.isRaw) {
-          process.stdin.setRawMode(false);
-        }
-        resolve();
+        cleanup();
       }
     }, 500);
 
-    // Also listen for X key
+    // Listen for X key
     if (process.stdin.isTTY) {
-      readline.emitKeypressEvents(process.stdin);
-      process.stdin.setRawMode(true);
-      
-      const onKeypress = (str, key) => {
-        if (key && (key.name === 'x' || key.name === 'X' || (key.ctrl && key.name === 'c'))) {
-          clearInterval(checkInterval);
-          process.stdin.setRawMode(false);
-          process.stdin.removeListener('keypress', onKeypress);
-          resolve();
-        }
-      };
-      
-      process.stdin.on('keypress', onKeypress);
+      try {
+        readline.emitKeypressEvents(process.stdin);
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        
+        process.stdin.on('keypress', (str, key) => {
+          if (!key) return;
+          const keyName = key.name?.toLowerCase();
+          if (keyName === 'x' || (key.ctrl && keyName === 'c')) {
+            cleanup();
+          }
+        });
+      } catch (e) {
+        // Fallback: just wait for auto-stop
+      }
     }
   });
   
@@ -1014,6 +1034,26 @@ const launchCopyTrading = async (config) => {
     pnl: 0
   };
 
+  // Log colors
+  const typeColors = {
+    info: chalk.cyan,
+    success: chalk.green,
+    trade: chalk.green.bold,
+    copy: chalk.yellow.bold,
+    error: chalk.red,
+    warning: chalk.yellow
+  };
+
+  const getIcon = (type) => {
+    switch(type) {
+      case 'trade': return '[>]';
+      case 'copy': return '[+]';
+      case 'error': return '[X]';
+      case 'success': return '[OK]';
+      default: return '[.]';
+    }
+  };
+
   const addLog = (type, message) => {
     const timestamp = new Date().toLocaleTimeString();
     logs.push({ timestamp, type, message });
@@ -1022,74 +1062,52 @@ const launchCopyTrading = async (config) => {
 
   const displayUI = () => {
     console.clear();
+    
+    // Logo
+    const logo = [
+      '██╗  ██╗ ██████╗ ██╗  ██╗',
+      '██║  ██║██╔═══██╗╚██╗██╔╝',
+      '███████║██║   ██║ ╚███╔╝ ',
+      '██╔══██║██║▄▄ ██║ ██╔██╗ ',
+      '██║  ██║╚██████╔╝██╔╝ ██╗',
+      '╚═╝  ╚═╝ ╚══▀▀═╝ ╚═╝  ╚═╝'
+    ];
+    
     console.log();
-    console.log(chalk.gray(getSeparator()));
-    console.log(chalk.green.bold('  HQX Copy Trading'));
-    console.log(chalk.gray(getSeparator()));
-    console.log(chalk.white(`  Status: ${isRunning ? chalk.green('RUNNING') : chalk.red('STOPPED')}`));
-    console.log(chalk.gray(getSeparator()));
-    console.log();
-
-    // Risk Management
-    console.log(chalk.white.bold('  RISK MANAGEMENT'));
-    const targetProgress = Math.min(100, (stats.pnl / dailyTarget) * 100);
-    const riskProgress = Math.min(100, (Math.abs(Math.min(0, stats.pnl)) / maxRisk) * 100);
-    console.log(chalk.white(`    Target:  ${chalk.green('$' + dailyTarget.toFixed(2))} | Progress: ${targetProgress >= 100 ? chalk.green.bold(targetProgress.toFixed(1) + '%') : chalk.yellow(targetProgress.toFixed(1) + '%')}`));
-    console.log(chalk.white(`    Risk:    ${chalk.red('$' + maxRisk.toFixed(2))} | Used: ${riskProgress >= 100 ? chalk.red.bold(riskProgress.toFixed(1) + '%') : chalk.cyan(riskProgress.toFixed(1) + '%')}`));
-    console.log(chalk.white(`    P&L:     ${stats.pnl >= 0 ? chalk.green('+$' + stats.pnl.toFixed(2)) : chalk.red('-$' + Math.abs(stats.pnl).toFixed(2))}`));
-    console.log();
-
-    // Lead info
-    console.log(chalk.white.bold('  LEAD'));
-    console.log(chalk.white(`    ${chalk.cyan(lead.account.accountName)} @ ${chalk.magenta(lead.account.propfirm)}`));
-    console.log(chalk.white(`    ${chalk.cyan(lead.symbol.value)} x ${lead.contracts}`));
-    console.log();
-
-    // Follower info
-    console.log(chalk.white.bold('  FOLLOWER'));
-    console.log(chalk.white(`    ${chalk.cyan(follower.account.accountName)} @ ${chalk.magenta(follower.account.propfirm)}`));
-    console.log(chalk.white(`    ${chalk.cyan(follower.symbol.value)} x ${follower.contracts}`));
+    logo.forEach(line => {
+      console.log(chalk.cyan('  ' + line));
+    });
+    console.log(chalk.gray('  Copy Trading System'));
     console.log();
 
-    // Stats
-    console.log(chalk.gray(getSeparator()));
-    console.log(chalk.white('  Stats: ') +
-      chalk.gray('Lead Trades: ') + chalk.cyan(stats.leadTrades) +
-      chalk.gray(' | Copied: ') + chalk.green(stats.copiedTrades) +
-      chalk.gray(' | Errors: ') + chalk.red(stats.errors)
-    );
-    console.log(chalk.gray(getSeparator()));
+    // Info Box
+    const pnlColor = stats.pnl >= 0 ? chalk.green : chalk.red;
+    const pnlStr = (stats.pnl >= 0 ? '+$' : '-$') + Math.abs(stats.pnl).toFixed(2);
+    
+    console.log(chalk.cyan('  ╔════════════════════════════════════════════════════════════════════╗'));
+    console.log(chalk.cyan('  ║') + chalk.white(` LEAD:     ${chalk.cyan((lead.account.accountName || '').substring(0, 20).padEnd(20))} ${chalk.yellow((lead.symbol.value || '').padEnd(10))} x${lead.contracts}`) + chalk.cyan('       ║'));
+    console.log(chalk.cyan('  ║') + chalk.white(` FOLLOWER: ${chalk.cyan((follower.account.accountName || '').substring(0, 20).padEnd(20))} ${chalk.yellow((follower.symbol.value || '').padEnd(10))} x${follower.contracts}`) + chalk.cyan('       ║'));
+    console.log(chalk.cyan('  ╠════════════════════════════════════════════════════════════════════╣'));
+    console.log(chalk.cyan('  ║') + chalk.white(` Target: ${chalk.green(('$' + dailyTarget.toFixed(2)).padEnd(10))} Risk: ${chalk.red(('$' + maxRisk.toFixed(2)).padEnd(10))} P&L: ${pnlColor(pnlStr.padEnd(12))}`) + chalk.cyan('   ║'));
+    console.log(chalk.cyan('  ║') + chalk.white(` Lead Trades: ${chalk.cyan(stats.leadTrades.toString().padEnd(4))} Copied: ${chalk.green(stats.copiedTrades.toString().padEnd(4))} Errors: ${chalk.red(stats.errors.toString().padEnd(4))}`) + chalk.cyan('           ║'));
+    console.log(chalk.cyan('  ╠════════════════════════════════════════════════════════════════════╣'));
+    console.log(chalk.cyan('  ║') + chalk.white(' Activity Log                                   ') + chalk.yellow('Press X to stop') + chalk.cyan(' ║'));
+    console.log(chalk.cyan('  ╠════════════════════════════════════════════════════════════════════╣'));
 
     // Logs
-    console.log(chalk.white.bold('  Activity Log'));
-    console.log(chalk.gray(getSeparator()));
-
     if (logs.length === 0) {
-      console.log(chalk.gray('  Monitoring lead account for trades...'));
+      console.log(chalk.cyan('  ║') + chalk.gray('  Monitoring lead account for trades...'.padEnd(68)) + chalk.cyan('║'));
     } else {
-      const typeColors = {
-        info: chalk.cyan,
-        success: chalk.green,
-        trade: chalk.green.bold,
-        copy: chalk.yellow.bold,
-        error: chalk.red,
-        warning: chalk.yellow
-      };
-
       logs.forEach(log => {
         const color = typeColors[log.type] || chalk.white;
-        const icon = log.type === 'trade' ? '[>]' :
-                     log.type === 'copy' ? '[+]' :
-                     log.type === 'error' ? '[X]' :
-                     log.type === 'success' ? '[OK]' : '[.]';
-        console.log(chalk.gray(`  [${log.timestamp}]`) + ' ' + color(`${icon} ${log.message}`));
+        const icon = getIcon(log.type);
+        const logLine = `[${log.timestamp}] ${icon} ${log.message}`;
+        const truncated = logLine.length > 66 ? logLine.substring(0, 63) + '...' : logLine;
+        console.log(chalk.cyan('  ║') + ' ' + color(truncated.padEnd(67)) + chalk.cyan('║'));
       });
     }
 
-    console.log(chalk.gray(getSeparator()));
-    console.log();
-    console.log(chalk.yellow('  Press X to stop copy trading...'));
-    console.log();
+    console.log(chalk.cyan('  ╚════════════════════════════════════════════════════════════════════╝'));
   };
 
   addLog('info', 'Copy trading initialized');

package/src/services/hqx-server.js

@@ -30,6 +30,8 @@ class HQXServerService {
     this.listeners = new Map();
     this.heartbeatInterval = null;
     this.messageQueue = [];
+    this.latency = 0;
+    this.lastPingTime = 0;
   }
 
   /**
@@ -200,6 +202,14 @@ class HQXServerService {
    * Handle incoming messages
    */
   _handleMessage(message) {
+    // Calculate latency from server timestamp
+    if (message.timestamp) {
+      this.latency = Date.now() - message.timestamp;
+      if (this.latency < 0) this.latency = 0; // Handle clock skew
+      if (this.latency > 5000) this.latency = 0; // Ignore unrealistic values
+      this._emit('latency', { latency: this.latency });
+    }
+    
     switch (message.type) {
       case 'signal':
         this._emit('signal', message.data);
@@ -217,12 +227,23 @@ class HQXServerService {
         this._emit('error', message.data);
         break;
       case 'pong':
-        // Heartbeat response
+        // Calculate ping latency
+        if (this.lastPingTime > 0) {
+          this.latency = Date.now() - this.lastPingTime;
+          this._emit('latency', { latency: this.latency });
+        }
         break;
       default:
         this._emit('message', message);
     }
   }
+  
+  /**
+   * Get current latency
+   */
+  getLatency() {
+    return this.latency;
+  }
 
   /**
    * Send message to server
@@ -303,9 +324,10 @@ class HQXServerService {
   _startHeartbeat() {
     this.heartbeatInterval = setInterval(() => {
       if (this.connected) {
-        this.send('ping', { timestamp: Date.now() });
+        this.lastPingTime = Date.now();
+        this.send('ping', { timestamp: this.lastPingTime });
       }
-    }, 30000);
+    }, 5000); // Ping every 5 seconds for more accurate latency
   }
 
   _stopHeartbeat() {