hedgequantx 1.8.47 → 1.8.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.8.47",
+  "version": "1.8.48",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {

package/src/pages/accounts.js

@@ -28,8 +28,8 @@ const showAccounts = async (service) => {
   let spinner;
 
   try {
-    // Step 1: Get connections
-    spinner = ora({ text: 'Loading connections...', color: 'yellow' }).start();
+    // Single spinner for loading
+    spinner = ora({ text: 'Loading accounts...', color: 'yellow' }).start();
     
     const allConns = connections.count() > 0 ? connections.getAll() : (service ? [{ service, propfirm: service.propfirm?.name || 'Unknown', type: 'single' }] : []);
     
@@ -38,16 +38,11 @@ const showAccounts = async (service) => {
       await prompts.waitForEnter();
       return;
     }
-    
-    spinner.succeed(`Found ${allConns.length} connection(s)`);
 
-    // Step 2: Fetch accounts from each connection
-    for (let i = 0; i < allConns.length; i++) {
-      const conn = allConns[i];
+    // Fetch accounts from each connection
+    for (const conn of allConns) {
       const propfirmName = conn.propfirm || conn.type || 'Unknown';
       
-      spinner = ora({ text: `Fetching accounts from ${propfirmName}...`, color: 'yellow' }).start();
-      
       try {
         const result = await conn.service.getTradingAccounts();
         if (result.success && result.accounts && result.accounts.length > 0) {
@@ -58,29 +53,21 @@ const showAccounts = async (service) => {
               service: conn.service 
             });
           });
-          spinner.succeed(`${propfirmName}: ${result.accounts.length} account(s)`);
-        } else {
-          spinner.warn(`${propfirmName}: No accounts found`);
         }
       } catch (e) {
-        spinner.fail(`${propfirmName}: Failed to fetch accounts`);
+        // Silent fail
       }
     }
 
-    // Step 3: Check if we have accounts
     if (allAccounts.length === 0) {
-      console.log(chalk.yellow('\n  No accounts found across all connections.'));
+      spinner.fail('No accounts found');
       await prompts.waitForEnter();
       return;
     }
 
-    // Step 4: Fetch additional data for each account (balance, P&L)
-    spinner = ora({ text: 'Loading account details...', color: 'yellow' }).start();
-    
-    let detailsLoaded = 0;
+    // Fetch additional data for each account
     for (const account of allAccounts) {
       try {
-        // Try to get fresh balance/P&L if available
         if (account.service && typeof account.service.getAccountBalance === 'function') {
           const balanceResult = await account.service.getAccountBalance(account.accountId);
           if (balanceResult.success) {
@@ -88,14 +75,11 @@ const showAccounts = async (service) => {
             account.profitAndLoss = balanceResult.profitAndLoss;
           }
         }
-        detailsLoaded++;
-        spinner.text = `Loading account details... (${detailsLoaded}/${allAccounts.length})`;
-      } catch (e) {
-        // Continue with existing data
-      }
+      } catch (e) {}
     }
     
-    spinner.succeed(`Loaded ${allAccounts.length} account(s)`);
+    spinner.stop();
+    console.clear();
     console.log();
 
     // Display accounts

package/src/pages/stats.js

@@ -17,8 +17,8 @@ const showStats = async (service) => {
   let spinner;
   
   try {
-    // Step 1: Get connections
-    spinner = ora({ text: 'Loading connections...', color: 'yellow' }).start();
+    // Single spinner for loading
+    spinner = ora({ text: 'Loading stats...', color: 'yellow' }).start();
     
     const allConns = connections.count() > 0 
       ? connections.getAll() 
@@ -29,14 +29,12 @@ const showStats = async (service) => {
       await prompts.waitForEnter();
       return;
     }
-    spinner.succeed(`Found ${allConns.length} connection(s)`);
 
-    // Step 2: Fetch accounts from each connection
+    // Fetch accounts from each connection
     let allAccountsData = [];
     
     for (const conn of allConns) {
       const propfirmName = conn.propfirm || conn.type || 'Unknown';
-      spinner = ora({ text: `Fetching accounts from ${propfirmName}...`, color: 'yellow' }).start();
       
       try {
         const result = await conn.service.getTradingAccounts();
@@ -48,17 +46,12 @@ const showStats = async (service) => {
               service: conn.service
             });
           });
-          spinner.succeed(`${propfirmName}: ${result.accounts.length} account(s)`);
-        } else {
-          spinner.warn(`${propfirmName}: No accounts`);
         }
-      } catch (e) {
-        spinner.fail(`${propfirmName}: Failed`);
-      }
+      } catch (e) {}
     }
     
     if (allAccountsData.length === 0) {
-      console.log(chalk.yellow('\n  No accounts found.'));
+      spinner.fail('No accounts found');
       await prompts.waitForEnter();
       return;
     }
