@icgio/icg-exchanges-wrapper 1.14.268 → 1.15.0

package/README.md

@@ -66,16 +66,6 @@ await orders.cancel_order(exchange, pair, order_id)
 const status = await orders.get_order_status(exchange, pair, order_id)
 ```
 
-### WebSocket Data Client
-
-```javascript
-const { ws_data_client, send_log } = require('@icgio/icg-exchanges-wrapper')
-
-// Send log messages via WebSocket
-send_log('info', 'Operation completed successfully')
-send_log('error', 'An error occurred')
-```
-
 ## Project Structure
 
 ```
@@ -91,8 +81,6 @@ icg-exchanges-wrapper/
 ├── middleware/
 │   ├── account.js            # Account middleware
 │   └── orders.js             # Order management middleware
-├── lib/
-│   └── ws-data-client.js     # WebSocket data client
 └── package.json
 ```
 

package/index.js

@@ -4,7 +4,6 @@ const get_exchanges_trades = require('./functions/get-exchanges-trades.js')
 const get_exchanges_open_orders = require('./functions/get-exchanges-open-orders.js')
 const get_exchanges_deposits = require('./functions/get-exchanges-deposits.js')
 const get_exchanges_withdrawals = require('./functions/get-exchanges-withdrawals.js')
-const { ws_data_client } = require('./lib/ws-data-client.js')
 
 module.exports.functions = {
   get_exchanges_rates,
@@ -18,7 +17,3 @@ module.exports.functions = {
 }
 
 module.exports.orders = require('./middleware/orders.js')
-
-// WebSocket data client for log streaming
-module.exports.ws_data_client = ws_data_client
-module.exports.send_log = (level, message) => ws_data_client.send_log(level, message)

package/middleware/orders.js

@@ -7,10 +7,9 @@ const utils = require('@icgio/icg-utils').utils
 const { crypto_rates: get_crypto_rates, observable: Observable } = require('@icgio/icg-utils')
 
 const Account = require('./account.js')
-const { ws_data_client: default_ws_data_client } = require('../lib/ws-data-client.js')
 
-// Module-level ws_data_client reference (can be overridden)
-let ws_data_client = default_ws_data_client
+// Module-level ws_client reference (must be provided via settings.ws_client)
+let ws_client = null
 
 // Default precision functions - will be overridden if provided in settings
 let round_price = (exchange, pair, price) => price
@@ -246,14 +245,11 @@ module.exports = class Orders {
         this.process_query_order(this.query_order)
       }, PROCESS_OPEN_ORDERS_TRADERS_INTERVAL_MS)
     }
-    // Initialize WS data client for streaming to dashboard backend
-    // If external ws_client is provided, use it instead of the default
+    // Initialize WS client for streaming to dashboard backend
+    // ws_client must be provided via settings (no built-in fallback)
     if (settings.ws_client) {
-      ws_data_client = settings.ws_client
-      ws_data_client.set_order_info_ref(this.order_info)
-    } else if (settings.ws_backend_secret && settings.client_id) {
-      ws_data_client.init(settings.ws_backend_secret, settings.client_id)
-      ws_data_client.set_order_info_ref(this.order_info)
+      ws_client = settings.ws_client
+      ws_client.set_order_info_ref(this.order_info)
     }
   }
   init_account(balances, benchmarks) {
@@ -811,8 +807,8 @@ module.exports = class Orders {
     // Send order update via WebSocket to dashboard backend
     const order_data = _.get(this.order_info, [exchange, pair, type, order_id], {})
     // Only send N-FILLED and later statuses (skip INIT which has temporary order_id)
-    if (dict.status !== 'INIT' && order_data.status !== 'INIT') {
-      ws_data_client.send_order({
+    if (dict.status !== 'INIT' && order_data.status !== 'INIT' && ws_client) {
+      ws_client.send_order({
         action: 'update',
         exchange,
         pair,
@@ -829,8 +825,8 @@ module.exports = class Orders {
     console.log('DELETE %s: %s %s %s %s', note, exchange, pair, type, order_id)
 
     // Send delete event via WebSocket (only for non-INIT orders)
-    if (order_data.status !== 'INIT') {
-      ws_data_client.send_order({
+    if (order_data.status !== 'INIT' && ws_client) {
+      ws_client.send_order({
         action: 'delete',
         exchange,
         pair,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icgio/icg-exchanges-wrapper",
-  "version": "1.14.268",
+  "version": "1.15.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/icgio/icg-exchanges-wrapper#readme",
   "dependencies": {
-    "@icgio/icg-exchanges": "^1.32.138",
+    "@icgio/icg-exchanges": "^1.32.139",
     "@icgio/icg-utils": "^1.9.44",
     "lodash": "^4.17.23",
     "pg": "^8.17.2"

package/lib/ws-data-client.js

@@ -1,248 +0,0 @@
-const WebSocket = require('ws')
-const { randomUUID: uuid } = require('crypto')
-
-// Hardcoded backend URL for production
-const WS_BACKEND_URL = 'wss://api-prod.icg.io/ws/data/ingest'
-
-/**
- * WebSocket client for streaming logs and order status to dashboard backend.
- * Singleton instance shared across the application.
- */
-class WSDataClient {
-  constructor() {
-    this.backend_url = WS_BACKEND_URL
-    this.secret = null
-    this.client_id = null
-    this.ws = null
-    this.queue = []
-    this.max_queue = 100
-    this.reconnect_interval = 5000
-    this.enabled = false
-    this.connected = false
-    this.reconnect_timer = null
-    this.sync_interval = null
-    this.sync_interval_ms = 30 * 1000 // 30 seconds
-    this.order_info_ref = null // Reference to Orders.order_info for periodic sync
-  }
-
-  /**
-   * Initialize the WS client with connection details.
-   * @param {string} secret - Shared secret for authentication
-   * @param {string} client_id - Client identifier (e.g., "FREEZONE")
-   */
-  init(secret, client_id) {
-    if (!secret || !client_id) {
-      console.log('[WSDataClient] Missing config (secret or client_id), disabled')
-      return
-    }
-
-    this.secret = secret
-    this.client_id = client_id
-    this.enabled = true
-
-    console.log('[WSDataClient] Initializing for client:', client_id, 'URL:', this.backend_url)
-    this.connect()
-  }
-
-  /**
-   * Set reference to order_info for periodic sync.
-   * @param {object} order_info - Reference to Orders.order_info object
-   */
-  set_order_info_ref(order_info) {
-    this.order_info_ref = order_info
-
-    // Start periodic sync if not already started
-    if (!this.sync_interval && this.enabled) {
-      this.start_periodic_sync()
-    }
-  }
-
-  /**
-   * Start periodic full sync of order_info (every 30 seconds).
-   */
-  start_periodic_sync() {
-    if (this.sync_interval) return
-
-    // Send initial reset on startup
-    this.send_reset('orders')
-
-    this.sync_interval = setInterval(() => {
-      if (this.order_info_ref && this.connected) {
-        this.send_order_sync(this.order_info_ref)
-      }
-    }, this.sync_interval_ms)
-
-    console.log('[WSDataClient] Periodic sync started (every %ds)', this.sync_interval_ms / 1000)
-  }
-
-  /**
-   * Connect to the dashboard backend WebSocket.
-   */
-  connect() {
-    if (!this.enabled) return
-
-    try {
-      this.ws = new WebSocket(this.backend_url, {
-        headers: {
-          'x-client-secret': this.secret,
-          'x-client-id': this.client_id,
-        },
-      })
-
-      this.ws.on('open', () => {
-        console.log('[WSDataClient] Connected to backend')
-        this.connected = true
-        this.flush_queue()
-
-        // Send reset on reconnect to clear stale state
-        this.send_reset('orders')
-
-        // Send full sync immediately after connect
-        if (this.order_info_ref) {
-          this.send_order_sync(this.order_info_ref)
-        }
-      })
-
-      this.ws.on('close', (code, reason) => {
-        console.log('[WSDataClient] Disconnected:', code, reason?.toString())
-        this.connected = false
-        this.schedule_reconnect()
-      })
-
-      this.ws.on('error', (err) => {
-        console.error('[WSDataClient] Error:', err.message)
-        this.connected = false
-      })
-
-      this.ws.on('message', (data) => {
-        // Handle any messages from backend (e.g., acknowledgments)
-        try {
-          const msg = JSON.parse(data.toString())
-          if (msg.type === 'error') {
-            console.error('[WSDataClient] Backend error:', msg.message)
-          }
-        } catch (e) {
-          // Ignore parse errors
-        }
-      })
-    } catch (err) {
-      console.error('[WSDataClient] Connection error:', err.message)
-      this.schedule_reconnect()
-    }
-  }
-
-  /**
-   * Schedule reconnection attempt.
-   */
-  schedule_reconnect() {
-    if (this.reconnect_timer) return
-
-    this.reconnect_timer = setTimeout(() => {
-      this.reconnect_timer = null
-      console.log('[WSDataClient] Attempting reconnect...')
-      this.connect()
-    }, this.reconnect_interval)
-  }
-
-  /**
-   * Send a message to the backend.
-   * @param {string} type - Message type
-   * @param {object} data - Message data
-   */
-  send(type, data) {
-    if (!this.enabled) return
-
-    const msg = JSON.stringify({
-      type,
-      client: this.client_id,
-      ts: Date.now(),
-      ...data,
-    })
-
-    if (this.connected && this.ws?.readyState === WebSocket.OPEN) {
-      this.ws.send(msg)
-    } else {
-      // Queue message for later
-      this.queue.push(msg)
-      if (this.queue.length > this.max_queue) {
-        this.queue.shift() // Drop oldest
-      }
-    }
-  }
-
-  /**
-   * Flush queued messages after reconnection.
-   */
-  flush_queue() {
-    while (this.queue.length > 0 && this.connected && this.ws?.readyState === WebSocket.OPEN) {
-      const msg = this.queue.shift()
-      this.ws.send(msg)
-    }
-  }
-
-  /**
-   * Send reset event to clear state on backend.
-   * @param {string} scope - What to reset ('orders', 'logs', 'all')
-   */
-  send_reset(scope = 'orders') {
-    this.send('reset', { scope })
-  }
-
-  /**
-   * Send full order_info sync to backend.
-   * @param {object} order_info - Complete order_info object
-   */
-  send_order_sync(order_info) {
-    this.send('order_sync', { data: order_info })
-  }
-
-  /**
-   * Send order update event to backend.
-   * @param {object} event - Order event data
-   */
-  send_order(event) {
-    this.send('order', event)
-  }
-
-  /**
-   * Send log entry to backend.
-   * @param {string} level - Log level ('info', 'warn', 'error')
-   * @param {string} message - Log message
-   */
-  send_log(level, message) {
-    this.send('log', {
-      id: uuid(),
-      level,
-      msg: message,
-    })
-  }
-
-  /**
-   * Close the WebSocket connection.
-   */
-  close() {
-    this.enabled = false
-
-    if (this.sync_interval) {
-      clearInterval(this.sync_interval)
-      this.sync_interval = null
-    }
-
-    if (this.reconnect_timer) {
-      clearTimeout(this.reconnect_timer)
-      this.reconnect_timer = null
-    }
-
-    if (this.ws) {
-      this.ws.close()
-      this.ws = null
-    }
-
-    this.connected = false
-  }
-}
-
-// Singleton instance
-const ws_data_client = new WSDataClient()
-
-module.exports = { WSDataClient, ws_data_client }