@icgio/icg-exchanges-wrapper 1.14.231 → 1.14.233

package/lib/order-status-store.js

@@ -84,6 +84,21 @@ class AllOrdersStore {
     }
   }
 
+  /**
+   * Remove all rows for a specific exchange/pair (fresh start).
+   * @param {string} exchange
+   * @param {string} pair
+   */
+  async clear_orders(exchange, pair) {
+    if (!this.enabled || !this.table_ready) return
+    const client = await this.pool.connect()
+    try {
+      await client.query('DELETE FROM all_orders WHERE exchange = $1 AND pair = $2', [exchange, pair])
+    } finally {
+      client.release()
+    }
+  }
+
   start_flush_interval() {
     if (this.flush_interval) return
 
@@ -179,28 +194,38 @@ class AllOrdersStore {
         updated_at = (NOW() AT TIME ZONE 'UTC')
     `
 
+    const delete_all_orders_query = `
+      DELETE FROM all_orders 
+      WHERE exchange = $1 AND pair = $2 AND type = $3 AND order_id = $4
+    `
+
     const client = await this.pool.connect()
     try {
       for (const record of batch) {
-        // Always persist in all_orders
-        await client.query(upsert_all_orders_query, [
-          record.id,
-          record.exchange,
-          record.pair,
-          record.type,
-          record.order_id,
-          record.order_type,
-          record.status,
-          record.price,
-          record.amount,
-          record.f_amount,
-          record.f_percentage,
-          record.t_amount,
-          record.fees,
-          record.open_time,
-          record.close_time,
-          record.note,
-        ])
+        if (record.status === 'DELETED') {
+          // Physically delete rows for deleted orders to limit DB size
+          await client.query(delete_all_orders_query, [record.exchange, record.pair, record.type, record.order_id])
+        } else {
+          // Upsert active / updated orders
+          await client.query(upsert_all_orders_query, [
+            record.id,
+            record.exchange,
+            record.pair,
+            record.type,
+            record.order_id,
+            record.order_type,
+            record.status,
+            record.price,
+            record.amount,
+            record.f_amount,
+            record.f_percentage,
+            record.t_amount,
+            record.fees,
+            record.open_time,
+            record.close_time,
+            record.note,
+          ])
+        }
       }
     } catch (err) {
       // Re-queue failed records

package/middleware/orders.js

@@ -765,7 +765,11 @@ module.exports = class Orders {
     this.order_info[exchange][pair][type] = _.omit(this.order_info[exchange][pair][type], [order_id])
     console.log('DELETE %s: %s %s %s %s', note, exchange, pair, type, order_id)
     // Store deletion to PostgreSQL (non-blocking)
-    this.all_orders_store.store(exchange, pair, type, order_id, { ...order_data, status: 'DELETED' }, note)
+    // Keep final F-FILLED / P-FILLED states in DB (do NOT mark them as DELETED)
+    if (order_data.status === 'F-FILLED' || order_data.status === 'P-FILLED') {
+    } else {
+      this.all_orders_store.store(exchange, pair, type, order_id, { ...order_data, status: 'DELETED' }, note)
+    }
   }
   check_balances() {
     let balances_handler = (exchange, res) => {
@@ -886,6 +890,8 @@ module.exports = class Orders {
       }
       // cancel previous orders
       else if (this.cancel_previous_orders && !this.previous_orders_canceled) {
+        // remove all previous orders for this exchange/pair from all_orders (fire-and-forget)
+        this.all_orders_store.clear_orders(exchange, pair).catch((err) => console.error('clear_all_orders error', exchange, pair, err.message))
         if (this.cancel_previous_orders_with_delay) {
           setTimeout(() => {
             orders.map((order) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.14.231",
+  "version": "1.14.233",
   "description": "",
   "main": "index.js",
   "scripts": {