@icgio/icg-exchanges-wrapper 1.14.230 → 1.14.231

package/lib/order-status-store.js

@@ -1,10 +1,10 @@
 const { Pool } = require('pg')
 
 /**
- * Async PostgreSQL store for open orders
+ * Async PostgreSQL store for all orders
  * Non-blocking: all writes are fire-and-forget to avoid blocking the main process
  */
-class OpenOrdersStore {
+class AllOrdersStore {
   constructor(connection_string) {
     this.enabled = true
     this.pool = null
@@ -30,7 +30,7 @@ class OpenOrdersStore {
       })
 
       this.pool.on('error', (err) => {
-        console.error('OpenOrdersStore pool error:', err.message)
+        console.error('AllOrdersStore pool error:', err.message)
       })
 
       // Set timezone to UTC for all connections
@@ -41,16 +41,18 @@ class OpenOrdersStore {
       await this.ensure_table()
       this.enabled = true
       this.start_flush_interval()
-      console.log('OpenOrdersStore initialized successfully')
+      console.log('AllOrdersStore initialized successfully')
     } catch (err) {
-      console.error('OpenOrdersStore init failed:', err.message)
+      console.error('AllOrdersStore init failed:', err.message)
       this.enabled = false
     }
   }
 
   async ensure_table() {
     const create_table_query = `
-      CREATE TABLE IF NOT EXISTS open_orders (
+      -- All orders (persistent mapping of id/order_id to order_type & status)
+      CREATE TABLE IF NOT EXISTS all_orders (
+        id VARCHAR(128),
         exchange VARCHAR(64) NOT NULL,
         pair VARCHAR(32) NOT NULL,
         order_type VARCHAR(64),
@@ -66,12 +68,11 @@ class OpenOrdersStore {
         open_time TIMESTAMPTZ,
         close_time TIMESTAMPTZ,
         note VARCHAR(256),
+        created_at TIMESTAMPTZ DEFAULT (NOW() AT TIME ZONE 'UTC'),
         updated_at TIMESTAMPTZ DEFAULT (NOW() AT TIME ZONE 'UTC'),
         PRIMARY KEY (exchange, pair, type, order_id)
       );
-      CREATE INDEX IF NOT EXISTS idx_open_orders_status ON open_orders(status);
-      CREATE INDEX IF NOT EXISTS idx_open_orders_exchange ON open_orders(exchange);
-      CREATE INDEX IF NOT EXISTS idx_open_orders_ex_pair_order ON open_orders(exchange, pair, order_id);
+      CREATE INDEX IF NOT EXISTS idx_all_orders_exchange_pair_order ON all_orders(exchange, pair, order_id);
     `
 
     const client = await this.pool.connect()
@@ -88,7 +89,7 @@ class OpenOrdersStore {
 
     this.flush_interval = setInterval(() => {
       this.flush().catch((err) => {
-        console.error('OpenOrdersStore flush error:', err.message)
+        console.error('AllOrdersStore flush error:', err.message)
       })
     }, this.flush_interval_ms)
   }
@@ -122,6 +123,7 @@ class OpenOrdersStore {
     }
 
     const record = {
+      id: data.id,
       exchange,
       pair,
       type,
@@ -155,13 +157,14 @@ class OpenOrdersStore {
 
     const batch = this.queue.splice(0, 100) // Process up to 100 at a time
 
-    const upsert_query = `
-      INSERT INTO open_orders (
-        exchange, pair, type, order_id, order_type, status,
+    const upsert_all_orders_query = `
+      INSERT INTO all_orders (
+        id, exchange, pair, type, order_id, order_type, status,
         price, amount, f_amount, f_percentage, t_amount,
-        fees, open_time, close_time, note, updated_at
-      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, (NOW() AT TIME ZONE 'UTC'))
+        fees, open_time, close_time, note, created_at, updated_at
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, (NOW() AT TIME ZONE 'UTC'), (NOW() AT TIME ZONE 'UTC'))
       ON CONFLICT (exchange, pair, type, order_id) DO UPDATE SET
+        id = EXCLUDED.id,
         order_type = EXCLUDED.order_type,
         status = EXCLUDED.status,
         price = EXCLUDED.price,
@@ -176,35 +179,28 @@ class OpenOrdersStore {
         updated_at = (NOW() AT TIME ZONE 'UTC')
     `
 
-    const delete_query = `
-      DELETE FROM open_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) {
-        if (record.status === 'DELETED') {
-          await client.query(delete_query, [record.exchange, record.pair, record.type, record.order_id])
-        } else {
-          await client.query(upsert_query, [
-            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,
-          ])
-        }
+        // 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,
+        ])
       }
     } catch (err) {
       // Re-queue failed records
@@ -221,7 +217,7 @@ class OpenOrdersStore {
       try {
         await this.flush()
       } catch (err) {
-        console.error('OpenOrdersStore final flush error:', err.message)
+        console.error('AllOrdersStore final flush error:', err.message)
       }
     }
     if (this.pool) {
@@ -231,4 +227,4 @@ class OpenOrdersStore {
   }
 }
 
-module.exports = OpenOrdersStore
+module.exports = AllOrdersStore

package/middleware/orders.js

@@ -7,7 +7,7 @@ const utils = require('@icgio/icg-utils').utils
 const { coinmarketcap: get_coinmarketcap_rates, observable: Observable } = require('@icgio/icg-utils')
 
 const Account = require('./account.js')
-const OpenOrdersStore = require('../lib/order-status-store.js')
+const AllOrdersStore = require('../lib/order-status-store.js')
 
 // Default precision functions - will be overridden if provided in settings
 let round_price = (exchange, pair, price) => price
@@ -125,8 +125,8 @@ module.exports = class Orders {
     this.accounting_benchmark = settings.accounting_benchmark
     this.balance_benchmark = settings.balance_benchmark || {}
     this.min_reserve_balance = settings.min_reserve_balance || {}
-    // Initialize order status store for PostgreSQL persistence (async, non-blocking)
-    this.order_status_store = new OpenOrdersStore(cd.order_status_store_connection_string)
+    // Initialize all orders store for PostgreSQL persistence (async, non-blocking)
+    this.all_orders_store = new AllOrdersStore(cd.all_orders_store_connection_string)
     for (let exchange in exchange_pairs) {
       let api_key_temp = cd[exchange]['api_keys'] || cd[exchange]['api_key'],
         secret_key_temp = cd[exchange]['secret_keys'] || cd[exchange]['secret_key'],
@@ -758,14 +758,14 @@ module.exports = class Orders {
     // end: log every f-filled trade for future analysis
     // Store order status to PostgreSQL asynchronously (non-blocking)
     const order_data = _.get(this.order_info, [exchange, pair, type, order_id], {})
-    this.order_status_store.store(exchange, pair, type, order_id, order_data, note)
+    this.all_orders_store.store(exchange, pair, type, order_id, order_data, note)
   }
   delete_order_info(exchange, pair, type, order_id, note) {
     const order_data = _.get(this.order_info, [exchange, pair, type, order_id], {})
     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.order_status_store.store(exchange, pair, type, order_id, { ...order_data, status: 'DELETED' }, note)
+    this.all_orders_store.store(exchange, pair, type, order_id, { ...order_data, status: 'DELETED' }, note)
   }
   check_balances() {
     let balances_handler = (exchange, res) => {

package/package.json

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