hedgequantx 2.6.161 → 2.6.163

package/src/services/tradovate/index.js

@@ -13,6 +13,7 @@ const { TIMEOUTS } = require('../../config/settings');
 const { TRADOVATE_URLS, API_PATHS, getBaseUrl, getTradingWebSocketUrl } = require('./constants');
 const { checkMarketHours, isDST } = require('./market');
 const { connectWebSocket, wsSend, disconnectWebSocket } = require('./websocket');
+const { getOrders, placeOrder, cancelOrder, closePosition, getOrderHistory } = require('./orders');
 const { logger } = require('../../utils/logger');
 
 const log = logger.scope('Tradovate');
@@ -252,112 +253,10 @@ class TradovateService extends EventEmitter {
 
   // ==================== ORDERS ====================
 
-  /**
-   * Get orders
-   * @param {number} [accountId] - Optional account filter
-   * @returns {Promise<{success: boolean, orders: Array, error?: string}>}
-   */
-  async getOrders(accountId) {
-    try {
-      const result = await this._request(API_PATHS.ORDER_LIST, 'GET');
-      const orders = Array.isArray(result.data) ? result.data : [];
-      
-      const filtered = accountId
-        ? orders.filter(o => o.accountId === accountId)
-        : orders;
-
-      return {
-        success: true,
-        orders: filtered.map(o => ({
-          orderId: o.id,
-          accountId: o.accountId,
-          symbol: o.contractId,
-          side: o.action === 'Buy' ? 0 : 1,
-          quantity: o.orderQty,
-          filledQuantity: o.filledQty || 0,
-          price: o.price,
-          status: o.ordStatus === 'Working' ? 1 : (o.ordStatus === 'Filled' ? 2 : 0),
-          orderType: o.orderType,
-        })),
-      };
-    } catch (err) {
-      return { success: false, error: err.message, orders: [] };
-    }
-  }
-
-  /**
-   * Place an order
-   * @param {Object} orderData - Order details
-   * @returns {Promise<{success: boolean, orderId?: number, error?: string}>}
-   */
-  async placeOrder(orderData) {
-    try {
-      const result = await this._request(API_PATHS.ORDER_PLACE, 'POST', {
-        accountId: orderData.accountId,
-        action: orderData.side === 0 ? 'Buy' : 'Sell',
-        symbol: orderData.symbol,
-        orderQty: orderData.size,
-        orderType: orderData.type === 2 ? 'Market' : 'Limit',
-        price: orderData.price,
-        isAutomated: true,
-      });
-
-      if (result.data.errorText || result.data.failureReason) {
-        return { success: false, error: result.data.errorText || result.data.failureText };
-      }
-
-      log.info('Order placed', { orderId: result.data.orderId });
-      return { success: true, orderId: result.data.orderId };
-    } catch (err) {
-      return { success: false, error: err.message };
-    }
-  }
-
-  /**
-   * Cancel an order
-   * @param {number} orderId - Order ID
-   * @returns {Promise<{success: boolean, error?: string}>}
-   */
-  async cancelOrder(orderId) {
-    try {
-      const result = await this._request(API_PATHS.ORDER_CANCEL, 'POST', {
-        orderId,
-        isAutomated: true,
-      });
-
-      if (result.data.errorText) {
-        return { success: false, error: result.data.errorText };
-      }
-
-      return { success: true };
-    } catch (err) {
-      return { success: false, error: err.message };
-    }
-  }
-
-  /**
-   * Close a position
-   * @param {number} accountId - Account ID
-   * @param {number} contractId - Contract ID
-   * @returns {Promise<{success: boolean, error?: string}>}
-   */
-  async closePosition(accountId, contractId) {
-    try {
-      const result = await this._request(API_PATHS.ORDER_LIQUIDATE_POSITION, 'POST', {
-        accountId,
-        contractId,
-        isAutomated: true,
-      });
-
-      if (result.data.errorText) {
-        return { success: false, error: result.data.errorText };
-      }
-
-      return { success: true };
-    } catch (err) {
-      return { success: false, error: err.message };
-    }
-  }
+  async getOrders(accountId) { return getOrders(this, accountId); }
+  async placeOrder(orderData) { return placeOrder(this, orderData); }
+  async cancelOrder(orderId) { return cancelOrder(this, orderId); }
+  async closePosition(accountId, contractId) { return closePosition(this, accountId, contractId); }
 
   // ==================== TRADES ====================
 
@@ -404,19 +303,7 @@ class TradovateService extends EventEmitter {
     }
   }
 
