@orderly.network/hooks 2.8.4 → 2.8.5-alpha.0

package/dist/index.d.mts

@@ -36,7 +36,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.8.4";
+declare const _default: "2.8.5-alpha.0";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -705,7 +705,7 @@ declare const useSymbolInfo: (symbol?: string) => ((<Key extends keyof _orderly_
 declare const useAccountInfo: () => swr.SWRResponse<API.AccountInfo, any, any>;
 
 declare const useMarketsStream: () => {
-    data: WSMessage.Ticker[] | null;
+    data: WSMessage.Ticker[];
 };
 
 declare enum MarketsType$1 {

package/dist/index.d.ts

@@ -36,7 +36,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.8.4";
+declare const _default: "2.8.5-alpha.0";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -705,7 +705,7 @@ declare const useSymbolInfo: (symbol?: string) => ((<Key extends keyof _orderly_
 declare const useAccountInfo: () => swr.SWRResponse<API.AccountInfo, any, any>;
 
 declare const useMarketsStream: () => {
-    data: WSMessage.Ticker[] | null;
+    data: WSMessage.Ticker[];
 };
 
 declare enum MarketsType$1 {

package/dist/index.js

@@ -64,9 +64,9 @@ var __export = (target, all) => {
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.8.4";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.8.5-alpha.0";
 }
-var version_default = "2.8.4";
+var version_default = "2.8.5-alpha.0";
 var fetcher = (url, init2 = {}, queryOptions) => net.get(url, init2, queryOptions?.formatter);
 var noCacheConfig = {
   dedupingInterval: 0,
@@ -3231,28 +3231,42 @@ var ProxyConfigStore = class {
     this._originConfigStore.clear();
   }
 };
+var useMarketStore = zustand.create(
+  (set, get3) => ({
+    market: [],
+    marketMap: null,
+    actions: {
+      updateMarket: (data) => {
+        const marketMap = {};
+        data.forEach((item) => {
+          marketMap[item.symbol] = item;
+        });
+        set({
+          market: data,
+          marketMap
+        });
+      }
+    }
+  })
+);
+var useMarketList = () => {
+  return useMarketStore((state) => state.market);
+};
+var useMarketMap = () => {
+  return useMarketStore((state) => state.marketMap);
+};
+
+// src/orderly/useMarketsStream.ts
 var useMarketsStream = () => {
   const ws = useWS();
-  const { data: futures } = useQuery(`/v1/public/futures`, {
-    revalidateOnFocus: false
-  });
+  const futures = useMarketList();
   const topic = "tickers";
   const { data: tickers } = useSWRSubscription__default.default("tickers", (_, { next }) => {
-    const unsubscribe = ws.subscribe(
-      // { event: "subscribe", topic: "markprices" },
-      topic,
-      {
-        onMessage: (message) => {
-          next(null, message);
-        }
-        // onUnsubscribe: () => {
-        //   return "markprices";
-        // },
-        // onError: (error: any) => {
-        //
-        // },
+    const unsubscribe = ws.subscribe(topic, {
+      onMessage: (message) => {
+        next(null, message);
       }
-    );
+    });
     return () => {
       unsubscribe?.();
     };
@@ -4018,37 +4032,6 @@ var useMarkPrice = (symbol) => {
   }, [symbol]);
   return { data: price };
 };
-var useFutures = () => {
-  const { data, isLoading, error } = useQuery(
-    `/v1/public/futures`,
-    {
-      revalidateOnFocus: false
-    }
-  );
-  const [sortedData, setSortedData] = React2.useState(data);
-  useWS();
-  React2.useEffect(() => {
-  }, []);
-  React2.useEffect(() => {
-    if (data) {
-      const sortedData2 = data.sort((a, b) => {
-        return 0;
-      });
-      setSortedData(sortedData2);
-    }
-  }, [data]);
-  const sortBy = React2.useCallback((key) => {
-  }, [data]);
-  const filterBy = React2.useCallback((key) => {
-  }, [data]);
-  return {
-    data: sortedData,
-    sortBy,
-    filterBy,
-    isLoading,
-    error
-  };
-};
 var useIndexPrice = (symbol) => {
   symbol = symbol.replace("PERP", "SPOT");
   const symbolRef = React2.useRef(symbol);
@@ -4126,24 +4109,17 @@ var useTickerStream = (symbol) => {
   const { data: markPrice } = useMarkPrice(symbol);
   const { data: indexPrice } = useIndexPrice(symbol);
   const { data: openInterest } = useOpenInterest(symbol);
-  const { data: futures } = useFutures();
+  const marketMap = useMarketMap();
   const value = React2.useMemo(() => {
     if (!info)
       return null;
     if (!ticker || ticker.symbol !== symbol)
       return info;
-    const futureIndex = futures?.findIndex(
-      (item) => item.symbol === symbol
-    );
-    let _oi = openInterest;
-    if (!_oi && futureIndex !== -1 && futures) {
-      _oi = futures[futureIndex].open_interest;
-    }
     const config = {
       ...info,
       mark_price: markPrice,
       index_price: indexPrice,
-      open_interest: _oi
+      open_interest: openInterest || marketMap?.[symbol]?.open_interest
     };
     if (ticker.open !== void 0) {
       config["24h_open"] = ticker.open;
@@ -4166,7 +4142,7 @@ var useTickerStream = (symbol) => {
       config["24h_change"] = new utils.Decimal(ticker.close).minus(ticker.open).toNumber();
     }
     return config;
-  }, [info, symbol, ticker, futures, openInterest]);
+  }, [info, symbol, ticker, openInterest, marketMap]);
   return value;
 };
 
@@ -10975,54 +10951,46 @@ var useTokenInfo = (token) => {
     return tokensInfo?.find((item) => item.token === token);
   }, [tokensInfo, token]);
 };
-var useMarketStore = zustand.create(
-  (set, get3) => ({
-    market: [],
-    // marketSymbols: [],
-    marketMap: null,
-    actions: {
-      updateMarket: (data) => {
-        const marketMap = {};
-        data.forEach((item) => {
-          marketMap[item.symbol] = item;
-        });
-        set({
-          market: data,
-          // marketSymbols: symbols,
-          marketMap
-        });
-      },
-      updateTicker: (data) => {
-        set(
-          immer$1.produce((state) => {
-            state.market = data;
-          })
-        );
-      }
+var useFutures = () => {
+  const { dataAdapter } = useOrderlyContext();
+  const { data } = useQuery("/v1/public/futures", {
+    // 24 hours
+    focusThrottleInterval: 1e3 * 60 * 60 * 24,
+    revalidateOnFocus: true,
+    // 24 hours
+    dedupingInterval: 1e3 * 60 * 60 * 24
+    // onSuccess will not be called, because /v1/public/futures trigger multiple times
+    // onSuccess(data: API.MarketInfo[]) {
+    // if (!data || !data?.length) {
+    //   return [];
+    // }
+    // updateMarket(data as API.MarketInfoExt[]);
+    // },
+  });
+  const futures = React2.useMemo(() => {
+    if (Array.isArray(data)) {
+      return typeof dataAdapter?.symbolList === "function" ? dataAdapter.symbolList(data) : data;
     }
-  })
-);
-var useMarketList = () => {
-  return useMarketStore((state) => state.market);
-};
-var useMarketMap = () => {
-  return useMarketStore((state) => state.marketMap);
+    return [];
+  }, [data, dataAdapter?.symbolList]);
+  return {
+    data: futures
+  };
 };
 
 // src/orderly/usePublicDataObserver.ts
 var publicQueryOptions = {
+  // 24 hours, not effective, because revalidateOnFocus is false
   focusThrottleInterval: 1e3 * 60 * 60 * 24,
   revalidateOnFocus: false,
+  // 24 hours
   dedupingInterval: 1e3 * 60 * 60 * 24
 };
 var usePublicDataObserver = () => {
   const { setSymbolsInfo, setFundingRates, setRwaSymbolsInfo } = useAppStore(
     (state) => state.actions
   );
-  const { updateMarket } = useMarketStore((state) => state.actions);
   const symbols = useSymbolStore((state) => state.data);
-  const { dataAdapter } = useOrderlyContext();
-  const resolveList = typeof dataAdapter?.symbolList === "function" ? dataAdapter.symbolList : (oriVal) => oriVal;
   React2.useEffect(() => {
     if (!symbols || !symbols?.length) {
       return;
@@ -11083,23 +11051,11 @@ var usePublicDataObserver = () => {
       setFundingRates(obj);
     }
   });
-  useQuery(`/v1/public/futures`, {
-    // revalidateOnFocus: false,
-    ...publicQueryOptions,
-    onSuccess(data) {
-      if (!data || !data?.length) {
-        return [];
-      }
-      updateMarket(data);
-    },
-    formatter(data) {
-      const rowsData = data.rows;
-      if (Array.isArray(rowsData)) {
-        return resolveList(rowsData);
-      }
-      return resolveList(data);
-    }
-  });
+  const { data: futures } = useFutures();
+  const { updateMarket } = useMarketStore((state) => state.actions);
+  React2.useEffect(() => {
+    updateMarket(futures);
+  }, [futures]);
 };
 function getEstFundingRate(data) {
   if (!data) {