hedgequantx 2.9.162 → 2.9.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.9.162",
+  "version": "2.9.163",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/services/rithmic-broker/client.js

@@ -37,15 +37,20 @@ class RithmicBrokerClient extends EventEmitter {
     // Ensure daemon is running
     const daemonStatus = await manager.ensureRunning();
     if (!daemonStatus.success) {
-      return { success: false, error: daemonStatus.error || 'Failed to start daemon' };
+      const errorMsg = daemonStatus.error || 'Failed to start daemon';
+      return { success: false, error: `Daemon error: ${errorMsg}` };
     }
     
     return new Promise((resolve) => {
-      this.ws = new WebSocket(`ws://127.0.0.1:${BROKER_PORT}`);
+      try {
+        this.ws = new WebSocket(`ws://127.0.0.1:${BROKER_PORT}`);
+      } catch (err) {
+        return resolve({ success: false, error: `WebSocket create error: ${err.message}` });
+      }
       
       const timeout = setTimeout(() => {
         this.ws?.terminate();
-        resolve({ success: false, error: 'Connection timeout' });
+        resolve({ success: false, error: `Connection timeout (port ${BROKER_PORT})` });
       }, 5000);
       
       this.ws.on('open', () => {
@@ -64,7 +69,7 @@ class RithmicBrokerClient extends EventEmitter {
       this.ws.on('error', (err) => {
         clearTimeout(timeout);
         this.connected = false;
-        resolve({ success: false, error: err.message });
+        resolve({ success: false, error: `Daemon connection failed: ${err.message}` });
       });
     });
   }

package/src/services/rithmic-broker/daemon.js

@@ -67,16 +67,35 @@ class RithmicBrokerDaemon {
     
     if (!fs.existsSync(BROKER_DIR)) fs.mkdirSync(BROKER_DIR, { recursive: true });
     fs.writeFileSync(PID_FILE, String(process.pid));
+    log('INFO', 'Starting daemon...', { pid: process.pid });
     
     // Restore connections from state (with cached accounts - no API spam)
-    await this.reconnectManager.restoreConnections(STATE_FILE);
+    try {
+      await this.reconnectManager.restoreConnections(STATE_FILE);
+    } catch (e) {
+      log('WARN', 'Failed to restore connections', { error: e.message });
+    }
+    
+    // Create WebSocket server with proper error handling
+    try {
+      this.wss = new WebSocket.Server({ port: BROKER_PORT, host: '127.0.0.1' });
+    } catch (e) {
+      log('ERROR', 'Failed to create WebSocket server', { error: e.message, port: BROKER_PORT });
+      throw e;
+    }
+    
+    // Wait for server to be listening
+    await new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => reject(new Error('WSS listen timeout')), 5000);
+      this.wss.on('listening', () => { clearTimeout(timeout); resolve(); });
+      this.wss.on('error', (err) => { clearTimeout(timeout); reject(err); });
+    });
     
-    this.wss = new WebSocket.Server({ port: BROKER_PORT, host: '127.0.0.1' });
     this.wss.on('connection', (ws) => this._handleClient(ws));
     this.wss.on('error', (err) => log('ERROR', 'WSS error', { error: err.message }));
     
     this.running = true;
-    log('INFO', 'Daemon started', { pid: process.pid, port: BROKER_PORT });
+    log('INFO', 'Daemon started successfully', { pid: process.pid, port: BROKER_PORT });
     
     // Save state on ANY termination signal
     const gracefulShutdown = (signal) => {
@@ -392,8 +411,31 @@ class RithmicBrokerDaemon {
 
 // Main entry point
 if (require.main === module) {
-  const daemon = new RithmicBrokerDaemon();
-  daemon.start().catch((e) => { console.error('Daemon failed:', e.message); process.exit(1); });
+  // Ensure log directory exists early
+  if (!fs.existsSync(BROKER_DIR)) {
+    fs.mkdirSync(BROKER_DIR, { recursive: true });
+  }
+  
+  // Log startup attempt
+  const startupLog = (msg) => {
+    const ts = new Date().toISOString();
+    fs.appendFileSync(LOG_FILE, `[${ts}] [STARTUP] ${msg}\n`);
+  };
+  
+  startupLog(`Daemon starting (pid=${process.pid}, node=${process.version})`);
+  
+  try {
+    const daemon = new RithmicBrokerDaemon();
+    daemon.start().catch((e) => { 
+      startupLog(`FATAL: start() failed - ${e.message}`);
+      console.error('Daemon failed:', e.message); 
+      process.exit(1); 
+    });
+  } catch (e) {
+    startupLog(`FATAL: constructor failed - ${e.message}`);
+    console.error('Daemon failed:', e.message);
+    process.exit(1);
+  }
 }
 
 module.exports = { RithmicBrokerDaemon, BROKER_PORT, BROKER_DIR, PID_FILE, LOG_FILE, STATE_FILE };

package/src/services/rithmic-broker/manager.js

@@ -86,21 +86,29 @@ const start = async () => {
     child.unref();
     fs.closeSync(logFd);
     
-    // Wait for daemon to start
-    await new Promise(r => setTimeout(r, 2000));
+    // Wait for daemon to start (poll every 500ms, max 5s)
+    let attempts = 0;
+    const maxAttempts = 10;
+    let runStatus = { running: false, pid: null };
     
-    const runStatus = await isRunning();
-    if (runStatus.running) {
-      return { success: true, error: null, pid: runStatus.pid || child.pid };
-    } else {
-      // Read log for error details
-      let errorDetail = 'Failed to start RithmicBroker daemon';
-      if (fs.existsSync(LOG_FILE)) {
-        const log = fs.readFileSync(LOG_FILE, 'utf8').slice(-500);
-        if (log) errorDetail += `: ${log.split('\n').filter(l => l).pop()}`;
+    while (attempts < maxAttempts) {
+      await new Promise(r => setTimeout(r, 500));
+      runStatus = await isRunning();
+      if (runStatus.running) {
+        return { success: true, error: null, pid: runStatus.pid || child.pid };
       }
-      return { success: false, error: errorDetail, pid: null };
+      attempts++;
     }
+    
+    // Read log for error details
+    let errorDetail = 'Daemon failed to start';
+    if (fs.existsSync(LOG_FILE)) {
+      const logContent = fs.readFileSync(LOG_FILE, 'utf8');
+      const lines = logContent.split('\n').filter(l => l.trim());
+      const lastLines = lines.slice(-5).join(' | ');
+      if (lastLines) errorDetail += ` - Log: ${lastLines}`;
+    }
+    return { success: false, error: errorDetail, pid: null };
   } catch (error) {
     return { success: false, error: error.message, pid: null };
   }