@@ -76,12 +69,12 @@ const showStats = async (service) => {
     const activeAccounts = allAccountsData.filter(acc => acc.status === 0);
     
     if (activeAccounts.length === 0) {
-      console.log(chalk.yellow('\n  No active accounts found.'));
+      spinner.fail('No active accounts found');
       await prompts.waitForEnter();
       return;
     }
 
-    // Step 3: Collect stats for each account
+    // Collect stats for each account
     let totalBalance = 0;
     let totalPnL = 0;
     let totalStartingBalance = 0;
@@ -94,9 +87,6 @@ const showStats = async (service) => {
     for (let i = 0; i < activeAccounts.length; i++) {
       const account = activeAccounts[i];
       const svc = account.service;
-      const accName = String(account.accountId || account.accountName || `Account ${i+1}`).substring(0, 20);
-      
-      spinner = ora({ text: `Loading stats for ${accName}...`, color: 'yellow' }).start();
       
       try {
         // Balance
@@ -118,7 +108,6 @@ const showStats = async (service) => {
         }
         
         // Positions
-        spinner.text = `Loading positions for ${accName}...`;
         try {
           const posResult = await svc.getPositions(account.accountId);
           if (posResult.success && posResult.positions) {
@@ -127,7 +116,6 @@ const showStats = async (service) => {
         } catch (e) {}
         
         // Orders
-        spinner.text = `Loading orders for ${accName}...`;
         try {
           const ordResult = await svc.getOrders(account.accountId);
           if (ordResult.success && ordResult.orders) {
@@ -136,7 +124,6 @@ const showStats = async (service) => {
         } catch (e) {}
         
         // Lifetime stats
-        spinner.text = `Loading lifetime stats for ${accName}...`;
         if (typeof svc.getLifetimeStats === 'function') {
           try {
             const lifetimeResult = await svc.getLifetimeStats(account.accountId);
@@ -147,7 +134,6 @@ const showStats = async (service) => {
         }
         
         // Trade history
-        spinner.text = `Loading trade history for ${accName}...`;
         if (typeof svc.getTradeHistory === 'function') {
           try {
             const tradesResult = await svc.getTradeHistory(account.accountId, 30);
@@ -160,15 +146,10 @@ const showStats = async (service) => {
             }
           } catch (e) {}
         }
-        
-        spinner.succeed(`${accName}: Stats loaded`);
-      } catch (e) {
-        spinner.fail(`${accName}: Failed to load stats`);
-      }
+      } catch (e) {}
     }
 
     // Aggregate stats
-    spinner = ora({ text: 'Calculating metrics...', color: 'yellow' }).start();
     
     let stats = {
       totalTrades: 0, winningTrades: 0, losingTrades: 0,

package/src/utils/prompts.js

@@ -46,13 +46,13 @@ const prepareStdin = () => {
  * Native readline prompt
  */
 const nativePrompt = (message) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     try {
       prepareStdin();
       
       // Always create a fresh readline for each prompt to avoid state issues
       if (rl && !rl.closed) {
-        rl.close();
+        try { rl.close(); } catch (e) {}
         rl = null;
       }
       
@@ -62,18 +62,23 @@ const nativePrompt = (message) => {
         terminal: true
       });
       
-      // Handle readline close/error
-      rl.on('close', () => {
-        resolve('');
-      });
-      
-      rl.on('error', (err) => {
-        resolve('');
-      });
+      let answered = false;
       
       rl.question(message + ' ', (answer) => {
+        answered = true;
+        try { rl.close(); } catch (e) {}
+        rl = null;
         resolve(answer || '');
       });
+      
+      // Handle readline close (e.g., Ctrl+C)
+      rl.on('close', () => {
+        if (!answered) {
+          rl = null;
+          resolve('');
+        }
+      });
+      
     } catch (e) {
       resolve('');
     }