@orderly.network/hooks 1.0.14 → 1.0.15

package/dist/index.d.mts

@@ -9,8 +9,9 @@ import { AccountState, Account, EventEmitter, ConfigKey, ConfigStore, OrderlyKey
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as react from 'react';
-import react__default, { PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import { NetworkId, OrderSide, OrderEntity, API, WSMessage, OrderStatus, WS_WalletStatusEnum } from '@orderly.network/types';
+import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as swr_subscription from 'swr/subscription';
 import { Decimal } from '@orderly.network/utils';
 export * from 'use-debounce';
@@ -117,7 +118,7 @@ interface ConfigProviderProps {
     networkId: NetworkId;
     enableSwapDeposit?: boolean;
 }
-declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react__default.JSX.Element | null;
+declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react_jsx_runtime.JSX.Element | null;
 
 type ConnectedChain = {
     id: string;
@@ -253,6 +254,10 @@ declare const useOrderStream: (params: Params) => readonly [any[] | null, {
     readonly cancelAllOrders: () => void;
     readonly updateOrder: (orderId: string, order: OrderEntity) => Promise<any>;
     readonly cancelOrder: (orderId: string, symbol?: string) => Promise<void>;
+    readonly errors: {
+        readonly cancelOrder: unknown;
+        readonly updateOrder: unknown;
+    };
 }];
 
 interface MarketTradeStreamOptions {

package/dist/index.d.ts

@@ -9,8 +9,9 @@ import { AccountState, Account, EventEmitter, ConfigKey, ConfigStore, OrderlyKey
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
 import * as react from 'react';
-import react__default, { PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import { NetworkId, OrderSide, OrderEntity, API, WSMessage, OrderStatus, WS_WalletStatusEnum } from '@orderly.network/types';
+import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as swr_subscription from 'swr/subscription';
 import { Decimal } from '@orderly.network/utils';
 export * from 'use-debounce';
@@ -117,7 +118,7 @@ interface ConfigProviderProps {
     networkId: NetworkId;
     enableSwapDeposit?: boolean;
 }
-declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react__default.JSX.Element | null;
+declare const OrderlyConfigProvider: (props: PropsWithChildren<RequireAtLeastOne<ConfigProviderProps, "brokerId" | "configStore">>) => react_jsx_runtime.JSX.Element | null;
 
 type ConnectedChain = {
     id: string;
@@ -253,6 +254,10 @@ declare const useOrderStream: (params: Params) => readonly [any[] | null, {
     readonly cancelAllOrders: () => void;
     readonly updateOrder: (orderId: string, order: OrderEntity) => Promise<any>;
     readonly cancelOrder: (orderId: string, symbol?: string) => Promise<void>;
+    readonly errors: {
+        readonly cancelOrder: unknown;
+        readonly updateOrder: unknown;
+    };
 }];
 
 interface MarketTradeStreamOptions {

package/dist/index.js

@@ -8,11 +8,12 @@ var useConstant4 = require('use-constant');
 var core = require('@orderly.network/core');
 var types = require('@orderly.network/types');
 var useSWRInfinite = require('swr/infinite');
+var useDebounce = require('use-debounce');
+var jsxRuntime = require('react/jsx-runtime');
 var utils = require('@orderly.network/utils');
 var useSWRSubscription = require('swr/subscription');
 var ramda = require('ramda');
 var perp = require('@orderly.network/perp');
-var useDebounce = require('use-debounce');
 var scanClient = require('@layerzerolabs/scan-client');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -183,7 +184,6 @@ var signatureMiddleware = (useSWRNext) => {
           url
         };
         const signature = await signer.sign(payload);
-        console.log("signature:", fullUrl);
         return fetcher3(fullUrl, {
           headers: {
             ...signature,
@@ -268,8 +268,16 @@ var usePrivateInfiniteQuery = (getKey, options) => {
   const account5 = useAccount();
   const middleware = Array.isArray(restOptions?.use) ? restOptions?.use ?? [] : [];
   const result = useSWRInfinite__default.default(
-    (pageIndex, previousPageData) => account5.state.status >= types.AccountStatusEnum.EnableTrading ? getKey(pageIndex, previousPageData) : null,
-    (url, init) => net.get(url, init, formatter),
+    (pageIndex, previousPageData) => {
+      const queryKey = getKey(pageIndex, previousPageData);
+      if (account5.state.status < types.AccountStatusEnum.EnableTrading || !queryKey) {
+        return null;
+      }
+      return [queryKey, account5.state.accountId];
+    },
+    (url, init) => {
+      return net.get(url, init, formatter);
+    },
     {
       ...restOptions,
       use: [signatureMiddleware, ...middleware]
@@ -432,12 +440,113 @@ var useWS = () => {
           websocketClient.openPrivate(nextState.accountId);
         }
       });
+      if (typeof window !== "undefined") {
+        window["__Orderly_WS"] = websocketClient;
+      }
       core.SimpleDI.registerByName(WS_NAME, websocketClient);
     }
     return websocketClient;
   });
   return ws;
 };
+var usePrivateDataObserver = () => {
+  const ws = useWS();
+  const { mutate: mutate2 } = useSWR.useSWRConfig();
+  const ee = useEventEmitter();
+  const { state } = useAccount();
+  const updateOrders = useDebounce.useDebouncedCallback(() => {
+    mutate2(
+      useSWRInfinite.unstable_serialize(() => [
+        `/v1/orders?size=100&page=1&status=${types.OrderStatus.INCOMPLETE}`,
+        state.accountId
+      ])
+    );
+    mutate2(
+      useSWRInfinite.unstable_serialize(() => [
+        `/v1/orders?size=100&page=1&status=${types.OrderStatus.NEW}`,
+        state.accountId
+      ])
+    );
+  }, 500);
+  React.useEffect(() => {
+    if (!state.accountId)
+      return;
+    const unsubscribe = ws.privateSubscribe("executionreport", {
+      onMessage: (data) => {
+        updateOrders();
+        ee.emit("orders:changed", data);
+      }
+    });
+    return () => unsubscribe?.();
+  }, [state.accountId]);
+  React.useEffect(() => {
+    if (!state.accountId)
+      return;
+    const key = ["/v1/positions", state.accountId];
+    const unsubscribe = ws.privateSubscribe("position", {
+      onMessage: (data) => {
+        const { positions: nextPostions } = data;
+        mutate2(
+          key,
+          (prevPositions) => {
+            if (!!prevPositions) {
+              return {
+                ...prevPositions,
+                rows: prevPositions.rows.map((row) => {
+                  const item = nextPostions.find(
+                    (item2) => item2.symbol === row.symbol
+                  );
+                  if (item) {
+                    return {
+                      symbol: item.symbol,
+                      position_qty: item.positionQty,
+                      cost_position: item.costPosition,
+                      last_sum_unitary_funding: item.lastSumUnitaryFunding,
+                      pending_long_qty: item.pendingLongQty,
+                      pending_short_qty: item.pendingShortQty,
+                      settle_price: item.settlePrice,
+                      average_open_price: item.averageOpenPrice,
+                      unsettled_pnl: item.unsettledPnl,
+                      mark_price: item.markPrice,
+                      est_liq_price: item.estLiqPrice,
+                      timestamp: Date.now(),
+                      imr: item.imr,
+                      mmr: item.mmr,
+                      IMR_withdraw_orders: item.imrwithOrders,
+                      MMR_with_orders: item.mmrwithOrders,
+                      pnl_24_h: item.pnl24H,
+                      fee_24_h: item.fee24H
+                    };
+                  }
+                  return row;
+                })
+              };
+            }
+          },
+          {
+            revalidate: false
+          }
+        );
+      }
+    });
+    return () => {
+      unsubscribe?.();
+    };
+  }, [state.accountId]);
+};
+var DataCenterContext = React.createContext(
+  {}
+);
+var DataCenterProvider = ({ children }) => {
+  const { error, done } = usePreLoadData();
+  usePrivateDataObserver();
+  if (error) {
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { children: "Data load failed" });
+  }
+  if (!done)
+    return null;
+  return /* @__PURE__ */ jsxRuntime.jsx(DataCenterContext.Provider, { value: {}, children });
+};
 var OrderlyConfigProvider = (props) => {
   const [account5, setAccount] = React__default.default.useState(null);
   const {
@@ -475,7 +584,7 @@ var OrderlyConfigProvider = (props) => {
   if (!account5) {
     return null;
   }
-  return /* @__PURE__ */ React__default.default.createElement(
+  return /* @__PURE__ */ jsxRuntime.jsx(
     OrderlyProvider,
     {
       value: {
@@ -485,9 +594,9 @@ var OrderlyConfigProvider = (props) => {
         networkId,
         enableSwapDeposit
         // apiBaseUrl,
-      }
-    },
-    props.children
+      },
+      children: /* @__PURE__ */ jsxRuntime.jsx(DataCenterProvider, { children: props.children })
+    }
   );
 };
 var WalletConnectorContext = React.createContext({});
@@ -1109,7 +1218,7 @@ var usePositionStream = (symbol, options) => {
   } = usePrivateQuery(`/v1/positions`, {
     // revalidateOnFocus: false,
     // revalidateOnReconnect: false,
-    // dedupingInterval: 100,
+    // dedupingInterval: 200,
     // keepPreviousData: false,
     // revalidateIfStale: true,
     ...options,
@@ -1117,10 +1226,6 @@ var usePositionStream = (symbol, options) => {
     onError: (err) => {
     }
   });
-  usePositionUpdateStream((positions2) => {
-    console.log("position message", positions2);
-    updatePositions();
-  });
   const { data: markPrices } = useMarkPricesStream();
   const formatedPositions = React.useMemo(() => {
     if (!data?.rows || !symbolInfo || !accountInfo)
@@ -1269,41 +1374,6 @@ var pathOr_unsettledPnLPathOr = ramda.pathOr(0, [
   "aggregated",
   "unsettledPnL"
 ]);
-var usePositionUpdateStream = (callback) => {
-  const ws = useWS();
-  const positionList = React.useRef({});
-  return useSWRSubscription__default.default("positionUpdate", (key, { next }) => {
-    const unsubscribe = ws.privateSubscribe(
-      // { event: "subscribe", topic: "markprices" },
-      "position",
-      {
-        onMessage: (message) => {
-          const { positions: positions2 } = message;
-          let update = false;
-          for (const p in positions2) {
-            const { symbol, positionQty } = positions2[p];
-            if (positionList.current[symbol] !== positionQty) {
-              update = true;
-              positionList.current[symbol] = positionQty;
-            }
-          }
-          if (update) {
-            callback(positions2.current);
-          }
-          next(null, positionList);
-        },
-        // onUnsubscribe: () => {
-        //   return "markprices";
-        // },
-        onError: (error) => {
-        }
-      }
-    );
-    return () => {
-      unsubscribe?.();
-    };
-  });
-};
 var useHoldingStream = () => {
   const ws = useWS();
   const { data, isLoading, mutate: mutate2 } = usePrivateQuery(
@@ -1355,10 +1425,15 @@ var useHoldingStream = () => {
 };
 var useOrderStream = (params) => {
   const { status, symbol, side, size = 100 } = params;
-  const ws = useWS();
   const { data: markPrices = {} } = useMarkPricesStream();
-  const [doCancelOrder] = useMutation("/v1/order", "DELETE");
-  const [doUpdateOrder] = useMutation("/v1/order", "PUT");
+  const [doCancelOrder, { error: cancelOrderError }] = useMutation(
+    "/v1/order",
+    "DELETE"
+  );
+  const [doUpdateOrder, { error: updateOrderError }] = useMutation(
+    "/v1/order",
+    "PUT"
+  );
   const ordersResponse = usePrivateInfiniteQuery(
     (pageIndex, previousPageData) => {
       if (previousPageData && !previousPageData.rows?.length)
@@ -1381,9 +1456,9 @@ var useOrderStream = (params) => {
     {
       initialSize: 1,
       // revalidateFirstPage: false,
-      onError: (err) => {
-        console.error("fetch failed::::", err);
-      },
+      // onError: (err) => {
+      //   console.error("fetch failed::::", err);
+      // },
       formatter: (data) => data
     }
   );
@@ -1400,68 +1475,7 @@ var useOrderStream = (params) => {
   }, [ordersResponse.data, markPrices]);
   const total = React.useMemo(() => {
     return ordersResponse.data?.[0]?.meta?.total || 0;
-  }, [ordersResponse.data]);
-  React.useEffect(() => {
-    const unsubscribe = ws.privateSubscribe(
-      {
-        id: "executionreport_orders",
-        event: "subscribe",
-        topic: "executionreport",
-        ts: Date.now()
-      },
-      {
-        onMessage: (data) => {
-          const { status: status2, orderId, timestamp } = data;
-          ordersResponse.mutate((prevData) => {
-            const newOrder = {
-              order_id: data.orderId,
-              symbol: data.symbol,
-              created_time: data.timestamp,
-              quantity: data.quantity,
-              side: data.side,
-              executed: data.totalExecutedQuantity,
-              price: data.price
-            };
-            const dataList = prevData?.map((item) => item.rows)?.flat() || [];
-            if (status2 === types.OrderStatus.NEW) {
-              if (!prevData) {
-                return {
-                  meta: {
-                    total: 1,
-                    records_per_page: size,
-                    current_page: 1
-                  },
-                  rows: [newOrder]
-                };
-              }
-              const total2 = (prevData?.[0]?.meta?.total || 0) + 1;
-              const isNew = !dataList.find((item) => item.order_id === orderId);
-              if (isNew) {
-                const list = [newOrder, ...dataList];
-                return rePageData(list, total2, size);
-              }
-              return prevData;
-            }
-            if (status2 === types.OrderStatus.CANCELLED || status2 === types.OrderStatus.FILLED) {
-              const total2 = (prevData?.[0]?.meta?.total || 0) - 1;
-              const list = dataList.filter(
-                (order2) => order2.order_id !== orderId
-              );
-              return rePageData(list, total2, size);
-            }
-            if (status2 === types.OrderStatus.PARTIAL_FILLED) {
-              return editPageData(dataList, newOrder);
-            }
-            if (status2 === types.OrderStatus.REPLACED) {
-              return editPageData(dataList, newOrder);
-            }
-            return prevData;
-          });
-        }
-      }
-    );
-    return () => unsubscribe();
-  }, []);
+  }, [ordersResponse.data?.[0]?.meta?.total]);
   const cancelAllOrders = React.useCallback(() => {
   }, [ordersResponse.data]);
   const updateOrder = React.useCallback((orderId, order2) => {
@@ -1488,44 +1502,14 @@ var useOrderStream = (params) => {
       loadMore,
       cancelAllOrders,
       updateOrder,
-      cancelOrder
+      cancelOrder,
+      errors: {
+        cancelOrder: cancelOrderError,
+        updateOrder: updateOrderError
+      }
     }
   ];
 };
-function rePageData(list, total, pageSize) {
-  const newData = [];
-  let rows = [];
-  let current_page = 0;
-  for (let i = 0; i < list.length; i++) {
-    rows.push(list[i]);
-    if ((i + 1) % pageSize === 0 || i === list.length - 1) {
-      newData.push({
-        meta: {
-          records_per_page: pageSize,
-          total,
-          current_page: current_page + 1
-        },
-        rows: [...rows]
-      });
-      rows = [];
-    }
-  }
-  return newData;
-}
-function editPageData(list, newOrder) {
-  const newData = list.map((item) => {
-    return {
-      ...item,
-      rows: item.rows.map((row) => {
-        if (row.order_id === newOrder.order_id) {
-          return { ...row, newOrder };
-        }
-        return row;
-      })
-    };
-  });
-  return newData;
-}
 
 // src/orderly/useCollateral.ts
 var positionsPath = ramda.pathOr([], [0, "rows"]);
@@ -1584,33 +1568,7 @@ var useMaxQty = (symbol, side, reduceOnly = false) => {
   const symbolInfo = useSymbolsInfo();
   const { totalCollateral } = useCollateral();
   const { data: markPrices } = useMarkPricesStream();
-  const {
-    data: orders,
-    error,
-    mutate: updateOrder
-  } = usePrivateQuery(`/v1/orders?status=NEW&size=99`, {
-    formatter: (data) => data.rows,
-    onError: (err) => {
-    }
-  });
-  const ws = useWS();
-  React.useEffect(() => {
-    const unsubscribe = ws.privateSubscribe(
-      {
-        id: "executionreport_orders",
-        event: "subscribe",
-        topic: "executionreport",
-        ts: Date.now()
-      },
-      {
-        onMessage: (data) => {
-          console.log("refresh orders", data);
-          updateOrder();
-        }
-      }
-    );
-    return () => unsubscribe();
-  }, []);
+  const [orders] = useOrderStream({ status: types.OrderStatus.NEW });
   const maxQty = React.useMemo(() => {
     if (!symbol)
       return 0;
@@ -3643,59 +3601,6 @@ var useSettleSubscription = (options) => {
     return () => unsubscribe();
   });
 };
-var usePrivateDataObserver = () => {
-  const ws = useWS();
-  const { mutate: mutate2 } = useSWR.useSWRConfig();
-  const { state } = useAccount();
-  React.useEffect(() => {
-    if (!state.accountId)
-      return;
-    const key = ["/v1/positions", state.accountId];
-    const unsubscribe = ws.privateSubscribe("position", {
-      onMessage: (data) => {
-        const { positions: nextPostions } = data;
-        mutate2(key, (prevPositions) => {
-          if (!!prevPositions) {
-            return {
-              ...prevPositions,
-              rows: prevPositions.rows.map((row) => {
-                const item = nextPostions.find(
-                  (item2) => item2.symbol === row.symbol
-                );
-                if (item) {
-                  return {
-                    symbol: item.symbol,
-                    position_qty: item.positionQty,
-                    cost_position: item.costPosition,
-                    last_sum_unitary_funding: item.lastSumUnitaryFunding,
-                    pending_long_qty: item.pendingLongQty,
-                    pending_short_qty: item.pendingShortQty,
-                    settle_price: item.settlePrice,
-                    average_open_price: item.averageOpenPrice,
-                    unsettled_pnl: item.unsettledPnl,
-                    mark_price: item.markPrice,
-                    est_liq_price: item.estLiqPrice,
-                    timestamp: Date.now(),
-                    imr: item.imr,
-                    mmr: item.mmr,
-                    IMR_withdraw_orders: item.imrwithOrders,
-                    MMR_with_orders: item.mmrwithOrders,
-                    pnl_24_h: item.pnl24H,
-                    fee_24_h: item.fee24H
-                  };
-                }
-                return row;
-              })
-            };
-          }
-        });
-      }
-    });
-    return () => {
-      unsubscribe?.();
-    };
-  }, [state.accountId]);
-};
 var useWooSwapQuery = () => {
   const { configStore } = React.useContext(OrderlyContext);
   const account5 = useAccountInstance();