hedgequantx 1.3.0 → 1.3.2

package/README.md

@@ -11,7 +11,7 @@
 
 **Prop Futures Algo Trading CLI**
 
-A powerful command-line interface for connecting to prop trading firms and managing your futures trading accounts.
+A powerful command-line interface for connecting to prop trading firms and managing your futures trading accounts with automated algo trading capabilities.
 
 [![npm version](https://img.shields.io/npm/v/hedgequantx.svg)](https://www.npmjs.com/package/hedgequantx)
 [![npm downloads](https://img.shields.io/npm/dm/hedgequantx.svg)](https://www.npmjs.com/package/hedgequantx)
@@ -20,12 +20,14 @@ A powerful command-line interface for connecting to prop trading firms and manag
 
 ## Features
 
-- Multi-platform support (ProjectX, Tradovate, Rithmic)
-- 37 supported prop firms
-- Multi-account connections
-- Real-time stats (balance, P&L, positions)
-- Secure encrypted session storage
-- Auto-update with restart
+- **Multi-platform support** - ProjectX, Rithmic, Tradovate
+- **37+ supported prop firms**
+- **Multi-account connections** - Connect multiple accounts simultaneously
+- **Real-time stats** - Balance, P&L, positions, orders
+- **Algo Trading** - One Account & Copy Trading modes
+- **HQX Server** - Cloud-based execution engine
+- **Secure sessions** - AES-256-GCM encrypted storage
+- **Auto-update** - Built-in update with restart
 
 ---
 
@@ -63,11 +65,33 @@ hedgequantx version
 
 ---
 
-## Supported Prop Firms (37)
+## Algo Trading Modes
+
+### One Account Mode
+Trade on a single account with automated signals and risk management.
+
+- Symbol selection (ES, NQ, MNQ, etc.)
+- Configurable contracts quantity
+- Daily target and max risk limits
+- Real-time P&L tracking
+- Activity log with trade history
+
+### Copy Trading Mode
+Mirror trades from a Lead account to Follower accounts.
+
+- Lead -> Follower trade copying
+- Different symbols per account
+- Configurable contract ratios
+- Privacy mode (hide account names)
+- Low-latency execution via HQX Server
+
+---
+
+## Supported Prop Firms (37+)
 
 | ProjectX (19) | Rithmic (16) | Tradovate (2) |
 |---------------|--------------|---------------|
-| TopStep | Apex | Apex |
+| TopStep | Apex Trader Funding | Apex |
 | Alpha Futures | TopstepTrader | TakeProfitTrader |
 | TickTickTrader | MES Capital | |
 | Bulenox | Bulenox | |
@@ -87,51 +111,46 @@ hedgequantx version
 | Lucid Trading | | |
 | Tradeify | | |
 
-> **Note:** ProjectX firms are fully supported. Rithmic and Tradovate coming soon.
-
 ---
 
 ## Dashboard Features
 
 - **View Accounts** - List all trading accounts with balance and status
-- **View Positions** - Open positions with P&L
-- **View Orders** - Pending and filled orders
 - **View Stats** - Trading metrics, equity curve, P&L calendar
-- **User Info** - Account details
 - **Add Prop-Account** - Connect multiple prop firms
-- **Algo-Trading** - Automated trading (coming soon)
-- **Update HQX** - Auto-update with restart
+- **Algo-Trading** - One Account & Copy Trading modes
+- **Update HQX** - Auto-update with confirmation and restart
 
 ---
 
 ## Screenshots
 
+### Main Dashboard
 ```
-╔══════════════════════════════════════════════════════════════════════════════════════════════╗
-║██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗██╗  ██╗║
-║██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝╚██╗██╔╝║
-║███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║    ╚███╔╝ ║
-║██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║    ██╔██╗ ║
-║██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ██╔╝ ██╗║
-║╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ╚═╝  ╚═╝║
-╠══════════════════════════════════════════════════════════════════════════════════════════════╣
-║                              Prop Futures Algo Trading  v1.2.0                               ║
-╠══════════════════════════════════════════════════════════════════════════════════════════════╣
-║         Connections: 1    Accounts: 2    Balance: $299,776    P&L: $-223 (-0.1%)             ║
-╚══════════════════════════════════════════════════════════════════════════════════════════════╝
-
-? Dashboard:
-  > View Accounts
-    View Positions
-    View Orders
-    View Stats
-    User Info
-    Add Prop-Account
-    ──────────────
-    Algo-Trading
-    ──────────────
-    Update HQX
-    Disconnect
+╔════════════════════════════════════════════════════════════════════════════════════════════════╗
+║ ██╗  ██╗███████╗██████╗  ██████╗ ███████╗ ██████╗ ██╗   ██╗ █████╗ ███╗   ██╗████████╗██╗  ██╗ ║
+║ ██║  ██║██╔════╝██╔══██╗██╔════╝ ██╔════╝██╔═══██╗██║   ██║██╔══██╗████╗  ██║╚══██╔══╝╚██╗██╔╝ ║
+║ ███████║█████╗  ██║  ██║██║  ███╗█████╗  ██║   ██║██║   ██║███████║██╔██╗ ██║   ██║    ╚███╔╝  ║
+║ ██╔══██║██╔══╝  ██║  ██║██║   ██║██╔══╝  ██║▄▄ ██║██║   ██║██╔══██║██║╚██╗██║   ██║    ██╔██╗  ║
+║ ██║  ██║███████╗██████╔╝╚██████╔╝███████╗╚██████╔╝╚██████╔╝██║  ██║██║ ╚████║   ██║   ██╔╝ ██╗ ║
+║ ╚═╝  ╚═╝╚══════╝╚═════╝  ╚═════╝ ╚══════╝ ╚══▀▀═╝  ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═══╝   ╚═╝   ╚═╝  ╚═╝ ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║                                Prop Futures Algo Trading  v1.3.0                               ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║         Connections: 2    Accounts: 3    Balance: $601,526    P&L: +$1,526 (+0.3%)             ║
+╚════════════════════════════════════════════════════════════════════════════════════════════════╝
+
+╔════════════════════════════════════════════════════════════════════════════════════════════════╗
+║                                      Welcome, HQX Trader!                                      ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║ ┌────────────────────────────────────────────┐  ┌────────────────────────────────────────────┐ ║
+║ │                  TopStep                   │  │            Apex Trader Funding             │ ║
+║ └────────────────────────────────────────────┘  └────────────────────────────────────────────┘ ║
+╠════════════════════════════════════════════════════════════════════════════════════════════════╣
+║  [1] View Accounts                               [2] View Stats                                ║
+║  [+] Add Prop-Account                            [A] Algo-Trading                              ║
+║  [U] Update HQX                                  [X] Disconnect                                ║
+╚════════════════════════════════════════════════════════════════════════════════════════════════╝
 ```
 
 ---
@@ -141,27 +160,32 @@ hedgequantx version
 ```
 HQX-CLI/
 ├── bin/
-│   └── cli.js                # Entry point
+│   └── cli.js                  # Entry point
 ├── src/
-│   ├── app.js                # Main router
+│   ├── app.js                  # Main router (380 lines)
 │   ├── config/
-│   │   ├── index.js
-│   │   ├── constants.js
-│   │   └── propfirms.js      # 37 PropFirms config
+│   │   ├── constants.js        # Futures symbols
+│   │   └── propfirms.js        # 37+ PropFirms config
+│   ├── menus/
+│   │   ├── connect.js          # Connection menus
+│   │   └── dashboard.js        # Dashboard & update
 │   ├── pages/
+│   │   ├── algo/
+│   │   │   ├── ui.js           # Algo trading UI
+│   │   │   ├── one-account.js  # One Account mode
+│   │   │   └── copy-trading.js # Copy Trading mode
 │   │   ├── accounts.js
-│   │   ├── orders.js
-│   │   ├── positions.js
-│   │   ├── stats.js
-│   │   └── user.js
+│   │   └── stats.js
 │   ├── security/
-│   │   ├── encryption.js     # AES-256-GCM
-│   │   ├── validation.js     # Input sanitization
-│   │   └── rateLimit.js      # API rate limiting
+│   │   ├── encryption.js       # AES-256-GCM
+│   │   ├── validation.js       # Input sanitization
+│   │   └── rateLimit.js        # API rate limiting
 │   ├── services/
-│   │   ├── projectx.js       # ProjectX API
-│   │   ├── session.js        # Encrypted sessions
-│   │   └── hqx-server.js     # HQX Server API
+│   │   ├── projectx/           # ProjectX API
+│   │   ├── rithmic/            # Rithmic API
+│   │   ├── tradovate/          # Tradovate API
+│   │   ├── hqx-server.js       # HQX Server API
+│   │   └── session.js          # Encrypted sessions
 │   └── ui/
 │       ├── box.js
 │       ├── table.js
@@ -179,6 +203,7 @@ HQX-CLI/
 - Input validation and sanitization
 - API rate limiting
 - Secure file permissions (0600)
+- No credentials stored in plain text
 
 ---
 
@@ -186,34 +211,53 @@ HQX-CLI/
 
 The CLI has a built-in update feature:
 
-1. Select **Update HQX** from the dashboard
-2. CLI pulls latest changes from GitHub
-3. Installs dependencies
-4. Auto-restarts with new version
+1. Select **[U] Update HQX** from the dashboard
+2. CLI checks npm registry for latest version
+3. Prompts for confirmation before updating
+4. Installs new version globally
+5. Auto-restarts with new version
 
 Or manually:
 
 ```bash
-cd ~/HQX-CLI && git pull origin main
+npm install -g hedgequantx@latest
 ```
 
 ---
 
+## Changelog
+
+### v1.3.0
+- Major refactoring for maintainability
+- Robust update function with confirmation
+- Fixed stdin leak in menus
+- Split services into modules
+- Algo UI: logs now show newest at bottom
+
+### v1.2.x
+- Algo Trading: One Account & Copy Trading modes
+- HQX Server integration
+- Rithmic full support
+- Multi-account dashboard
+- Privacy mode for account names
+
+---
+
 ## Roadmap
 
 - [x] ProjectX integration
-- [x] Multi-propfirm support (37 firms)
-- [x] Account viewing
-- [x] Position viewing
-- [x] Order viewing
+- [x] Rithmic integration
+- [x] Multi-propfirm support (37+ firms)
+- [x] Multi-account connections
 - [x] Stats with equity curve
 - [x] Encrypted sessions
-- [x] Multi-account connections
-- [ ] Rithmic integration
-- [ ] Tradovate integration
-- [ ] Algo trading engine
-- [ ] Real-time market data
-- [ ] Order placement
+- [x] Algo Trading - One Account mode
+- [x] Algo Trading - Copy Trading mode
+- [x] HQX Server integration
+- [ ] Tradovate full integration
+- [ ] Real-time market data streaming
+- [ ] Advanced order types
+- [ ] Mobile companion app
 
 ---
 

package/package.json

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

package/src/services/index.js

@@ -3,7 +3,7 @@
  * @module services
  */
 
-const { ProjectXService } = require('./projectx');
+const { ProjectXService } = require('./projectx/index');
 const { storage, connections } = require('./session');
 
 module.exports = {

package/src/services/projectx/index.js

@@ -0,0 +1,345 @@
+/**
+ * ProjectX API Service
+ * Main service for ProjectX prop firm connections
+ */
+
+const https = require('https');
+const { PROPFIRMS } = require('../../config');
+const { 
+  validateUsername, 
+  validatePassword, 
+  validateApiKey,
+  validateAccountId,
+  sanitizeString,
+  maskSensitive 
+} = require('../../security');
+const { getLimiter } = require('../../security/rateLimit');
+const { getMarketHolidays, checkHoliday, checkMarketHours } = require('./market');
+const { calculateLifetimeStats, calculateDailyPnL, formatTrades } = require('./stats');
+
+class ProjectXService {
+  constructor(propfirmKey = 'topstep') {
+    this.propfirm = PROPFIRMS[propfirmKey] || PROPFIRMS.topstep;
+    this.propfirmKey = propfirmKey;
+    this.token = null;
+    this.user = null;
+    this.rateLimiter = getLimiter('api');
+    this.loginLimiter = getLimiter('login');
+    this.orderLimiter = getLimiter('orders');
+  }
+
+  getToken() { return this.token; }
+  getPropfirm() { return this.propfirmKey; }
+
+  // ==================== HTTP ====================
+
+  async _request(host, path, method = 'GET', data = null, limiterType = 'api') {
+    const limiter = limiterType === 'login' ? this.loginLimiter : 
+                    limiterType === 'orders' ? this.orderLimiter : this.rateLimiter;
+    return limiter.execute(() => this._doRequest(host, path, method, data));
+  }
+
+  async _doRequest(host, path, method, data) {
+    return new Promise((resolve, reject) => {
+      const options = {
+        hostname: host,
+        port: 443,
+        path: path,
+        method: method,
+        headers: {
+          'Content-Type': 'application/json',
+          'Accept': 'application/json',
+          'User-Agent': 'HedgeQuantX-CLI/1.3.0'
+        },
+        timeout: 15000
+      };
+
+      if (this.token) {
+        options.headers['Authorization'] = `Bearer ${this.token}`;
+      }
+
+      const req = https.request(options, (res) => {
+        let body = '';
+        res.on('data', chunk => body += chunk);
+        res.on('end', () => {
+          try {
+            resolve({ statusCode: res.statusCode, data: JSON.parse(body) });
+          } catch (e) {
+            resolve({ statusCode: res.statusCode, data: body });
+          }
+        });
+      });
+
+      req.on('error', reject);
+      req.on('timeout', () => { req.destroy(); reject(new Error('Request timeout')); });
+      if (data) req.write(JSON.stringify(data));
+      req.end();
+    });
+  }
+
+  // ==================== AUTH ====================
+
+  async login(userName, password) {
+    try {
+      validateUsername(userName);
+      validatePassword(password);
+      
+      const response = await this._request(
+        this.propfirm.userApi, '/Login', 'POST',
+        { userName: sanitizeString(userName), password },
+        'login'
+      );
+      
+      if (response.statusCode === 200 && response.data.token) {
+        this.token = response.data.token;
+        return { success: true, token: maskSensitive(this.token) };
+      }
+      
+      return { success: false, error: response.data.errorMessage || 'Invalid credentials' };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  async loginWithApiKey(userName, apiKey) {
+    try {
+      validateUsername(userName);
+      validateApiKey(apiKey);
+      
+      const response = await this._request(
+        this.propfirm.userApi, '/Login/key', 'POST',
+        { userName: sanitizeString(userName), apiKey },
+        'login'
+      );
+      
+      if (response.statusCode === 200 && response.data.token) {
+        this.token = response.data.token;
+        return { success: true, token: maskSensitive(this.token) };
+      }
+      
+      return { success: false, error: response.data.errorMessage || 'Invalid API key' };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  logout() {
+    this.token = null;
+    this.user = null;
+  }
+
+  // ==================== USER ====================
+
+  async getUser() {
+    try {
+      const response = await this._request(this.propfirm.userApi, '/User', 'GET');
+      if (response.statusCode === 200) {
+        this.user = response.data;
+        return { success: true, user: response.data };
+      }
+      return { success: false, error: 'Failed to get user info' };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  // ==================== ACCOUNTS ====================
+
+  async getTradingAccounts() {
+    try {
+      const response = await this._request(this.propfirm.userApi, '/TradingAccount', 'GET');
+      if (response.statusCode === 200) {
+        return { success: true, accounts: Array.isArray(response.data) ? response.data : [] };
+      }
+      return { success: false, accounts: [], error: 'Failed to get accounts' };
+    } catch (error) {
+      return { success: false, accounts: [], error: error.message };
+    }
+  }
+
+  // ==================== TRADING ====================
+
+  async getPositions(accountId) {
+    try {
+      const id = validateAccountId(accountId);
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Position/searchOpen', 'POST', { accountId: id }
+      );
+      if (response.statusCode === 200) {
+        const positions = response.data.positions || response.data || [];
+        return { success: true, positions: Array.isArray(positions) ? positions : [] };
+      }
+      return { success: true, positions: [] };
+    } catch (error) {
+      return { success: true, positions: [], error: error.message };
+    }
+  }
+
+  async getOrders(accountId) {
+    try {
+      const id = validateAccountId(accountId);
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Order/searchOpen', 'POST', { accountId: id }
+      );
+      if (response.statusCode === 200) {
+        const orders = response.data.orders || response.data || [];
+        return { success: true, orders: Array.isArray(orders) ? orders : [] };
+      }
+      return { success: true, orders: [] };
+    } catch (error) {
+      return { success: true, orders: [], error: error.message };
+    }
+  }
+
+  async placeOrder(orderData) {
+    try {
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Order/place', 'POST', orderData, 'orders'
+      );
+      if (response.statusCode === 200 && response.data.success) {
+        return { success: true, order: response.data };
+      }
+      return { success: false, error: response.data.errorMessage || 'Order failed' };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  async cancelOrder(orderId) {
+    try {
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Order/cancel', 'POST',
+        { orderId: parseInt(orderId, 10) }, 'orders'
+      );
+      return { success: response.statusCode === 200 && response.data.success };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  async cancelAllOrders(accountId) {
+    try {
+      const id = validateAccountId(accountId);
+      const ordersResult = await this.getOrders(id);
+      if (!ordersResult.success || !ordersResult.orders) {
+        return { success: true, cancelled: 0 };
+      }
+      
+      const pendingOrders = ordersResult.orders.filter(o => 
+        o.status === 'Working' || o.status === 'Pending' || o.status === 0 || o.status === 1
+      );
+      
+      let cancelled = 0;
+      for (const order of pendingOrders) {
+        const result = await this.cancelOrder(order.orderId || order.id);
+        if (result.success) cancelled++;
+      }
+      
+      return { success: true, cancelled };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  async closePosition(accountId, contractId) {
+    try {
+      const id = validateAccountId(accountId);
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Position/closeContract', 'POST',
+        { accountId: id, contractId }, 'orders'
+      );
+      return { success: response.statusCode === 200 && response.data.success };
+    } catch (error) {
+      return { success: false, error: error.message };
+    }
+  }
+
+  // ==================== TRADES & STATS ====================
+
+  async getTradeHistory(accountId, days = 30) {
+    try {
+      const id = validateAccountId(accountId);
+      const endDate = new Date();
+      const startDate = new Date();
+      startDate.setDate(startDate.getDate() - days);
+
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Trade/search', 'POST',
+        { accountId: id, startTimestamp: startDate.toISOString(), endTimestamp: endDate.toISOString() }
+      );
+
+      if (response.statusCode === 200 && response.data) {
+        let trades = Array.isArray(response.data) ? response.data : (response.data.trades || []);
+        return { success: true, trades: formatTrades(trades) };
+      }
+
+      return { success: true, trades: [] };
+    } catch (error) {
+      return { success: true, trades: [], error: error.message };
+    }
+  }
+
+  async getDailyStats(accountId) {
+    try {
+      const id = validateAccountId(accountId);
+      const now = new Date();
+      const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Trade/search', 'POST',
+        { accountId: id, startTimestamp: startOfMonth.toISOString(), endTimestamp: now.toISOString() }
+      );
+
+      if (response.statusCode === 200 && response.data) {
+        let trades = Array.isArray(response.data) ? response.data : (response.data.trades || []);
+        return { success: true, stats: calculateDailyPnL(trades) };
+      }
+
+      return { success: false, stats: [] };
+    } catch (error) {
+      return { success: false, stats: [], error: error.message };
+    }
+  }
+
+  async getLifetimeStats(accountId) {
+    try {
+      const tradesResult = await this.getTradeHistory(accountId, 90);
+      if (!tradesResult.success || tradesResult.trades.length === 0) {
+        return { success: true, stats: null };
+      }
+      return { success: true, stats: calculateLifetimeStats(tradesResult.trades) };
+    } catch (error) {
+      return { success: false, stats: null, error: error.message };
+    }
+  }
+
+  // ==================== CONTRACTS ====================
+
+  async searchContracts(searchText) {
+    try {
+      const response = await this._request(
+        this.propfirm.gatewayApi, '/api/Contract/search', 'POST',
+        { searchText: sanitizeString(searchText), live: false }
+      );
+      if (response.statusCode === 200) {
+        return { success: true, contracts: response.data.contracts || response.data || [] };
+      }
+      return { success: false, contracts: [] };
+    } catch (error) {
+      return { success: false, contracts: [], error: error.message };
+    }
+  }
+
+  // ==================== MARKET STATUS ====================
+
+  getMarketHolidays() { return getMarketHolidays(); }
+  checkHoliday() { return checkHoliday(); }
+  checkMarketHours() { return checkMarketHours(); }
+
+  async getMarketStatus(accountId) {
+    const hours = checkMarketHours();
+    return { success: true, isOpen: hours.isOpen, message: hours.message };
+  }
+}
+
+module.exports = { ProjectXService };