hedgequantx 1.7.8 → 1.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "description": "Prop Futures Algo Trading CLI - Connect to Topstep, Alpha Futures, and other prop firms",
   "main": "src/app.js",
   "bin": {
@@ -45,6 +45,7 @@
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
     "figlet": "^1.7.0",
+    "inquirer": "^8.2.7",
     "ora": "^5.4.1",
     "protobufjs": "^8.0.0",
     "ws": "^8.18.3"

package/src/utils/prompts.js

@@ -1,195 +1,127 @@
 /**
- * Centralized prompts utility - lightweight, no external UI
- * Uses readline for simple input, keeps our custom box design
+ * Centralized prompts utility
+ * Uses inquirer for reliable stdin handling
  */
 
-const readline = require('readline');
+const inquirer = require('inquirer');
 
 /**
- * Create readline interface
+ * Ensure stdin is ready
  */
-const createRL = () => readline.createInterface({ 
-  input: process.stdin, 
-  output: process.stdout 
-});
+const prepareStdin = () => {
+  try {
+    if (process.stdin.isPaused()) process.stdin.resume();
+    if (process.stdin.isTTY && process.stdin.isRaw) process.stdin.setRawMode(false);
+  } catch (e) {}
+};
 
 /**
- * Wait for Enter key
+ * Wait for Enter
  */
-const waitForEnter = (message = 'Press Enter to continue...') => new Promise(resolve => {
-  const rl = createRL();
-  rl.question(message, () => { rl.close(); resolve(); });
-});
+const waitForEnter = async (message = 'Press Enter to continue...') => {
+  prepareStdin();
+  await inquirer.prompt([{ type: 'input', name: '_', message, prefix: '' }]);
+};
 
 /**
- * Simple text input
+ * Text input
  */
-const textInput = (message, defaultVal = '') => new Promise(resolve => {
-  const rl = createRL();
-  const prompt = defaultVal ? `${message} (${defaultVal}): ` : `${message}: `;
-  rl.question(prompt, (answer) => {
-    rl.close();
-    resolve(answer.trim() || defaultVal);
-  });
-});
+const textInput = async (message, defaultVal = '') => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'input',
+    name: 'value',
+    message,
+    default: defaultVal,
+    prefix: ''
+  }]);
+  return value;
+};
 
 /**
- * Password input (hidden)
+ * Password input
  */
-const passwordInput = (message) => new Promise(resolve => {
-  const rl = createRL();
-  process.stdout.write(`${message}: `);
-  
-  if (process.stdin.isTTY) {
-    process.stdin.setRawMode(true);
-  }
-  
-  let password = '';
-  const onData = (char) => {
-    char = char.toString();
-    
-    if (char === '\n' || char === '\r') {
-      if (process.stdin.isTTY) process.stdin.setRawMode(false);
-      process.stdin.removeListener('data', onData);
-      console.log();
-      rl.close();
-      resolve(password);
-    } else if (char === '\u0003') { // Ctrl+C
-      if (process.stdin.isTTY) process.stdin.setRawMode(false);
-      process.stdin.removeListener('data', onData);
-      rl.close();
-      resolve(null);
-    } else if (char === '\u007F' || char === '\b') { // Backspace
-      if (password.length > 0) {
-        password = password.slice(0, -1);
-        process.stdout.write('\b \b');
-      }
-    } else {
-      password += char;
-      process.stdout.write('*');
-    }
-  };
-  
-  process.stdin.on('data', onData);
-  process.stdin.resume();
-});
+const passwordInput = async (message) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'password',
+    name: 'value',
+    message,
+    mask: '*',
+    prefix: ''
+  }]);
+  return value;
+};
 
 /**
- * Select from options using arrow keys
+ * Confirm Y/n
  */
