hedgequantx 2.6.163 → 2.7.1

package/src/app.js

@@ -1,5 +1,5 @@
 /**
- * @fileoverview Main application router
+ * @fileoverview Main application router - Rithmic Only
  * @module app
  */
 
@@ -19,24 +19,13 @@ const { showAccounts } = require('./pages/accounts');
 const { algoTradingMenu } = require('./pages/algo');
 
 // Menus
-const {
-  projectXMenu,
-  rithmicMenu,
-  tradovateMenu,
-  addPropAccountMenu,
-  dashboardMenu,
-  handleUpdate,
-} = require('./menus');
-const { aiAgentMenu } = require('./menus/ai-agent');
+const { rithmicMenu, dashboardMenu, handleUpdate } = require('./menus');
 
 /** @type {Object|null} */
 let currentService = null;
 
 // ==================== TERMINAL ====================
 
-/**
- * Restore terminal state
- */
 const restoreTerminal = () => {
   try {
     process.stdout.write('\x1B[?1049l');
@@ -50,7 +39,6 @@ const restoreTerminal = () => {
   }
 };
 
-// Signal handlers
 process.on('exit', restoreTerminal);
 process.on('SIGINT', () => { restoreTerminal(); process.exit(0); });
 process.on('SIGTERM', () => { restoreTerminal(); process.exit(0); });
@@ -71,9 +59,6 @@ process.on('unhandledRejection', (reason) => {
 
 // ==================== STATS ====================
 
-/**
- * Refresh cached stats from all connections
- */
 const refreshStats = async () => {
   if (connections.count() === 0) {
     clearCachedStats();
@@ -114,45 +99,9 @@ const refreshStats = async () => {
 
 // ==================== BANNER ====================
 
-/**
- * Display application banner
- * @param {boolean} [clear=true] - Whether to clear screen first
- */
-const banner = async (clear = true) => {
-  if (clear) console.clear();
-  
-  const termWidth = process.stdout.columns || 100;
-  const isMobile = termWidth < 60;
-  const boxWidth = isMobile ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
-  const innerWidth = boxWidth - 2;
-  const version = require('../package.json').version;
-
-  console.log(chalk.cyan('╔' + '═'.repeat(innerWidth) + '╗'));
-
-  // Logo
-  const logoLines = isMobile ? getMobileLogo() : getFullLogo();
-  
-  for (const [hq, x] of logoLines) {
-    const fullLine = chalk.cyan(hq) + chalk.yellow(x);
-    const totalLen = hq.length + x.length;
-    const padding = innerWidth - totalLen;
-    const leftPad = Math.floor(padding / 2);
-    console.log(chalk.cyan('║') + ' '.repeat(leftPad) + fullLine + ' '.repeat(padding - leftPad) + chalk.cyan('║'));
-  }
-
-  console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-  
-  const tagline = isMobile ? `HQX v${version}` : `PROP FUTURES ALGO TRADING  v${version}`;
-  console.log(chalk.cyan('║') + chalk.yellow(centerText(tagline, innerWidth)) + chalk.cyan('║'));
+const banner = async () => {
+  console.clear();
   
-  // Close box for loading state
-  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
-};
-
-/**
- * Display banner WITHOUT bottom border (for dashboard to continue)
- */
-const bannerOpen = async () => {
   const termWidth = process.stdout.columns || 100;
   const isMobile = termWidth < 60;
   const boxWidth = isMobile ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
@@ -173,15 +122,10 @@ const bannerOpen = async () => {
 
   console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
   
-  const tagline = isMobile ? `HQX v${version}` : `PROP FUTURES ALGO TRADING  v${version}`;
-  console.log(chalk.cyan('║') + chalk.yellow(centerText(tagline, innerWidth)) + chalk.cyan('║'));
-  // NO bottom border - dashboardMenu will continue
+  const tagline = isMobile ? `HQX v${version}` : `Prop Futures Algo Trading  v${version}`;
+  console.log(chalk.cyan('║') + chalk.white(centerText(tagline, innerWidth)) + chalk.cyan('║'));
 };
 
-/**
- * Get full logo lines
- * @returns {Array<[string, string]>}
- */
 const getFullLogo = () => [
   ['██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗', '██╗  ██╗'],
   ['██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝', '╚██╗██╔╝'],
@@ -191,10 +135,6 @@ const getFullLogo = () => [
   ['╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ', '╚═╝  ╚═╝'],
 ];
 
-/**
- * Get mobile logo lines
- * @returns {Array<[string, string]>}
- */
 const getMobileLogo = () => [
   ['██╗  ██╗ ██████╗ ', '██╗  ██╗'],
   ['██║  ██║██╔═══██╗', '╚██╗██╔╝'],
@@ -204,121 +144,67 @@ const getMobileLogo = () => [
   ['╚═╝  ╚═╝ ╚══▀▀═╝ ', '╚═╝  ╚═╝'],
 ];
 
-/**
- * Display banner with closing border (alias for banner)
- */
 const bannerClosed = async () => {
   await banner();
-};
-
-// ==================== MENUS ====================
-
-/**
- * Main menu (platform selection)
- * @returns {Promise<string>}
- */
-const mainMenu = async () => {
-  const boxWidth = getLogoWidth();
-  const innerWidth = boxWidth - 2;
-  const col1Width = Math.floor(innerWidth / 2);
-
-  const menuRow = (left, right) => {
-    const leftPlain = left.replace(/\x1b\[[0-9;]*m/g, '');
-    const rightPlain = right ? right.replace(/\x1b\[[0-9;]*m/g, '') : '';
-    const leftPadded = '  ' + left + ' '.repeat(Math.max(0, col1Width - leftPlain.length - 2));
-    const rightPadded = (right || '') + ' '.repeat(Math.max(0, innerWidth - col1Width - rightPlain.length));
-    console.log(chalk.cyan('║') + leftPadded + rightPadded + chalk.cyan('║'));
-  };
-
-  console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-  console.log(chalk.cyan('║') + chalk.white.bold(centerText('SELECT PLATFORM', innerWidth)) + chalk.cyan('║'));
-  console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
-
-  menuRow(chalk.cyan('[1] ProjectX'), chalk.cyan('[2] Rithmic'));
-  menuRow(chalk.cyan('[3] Tradovate'), chalk.magenta('[I] AI Agent'));
-  menuRow(chalk.red('[X] Exit'), '');
-
-  console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
-
-  const input = await prompts.textInput(chalk.cyan('Select (1/2/3/I/X)'));
-
-  const actions = { '1': 'projectx', '2': 'rithmic', '3': 'tradovate', 'i': 'ai_agent', 'x': 'exit' };
-  return actions[(input || '').toLowerCase()] || 'exit';
+  const termWidth = process.stdout.columns || 100;
+  const boxWidth = termWidth < 60 ? Math.max(termWidth - 2, 40) : Math.max(getLogoWidth(), 98);
+  console.log(chalk.cyan('╚' + '═'.repeat(boxWidth - 2) + '╝'));
 };
 
 // ==================== MAIN LOOP ====================
 
-/**
- * Main application loop
- */
 const run = async () => {
   try {
     log.info('Starting HQX CLI');
     await bannerClosed();
 
-    // Single loading spinner
-    const spinner = ora({ text: 'LOADING DASHBOARD...', color: 'yellow' }).start();
-
-    // PRE-LOAD: Initialize Rithmic protobuf definitions at startup (silent)
-    const { proto } = require('./services/rithmic/protobuf');
-    try {
-      await proto.load();
-    } catch (e) {
-      // Silent fail
-    }
-
     // Restore session
+    const spinner = ora({ text: 'Restoring session...', color: 'yellow' }).start();
     const restored = await connections.restoreFromStorage();
 
     if (restored) {
+      spinner.succeed('Session restored');
       currentService = connections.getAll()[0].service;
       await refreshStats();
+    } else {
+      spinner.info('No active session');
     }
-    
-    spinner.stop();
-    console.clear();
 
     // Main loop
     while (true) {
       try {
         prepareStdin();
+        await banner();
 
         if (!connections.isConnected()) {
-          console.clear();
-          await bannerOpen();
-          const choice = await mainMenu();
-
-          if (choice === 'exit') {
-            console.log(chalk.gray('GOODBYE!'));
+          // Not connected - show Rithmic menu directly
+          const boxWidth = getLogoWidth();
+          const innerWidth = boxWidth - 2;
+          
+          console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
+          console.log(chalk.cyan('║') + chalk.white.bold(centerText('CONNECT TO PROPFIRM', innerWidth)) + chalk.cyan('║'));
+          console.log(chalk.cyan('╠' + '═'.repeat(innerWidth) + '╣'));
+          console.log(chalk.cyan('║') + '  ' + chalk.cyan('[1] Connect') + ' '.repeat(innerWidth - 14) + chalk.cyan('║'));
+          console.log(chalk.cyan('║') + '  ' + chalk.red('[X] Exit') + ' '.repeat(innerWidth - 11) + chalk.cyan('║'));
+          console.log(chalk.cyan('╚' + '═'.repeat(innerWidth) + '╝'));
+          
+          const input = await prompts.textInput(chalk.cyan('Select (1/X):'));
+          
+          if (!input || input.toLowerCase() === 'x') {
+            console.log(chalk.gray('Goodbye!'));
             process.exit(0);
           }
-
-          if (choice === 'ai_agent') {
-            await aiAgentMenu();
-            continue;
-          }
-
-          let service = null;
-          if (choice === 'projectx') service = await projectXMenu();
-          else if (choice === 'rithmic') service = await rithmicMenu();
-          else if (choice === 'tradovate') service = await tradovateMenu();
-
-          if (service) {
-            currentService = service;
-            await refreshStats();
+          
+          if (input === '1') {
+            const service = await rithmicMenu();
+            if (service) {
+              currentService = service;
+              await refreshStats();
+            }
           }
         } else {
-          // Show banner with loading spinner
-          console.clear();
-          await banner(false);
-          
-          const spinner = ora({ text: 'LOADING DASHBOARD...', color: 'cyan' }).start();
+          // Connected - show dashboard
           await refreshStats();
-          spinner.stop();
-          
-          // Redraw clean dashboard (banner without bottom border + menu)
-          console.clear();
-          await bannerOpen();
           
           const action = await dashboardMenu(currentService);
 
@@ -332,11 +218,7 @@ const run = async () => {
               break;
 
             case 'add_prop_account': {
-              const platformChoice = await addPropAccountMenu();
-              let newService = null;
-              if (platformChoice === 'projectx') newService = await projectXMenu();
-              else if (platformChoice === 'rithmic') newService = await rithmicMenu();
-              else if (platformChoice === 'tradovate') newService = await tradovateMenu();
+              const newService = await rithmicMenu();
               if (newService) {
                 currentService = newService;
                 await refreshStats();
@@ -353,10 +235,6 @@ const run = async () => {
               }
               break;
 
-            case 'ai_agent':
-              await aiAgentMenu();
-              break;
-
             case 'update':
               await handleUpdate();
               break;
@@ -365,7 +243,7 @@ const run = async () => {
               connections.disconnectAll();
               currentService = null;
               clearCachedStats();
-              console.log(chalk.yellow('DISCONNECTED'));
+              console.log(chalk.yellow('Disconnected'));
               break;
           }
         }
@@ -381,4 +259,4 @@ const run = async () => {
   }
 };
 
-module.exports = { run, banner, mainMenu, dashboardMenu };
+module.exports = { run, banner, dashboardMenu };

package/src/config/constants.js

@@ -1,57 +1,55 @@
 /**
- * Application Constants
+ * Application Constants - Rithmic Only
  */
 
-// Account Status Codes (ProjectX UserAPI)
+// Account Status Codes
 const ACCOUNT_STATUS = {
-  0: { text: 'ACTIVE', color: 'green' },
-  1: { text: 'END OF DAY', color: 'cyan' },
-  2: { text: 'HALTED', color: 'red' },
-  3: { text: 'PAUSED', color: 'yellow' },
-  4: { text: 'HOLIDAY', color: 'blue' },
-  5: { text: 'EXPIRED', color: 'gray' },
-  6: { text: 'TERMINATED', color: 'red' },
-  7: { text: 'CANCELLED', color: 'red' },
-  8: { text: 'FAILED', color: 'red' },
-  9: { text: 'PASSED', color: 'green' }
+  0: { text: 'Active', color: 'green' },
+  1: { text: 'End Of Day', color: 'cyan' },
+  2: { text: 'Halted', color: 'red' },
+  3: { text: 'Paused', color: 'yellow' },
+  4: { text: 'Holiday', color: 'blue' },
+  5: { text: 'Expired', color: 'gray' },
+  6: { text: 'Terminated', color: 'red' },
+  7: { text: 'Cancelled', color: 'red' },
+  8: { text: 'Failed', color: 'red' },
+  9: { text: 'Passed', color: 'green' }
 };
 
-// Account Types (ProjectX UserAPI)
+// Account Types
 const ACCOUNT_TYPE = {
-  0: { text: 'PRACTICE', color: 'blue' },
-  1: { text: 'EVALUATION', color: 'yellow' },
-  2: { text: 'LIVE', color: 'green' },
-  3: { text: 'EXPRESS', color: 'magenta' },
-  4: { text: 'SIM', color: 'gray' }
+  0: { text: 'Practice', color: 'blue' },
+  1: { text: 'Evaluation', color: 'yellow' },
+  2: { text: 'Live', color: 'green' },
+  3: { text: 'Express', color: 'magenta' },
+  4: { text: 'Sim', color: 'gray' }
 };
 
 // Order Status
 const ORDER_STATUS = {
-  0: { text: 'PENDING', color: 'yellow', icon: '[~]' },
-  1: { text: 'WORKING', color: 'cyan', icon: '[>]' },
-  2: { text: 'FILLED', color: 'green', icon: '[OK]' },
-  3: { text: 'CANCELLED', color: 'gray', icon: '[X]' },
-  4: { text: 'REJECTED', color: 'red', icon: '[!]' },
-  5: { text: 'EXPIRED', color: 'gray', icon: '[-]' }
+  0: { text: 'Pending', color: 'yellow', icon: '[~]' },
+  1: { text: 'Working', color: 'cyan', icon: '[>]' },
+  2: { text: 'Filled', color: 'green', icon: '[OK]' },
+  3: { text: 'Cancelled', color: 'gray', icon: '[X]' },
+  4: { text: 'Rejected', color: 'red', icon: '[!]' },
+  5: { text: 'Expired', color: 'gray', icon: '[-]' }
 };
 
 // Order Types
 const ORDER_TYPE = {
-  1: 'MARKET',
-  2: 'LIMIT',
-  3: 'STOP',
-  4: 'STOP LIMIT'
+  1: 'Market',
+  2: 'Limit',
+  3: 'Stop',
+  4: 'Stop Limit'
 };
 
 // Order Side
 const ORDER_SIDE = {
-  0: { text: 'BUY', color: 'green' },
-  1: { text: 'SELL', color: 'red' }
+  0: { text: 'Buy', color: 'green' },
+  1: { text: 'Sell', color: 'red' }
 };
 
-// NO STATIC CONTRACT DATA - All symbols/contracts come from API
-// - ProjectX: GET /api/Contract/available
-// - Rithmic: TICKER_PLANT RequestProductCodes + RequestFrontMonthContract
+// All symbols/contracts come from Rithmic API (TICKER_PLANT)
 
 module.exports = {
   ACCOUNT_STATUS,