-  /**
-   * Get order history
-   * @param {number} [days=30] - Days of history
-   * @returns {Promise<{success: boolean, orders: Array, error?: string}>}
-   */
-  async getOrderHistory(days = 30) {
-    try {
-      const result = await this._request(API_PATHS.ORDER_LIST, 'GET');
-      return { success: true, orders: result.data || [] };
-    } catch (err) {
-      return { success: false, error: err.message, orders: [] };
-    }
-  }
+  async getOrderHistory(days = 30) { return getOrderHistory(this, days); }
 
   // ==================== CONTRACTS ====================
 

package/src/services/tradovate/orders.js

@@ -0,0 +1,145 @@
+/**
+ * Tradovate Orders Module
+ * @module services/tradovate/orders
+ * 
+ * Order placement, cancellation, and queries
+ */
+
+const { API_PATHS } = require('./constants');
+const { logger } = require('../../utils/logger');
+
+const log = logger.scope('TradovateOrders');
+
+/**
+ * Get orders
+ * @param {TradovateService} service
+ * @param {number} [accountId]
+ * @returns {Promise<{success: boolean, orders: Array, error?: string}>}
+ */
+async function getOrders(service, accountId) {
+  try {
+    const result = await service._request(API_PATHS.ORDER_LIST, 'GET');
+    const orders = Array.isArray(result.data) ? result.data : [];
+    
+    const filtered = accountId
+      ? orders.filter(o => o.accountId === accountId)
+      : orders;
+
+    return {
+      success: true,
+      orders: filtered.map(o => ({
+        orderId: o.id,
+        accountId: o.accountId,
+        symbol: o.contractId,
+        side: o.action === 'Buy' ? 0 : 1,
+        quantity: o.orderQty,
+        filledQuantity: o.filledQty || 0,
+        price: o.price,
+        status: o.ordStatus === 'Working' ? 1 : (o.ordStatus === 'Filled' ? 2 : 0),
+        orderType: o.orderType,
+      })),
+    };
+  } catch (err) {
+    return { success: false, error: err.message, orders: [] };
+  }
+}
+
+/**
+ * Place an order
+ * @param {TradovateService} service
+ * @param {Object} orderData
+ * @returns {Promise<{success: boolean, orderId?: number, error?: string}>}
+ */
+async function placeOrder(service, orderData) {
+  try {
+    const result = await service._request(API_PATHS.ORDER_PLACE, 'POST', {
+      accountId: orderData.accountId,
+      action: orderData.side === 0 ? 'Buy' : 'Sell',
+      symbol: orderData.symbol,
+      orderQty: orderData.size,
+      orderType: orderData.type === 2 ? 'Market' : 'Limit',
+      price: orderData.price,
+      isAutomated: true,
+    });
+
+    if (result.data.errorText || result.data.failureReason) {
+      return { success: false, error: result.data.errorText || result.data.failureText };
+    }
+
+    log.info('Order placed', { orderId: result.data.orderId });
+    return { success: true, orderId: result.data.orderId };
+  } catch (err) {
+    return { success: false, error: err.message };
+  }
+}
+
+/**
+ * Cancel an order
+ * @param {TradovateService} service
+ * @param {number} orderId
+ * @returns {Promise<{success: boolean, error?: string}>}
+ */
+async function cancelOrder(service, orderId) {
+  try {
+    const result = await service._request(API_PATHS.ORDER_CANCEL, 'POST', {
+      orderId,
+      isAutomated: true,
+    });
+
+    if (result.data.errorText) {
+      return { success: false, error: result.data.errorText };
+    }
+
+    return { success: true };
+  } catch (err) {
+    return { success: false, error: err.message };
+  }
+}
+
+/**
+ * Close a position
+ * @param {TradovateService} service
+ * @param {number} accountId
+ * @param {number} contractId
+ * @returns {Promise<{success: boolean, error?: string}>}
+ */
+async function closePosition(service, accountId, contractId) {
+  try {
+    const result = await service._request(API_PATHS.ORDER_LIQUIDATE_POSITION, 'POST', {
+      accountId,
+      contractId,
+      isAutomated: true,
+    });
+
+    if (result.data.errorText) {
+      return { success: false, error: result.data.errorText };
+    }
+
+    return { success: true };
+  } catch (err) {
+    return { success: false, error: err.message };
+  }
+}
+
+/**
+ * Get order history
+ * @param {TradovateService} service
+ * @param {number} [days=30]
+ * @returns {Promise<{success: boolean, orders: Array, error?: string}>}
+ */
+async function getOrderHistory(service, days = 30) {
+  try {
+    const result = await service._request(API_PATHS.ORDER_LIST, 'GET');
+    return { success: true, orders: result.data || [] };
+  } catch (err) {
+    return { success: false, error: err.message, orders: [] };
+  }
+}
+
+module.exports = {
+  getOrders,
+  placeOrder,
+  cancelOrder,
+  closePosition,
+  getOrderHistory,
+};