hedgequantx 1.7.6 → 1.7.8

package/src/menus/dashboard.js

@@ -1,46 +1,41 @@
 /**
  * Dashboard Menu - Main menu after login
- * Shows connected PropFirms and navigation options
  */
 
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const ora = require('ora');
 const { execSync, spawn } = require('child_process');
 
 const { connections } = require('../services');
 const { getLogoWidth, centerText, prepareStdin } = require('../ui');
 const { getCachedStats } = require('../services/stats-cache');
+const { prompts } = require('../utils');
 
 /**
  * Dashboard menu after login
- * @param {Object} service - Connected service
  */
 const dashboardMenu = async (service) => {
-  // Ensure stdin is ready for prompts
   prepareStdin();
   
   const boxWidth = getLogoWidth();
-  const W = boxWidth - 2; // Inner width (without borders)
+  const W = boxWidth - 2;
   
-  // Helper to create a line that fits exactly in the box
   const makeLine = (content, align = 'left') => {
     const plainLen = content.replace(/\x1b\[[0-9;]*m/g, '').length;
     const padding = W - plainLen;
     if (align === 'center') {
       const leftPad = Math.floor(padding / 2);
-      const rightPad = padding - leftPad;
-      return chalk.cyan('║') + ' '.repeat(leftPad) + content + ' '.repeat(rightPad) + chalk.cyan('║');
+      return chalk.cyan('║') + ' '.repeat(leftPad) + content + ' '.repeat(padding - leftPad) + chalk.cyan('║');
     }
     return chalk.cyan('║') + content + ' '.repeat(Math.max(0, padding)) + chalk.cyan('║');
   };
   
-  // Dashboard box header
-  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
+  // Continue from banner (no top border)
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   console.log(makeLine(chalk.yellow.bold('Welcome, HQX Trader!'), 'center'));
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Show connected propfirms centered on one line (max 3)
+  // Show connected propfirms
   const allConns = connections.getAll();
   if (allConns.length > 0) {
     const propfirms = allConns.slice(0, 3).map(c => c.propfirm || c.type || 'Connected');
@@ -48,38 +43,30 @@ const dashboardMenu = async (service) => {
     console.log(makeLine(propfirmText, 'center'));
   }
   
-  // Show stats bar (Connections, Accounts, Balance, P&L)
+  // Stats bar
   const statsInfo = getCachedStats();
-  
   if (statsInfo) {
     console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
     
-    const connStr = `Connections: ${statsInfo.connections}`;
-    const accStr = `Accounts: ${statsInfo.accounts}`;
-    
-    const balStr = statsInfo.balance !== null 
-      ? `$${statsInfo.balance.toLocaleString()}` 
-      : '--';
+    const balStr = statsInfo.balance !== null ? `$${statsInfo.balance.toLocaleString()}` : '--';
     const balColor = statsInfo.balance !== null ? chalk.green : chalk.gray;
     
     let pnlDisplay, pnlColor;
     if (statsInfo.pnl !== null) {
-      const pnlSign = statsInfo.pnl >= 0 ? '+' : '';
       pnlColor = statsInfo.pnl >= 0 ? chalk.green : chalk.red;
-      pnlDisplay = `${pnlSign}$${Math.abs(statsInfo.pnl).toLocaleString()}`;
+      pnlDisplay = `${statsInfo.pnl >= 0 ? '+' : ''}$${Math.abs(statsInfo.pnl).toLocaleString()}`;
     } else {
       pnlColor = chalk.gray;
       pnlDisplay = '--';
     }
     
-    const statsText = connStr + '    ' + accStr + '    Balance: ' + balStr + '    P&L: ' + pnlDisplay;
-    const statsPlain = `${connStr}    ${accStr}    Balance: ${balStr}    P&L: ${pnlDisplay}`;
+    const statsPlain = `Connections: ${statsInfo.connections}    Accounts: ${statsInfo.accounts}    Balance: ${balStr}    P&L: ${pnlDisplay}`;
     const statsLeftPad = Math.floor((W - statsPlain.length) / 2);
     const statsRightPad = W - statsPlain.length - statsLeftPad;
     
     console.log(chalk.cyan('║') + ' '.repeat(statsLeftPad) +
-      chalk.white(connStr) + '    ' +
-      chalk.white(accStr) + '    ' +
+      chalk.white(`Connections: ${statsInfo.connections}`) + '    ' +
+      chalk.white(`Accounts: ${statsInfo.accounts}`) + '    ' +
       chalk.white('Balance: ') + balColor(balStr) + '    ' +
       chalk.white('P&L: ') + pnlColor(pnlDisplay) +
       ' '.repeat(Math.max(0, statsRightPad)) + chalk.cyan('║'));
@@ -87,9 +74,8 @@ const dashboardMenu = async (service) => {
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Menu options in 2 columns
+  // Menu in 2 columns
   const col1Width = Math.floor(W / 2);
-  
   const menuRow = (left, right) => {
     const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
     const rightPlain = right.replace(/\x1b\[[0-9;]*m/g, '');
@@ -98,153 +84,96 @@ const dashboardMenu = async (service) => {
     console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
   };
   
+  menuRow(chalk.cyan('[1] View Accounts'), chalk.cyan('[2] View Stats'));
+  menuRow(chalk.cyan('[+] Add Prop-Account'), chalk.magenta('[A] Algo-Trading'));
+  menuRow(chalk.yellow('[U] Update HQX'), chalk.red('[X] Disconnect'));
+  
   console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
   
-  // Use list type for stable input handling
-  const { action } = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'action',
-      message: chalk.cyan('Select:'),
-      choices: [
-        { name: chalk.cyan('[1] View Accounts'), value: 'accounts' },
-        { name: chalk.cyan('[2] View Stats'), value: 'stats' },
-        { name: chalk.cyan('[+] Add Prop-Account'), value: 'add_prop_account' },
-        { name: chalk.magenta('[A] Algo-Trading'), value: 'algotrading' },
-        { name: chalk.yellow('[U] Update HQX'), value: 'update' },
-        { name: chalk.red('[X] Disconnect'), value: 'disconnect' }
-      ],
-      loop: false
-    }
-  ]);
+  // Simple input - no duplicate menu
+  const input = await prompts.textInput('Select (1/2/+/A/U/X)');
   
-  return action;
-};
-
-/**
- * Wait for user to press Enter
- */
-const waitForEnter = async () => {
-  prepareStdin();
-  try {
-    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
-  } catch (e) {
-    // Ignore prompt errors
-  }
+  const actionMap = {
+    '1': 'accounts',
+    '2': 'stats',
+    '+': 'add_prop_account',
+    'a': 'algotrading',
+    'u': 'update',
+    'x': 'disconnect'
+  };
+  
+  return actionMap[(input || '').toLowerCase()] || null;
 };
 
 /**
- * Handles the update process with auto-restart
- * Robust version that handles all edge cases
+ * Handle update process
  */
 const handleUpdate = async () => {
   prepareStdin();
   
   let spinner = null;
   let currentVersion = 'unknown';
-  let latestVersion = null;
   
   try {
-    // Get current version safely
     try {
-      const pkg = require('../../package.json');
-      currentVersion = pkg.version || 'unknown';
-    } catch (e) {
-      currentVersion = 'unknown';
-    }
+      currentVersion = require('../../package.json').version || 'unknown';
+    } catch (e) {}
     
     spinner = ora({ text: 'Checking for updates...', color: 'yellow' }).start();
     
-    // Check latest version on npm with timeout
-    spinner.text = 'Checking npm registry...';
+    let latestVersion;
     try {
-      const result = execSync('npm view hedgequantx version 2>/dev/null', { 
-        stdio: 'pipe',
-        timeout: 15000,  // 15 second timeout
-        encoding: 'utf8'
-      });
-      latestVersion = (result || '').toString().trim();
+      latestVersion = execSync('npm view hedgequantx version 2>/dev/null', { 
+        stdio: 'pipe', timeout: 15000, encoding: 'utf8'
+      }).trim();
       
-      // Validate version format (x.y.z)
       if (!latestVersion || !/^\d+\.\d+\.\d+/.test(latestVersion)) {
-        throw new Error('Invalid version format received');
+        throw new Error('Invalid version');
       }
     } catch (e) {
       spinner.fail('Cannot reach npm registry');
-      console.log(chalk.gray('  Check your internet connection'));
-      console.log();
-      await waitForEnter();
+      await prompts.waitForEnter();
       return;
     }
     
-    // Compare versions
     if (currentVersion === latestVersion) {
       spinner.succeed(`Already up to date! (v${currentVersion})`);
-      console.log();
       await new Promise(r => setTimeout(r, 2000));
       return;
     }
     
-    // Show version info and update automatically
     spinner.text = `Updating v${currentVersion} → v${latestVersion}...`;
     
     try {
       execSync('npm install -g hedgequantx@latest 2>/dev/null', { 
-        stdio: 'pipe',
-        timeout: 120000,
-        encoding: 'utf8'
+        stdio: 'pipe', timeout: 120000, encoding: 'utf8'
       });
     } catch (e) {
       spinner.fail('Update failed');
-      console.log();
-      console.log(chalk.yellow('  Try manually:'));
-      console.log(chalk.white('  npm install -g hedgequantx@latest'));
-      console.log();
-      await waitForEnter();
+      console.log(chalk.yellow('  Try: npm install -g hedgequantx@latest'));
+      await prompts.waitForEnter();
       return;
     }
     
     spinner.succeed(`Updated: v${currentVersion} → v${latestVersion}`);
-    console.log();
-    console.log(chalk.cyan('  Restarting HedgeQuantX CLI...'));
-    console.log();
+    console.log(chalk.cyan('  Restarting...'));
     
-    // Auto restart after 2 seconds
     await new Promise(r => setTimeout(r, 2000));
     
-    // Restart the CLI
     try {
-      const child = spawn('hedgequantx', [], {
-        stdio: 'inherit',
-        detached: true,
-        shell: true
-      });
+      const child = spawn('hedgequantx', [], { stdio: 'inherit', detached: true, shell: true });
       child.unref();
       process.exit(0);
     } catch (e) {
-      console.log(chalk.yellow('  Could not auto-restart. Please run: hedgequantx'));
-      console.log();
-      await waitForEnter();
+      console.log(chalk.yellow('  Please run: hedgequantx'));
+      await prompts.waitForEnter();
     }
     
   } catch (error) {
-    // Catch-all for any unexpected errors
-    if (spinner) {
-      try { spinner.fail('Update error'); } catch (e) {}
-    }
-    console.log();
-    console.log(chalk.red('  An error occurred during update'));
-    if (error && error.message) {
-      console.log(chalk.gray(`  ${error.message.substring(0, 100)}`));
-    }
-    console.log();
-    console.log(chalk.yellow('  Try manually: npm install -g hedgequantx@latest'));
-    console.log();
-    await waitForEnter();
+    if (spinner) spinner.fail('Update error');
+    console.log(chalk.yellow('  Try: npm install -g hedgequantx@latest'));
+    await prompts.waitForEnter();
   }
 };
 
-module.exports = {
-  dashboardMenu,
-  handleUpdate
-};
+module.exports = { dashboardMenu, handleUpdate };

package/src/pages/accounts.js

@@ -1,35 +1,30 @@
 /**
- * @fileoverview Accounts page
- * @module pages/accounts
+ * Accounts page
  */
 
 const chalk = require('chalk');
 const ora = require('ora');
-const inquirer = require('inquirer');
 
 const { connections } = require('../services');
 const { ACCOUNT_STATUS, ACCOUNT_TYPE } = require('../config');
-const { getLogoWidth, getColWidths, drawBoxHeader, drawBoxFooter, draw2ColHeader, visibleLength, padText } = require('../ui');
+const { getLogoWidth, getColWidths, drawBoxHeader, drawBoxFooter, draw2ColHeader, visibleLength } = require('../ui');
+const { prompts } = require('../utils');
 
 /**
- * Shows all accounts from all connections
- * @param {Object} service - Current service
+ * Show all accounts
  */
 const showAccounts = async (service) => {
   const spinner = ora({ text: 'Fetching accounts...', color: 'yellow' }).start();
   const boxWidth = getLogoWidth();
   const { col1, col2 } = getColWidths(boxWidth);
 
-  // Helper for row formatting
   const fmtRow = (label, value, colW) => {
     const labelStr = ' ' + label.padEnd(12);
     const valueVisible = visibleLength(value || '');
-    const totalVisible = labelStr.length + valueVisible;
-    const padding = Math.max(0, colW - totalVisible);
+    const padding = Math.max(0, colW - labelStr.length - valueVisible);
     return chalk.white(labelStr) + value + ' '.repeat(padding);
   };
 
-  // Get accounts from all connections
   let allAccounts = [];
 
   if (connections.count() > 0) {
@@ -38,14 +33,10 @@ const showAccounts = async (service) => {
         const result = await conn.service.getTradingAccounts();
         if (result.success && result.accounts) {
           result.accounts.forEach(account => {
-            allAccounts.push({
-              ...account,
-              propfirm: conn.propfirm || conn.type,
-              service: conn.service
-            });
+            allAccounts.push({ ...account, propfirm: conn.propfirm || conn.type, service: conn.service });
           });
         }
-      } catch (e) { /* ignore */ }
+      } catch (e) {}
     }
   } else if (service) {
     const result = await service.getTradingAccounts();
@@ -56,7 +47,7 @@ const showAccounts = async (service) => {
 
   if (allAccounts.length === 0) {
     spinner.fail('No accounts found');
-    await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
+    await prompts.waitForEnter();
     return;
   }
 
@@ -65,7 +56,6 @@ const showAccounts = async (service) => {
 
   drawBoxHeader('TRADING ACCOUNTS', boxWidth);
 
-  // Display accounts 2 per row
   for (let i = 0; i < allAccounts.length; i += 2) {
     const acc1 = allAccounts[i];
     const acc2 = allAccounts[i + 1];
@@ -80,7 +70,7 @@ const showAccounts = async (service) => {
     const pf2 = acc2 ? chalk.magenta(acc2.propfirm || 'Unknown') : '';
     console.log(chalk.cyan('║') + fmtRow('PropFirm:', pf1, col1) + chalk.cyan('│') + (acc2 ? fmtRow('PropFirm:', pf2, col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-    // Balance - show '--' if null (not available from API)
+    // Balance
     const bal1 = acc1.balance;
     const bal2 = acc2 ? acc2.balance : null;
     const balStr1 = bal1 !== null && bal1 !== undefined ? '$' + bal1.toLocaleString() : '--';
@@ -99,10 +89,9 @@ const showAccounts = async (service) => {
     const type2 = acc2 ? (ACCOUNT_TYPE[acc2.type] || { text: 'Unknown', color: 'white' }) : null;
     console.log(chalk.cyan('║') + fmtRow('Type:', chalk[type1.color](type1.text), col1) + chalk.cyan('│') + (acc2 ? fmtRow('Type:', chalk[type2.color](type2.text), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-    // Account ID
+    // ID
     console.log(chalk.cyan('║') + fmtRow('ID:', chalk.gray(acc1.accountId), col1) + chalk.cyan('│') + (acc2 ? fmtRow('ID:', chalk.gray(acc2.accountId), col2) : ' '.repeat(col2)) + chalk.cyan('║'));
 
-    // Separator between pairs
     if (i + 2 < allAccounts.length) {
       console.log(chalk.cyan('╠') + chalk.cyan('═'.repeat(col1)) + chalk.cyan('╪') + chalk.cyan('═'.repeat(col2)) + chalk.cyan('╣'));
     }
@@ -111,7 +100,7 @@ const showAccounts = async (service) => {
   drawBoxFooter(boxWidth);
   console.log();
 
-  await inquirer.prompt([{ type: 'input', name: 'c', message: 'Press Enter to continue...' }]);
+  await prompts.waitForEnter();
 };
 
 module.exports = { showAccounts };