hedgequantx 1.2.36 → 1.2.38

package/package.json

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

package/src/services/rithmic/index.js

@@ -70,21 +70,22 @@ class RithmicService extends EventEmitter {
       // Login
       return new Promise((resolve, reject) => {
         const timeout = setTimeout(() => {
-          reject(new Error('Login timeout'));
-        }, 15000);
+          resolve({ success: false, error: 'Login timeout - server did not respond' });
+        }, 30000);
 
         this.orderConn.once('loggedIn', async (data) => {
           clearTimeout(timeout);
           this.loginInfo = data;
-          this.user = { userName: username };
+          this.user = { userName: username, fcmId: data.fcmId, ibId: data.ibId };
           
+          // Try to get accounts but don't fail if it doesn't work
           try {
-            // Get accounts
             await this.fetchAccounts();
-            resolve({ success: true });
           } catch (e) {
-            resolve({ success: false, error: e.message });
+            // Accounts fetch failed, but login succeeded
+            console.log('Note: Could not fetch accounts');
           }
+          resolve({ success: true });
         });
 
         this.orderConn.once('loginFailed', (data) => {
@@ -215,7 +216,7 @@ class RithmicService extends EventEmitter {
       await this.fetchAccounts();
     }
 
-    const tradingAccounts = this.accounts.map((acc, index) => {
+    let tradingAccounts = this.accounts.map((acc, index) => {
       const pnl = this.accountPnL.get(acc.accountId) || {};
       const balance = parseFloat(pnl.accountBalance || pnl.marginBalance || pnl.cashOnHand || 0) || this.propfirm.defaultBalance;
       const startingBalance = this.propfirm.defaultBalance;
@@ -235,6 +236,23 @@ class RithmicService extends EventEmitter {
       };
     });
 
+    // If no accounts but user is logged in, create a default account from login info
+    if (tradingAccounts.length === 0 && this.user) {
+      const userName = this.user.userName || 'Unknown';
+      tradingAccounts = [{
+        accountId: this.hashAccountId(userName),
+        rithmicAccountId: userName,
+        accountName: userName,
+        name: userName,
+        balance: this.propfirm.defaultBalance,
+        startingBalance: this.propfirm.defaultBalance,
+        profitAndLoss: 0,
+        status: 0, // Active
+        platform: 'Rithmic',
+        propfirm: this.propfirm.name,
+      }];
+    }
+
     return { success: true, accounts: tradingAccounts };
   }