@runesx/api-client 0.4.0 → 0.5.1

package/src/waitForStores.mjs

@@ -3,6 +3,7 @@ import { coinStore, getCoins } from './store/coinStore.mjs';
 import { chainStore, getChains } from './store/chainStore.mjs';
 import { walletStore, getWallets } from './store/walletStore.mjs';
 import { userSharesStore, getUserShares } from './store/userSharesStore.mjs';
+import { orderbookStore, getAllOrderBooks } from './store/orderbookStore.mjs';
 
 export function waitForStores(socket) {
   // Function to wait for poolStore to be populated
@@ -18,7 +19,7 @@ export function waitForStores(socket) {
         reject(new Error('Timeout waiting for initial pool data'));
       }, 30000); // 30-second timeout
 
-      socket.on('pools_updated', ({ isInitial, pools }) => {
+      socket.on('pools_updated', ({ isInitial }) => {
         if (isInitial) {
           const pools = getPools();
           clearTimeout(timeout);
@@ -53,7 +54,7 @@ export function waitForStores(socket) {
         reject(new Error('Timeout waiting for initial coin data'));
       }, 30000); // 30-second timeout
 
-      socket.on('coins_updated', ({ isInitial, coins }) => {
+      socket.on('coins_updated', ({ isInitial }) => {
         if (isInitial) {
           const coins = getCoins();
           clearTimeout(timeout);
@@ -123,7 +124,7 @@ export function waitForStores(socket) {
         reject(new Error('Timeout waiting for initial wallet data'));
       }, 30000); // 30-second timeout
 
-      socket.on('wallets_updated', ({ isInitial, wallets }) => {
+      socket.on('wallets_updated', ({ isInitial }) => {
         if (isInitial) {
           const wallets = getWallets();
           clearTimeout(timeout);
@@ -158,7 +159,7 @@ export function waitForStores(socket) {
         reject(new Error('Timeout waiting for initial user shares data'));
       }, 30000); // 30-second timeout
 
-      socket.on('user_shares_updated', ({ isInitial, userShares }) => {
+      socket.on('user_shares_updated', ({ isInitial }) => {
         if (isInitial) {
           const userShares = getUserShares();
           clearTimeout(timeout);
@@ -180,13 +181,47 @@ export function waitForStores(socket) {
     });
   };
 
+  // Function to wait for orderbookStore to be populated
+  const waitForOrderBooks = () => {
+    return new Promise((resolve, reject) => {
+      if (orderbookStore.isInitialReceived) {
+        resolve(getAllOrderBooks());
+        return;
+      }
+
+      const timeout = setTimeout(() => {
+        reject(new Error('Timeout waiting for initial orderbook data'));
+      }, 30000);
+
+      socket.on('orderbooks_initial', ({ isInitial }) => {
+        if (isInitial) {
+          clearTimeout(timeout);
+          resolve(getAllOrderBooks());
+        }
+      });
+
+      socket.on('connect_error', (err) => {
+        console.error('Socket connect error:', err.message);
+        clearTimeout(timeout);
+        reject(new Error('Socket connection failed'));
+      });
+
+      socket.on('disconnect', (reason) => {
+        console.error('Socket disconnected:', reason);
+        clearTimeout(timeout);
+        reject(new Error('Socket disconnected before receiving initial orderbook data'));
+      });
+    });
+  };
+
   // Return a promise that resolves when all stores are populated
-  return Promise.all([waitForPools(), waitForCoins(), waitForChains(), waitForWallets(), waitForUserShares()])
-    .then(([pools, coins, chains, wallets, userShares]) => ({
+  return Promise.all([waitForPools(), waitForCoins(), waitForChains(), waitForWallets(), waitForUserShares(), waitForOrderBooks()])
+    .then(([pools, coins, chains, wallets, userShares, orderbooks]) => ({
       pools,
       coins,
       chains,
       wallets,
       userShares,
+      orderbooks,
     }));
 }

package/src/workers/swapWorker.mjs

@@ -4,9 +4,9 @@ import { parentPort } from 'worker_threads';
 import { estimateSwap } from '../utils/swapUtils.mjs';
 
 parentPort.on('message', async (data) => {
-  const { inputCoin, outputCoin, amountIn, pools, coins, maxHops, algorithm } = data;
+  const { inputCoin, outputCoin, amountIn, pools, coins, maxHops, algorithm, orderbooks, userOrders, clobFees, marketsLookup } = data;
   try {
-    const result = await estimateSwap(inputCoin, outputCoin, amountIn, pools, coins, maxHops, algorithm);
+    const result = await estimateSwap(inputCoin, outputCoin, amountIn, pools, coins, maxHops, algorithm, orderbooks, userOrders, clobFees, marketsLookup);
     parentPort.postMessage({ result });
   } catch (err) {
     parentPort.postMessage({ error: err.message });