@orderly.network/hooks 1.0.28-alpha.16 → 1.0.28-alpha.17

package/dist/index.d.mts

@@ -24,7 +24,7 @@ declare global {
         };
     }
 }
-declare const _default: "1.0.28-alpha.16";
+declare const _default: "1.0.28-alpha.17";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -277,8 +277,7 @@ declare const usePositionStream: (symbol?: string, options?: SWRConfiguration &
 }, any, {
     readonly loading: false;
     readonly error: any;
-    readonly loadMore: () => void;
-    readonly refresh: () => void;
+    readonly refresh: swr__internal.KeyedMutator<API.PositionInfo>;
 }];
 
 type Params = {
@@ -290,10 +289,11 @@ type Params = {
 declare const useOrderStream: (params: Params) => readonly [any[] | null, {
     readonly total: any;
     readonly isLoading: boolean;
+    readonly refresh: swr__internal.KeyedMutator<any[]>;
     readonly loadMore: () => void;
     readonly cancelAllOrders: () => void;
     readonly updateOrder: (orderId: string, order: OrderEntity) => Promise<any>;
-    readonly cancelOrder: (orderId: string, symbol?: string) => Promise<any>;
+    readonly cancelOrder: (orderId: number, symbol?: string) => Promise<any>;
     readonly errors: {
         readonly cancelOrder: unknown;
         readonly updateOrder: unknown;
@@ -424,7 +424,11 @@ declare const useSettleSubscription: (options?: {
     onMessage?: ((data: any) => void) | undefined;
 } | undefined) => swr_subscription.SWRSubscriptionResponse<any, any>;
 
-declare const usePrivateDataObserver: () => void;
+type getKeyFunction = (index: number, prevData: any) => string | null;
+
+declare const usePrivateDataObserver: (options: {
+    getKeysMap: (type: string) => Map<string, getKeyFunction>;
+}) => void;
 
 declare function useMediaQuery(query: string): boolean;
 

package/dist/index.d.ts

@@ -24,7 +24,7 @@ declare global {
         };
     }
 }
-declare const _default: "1.0.28-alpha.16";
+declare const _default: "1.0.28-alpha.17";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -277,8 +277,7 @@ declare const usePositionStream: (symbol?: string, options?: SWRConfiguration &
 }, any, {
     readonly loading: false;
     readonly error: any;
-    readonly loadMore: () => void;
-    readonly refresh: () => void;
+    readonly refresh: swr__internal.KeyedMutator<API.PositionInfo>;
 }];
 
 type Params = {
@@ -290,10 +289,11 @@ type Params = {
 declare const useOrderStream: (params: Params) => readonly [any[] | null, {
     readonly total: any;
     readonly isLoading: boolean;
+    readonly refresh: swr__internal.KeyedMutator<any[]>;
     readonly loadMore: () => void;
     readonly cancelAllOrders: () => void;
     readonly updateOrder: (orderId: string, order: OrderEntity) => Promise<any>;
-    readonly cancelOrder: (orderId: string, symbol?: string) => Promise<any>;
+    readonly cancelOrder: (orderId: number, symbol?: string) => Promise<any>;
     readonly errors: {
         readonly cancelOrder: unknown;
         readonly updateOrder: unknown;
@@ -424,7 +424,11 @@ declare const useSettleSubscription: (options?: {
     onMessage?: ((data: any) => void) | undefined;
 } | undefined) => swr_subscription.SWRSubscriptionResponse<any, any>;
 
-declare const usePrivateDataObserver: () => void;
+type getKeyFunction = (index: number, prevData: any) => string | null;
+
+declare const usePrivateDataObserver: (options: {
+    getKeysMap: (type: string) => Map<string, getKeyFunction>;
+}) => void;
 
 declare function useMediaQuery(query: string): boolean;
 

package/dist/index.js

@@ -28,9 +28,9 @@ var useSWRSubscription__default = /*#__PURE__*/_interopDefault(useSWRSubscriptio
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.0.28-alpha.16";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.0.28-alpha.17";
 }
-var version_default = "1.0.28-alpha.16";
+var version_default = "1.0.28-alpha.17";
 var fetcher = (url, init = {}, queryOptions) => net.get(url, init, queryOptions?.formatter);
 var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
@@ -444,31 +444,28 @@ var useWS = () => {
   });
   return ws;
 };
-var usePrivateDataObserver = () => {
+var usePrivateDataObserver = (options) => {
   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
-      ])
-    );
+  const updateOrders = useDebounce.useDebouncedCallback((data) => {
+    const map = options.getKeysMap("orders");
+    map.forEach((getKey, key) => {
+      mutate2(
+        useSWRInfinite.unstable_serialize((index, prevData) => [
+          getKey(index, prevData),
+          state.accountId
+        ])
+      );
+    });
   }, 500);
   React.useEffect(() => {
     if (!state.accountId)
       return;
     const unsubscribe = ws.privateSubscribe("executionreport", {
       onMessage: (data) => {
-        updateOrders();
+        updateOrders(data);
         ee.emit("orders:changed", data);
       }
     });
@@ -532,15 +529,31 @@ var usePrivateDataObserver = () => {
 var DataCenterContext = React.createContext(
   {}
 );
+var useDataCenterContext = () => React.useContext(DataCenterContext);
 var DataCenterProvider = ({ children }) => {
   const { error, done } = usePreLoadData();
-  usePrivateDataObserver();
+  const getKeyHandlerMapRef = React.useRef(/* @__PURE__ */ new Map());
+  usePrivateDataObserver({
+    getKeysMap(type) {
+      return getKeyHandlerMapRef.current;
+    }
+  });
   if (error) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { children: "Data load failed" });
   }
   if (!done)
     return null;
-  return /* @__PURE__ */ jsxRuntime.jsx(DataCenterContext.Provider, { value: {}, children });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    DataCenterContext.Provider,
+    {
+      value: {
+        regesterKeyHandler: (key, fun) => {
+          getKeyHandlerMapRef.current.set(key, fun);
+        }
+      },
+      children
+    }
+  );
 };
 var OrderlyConfigProvider = (props) => {
   const [account5, setAccount] = React__default.default.useState(null);
@@ -1271,7 +1284,7 @@ var usePositionStream = (symbol, options) => {
   const {
     data,
     error,
-    mutate: updatePositions
+    mutate: refreshPositions
   } = usePrivateQuery(`/v1/positions`, {
     // revalidateOnFocus: false,
     // revalidateOnReconnect: false,
@@ -1368,7 +1381,16 @@ var usePositionStream = (symbol, options) => {
         unsettledPnL: unsettlementPnL_total.toNumber()
       }
     ];
-  }, [data?.rows, symbolInfo, accountInfo, markPrices, priceMode, tickerPrices, symbol, holding]);
+  }, [
+    data?.rows,
+    symbolInfo,
+    accountInfo,
+    markPrices,
+    priceMode,
+    tickerPrices,
+    symbol,
+    holding
+  ]);
   const [totalCollateral, totalValue, totalUnrealizedROI] = React.useMemo(() => {
     if (!holding || !markPrices) {
       return [utils.zero, utils.zero, 0];
@@ -1441,10 +1463,8 @@ var usePositionStream = (symbol, options) => {
       loading: false,
       // showSymbol,
       error,
-      loadMore: () => {
-      },
-      refresh: () => {
-      }
+      // loadMore: () => {},
+      refresh: refreshPositions
     }
   ];
 };
@@ -1505,6 +1525,7 @@ var useHoldingStream = () => {
 var useOrderStream = (params) => {
   const { status, symbol, side, size = 100 } = params;
   const { data: markPrices = {} } = useMarkPricesStream();
+  const { regesterKeyHandler } = useDataCenterContext();
   const [
     doCancelOrder,
     { error: cancelOrderError, isMutating: cancelMutating }
@@ -1513,45 +1534,56 @@ var useOrderStream = (params) => {
     doUpdateOrder,
     { error: updateOrderError, isMutating: updateMutating }
   ] = useMutation("/v1/order", "PUT");
-  const ordersResponse = usePrivateInfiniteQuery(
-    (pageIndex, previousPageData) => {
-      if (previousPageData && !previousPageData.rows?.length)
-        return null;
-      const search = new URLSearchParams([
-        ["size", size.toString()],
-        ["page", `${pageIndex + 1}`]
-      ]);
-      if (status) {
-        search.set(`status`, status);
-      }
-      if (symbol) {
-        search.set(`symbol`, symbol);
-      }
-      if (side) {
-        search.set(`side`, side);
-      }
-      return `/v1/orders?${search.toString()}`;
-    },
-    {
-      initialSize: 1,
-      // revalidateFirstPage: false,
-      // onError: (err) => {
-      //   console.error("fetch failed::::", err);
-      // },
-      formatter: (data) => data
+  const getKey = (pageIndex, previousPageData) => {
+    if (previousPageData && !previousPageData.rows?.length)
+      return null;
+    const search = new URLSearchParams([
+      ["size", size.toString()],
+      ["page", `${pageIndex + 1}`]
+    ]);
+    if (status) {
+      search.set(`status`, status);
     }
-  );
-  const orders = React.useMemo(() => {
+    if (symbol) {
+      search.set(`symbol`, symbol);
+    }
+    if (side) {
+      search.set(`side`, side);
+    }
+    return `/v1/orders?${search.toString()}`;
+  };
+  React.useEffect(() => {
+    const key = `orders:${status}:${symbol}:${side}`;
+    regesterKeyHandler(key, getKey);
+  }, [status, symbol, side]);
+  const ordersResponse = usePrivateInfiniteQuery(getKey, {
+    initialSize: 1,
+    // revalidateFirstPage: false,
+    // onError: (err) => {
+    //   console.error("fetch failed::::", err);
+    // },
+    formatter: (data) => data
+  });
+  const flattenOrders = React.useMemo(() => {
     if (!ordersResponse.data) {
       return null;
     }
-    return ordersResponse.data?.map((item) => item.rows)?.flat().map((item) => {
+    return ordersResponse.data?.map((item) => item.rows)?.flat();
+  }, [ordersResponse.data]);
+  const orders = React.useMemo(() => {
+    if (!flattenOrders) {
+      return null;
+    }
+    if (status !== types.OrderStatus.NEW) {
+      return flattenOrders;
+    }
+    return flattenOrders.map((item) => {
       return {
         ...item,
         mark_price: markPrices[item.symbol] ?? 0
       };
     });
-  }, [ordersResponse.data, markPrices]);
+  }, [flattenOrders, markPrices, status]);
   const total = React.useMemo(() => {
     return ordersResponse.data?.[0]?.meta?.total || 0;
   }, [ordersResponse.data?.[0]?.meta?.total]);
@@ -1564,7 +1596,7 @@ var useOrderStream = (params) => {
     return doCancelOrder(null, {
       order_id: orderId,
       symbol: symbol2,
-      source: "mweb"
+      source: `SDK_${version_default}`
     }).then((res) => {
       if (res.success) {
         return res;
@@ -1581,6 +1613,7 @@ var useOrderStream = (params) => {
     {
       total,
       isLoading: ordersResponse.isLoading,
+      refresh: ordersResponse.mutate,
       loadMore,
       cancelAllOrders,
       updateOrder,