-const selectOption = (message, options) => new Promise(resolve => {
-  if (!process.stdin.isTTY) {
-    // Fallback for non-TTY
-    const rl = createRL();
-    console.log(message);
-    options.forEach((opt, i) => console.log(`  ${i + 1}. ${opt.label}`));
-    rl.question('Enter number: ', (answer) => {
-      rl.close();
-      const idx = parseInt(answer) - 1;
-      resolve(options[idx]?.value || null);
-    });
-    return;
-  }
-  
-  let selectedIndex = 0;
-  const maxIndex = options.length - 1;
-  
-  const render = () => {
-    // Move cursor up and clear lines
-    if (selectedIndex > 0 || options.length > 1) {
-      process.stdout.write(`\x1B[${options.length}A`);
-    }
-    
-    options.forEach((opt, i) => {
-      const prefix = i === selectedIndex ? '› ' : '  ';
-      const style = i === selectedIndex ? '\x1B[36m' : '\x1B[90m'; // cyan : gray
-      process.stdout.write(`\x1B[2K${style}${prefix}${opt.label}\x1B[0m\n`);
-    });
-  };
-  
-  // Initial render
-  console.log(`\x1B[36m${message}\x1B[0m`);
-  options.forEach((opt, i) => {
-    const prefix = i === selectedIndex ? '› ' : '  ';
-    const style = i === selectedIndex ? '\x1B[36m' : '\x1B[90m';
-    console.log(`${style}${prefix}${opt.label}\x1B[0m`);
-  });
-  
-  readline.emitKeypressEvents(process.stdin);
-  process.stdin.setRawMode(true);
-  process.stdin.resume();
-  
-  const onKeypress = (str, key) => {
-    if (key.name === 'up' || key.name === 'k') {
-      selectedIndex = selectedIndex > 0 ? selectedIndex - 1 : maxIndex;
-      render();
-    } else if (key.name === 'down' || key.name === 'j') {
-      selectedIndex = selectedIndex < maxIndex ? selectedIndex + 1 : 0;
-      render();
-    } else if (key.name === 'return') {
-      cleanup();
-      resolve(options[selectedIndex].value);
-    } else if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
-      cleanup();
-      resolve(null);
-    } else if (str >= '1' && str <= '9') {
-      const idx = parseInt(str) - 1;
-      if (idx <= maxIndex) {
-        cleanup();
-        resolve(options[idx].value);
-      }
-    }
-  };
-  
-  const cleanup = () => {
-    process.stdin.removeListener('keypress', onKeypress);
-    if (process.stdin.isTTY) process.stdin.setRawMode(false);
-    // Clear the menu display
-    process.stdout.write(`\x1B[${options.length + 1}A`);
-    for (let i = 0; i <= options.length; i++) {
-      process.stdout.write('\x1B[2K\n');
-    }
-    process.stdout.write(`\x1B[${options.length + 1}A`);
-  };
-  
-  process.stdin.on('keypress', onKeypress);
-});
+const confirmPrompt = async (message, defaultVal = true) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'value',
+    message,
+    default: defaultVal,
+    prefix: ''
+  }]);
+  return value;
+};
 
 /**
- * Confirm yes/no
+ * Number input
  */
-const confirmPrompt = (message, defaultVal = true) => new Promise(resolve => {
-  const rl = createRL();
-  const hint = defaultVal ? '(Y/n)' : '(y/N)';
-  rl.question(`${message} ${hint}: `, (answer) => {
-    rl.close();
-    const a = answer.toLowerCase().trim();
-    if (a === '') resolve(defaultVal);
-    else if (a === 'y' || a === 'yes') resolve(true);
-    else if (a === 'n' || a === 'no') resolve(false);
-    else resolve(defaultVal);
-  });
-});
+const numberInput = async (message, defaultVal = 1, min = 1, max = 1000) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'input',
+    name: 'value',
+    message,
+    default: String(defaultVal),
+    prefix: '',
+    validate: (v) => {
+      const n = parseInt(v);
+      if (isNaN(n)) return 'Enter a number';
+      if (n < min) return `Min: ${min}`;
+      if (n > max) return `Max: ${max}`;
+      return true;
+    }
+  }]);
+  return parseInt(value) || defaultVal;
+};
 
 /**
- * Number input
+ * Select - just text input, map to value
  */
-const numberInput = (message, defaultVal = 1, min = 1, max = 1000) => new Promise(resolve => {
-  const rl = createRL();
-  rl.question(`${message} (${defaultVal}): `, (answer) => {
-    rl.close();
-    const n = parseInt(answer) || defaultVal;
-    if (n < min) resolve(min);
-    else if (n > max) resolve(max);
-    else resolve(n);
-  });
-});
+const selectOption = async (message, options) => {
+  prepareStdin();
+  const { value } = await inquirer.prompt([{
+    type: 'input',
+    name: 'value',
+    message,
+    prefix: ''
+  }]);
+  
+  const input = (value || '').toLowerCase().trim();
+  
+  // Find by value
+  for (const opt of options) {
+    if (String(opt.value).toLowerCase() === input) return opt.value;
+  }
+  
+  // Find by index (1-based)
+  const idx = parseInt(input) - 1;
+  if (idx >= 0 && idx < options.length) return options[idx].value;
+  
+  return null;
+};
 
 module.exports = {
+  prepareStdin,
   waitForEnter,
-  selectOption,
   textInput,
   passwordInput,
   confirmPrompt,
-  numberInput
+  numberInput,
+  selectOption
 };