hedgequantx 1.2.71 → 1.2.73

package/package.json

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

@@ -307,6 +307,8 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
   let algoRunning = false;
   let stopReason = null;
   let latency = 0;
+  let spinnerFrame = 0;
+  const spinnerChars = ['\u280B', '\u2819', '\u2839', '\u2838', '\u283C', '\u2834', '\u2826', '\u2827', '\u2807', '\u280F'];
   
   // Stats
   let stats = {
@@ -434,41 +436,104 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     console.log(chalk.cyan(V) + chalk.white(center(title2, W)) + chalk.cyan(V));
     console.log(chalk.cyan(MID));
     
-    // Account line - build plain string first, then color
-    const acc = accountName.length > 24 ? accountName.substring(0, 24) : accountName.padEnd(24);
-    const sym = symbolName.length > 8 ? symbolName.substring(0, 8) : symbolName.padEnd(8);
-    const qty = numContracts.toString().padEnd(2);
-    const srv = serverStatus.padEnd(3);
-    const lat = latencyStr.padEnd(6);
-    const line1 = ` Account: ${acc}  Symbol: ${sym}  Qty: ${qty}  Server: ${srv} ${lat}`;
-    const line1Colored = ` Account: ${chalk.cyan(acc)}  Symbol: ${chalk.yellow(sym)}  Qty: ${chalk.cyan(qty)}  Server: ${serverColor(srv)} ${latencyColor(lat)}`;
-    console.log(chalk.cyan(V) + line1Colored + ' '.repeat(W - line1.length) + chalk.cyan(V));
+    // Grid layout for metrics - each in its own cell
+    // Row 1: Account | Symbol | Qty | Server | Latency
+    // Row 2: Target | Risk | P&L | Trades | W/L
+    const VS = '\u2502'; // Vertical separator (thin)
     
-    // Target line
-    const tgt = ('$' + dailyTarget.toFixed(2)).padEnd(10);
-    const rsk = ('$' + maxRisk.toFixed(2)).padEnd(10);
-    const pnl = pnlStr.padEnd(10);
-    const trd = stats.trades.toString().padEnd(2);
-    const win = stats.wins.toString();
-    const los = stats.losses.toString();
-    const line2 = ` Target: ${tgt}  Risk: ${rsk}  P&L: ${pnl}  Trades: ${trd} W:${win} L:${los}`;
-    const line2Colored = ` Target: ${chalk.green(tgt)}  Risk: ${chalk.red(rsk)}  P&L: ${pnlColor(pnl)}  Trades: ${chalk.cyan(trd)} W:${chalk.green(win)} L:${chalk.red(los)}`;
-    console.log(chalk.cyan(V) + line2Colored + ' '.repeat(W - line2.length) + chalk.cyan(V));
+    // Prepare values with fixed widths
+    const accLabel = 'Account';
+    const accVal = accountName.length > 26 ? accountName.substring(0, 26) : accountName;
+    const symLabel = 'Symbol';
+    const symVal = symbolName.length > 10 ? symbolName.substring(0, 10) : symbolName;
+    const qtyLabel = 'Qty';
+    const qtyVal = numContracts.toString();
+    const srvLabel = 'Server';
+    const srvVal = serverStatus;
+    const latLabel = 'Latency';
+    const latVal = latencyStr;
+    
+    // Row 1 cells: widths = 36 + 18 + 10 + 14 + 14 = 92 + 4 separators = 96
+    const c1w = 36, c2w = 18, c3w = 10, c4w = 14, c5w = 14;
+    
+    const cell1 = ` ${accLabel}: ${chalk.cyan(accVal)}`;
+    const cell1plain = ` ${accLabel}: ${accVal}`;
+    const cell2 = ` ${symLabel}: ${chalk.yellow(symVal)}`;
+    const cell2plain = ` ${symLabel}: ${symVal}`;
+    const cell3 = ` ${qtyLabel}: ${chalk.cyan(qtyVal)}`;
+    const cell3plain = ` ${qtyLabel}: ${qtyVal}`;
+    const cell4 = ` ${srvLabel}: ${serverColor(srvVal)}`;
+    const cell4plain = ` ${srvLabel}: ${srvVal}`;
+    const cell5 = ` ${latLabel}: ${latencyColor(latVal)}`;
+    const cell5plain = ` ${latLabel}: ${latVal}`;
+    
+    const row1 = cell1 + ' '.repeat(c1w - cell1plain.length) + chalk.cyan(VS) +
+                 cell2 + ' '.repeat(c2w - cell2plain.length) + chalk.cyan(VS) +
+                 cell3 + ' '.repeat(c3w - cell3plain.length) + chalk.cyan(VS) +
+                 cell4 + ' '.repeat(c4w - cell4plain.length) + chalk.cyan(VS) +
+                 cell5 + ' '.repeat(c5w - cell5plain.length);
+    
+    console.log(chalk.cyan(V) + row1 + chalk.cyan(V));
+    
+    // Separator with intersections
+    const SEP = '\u2560' + '\u2550'.repeat(c1w) + '\u256A' + '\u2550'.repeat(c2w) + '\u256A' + '\u2550'.repeat(c3w) + '\u256A' + '\u2550'.repeat(c4w) + '\u256A' + '\u2550'.repeat(c5w) + '\u2563';
+    console.log(chalk.cyan(SEP));
+    
+    // Row 2: Target | Risk | P&L | Trades | W/L
+    const tgtLabel = 'Target';
+    const tgtVal = '$' + dailyTarget.toFixed(2);
+    const rskLabel = 'Risk';
+    const rskVal = '$' + maxRisk.toFixed(2);
+    const pnlLabel = 'P&L';
+    const pnlVal = pnlStr;
+    const trdLabel = 'Trades';
+    const trdVal = stats.trades.toString();
+    const wlLabel = 'W/L';
+    const wlVal = `${stats.wins}/${stats.losses}`;
+    
+    const cell6 = ` ${tgtLabel}: ${chalk.green(tgtVal)}`;
+    const cell6plain = ` ${tgtLabel}: ${tgtVal}`;
+    const cell7 = ` ${rskLabel}: ${chalk.red(rskVal)}`;
+    const cell7plain = ` ${rskLabel}: ${rskVal}`;
+    const cell8 = ` ${pnlLabel}: ${pnlColor(pnlVal)}`;
+    const cell8plain = ` ${pnlLabel}: ${pnlVal}`;
+    const cell9 = ` ${trdLabel}: ${chalk.cyan(trdVal)}`;
+    const cell9plain = ` ${trdLabel}: ${trdVal}`;
+    const cell10 = ` ${wlLabel}: ${chalk.green(stats.wins.toString())}/${chalk.red(stats.losses.toString())}`;
+    const cell10plain = ` ${wlLabel}: ${wlVal}`;
+    
+    const row2 = cell6 + ' '.repeat(c1w - cell6plain.length) + chalk.cyan(VS) +
+                 cell7 + ' '.repeat(c2w - cell7plain.length) + chalk.cyan(VS) +
+                 cell8 + ' '.repeat(c3w - cell8plain.length) + chalk.cyan(VS) +
+                 cell9 + ' '.repeat(c4w - cell9plain.length) + chalk.cyan(VS) +
+                 cell10 + ' '.repeat(c5w - cell10plain.length);
+    
+    console.log(chalk.cyan(V) + row2 + chalk.cyan(V));
     console.log(chalk.cyan(MID));
     
-    // Activity log header
-    const actLeft = ` Activity Log - ${dateStr}`;
+    // Activity log header with spinner and centered date
+    spinnerFrame = (spinnerFrame + 1) % spinnerChars.length;
+    const spinner = spinnerChars[spinnerFrame];
+    const actLeft = ` Activity Log ${chalk.cyan(spinner)}`;
+    const actLeftPlain = ` Activity Log ${spinner}`;
     const actRight = 'Press X to stop ';
-    const actMid = W - actLeft.length - actRight.length;
-    console.log(chalk.cyan(V) + chalk.white(actLeft) + ' '.repeat(actMid) + chalk.yellow(actRight) + chalk.cyan(V));
+    const dateCentered = `- ${dateStr} -`;
+    const leftLen = actLeftPlain.length;
+    const rightLen = actRight.length;
+    const midSpace = W - leftLen - rightLen;
+    const datePad = Math.floor((midSpace - dateCentered.length) / 2);
+    const dateSection = ' '.repeat(datePad) + chalk.gray(dateCentered) + ' '.repeat(midSpace - datePad - dateCentered.length);
+    console.log(chalk.cyan(V) + chalk.white(actLeft) + dateSection + chalk.yellow(actRight) + chalk.cyan(V));
     console.log(chalk.cyan(BOT));
     
-    // Logs (without borders)
+    // Logs (without borders) - newest first
     console.log();
     if (logs.length === 0) {
       console.log(chalk.gray('  Waiting for activity...'));
     } else {
-      logs.forEach(log => {
+      // Reverse to show newest first
+      const reversedLogs = [...logs].reverse();
+      reversedLogs.forEach(log => {
         const color = typeColors[log.type] || chalk.white;
         const icon = getIcon(log.type);
         console.log(color(`  [${log.timestamp}] ${icon} ${log.message}`));
@@ -476,6 +541,13 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     }
   };
   
+  // Spinner interval to refresh UI
+  const spinnerInterval = setInterval(() => {
+    if (algoRunning) {
+      displayUI();
+    }
+  }, 100);
+  
   // Connect to HQX Server
   const spinner = ora('Authenticating with HQX Server...').start();
   
@@ -650,6 +722,9 @@ const launchAlgo = async (service, account, contract, numContracts, dailyTarget,
     }
   });
   
+  // Clear spinner interval
+  clearInterval(spinnerInterval);
+  
   // Stop algo
   console.log();
   if (!stopReason) {