hedgequantx 1.2.145 → 1.2.147

package/src/menus/connect.js

@@ -0,0 +1,402 @@
+/**
+ * Connection Menus - PropFirm platform selection and login
+ * Handles ProjectX, Rithmic, and Tradovate connections
+ */
+
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const ora = require('ora');
+
+const { ProjectXService, connections } = require('../services');
+const { RithmicService } = require('../services/rithmic');
+const { TradovateService } = require('../services/tradovate');
+const { getPropFirmsByPlatform } = require('../config');
+const { getDevice, getLogoWidth, centerText } = require('../ui');
+const { validateUsername, validatePassword } = require('../security');
+
+/**
+ * Login prompt with validation
+ * @param {string} propfirmName - PropFirm display name
+ * @returns {Promise<{username: string, password: string}>}
+ */
+const loginPrompt = async (propfirmName) => {
+  const device = getDevice();
+  console.log();
+  console.log(chalk.cyan(`Connecting to ${propfirmName}...`));
+  console.log();
+
+  const credentials = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'username',
+      message: chalk.white.bold('Username:'),
+      validate: (input) => {
+        try {
+          validateUsername(input);
+          return true;
+        } catch (e) {
+          return e.message;
+        }
+      }
+    },
+    {
+      type: 'password',
+      name: 'password',
+      message: chalk.white.bold('Password:'),
+      mask: '*',
+      validate: (input) => {
+        try {
+          validatePassword(input);
+          return true;
+        } catch (e) {
+          return e.message;
+        }
+      }
+    }
+  ]);
+
+  return credentials;
+};
+
+/**
+ * ProjectX platform connection menu
+ */
+const projectXMenu = async () => {
+  const propfirms = getPropFirmsByPlatform('ProjectX');
+  const boxWidth = getLogoWidth();
+  const innerWidth = boxWidth - 2;
+  const numCols = 3;
+  const colWidth = Math.floor(innerWidth / numCols);
+  
+  // Build numbered list
+  const numbered = propfirms.map((pf, i) => ({
+    num: i + 1,
+    key: pf.key,
+    name: pf.displayName
+  }));
+  
+  // PropFirm selection box
+  console.log();
+  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
+  console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM', innerWidth)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  
+  // Display in 3 columns with fixed width alignment
+  const rows = Math.ceil(numbered.length / numCols);
+  const maxNum = numbered.length;
+  const numWidth = maxNum >= 10 ? 4 : 3; // [XX] or [X]
+  
+  for (let row = 0; row < rows; row++) {
+    let line = '';
+    for (let col = 0; col < numCols; col++) {
+      const idx = row + col * rows;
+      if (idx < numbered.length) {
+        const item = numbered[idx];
+        const numStr = item.num.toString().padStart(2, ' ');
+        const coloredText = chalk.cyan(`[${numStr}]`) + ' ' + chalk.white(item.name);
+        const textLen = 4 + 1 + item.name.length; // [XX] + space + name
+        const padding = colWidth - textLen - 2;
+        line += '  ' + coloredText + ' '.repeat(Math.max(0, padding));
+      } else {
+        line += ' '.repeat(colWidth);
+      }
+    }
+    // Adjust for exact width
+    const lineLen = line.replace(/\x1b\[[0-9;]*m/g, '').length;
+    const adjust = innerWidth - lineLen;
+    console.log(chalk.cyan('║') + line + ' '.repeat(Math.max(0, adjust)) + chalk.cyan('║'));
+  }
+  
+  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  const backText = '  ' + chalk.red('[X] Back');
+  const backLen = '[X] Back'.length + 2;
+  console.log(chalk.cyan('║') + backText + ' '.repeat(innerWidth - backLen) + chalk.cyan('║'));
+  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  console.log();
+
+  const validInputs = numbered.map(n => n.num.toString());
+  validInputs.push('x', 'X');
+  
+  const { action } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'action',
+      message: chalk.cyan(`Enter choice (1-${numbered.length}/X):`),
+      validate: (input) => {
+        if (validInputs.includes(input)) return true;
+        return `Please enter 1-${numbered.length} or X`;
+      }
+    }
+  ]);
+
+  if (action.toLowerCase() === 'x') return null;
+  
+  const selectedIdx = parseInt(action) - 1;
+  const selectedPropfirm = numbered[selectedIdx];
+
+  const credentials = await loginPrompt(selectedPropfirm.name);
+  const spinner = ora('Authenticating...').start();
+
+  try {
+    const service = new ProjectXService(selectedPropfirm.key);
+    const result = await service.login(credentials.username, credentials.password);
+
+    if (result.success) {
+      await service.getUser();
+      connections.add('projectx', service, service.propfirm.name);
+      spinner.succeed(`Connected to ${service.propfirm.name}`);
+      return service;
+    } else {
+      spinner.fail(result.error || 'Authentication failed');
+      return null;
+    }
+  } catch (error) {
+    spinner.fail(error.message);
+    return null;
+  }
+};
+
+/**
+ * Rithmic platform connection menu
+ */
+const rithmicMenu = async () => {
+  const propfirms = getPropFirmsByPlatform('Rithmic');
+  const boxWidth = getLogoWidth();
+  const innerWidth = boxWidth - 2;
+  const numCols = 3;
+  const colWidth = Math.floor(innerWidth / numCols);
+  
+  // Build numbered list
+  const numbered = propfirms.map((pf, i) => ({
+    num: i + 1,
+    key: pf.key,
+    name: pf.displayName,
+    systemName: pf.rithmicSystem
+  }));
+  
+  // PropFirm selection box
+  console.log();
+  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
+  console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM (RITHMIC)', innerWidth)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  
+  // Display in 3 columns with fixed width alignment
+  const rows = Math.ceil(numbered.length / numCols);
+  
+  for (let row = 0; row < rows; row++) {
+    let line = '';
+    for (let col = 0; col < numCols; col++) {
+      const idx = row + col * rows;
+      if (idx < numbered.length) {
+        const item = numbered[idx];
+        const numStr = item.num.toString().padStart(2, ' ');
+        const coloredText = chalk.cyan(`[${numStr}]`) + ' ' + chalk.white(item.name);
+        const textLen = 4 + 1 + item.name.length;
+        const padding = colWidth - textLen - 2;
+        line += '  ' + coloredText + ' '.repeat(Math.max(0, padding));
+      } else {
+        line += ' '.repeat(colWidth);
+      }
+    }
+    const lineLen = line.replace(/\x1b\[[0-9;]*m/g, '').length;
+    const adjust = innerWidth - lineLen;
+    console.log(chalk.cyan('║') + line + ' '.repeat(Math.max(0, adjust)) + chalk.cyan('║'));
+  }
+  
+  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  const backText = '  ' + chalk.red('[X] Back');
+  const backLen = '[X] Back'.length + 2;
+  console.log(chalk.cyan('║') + backText + ' '.repeat(innerWidth - backLen) + chalk.cyan('║'));
+  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  console.log();
+
+  const validInputs = numbered.map(n => n.num.toString());
+  validInputs.push('x', 'X');
+  
+  const { action } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'action',
+      message: chalk.cyan(`Enter choice (1-${numbered.length}/X):`),
+      validate: (input) => {
+        if (validInputs.includes(input)) return true;
+        return `Please enter 1-${numbered.length} or X`;
+      }
+    }
+  ]);
+
+  if (action.toLowerCase() === 'x') return null;
+  
+  const selectedIdx = parseInt(action) - 1;
+  const selectedPropfirm = numbered[selectedIdx];
+
+  const credentials = await loginPrompt(selectedPropfirm.name);
+  const spinner = ora('Connecting to Rithmic...').start();
+
+  try {
+    const service = new RithmicService(selectedPropfirm.key);
+    const result = await service.login(credentials.username, credentials.password);
+
+    if (result.success) {
+      spinner.text = 'Fetching accounts...';
+      const accResult = await service.getTradingAccounts();
+      
+      connections.add('rithmic', service, service.propfirm.name);
+      spinner.succeed(`Connected to ${service.propfirm.name} (${accResult.accounts?.length || 0} accounts)`);
+      
+      // Small pause to see the success message
+      await new Promise(r => setTimeout(r, 1500));
+      return service;
+    } else {
+      spinner.fail(result.error || 'Authentication failed');
+      await new Promise(r => setTimeout(r, 2000));
+      return null;
+    }
+  } catch (error) {
+    spinner.fail(`Connection error: ${error.message}`);
+    await new Promise(r => setTimeout(r, 2000));
+    return null;
+  }
+};
+
+/**
+ * Tradovate platform connection menu
+ */
+const tradovateMenu = async () => {
+  const propfirms = getPropFirmsByPlatform('Tradovate');
+  const boxWidth = getLogoWidth();
+  const innerWidth = boxWidth - 2;
+  
+  // Build numbered list
+  const numbered = propfirms.map((pf, i) => ({
+    num: i + 1,
+    key: pf.key,
+    name: pf.displayName
+  }));
+  
+  // PropFirm selection box
+  console.log();
+  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
+  console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PROPFIRM (TRADOVATE)', innerWidth)) + chalk.cyan('║'));
+  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  
+  // Display propfirms
+  for (const item of numbered) {
+    const numStr = item.num.toString().padStart(2, ' ');
+    const text = '  ' + chalk.cyan(`[${numStr}]`) + ' ' + chalk.white(item.name);
+    const textLen = 4 + 1 + item.name.length + 2;
+    console.log(chalk.cyan('║') + text + ' '.repeat(innerWidth - textLen) + chalk.cyan('║'));
+  }
+  
+  console.log(chalk.cyan('║') + ' '.repeat(innerWidth) + chalk.cyan('║'));
+  const backText = '  ' + chalk.red('[X] Back');
+  const backLen = '[X] Back'.length + 2;
+  console.log(chalk.cyan('║') + backText + ' '.repeat(innerWidth - backLen) + chalk.cyan('║'));
+  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  console.log();
+
+  const validInputs = numbered.map(n => n.num.toString());
+  validInputs.push('x', 'X');
+  
+  const { action } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'action',
+      message: chalk.cyan(`Enter choice (1-${numbered.length}/X):`),
+      validate: (input) => {
+        if (validInputs.includes(input)) return true;
+        return `Please enter 1-${numbered.length} or X`;
+      }
+    }
+  ]);
+
+  if (action.toLowerCase() === 'x') return null;
+  
+  const selectedIdx = parseInt(action) - 1;
+  const selectedPropfirm = numbered[selectedIdx];
+
+  const credentials = await loginPrompt(selectedPropfirm.name);
+  const spinner = ora('Connecting to Tradovate...').start();
+
+  try {
+    const service = new TradovateService(selectedPropfirm.key);
+    const result = await service.login(credentials.username, credentials.password);
+
+    if (result.success) {
+      spinner.text = 'Fetching accounts...';
+      await service.getTradingAccounts();
+      
+      connections.add('tradovate', service, service.propfirm.name);
+      spinner.succeed(`Connected to ${service.propfirm.name}`);
+      return service;
+    } else {
+      spinner.fail(result.error || 'Authentication failed');
+      return null;
+    }
+  } catch (error) {
+    spinner.fail(error.message);
+    return null;
+  }
+};
+
+/**
+ * Add Prop Account menu (select platform)
+ */
+const addPropAccountMenu = async () => {
+  const boxWidth = getLogoWidth();
+  const innerWidth = boxWidth - 2;
+  const col1Width = Math.floor(innerWidth / 2);
+  const col2Width = innerWidth - col1Width;
+  
+  console.log();
+  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
+  console.log(chalk.cyan('║') + chalk.white.bold(centerText('ADD PROP ACCOUNT', innerWidth)) + chalk.cyan('║'));
+  console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
+  
+  const menuRow = (left, right) => {
+    const leftText = '  ' + left;
+    const rightText = right ? '  ' + right : '';
+    const leftLen = leftText.replace(/\x1b\[[0-9;]*m/g, '').length;
+    const rightLen = rightText.replace(/\x1b\[[0-9;]*m/g, '').length;
+    const leftPad = col1Width - leftLen;
+    const rightPad = col2Width - rightLen;
+    console.log(chalk.cyan('║') + leftText + ' '.repeat(Math.max(0, leftPad)) + rightText + ' '.repeat(Math.max(0, rightPad)) + chalk.cyan('║'));
+  };
+  
+  menuRow(chalk.cyan('[1] ProjectX'), chalk.cyan('[2] Rithmic'));
+  menuRow(chalk.cyan('[3] Tradovate'), chalk.red('[X] Back'));
+  
+  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+  console.log();
+
+  const { action } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'action',
+      message: chalk.cyan('Enter choice (1/2/3/X):'),
+      validate: (input) => {
+        const valid = ['1', '2', '3', 'x', 'X'];
+        if (valid.includes(input)) return true;
+        return 'Please enter 1, 2, 3 or X';
+      }
+    }
+  ]);
+
+  const actionMap = {
+    '1': 'projectx',
+    '2': 'rithmic',
+    '3': 'tradovate',
+    'x': null,
+    'X': null
+  };
+
+  return actionMap[action];
+};
+
+module.exports = {
+  loginPrompt,
+  projectXMenu,
+  rithmicMenu,
+  tradovateMenu,
+  addPropAccountMenu
+};

