hedgequantx 1.8.49 → 2.3.0

package/src/pages/algo/copy-trading.js

@@ -1,5 +1,6 @@
 /**
- * Copy Trading Mode
+ * @fileoverview Copy Trading Mode
+ * @module pages/algo/copy-trading
  */
 
 const chalk = require('chalk');
@@ -19,8 +20,8 @@ const log = logger.scope('CopyTrading');
  */
 const copyTradingMenu = async () => {
   log.info('Copy Trading menu opened');
-  
-  // Check if market is open (skip early close check - market may still be open)
+
+  // Check market hours
   const market = checkMarketHours();
   if (!market.isOpen && !market.message.includes('early')) {
     console.log();
@@ -30,9 +31,9 @@ const copyTradingMenu = async () => {
     await prompts.waitForEnter();
     return;
   }
-  
+
   const allConns = connections.getAll();
-  
+
   if (allConns.length < 2) {
     console.log();
     console.log(chalk.yellow(`  Copy Trading requires 2 connected accounts (found: ${allConns.length})`));
@@ -41,101 +42,65 @@ const copyTradingMenu = async () => {
     await prompts.waitForEnter();
     return;
   }
-  
+
   console.log();
   console.log(chalk.yellow.bold('  Copy Trading Setup'));
   console.log();
-  
+
+  // Fetch all accounts
   const spinner = ora({ text: 'Fetching accounts...', color: 'yellow' }).start();
-  
-  const allAccounts = [];
-  for (const conn of allConns) {
-    try {
-      const result = await conn.service.getTradingAccounts();
-      if (result.success && result.accounts) {
-        const active = result.accounts.filter(a => a.status === 0);
-        for (const acc of active) {
-          allAccounts.push({ account: acc, service: conn.service, propfirm: conn.propfirm, type: conn.type });
-        }
-      }
-    } catch (e) {}
-  }
-  
+  const allAccounts = await fetchAllAccounts(allConns);
+
   if (allAccounts.length < 2) {
     spinner.fail('Need at least 2 active accounts');
     await prompts.waitForEnter();
     return;
   }
-  
+
   spinner.succeed(`Found ${allAccounts.length} active accounts`);
-  
+
   // Step 1: Select Lead Account
   console.log(chalk.cyan('  Step 1: Select LEAD Account'));
-  const leadOptions = allAccounts.map((a, i) => ({
-    label: `${a.propfirm} - ${a.account.rithmicAccountId || a.account.name || a.account.accountId}${a.account.balance !== null ? ` ($${a.account.balance.toLocaleString()})` : ''}`,
-    value: i
-  }));
-  leadOptions.push({ label: '< Cancel', value: -1 });
-  
-  const leadIdx = await prompts.selectOption('Lead Account:', leadOptions);
+  const leadIdx = await selectAccount('Lead Account:', allAccounts, -1);
   if (leadIdx === null || leadIdx === -1) return;
   const lead = allAccounts[leadIdx];
-  
+
   // Step 2: Select Follower Account
   console.log();
   console.log(chalk.cyan('  Step 2: Select FOLLOWER Account'));
-  const followerOptions = allAccounts
-    .map((a, i) => ({ a, i }))
-    .filter(x => x.i !== leadIdx)
-    .map(x => ({
-      label: `${x.a.propfirm} - ${x.a.account.rithmicAccountId || x.a.account.name || x.a.account.accountId}${x.a.account.balance !== null ? ` ($${x.a.account.balance.toLocaleString()})` : ''}`,
-      value: x.i
-    }));
-  followerOptions.push({ label: '< Cancel', value: -1 });
-  
-  const followerIdx = await prompts.selectOption('Follower Account:', followerOptions);
+  const followerIdx = await selectAccount('Follower Account:', allAccounts, leadIdx);
   if (followerIdx === null || followerIdx === -1) return;
   const follower = allAccounts[followerIdx];
-  
-  // Step 3: Select Trading Symbol
+
+  // Step 3: Select Symbol
   console.log();
   console.log(chalk.cyan('  Step 3: Select Trading Symbol'));
-  let symbol;
-  try {
-    symbol = await selectSymbol(lead.service, 'Trading');
-  } catch (err) {
-    console.log(chalk.red(`  Error selecting symbol: ${err.message}`));
-    await prompts.waitForEnter();
-    return;
-  }
-  if (!symbol) {
-    log.debug('No symbol selected');
-    return;
-  }
-  
-  // Step 4: Configure parameters
+  const symbol = await selectSymbol(lead.service);
+  if (!symbol) return;
+
+  // Step 4: Configure Parameters
   console.log();
   console.log(chalk.cyan('  Step 4: Configure Parameters'));
-  
+
   const leadContracts = await prompts.numberInput('Lead contracts:', 1, 1, 10);
   if (leadContracts === null) return;
-  
+
   const followerContracts = await prompts.numberInput('Follower contracts:', leadContracts, 1, 10);
   if (followerContracts === null) return;
-  
+
   const dailyTarget = await prompts.numberInput('Daily target ($):', 400, 1, 10000);
   if (dailyTarget === null) return;
-  
+
   const maxRisk = await prompts.numberInput('Max risk ($):', 200, 1, 5000);
   if (maxRisk === null) return;
-  
+
   // Step 5: Privacy
   const showNames = await prompts.selectOption('Account names:', [
     { label: 'Hide account names', value: false },
-    { label: 'Show account names', value: true }
+    { label: 'Show account names', value: true },
   ]);
   if (showNames === null) return;
-  
+
   // Confirm
   console.log();
   console.log(chalk.white('  Summary:'));
@@ -144,240 +109,368 @@ const copyTradingMenu = async () => {
   console.log(chalk.cyan(`  Follower: ${follower.propfirm} x${followerContracts}`));
   console.log(chalk.cyan(`  Target: $${dailyTarget} | Risk: $${maxRisk}`));
   console.log();
-  
+
   const confirm = await prompts.confirmPrompt('Start Copy Trading?', true);
   if (!confirm) return;
-  
+
   // Launch
   await launchCopyTrading({
     lead: { ...lead, symbol, contracts: leadContracts },
     follower: { ...follower, symbol, contracts: followerContracts },
-    dailyTarget, maxRisk, showNames
+    dailyTarget,
+    maxRisk,
+    showNames,
   });
 };
 
 /**
- * Get contracts from ProjectX API (shared for all services)
+ * Fetch all active accounts from connections
+ * @param {Array} allConns - All connections
+ * @returns {Promise<Array>}
  */
-const getContractsFromAPI = async () => {
-  // Find a ProjectX connection to get contracts from API
-  const allConns = connections.getAll();
-  const projectxConn = allConns.find(c => c.type === 'projectx');
-  
-  if (projectxConn && typeof projectxConn.service.getContracts === 'function') {
-    const result = await projectxConn.service.getContracts();
-    if (result.success && result.contracts?.length > 0) {
-      // Normalize contract structure - API returns { name: "ESH6", description: "E-mini S&P 500..." }
-      return result.contracts.map(c => ({
-        ...c,
-        symbol: c.name || c.symbol,
-        name: c.description || c.name || c.symbol
-      }));
+const fetchAllAccounts = async (allConns) => {
+  const allAccounts = [];
+
+  for (const conn of allConns) {
+    try {
+      const result = await conn.service.getTradingAccounts();
+      if (result.success && result.accounts) {
+        const active = result.accounts.filter(a => a.status === 0);
+        for (const acc of active) {
+          allAccounts.push({
+            account: acc,
+            service: conn.service,
+            propfirm: conn.propfirm,
+            type: conn.type,
+          });
+        }
+      }
+    } catch (err) {
+      log.warn('Failed to get accounts', { type: conn.type, error: err.message });
     }
   }
-  
-  return null;
+
+  return allAccounts;
+};
+
+/**
+ * Select account from list
+ * @param {string} message - Prompt message
+ * @param {Array} accounts - Available accounts
+ * @param {number} excludeIdx - Index to exclude
+ * @returns {Promise<number|null>}
+ */
+const selectAccount = async (message, accounts, excludeIdx) => {
+  const options = accounts
+    .map((a, i) => ({ a, i }))
+    .filter(x => x.i !== excludeIdx)
+    .map(x => {
+      const acc = x.a.account;
+      const balance = acc.balance !== null ? ` ($${acc.balance.toLocaleString()})` : '';
+      return {
+        label: `${x.a.propfirm} - ${acc.rithmicAccountId || acc.name || acc.accountId}${balance}`,
+        value: x.i,
+      };
+    });
+
+  options.push({ label: '< Cancel', value: -1 });
+  return prompts.selectOption(message, options);
 };
 
 /**
- * Symbol selection helper - grouped by category with indices first
+ * Select trading symbol
+ * @param {Object} service - Service instance
+ * @returns {Promise<Object|null>}
  */
-const selectSymbol = async (service, label) => {
+const selectSymbol = async (service) => {
   const spinner = ora({ text: 'Loading symbols...', color: 'yellow' }).start();
-  
+
   try {
-    // Always use contracts from ProjectX API for consistency
+    // Try ProjectX API first for consistency
     let contracts = await getContractsFromAPI();
-    
-    // Fallback to service's own contracts if no ProjectX available
+
+    // Fallback to service
     if (!contracts && typeof service.getContracts === 'function') {
       const result = await service.getContracts();
       if (result.success && result.contracts?.length > 0) {
-        // Contracts from Rithmic are already categorized and sorted
         contracts = result.contracts;
       }
     }
-    
-    if (!contracts || contracts.length === 0) {
+
+    if (!contracts || !contracts.length) {
       spinner.fail('No contracts available');
       await prompts.waitForEnter();
       return null;
     }
-    
+
     spinner.succeed(`Found ${contracts.length} contracts`);
-    
-    // Build options with category headers (if contracts have category info)
+
+    // Build options with category headers
     const options = [];
     let currentCategory = null;
-    
+
     for (const c of contracts) {
-      // Add category header when category changes (if available)
       if (c.categoryName && c.categoryName !== currentCategory) {
         currentCategory = c.categoryName;
-        options.push({ 
-          label: chalk.cyan.bold(`── ${currentCategory} ──`), 
-          value: null, 
-          disabled: true 
+        options.push({
+          label: chalk.cyan.bold(`── ${currentCategory} ──`),
+          value: null,
+          disabled: true,
         });
       }
-      
-      // Format label based on available data
+
       const symbolDisplay = c.symbol || c.name;
       const nameDisplay = c.name || c.symbol;
       const exchangeDisplay = c.exchange ? ` (${c.exchange})` : '';
-      const label = c.categoryName 
+      const label = c.categoryName
         ? `  ${symbolDisplay} - ${nameDisplay}${exchangeDisplay}`
         : `${nameDisplay}${exchangeDisplay}`;
-      
+
       options.push({ label, value: c });
     }
-    
-    options.push({ label: '', value: null, disabled: true }); // Spacer
+
+    options.push({ label: '', value: null, disabled: true });
     options.push({ label: chalk.gray('< Cancel'), value: null });
-    
-    return await prompts.selectOption(`${label} Symbol:`, options);
-  } catch (e) {
-    spinner.fail(`Error loading contracts: ${e.message}`);
+
+    return prompts.selectOption('Trading Symbol:', options);
+  } catch (err) {
+    spinner.fail(`Error loading contracts: ${err.message}`);
     await prompts.waitForEnter();
     return null;
   }
 };
 
 /**
- * Launch Copy Trading
+ * Get contracts from ProjectX API
+ * @returns {Promise<Array|null>}
+ */
+const getContractsFromAPI = async () => {
+  const allConns = connections.getAll();
+  const projectxConn = allConns.find(c => c.type === 'projectx');
+
+  if (projectxConn && typeof projectxConn.service.getContracts === 'function') {
+    const result = await projectxConn.service.getContracts();
+    if (result.success && result.contracts?.length > 0) {
+      return result.contracts.map(c => ({
+        ...c,
+        symbol: c.name || c.symbol,
+        name: c.description || c.name || c.symbol,
+      }));
+    }
+  }
+
+  return null;
+};
+
+/**
+ * Launch Copy Trading session
+ * @param {Object} config - Session configuration
  */
 const launchCopyTrading = async (config) => {
   const { lead, follower, dailyTarget, maxRisk, showNames } = config;
-  
-  // NEVER show real name - only account ID or masked
+
+  // Account names (masked for privacy)
   const leadName = showNames ? lead.account.accountId : 'HQX Lead *****';
   const followerName = showNames ? follower.account.accountId : 'HQX Follower *****';
-  
+
   const ui = new AlgoUI({ subtitle: 'HQX Copy Trading', mode: 'copy-trading' });
-  
+
   const stats = {
-    leadName, followerName,
+    leadName,
+    followerName,
     leadSymbol: lead.symbol.name,
     followerSymbol: follower.symbol.name,
     leadQty: lead.contracts,
     followerQty: follower.contracts,
-    target: dailyTarget, risk: maxRisk,
-    pnl: 0, trades: 0, wins: 0, losses: 0,
-    latency: 0, connected: false
+    target: dailyTarget,
+    risk: maxRisk,
+    pnl: 0,
+    trades: 0,
+    wins: 0,
+    losses: 0,
+    latency: 0,
+    connected: false,
   };
-  
+
   let running = true;
   let stopReason = null;
-  
+
+  // Connect to HQX Server
   const hqx = new HQXServerService();
   const spinner = ora({ text: 'Connecting to HQX Server...', color: 'yellow' }).start();
-  
+
   try {
-    const auth = await hqx.authenticate(lead.account.accountId.toString(), lead.propfirm || 'topstep');
+    const auth = await hqx.authenticate(
+      lead.account.accountId.toString(),
+      lead.propfirm || 'topstep'
+    );
     if (!auth.success) throw new Error(auth.error);
-    
+
     const conn = await hqx.connect();
     if (!conn.success) throw new Error('WebSocket failed');
-    
+
     spinner.succeed('Connected');
     stats.connected = true;
   } catch (err) {
     spinner.warn('HQX Server unavailable');
+    log.warn('HQX connection failed', { error: err.message });
   }
-  
+
   // Event handlers
-  hqx.on('latency', (d) => { stats.latency = d.latency || 0; });
+  setupEventHandlers(hqx, ui, stats, lead, follower, showNames, () => {
+    running = false;
+  }, (reason) => {
+    stopReason = reason;
+  }, dailyTarget, maxRisk);
+
+  // Start algo on server
+  if (stats.connected) {
+    startCopyTradingOnServer(hqx, lead, follower, dailyTarget, maxRisk, ui);
+  }
+
+  // UI refresh loop
+  const refreshInterval = setInterval(() => {
+    if (running) ui.render(stats);
+  }, 250);
+
+  // Keyboard handling
+  const cleanupKeys = setupKeyboardHandler(() => {
+    running = false;
+    stopReason = 'manual';
+  });
+
+  // Wait for stop
+  await new Promise((resolve) => {
+    const check = setInterval(() => {
+      if (!running) {
+        clearInterval(check);
+        resolve();
+      }
+    }, 100);
+  });
+
+  // Cleanup
+  clearInterval(refreshInterval);
+  if (cleanupKeys) cleanupKeys();
+  if (stats.connected) {
+    hqx.stopAlgo();
+    hqx.disconnect();
+  }
+  ui.cleanup();
+
+  // Show summary
+  renderSessionSummary(stats, stopReason);
+  await prompts.waitForEnter();
+};
+
+/**
+ * Setup HQX event handlers
+ */
+const setupEventHandlers = (hqx, ui, stats, lead, follower, showNames, stop, setReason, dailyTarget, maxRisk) => {
+  hqx.on('latency', (d) => {
+    stats.latency = d.latency || 0;
+  });
+
   hqx.on('log', (d) => {
     let msg = d.message;
     if (!showNames) {
-      if (lead.account.accountName) msg = msg.replace(new RegExp(lead.account.accountName, 'gi'), 'Lead *****');
-      if (follower.account.accountName) msg = msg.replace(new RegExp(follower.account.accountName, 'gi'), 'Follower *****');
+      if (lead.account.accountName) {
+        msg = msg.replace(new RegExp(lead.account.accountName, 'gi'), 'Lead *****');
+      }
+      if (follower.account.accountName) {
+        msg = msg.replace(new RegExp(follower.account.accountName, 'gi'), 'Follower *****');
+      }
     }
     ui.addLog(d.type || 'info', msg);
   });
+
   hqx.on('trade', (d) => {
     stats.trades++;
     stats.pnl += d.pnl || 0;
     d.pnl >= 0 ? stats.wins++ : stats.losses++;
     ui.addLog(d.pnl >= 0 ? 'trade' : 'loss', `${d.pnl >= 0 ? '+' : ''}$${d.pnl.toFixed(2)}`);
-    
+
     if (stats.pnl >= dailyTarget) {
-      stopReason = 'target'; running = false;
+      setReason('target');
+      stop();
       ui.addLog('success', `TARGET! +$${stats.pnl.toFixed(2)}`);
       hqx.stopAlgo();
     } else if (stats.pnl <= -maxRisk) {
-      stopReason = 'risk'; running = false;
+      setReason('risk');
+      stop();
       ui.addLog('error', `MAX RISK! -$${Math.abs(stats.pnl).toFixed(2)}`);
       hqx.stopAlgo();
     }
   });
-  hqx.on('copy', (d) => { ui.addLog('trade', `COPIED: ${d.side} ${d.quantity}x`); });
-  hqx.on('error', (d) => { ui.addLog('error', d.message); });
-  hqx.on('disconnected', () => { stats.connected = false; });
-  
-  // Start on server
-  if (stats.connected) {
-    ui.addLog('info', 'Starting Copy Trading...');
-    
-    let leadCreds = null, followerCreds = null;
-    if (lead.service.getRithmicCredentials) leadCreds = lead.service.getRithmicCredentials();
-    if (follower.service.getRithmicCredentials) followerCreds = follower.service.getRithmicCredentials();
-    
-    hqx.startCopyTrading({
-      leadAccountId: lead.account.accountId,
-      leadContractId: lead.symbol.id || lead.symbol.contractId,
-      leadSymbol: lead.symbol.symbol || lead.symbol.name,
-      leadContracts: lead.contracts,
-      leadPropfirm: lead.propfirm,
-      leadToken: lead.service.getToken?.() || null,
-      leadRithmicCredentials: leadCreds,
-      followerAccountId: follower.account.accountId,
-      followerContractId: follower.symbol.id || follower.symbol.contractId,
-      followerSymbol: follower.symbol.symbol || follower.symbol.name,
-      followerContracts: follower.contracts,
-      followerPropfirm: follower.propfirm,
-      followerToken: follower.service.getToken?.() || null,
-      followerRithmicCredentials: followerCreds,
-      dailyTarget, maxRisk
-    });
-  }
-  
-  const refreshInterval = setInterval(() => { if (running) ui.render(stats); }, 250);
-  
-  // Keyboard
-  const setupKeys = () => {
-    if (!process.stdin.isTTY) return null;
-    readline.emitKeypressEvents(process.stdin);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
-    
-    const handler = (str, key) => {
-      if (key && (key.name === 'x' || (key.ctrl && key.name === 'c'))) {
-        running = false; stopReason = 'manual';
-      }
-    };
-    process.stdin.on('keypress', handler);
-    return () => {
-      process.stdin.removeListener('keypress', handler);
-      if (process.stdin.isTTY) process.stdin.setRawMode(false);
-    };
-  };
-  
-  const cleanupKeys = setupKeys();
-  
-  await new Promise(resolve => {
-    const check = setInterval(() => { if (!running) { clearInterval(check); resolve(); } }, 100);
+
+  hqx.on('copy', (d) => {
+    ui.addLog('trade', `COPIED: ${d.side} ${d.quantity}x`);
   });
-  
-  clearInterval(refreshInterval);
-  if (cleanupKeys) cleanupKeys();
-  if (stats.connected) { hqx.stopAlgo(); hqx.disconnect(); }
-  ui.cleanup();
-  
-  // Summary
-  renderSessionSummary(stats, stopReason);
-  
-  await prompts.waitForEnter();
+
+  hqx.on('error', (d) => {
+    ui.addLog('error', d.message);
+  });
+
+  hqx.on('disconnected', () => {
+    stats.connected = false;
+  });
+};
+
+/**
+ * Start copy trading on HQX server
+ */
+const startCopyTradingOnServer = (hqx, lead, follower, dailyTarget, maxRisk, ui) => {
+  ui.addLog('info', 'Starting Copy Trading...');
+
+  const leadCreds = lead.service.getRithmicCredentials?.() || null;
+  const followerCreds = follower.service.getRithmicCredentials?.() || null;
+
+  hqx.startCopyTrading({
+    leadAccountId: lead.account.accountId,
+    leadContractId: lead.symbol.id || lead.symbol.contractId,
+    leadSymbol: lead.symbol.symbol || lead.symbol.name,
+    leadContracts: lead.contracts,
+    leadPropfirm: lead.propfirm,
+    leadToken: lead.service.getToken?.() || null,
+    leadRithmicCredentials: leadCreds,
+    followerAccountId: follower.account.accountId,
+    followerContractId: follower.symbol.id || follower.symbol.contractId,
+    followerSymbol: follower.symbol.symbol || follower.symbol.name,
+    followerContracts: follower.contracts,
+    followerPropfirm: follower.propfirm,
+    followerToken: follower.service.getToken?.() || null,
+    followerRithmicCredentials: followerCreds,
+    dailyTarget,
+    maxRisk,
+  });
+};
+
+/**
+ * Setup keyboard handler
+ * @param {Function} onStop - Stop callback
+ * @returns {Function|null} Cleanup function
+ */
+const setupKeyboardHandler = (onStop) => {
+  if (!process.stdin.isTTY) return null;
+
+  readline.emitKeypressEvents(process.stdin);
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+
+  const handler = (str, key) => {
+    if (key && (key.name === 'x' || (key.ctrl && key.name === 'c'))) {
+      onStop();
+    }
+  };
+
+  process.stdin.on('keypress', handler);
+
+  return () => {
+    process.stdin.removeListener('keypress', handler);
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(false);
+    }
+  };
 };
 
 module.exports = { copyTradingMenu };

package/src/pages/algo/one-account.js

@@ -132,7 +132,7 @@ const configureAlgo = async (account, contract) => {
   const maxRisk = await prompts.numberInput('Max risk ($):', 100, 1, 5000);
   if (maxRisk === null) return null;
   
-  const showName = await prompts.confirmPrompt('Show account name?', true);
+  const showName = await prompts.confirmPrompt('Show account name?', false);
   if (showName === null) return null;
   
   const confirm = await prompts.confirmPrompt('Start algo trading?', true);