package/src/menus/dashboard.js

@@ -0,0 +1,214 @@
+/**
+ * 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 } = require('../ui');
+
+/**
+ * Dashboard menu after login
+ * @param {Object} service - Connected service
+ */
+const dashboardMenu = async (service) => {
+  const user = service.user;
+  const boxWidth = getLogoWidth();
+  const W = boxWidth - 2; // Same width as logo (inner width)
+  
+  // Helper to center text
+  const centerLine = (text, width) => {
+    const pad = Math.floor((width - text.length) / 2);
+    return ' '.repeat(Math.max(0, pad)) + text + ' '.repeat(Math.max(0, width - pad - text.length));
+  };
+  
+  // Helper to pad text left
+  const padLine = (text, width) => {
+    return ' ' + text + ' '.repeat(Math.max(0, width - text.length - 1));
+  };
+  
+  // Dashboard box header
+  console.log();
+  console.log(chalk.cyan('╔' + '═'.repeat(W) + '╗'));
+  console.log(chalk.cyan('║') + chalk.yellow.bold(centerLine('Welcome, HQX Trader!', W)) + chalk.cyan('║'));
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
+  
+  // Connection info - show all active connections in boxes (max 3 per row)
+  const allConns = connections.getAll();
+  if (allConns.length > 0) {
+    const maxPerRow = 3;
+    const boxPadding = 2; // padding inside each mini-box
+    const gap = 2; // gap between boxes
+    
+    // Calculate box width based on number of connections (max 3)
+    const numBoxes = Math.min(allConns.length, maxPerRow);
+    const totalGaps = (numBoxes - 1) * gap;
+    const connBoxWidth = Math.floor((W - totalGaps - 2) / numBoxes); // -2 for outer padding
+    
+    // Process connections in rows of 3
+    for (let rowStart = 0; rowStart < allConns.length; rowStart += maxPerRow) {
+      const rowConns = allConns.slice(rowStart, rowStart + maxPerRow);
+      const numInRow = rowConns.length;
+      const rowBoxWidth = Math.floor((W - (numInRow - 1) * gap - 2) / numInRow);
+      
+      // Top border of boxes
+      let topLine = ' ';
+      for (let i = 0; i < numInRow; i++) {
+        topLine += '┌' + '─'.repeat(rowBoxWidth - 2) + '┐';
+        if (i < numInRow - 1) topLine += ' '.repeat(gap);
+      }
+      const topPad = W - topLine.length;
+      console.log(chalk.cyan('║') + chalk.green(topLine) + ' '.repeat(Math.max(0, topPad)) + chalk.cyan('║'));
+      
+      // Content of boxes
+      let contentLine = ' ';
+      for (let i = 0; i < numInRow; i++) {
+        const connText = rowConns[i].propfirm || rowConns[i].type || 'Connected';
+        const truncated = connText.length > rowBoxWidth - 4 ? connText.slice(0, rowBoxWidth - 7) + '...' : connText;
+        const innerWidth = rowBoxWidth - 4; // -2 for borders, -2 for padding
+        const textPad = Math.floor((innerWidth - truncated.length) / 2);
+        const textPadRight = innerWidth - truncated.length - textPad;
+        contentLine += '│ ' + ' '.repeat(textPad) + truncated + ' '.repeat(textPadRight) + ' │';
+        if (i < numInRow - 1) contentLine += ' '.repeat(gap);
+      }
+      const contentPad = W - contentLine.length;
+      console.log(chalk.cyan('║') + chalk.green(contentLine) + ' '.repeat(Math.max(0, contentPad)) + chalk.cyan('║'));
+      
+      // Bottom border of boxes
+      let bottomLine = ' ';
+      for (let i = 0; i < numInRow; i++) {
+        bottomLine += '└' + '─'.repeat(rowBoxWidth - 2) + '┘';
+        if (i < numInRow - 1) bottomLine += ' '.repeat(gap);
+      }
+      const bottomPad = W - bottomLine.length;
+      console.log(chalk.cyan('║') + chalk.green(bottomLine) + ' '.repeat(Math.max(0, bottomPad)) + chalk.cyan('║'));
+    }
+  }
+  
+  console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
+  
+  // Menu options in 2 columns
+  const col1Width = Math.floor(W / 2);
+  const col2Width = W - col1Width;
+  
+  const menuRow = (left, right) => {
+    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
+    const rightPlain = right ? right.replace(/\x1b\[[0-9;]*m/g, '') : '';
+    const leftPad = ' '.repeat(Math.max(0, col1Width - leftPlain.length - 2));
+    const rightPad = ' '.repeat(Math.max(0, col2Width - rightPlain.length - 2));
+    console.log(chalk.cyan('║') + '  ' + left + leftPad + '  ' + (right || '') + rightPad + chalk.cyan('║'));
+  };
+  
+  menuRow(chalk.cyan('[1] View Accounts'), chalk.cyan('[2] View Stats'));
+  menuRow(chalk.cyan('[+] Add Prop-Account'), chalk.cyan('[A] Algo-Trading'));
+  menuRow(chalk.yellow('[U] Update HQX'), chalk.red('[X] Disconnect'));
+  
+  console.log(chalk.cyan('╚' + '═'.repeat(W) + '╝'));
+  console.log();
+
+  const { action } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'action',
+      message: chalk.cyan('Enter choice (1/2/+/A/U/X):'),
+      validate: (input) => {
+        const valid = ['1', '2', '+', 'a', 'A', 'u', 'U', 'x', 'X'];
+        if (valid.includes(input)) return true;
+        return 'Please enter a valid option';
+      }
+    }
+  ]);
+
+  // Map input to action
+  const actionMap = {
+    '1': 'accounts',
+    '2': 'stats',
+    '+': 'add_prop_account',
+    'a': 'algotrading',
+    'A': 'algotrading',
+    'u': 'update',
+    'U': 'update',
+    'x': 'disconnect',
+    'X': 'disconnect'
+  };
+
+  return actionMap[action] || 'accounts';
+};
+
+/**
+ * Handles the update process with auto-restart
+ */
+const handleUpdate = async () => {
+  const pkg = require('../../package.json');
+  const currentVersion = pkg.version;
+  const spinner = ora('Checking for updates...').start();
+  
+  try {
+    // Check latest version on npm
+    spinner.text = 'Checking npm registry...';
+    let latestVersion;
+    try {
+      latestVersion = execSync('npm view hedgequantx version', { stdio: 'pipe' }).toString().trim();
+    } catch (e) {
+      spinner.fail('Cannot reach npm registry');
+      console.log();
+      await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+      return;
+    }
+    
+    if (currentVersion === latestVersion) {
+      spinner.succeed('Already up to date!');
+      console.log();
+      console.log(chalk.green(`  ✓ You have the latest version of HedgeQuantX CLI: v${currentVersion}`));
+      console.log();
+      await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+      return;
+    }
+    
+    // Update via npm
+    spinner.text = `Updating v${currentVersion} -> v${latestVersion}...`;
+    try {
+      execSync('npm install -g hedgequantx@latest', { stdio: 'pipe' });
+    } catch (e) {
+      spinner.fail('Update failed - try manually: npm install -g hedgequantx@latest');
+      console.log(chalk.gray(`  Error: ${e.message}`));
+      console.log();
+      await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+      return;
+    }
+    
+    spinner.succeed('CLI updated!');
+    console.log();
+    console.log(chalk.green(`  ✓ Updated: v${currentVersion} -> v${latestVersion}`));
+    console.log();
+    console.log(chalk.cyan('  Restarting HedgeQuantX CLI...'));
+    console.log();
+    
+    // Small delay so user can see the message
+    await new Promise(resolve => setTimeout(resolve, 1500));
+    
+    // Restart the CLI automatically
+    const child = spawn('hedgequantx', [], {
+      stdio: 'inherit',
+      detached: true,
+      shell: true
+    });
+    child.unref();
+    process.exit(0);
+    
+  } catch (error) {
+    spinner.fail('Update failed: ' + error.message);
+    console.log(chalk.yellow('  Try manually: npm install -g hedgequantx@latest'));
+    console.log();
+    await inquirer.prompt([{ type: 'input', name: 'continue', message: 'Press Enter to continue...' }]);
+  }
+};
+
+module.exports = {
+  dashboardMenu,
+  handleUpdate
+};

package/src/menus/index.js

@@ -0,0 +1,8 @@
+/**
+ * Menus - Export all menu modules
+ */
+
+module.exports = {
+  ...require('./connect'),
+  ...require('./dashboard')
+};