@orderly.network/hooks 1.1.3-alpha.9 → 1.1.3

package/dist/index.d.mts

@@ -25,7 +25,7 @@ declare global {
         };
     }
 }
-declare const _default: "1.1.3-alpha.9";
+declare const _default: "1.1.3";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -118,7 +118,11 @@ interface OrderlyConfigContextState {
 declare const OrderlyContext: react.Context<OrderlyConfigContextState>;
 declare const OrderlyProvider: react.Provider<OrderlyConfigContextState>;
 
-type WsNetworkStatus = "connected" | "unstable" | "disconnected";
+declare enum WsNetworkStatus {
+    Connected = "connected",
+    Unstable = "unstable",
+    Disconnected = "disconnected"
+}
 declare function useWsStatus(): WsNetworkStatus;
 
 interface StatusContextState {
@@ -185,7 +189,7 @@ type OrderbookOptions = {
 declare const useOrderbookStream: (symbol: string, initial?: OrderbookData, options?: OrderbookOptions) => ({
     asks: OrderBookItem[];
     bids: OrderBookItem[];
-    markPrice: any;
+    markPrice: number;
     middlePrice: number[];
     onDepthChange?: undefined;
     depth?: undefined;
@@ -240,7 +244,7 @@ type UseOrderEntryReturn = {
     metaState: UseOrderEntryMetaState;
     symbolConfig: API.SymbolExt;
 };
-type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">>;
+type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">> & {};
 /**
  * Create Order
  * @example
@@ -302,7 +306,9 @@ declare const useMarkets: (type: MarketsType) => readonly [_orderly_network_type
 
 declare const useMarkPricesStream: () => swr_subscription.SWRSubscriptionResponse<any, any>;
 
-declare const useMarkPrice: (symbol: string) => swr_subscription.SWRSubscriptionResponse<any, any>;
+declare const useMarkPrice: (symbol: string) => {
+    data: number;
+};
 
 declare const useIndexPrice: (symbol: string) => swr_subscription.SWRSubscriptionResponse<any, any>;
 
@@ -539,4 +545,4 @@ declare const useCrossSwap: () => any;
 /** @hidden */
 declare const useSwap: () => any;
 
-export { ConfigProviderProps, Favorite, FavoriteTab, MarketsType, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, Recent, StatusContext, StatusContextState, StatusProvider, UseOrderEntryMetaState, WalletConnectorContext, cleanStringStyle, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarkets, useMarketsStream, useMaxQty, useMediaQuery, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolPriceRange, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery, useWsStatus, _default as version };
+export { ConfigProviderProps, Favorite, FavoriteTab, MarketsType, OrderParams, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, Recent, StatusContext, StatusContextState, StatusProvider, UseOrderEntryMetaState, WalletConnectorContext, WsNetworkStatus, cleanStringStyle, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarkets, useMarketsStream, useMaxQty, useMediaQuery, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolPriceRange, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery, useWsStatus, _default as version };

package/dist/index.d.ts

@@ -25,7 +25,7 @@ declare global {
         };
     }
 }
-declare const _default: "1.1.3-alpha.9";
+declare const _default: "1.1.3";
 
 type useQueryOptions<T> = SWRConfiguration & {
     formatter?: (data: any) => T;
@@ -118,7 +118,11 @@ interface OrderlyConfigContextState {
 declare const OrderlyContext: react.Context<OrderlyConfigContextState>;
 declare const OrderlyProvider: react.Provider<OrderlyConfigContextState>;
 
-type WsNetworkStatus = "connected" | "unstable" | "disconnected";
+declare enum WsNetworkStatus {
+    Connected = "connected",
+    Unstable = "unstable",
+    Disconnected = "disconnected"
+}
 declare function useWsStatus(): WsNetworkStatus;
 
 interface StatusContextState {
@@ -185,7 +189,7 @@ type OrderbookOptions = {
 declare const useOrderbookStream: (symbol: string, initial?: OrderbookData, options?: OrderbookOptions) => ({
     asks: OrderBookItem[];
     bids: OrderBookItem[];
-    markPrice: any;
+    markPrice: number;
     middlePrice: number[];
     onDepthChange?: undefined;
     depth?: undefined;
@@ -240,7 +244,7 @@ type UseOrderEntryReturn = {
     metaState: UseOrderEntryMetaState;
     symbolConfig: API.SymbolExt;
 };
-type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">>;
+type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">> & {};
 /**
  * Create Order
  * @example
@@ -302,7 +306,9 @@ declare const useMarkets: (type: MarketsType) => readonly [_orderly_network_type
 
 declare const useMarkPricesStream: () => swr_subscription.SWRSubscriptionResponse<any, any>;
 
-declare const useMarkPrice: (symbol: string) => swr_subscription.SWRSubscriptionResponse<any, any>;
+declare const useMarkPrice: (symbol: string) => {
+    data: number;
+};
 
 declare const useIndexPrice: (symbol: string) => swr_subscription.SWRSubscriptionResponse<any, any>;
 
@@ -539,4 +545,4 @@ declare const useCrossSwap: () => any;
 /** @hidden */
 declare const useSwap: () => any;
 
-export { ConfigProviderProps, Favorite, FavoriteTab, MarketsType, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, Recent, StatusContext, StatusContextState, StatusProvider, UseOrderEntryMetaState, WalletConnectorContext, cleanStringStyle, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarkets, useMarketsStream, useMaxQty, useMediaQuery, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolPriceRange, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery, useWsStatus, _default as version };
+export { ConfigProviderProps, Favorite, FavoriteTab, MarketsType, OrderParams, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, Recent, StatusContext, StatusContextState, StatusProvider, UseOrderEntryMetaState, WalletConnectorContext, WsNetworkStatus, cleanStringStyle, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarkets, useMarketsStream, useMaxQty, useMediaQuery, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolPriceRange, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery, useWsStatus, _default as version };

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.1.3-alpha.9";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.3";
 }
-var version_default = "1.1.3-alpha.9";
+var version_default = "1.1.3";
 var fetcher = (url, init = {}, queryOptions) => net.get(url, init, queryOptions?.formatter);
 var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
@@ -457,10 +457,16 @@ var useWS = () => {
   });
   return ws;
 };
+var WsNetworkStatus = /* @__PURE__ */ ((WsNetworkStatus2) => {
+  WsNetworkStatus2["Connected"] = "connected";
+  WsNetworkStatus2["Unstable"] = "unstable";
+  WsNetworkStatus2["Disconnected"] = "disconnected";
+  return WsNetworkStatus2;
+})(WsNetworkStatus || {});
 function useWsStatus() {
   const ws = useWS();
   const [wsStatus, setWsStatus] = React.useState(
-    ws.client.public.readyState ? "connected" : "disconnected"
+    ws.client.public.readyState ? "connected" /* Connected */ : "disconnected" /* Disconnected */
   );
   const connectCount = React.useRef(0);
   React.useEffect(() => {
@@ -470,16 +476,16 @@ function useWsStatus() {
         switch (type) {
           case "open":
             connectCount.current = 0;
-            setWsStatus("connected");
+            setWsStatus("connected" /* Connected */);
             break;
           case "close":
             connectCount.current = 0;
-            setWsStatus("disconnected");
+            setWsStatus("disconnected" /* Disconnected */);
             break;
           case "reconnecting":
             connectCount.current++;
-            if (connectCount.current >= 2) {
-              setWsStatus("unstable");
+            if (connectCount.current >= 3) {
+              setWsStatus("unstable" /* Unstable */);
             }
             break;
         }
@@ -507,7 +513,8 @@ var usePrivateDataObserver = (options) => {
       "positions"
     );
     map.forEach((getKey, key) => {
-      if (orderStatus === "history" && key === "orders" || orderStatus === "positions" && key === "orders:NEW" || key.includes(orderStatus)) {
+      if (orderStatus === "history" && key === "orders" || orderStatus === "positions" && key === "orders:NEW" || key.includes("INCOMPLETE") || // always update pending list
+      key.includes(orderStatus)) {
         mutate2(
           useSWRInfinite.unstable_serialize((index, prevData) => [
             getKey(index, prevData),
@@ -704,16 +711,18 @@ var useWalletConnector = () => {
 };
 var useMarkPrice = (symbol) => {
   const ws = useWS();
-  return useSWRSubscription__default.default(`${symbol}@markprice`, (key, { next }) => {
+  const [price, setPrice] = React.useState(0);
+  React.useEffect(() => {
     const unsubscribe = ws.subscribe(`${symbol}@markprice`, {
       onMessage: (message) => {
-        next(null, message.price);
+        setPrice(message.price);
       }
     });
     return () => {
       unsubscribe?.();
     };
-  });
+  }, [symbol]);
+  return { data: price };
 };
 var useIndexPrice = (symbol) => {
   symbol = symbol.replace("PERP", "SPOT");
@@ -879,7 +888,7 @@ var reduceItems = (depth, level, data, asks = false) => {
   const result = [];
   if (typeof depth !== "undefined") {
     const prices = /* @__PURE__ */ new Map();
-    for (let i = 0; i < ramda.min(level, data.length); i++) {
+    for (let i = 0; i < data.length; i++) {
       const [price, quantity] = data[i];
       if (isNaN(price) || isNaN(quantity))
         continue;
@@ -1202,13 +1211,13 @@ function quantityInputHandle(inputs) {
   }
   if (values.order_type === types.OrderType.MARKET || values.order_type === types.OrderType.STOP_MARKET) {
     const price = markPrice;
-    values.total = quantity.mul(price).todp(2).toNumber();
+    values.total = quantity.mul(price).todp(2).toString();
   }
   if (values.order_type === types.OrderType.LIMIT || values.order_type === types.OrderType.STOP_LIMIT) {
     if (values.order_price) {
       const price = Number(values.order_price);
       const total = quantity.mul(price);
-      values.total = total.todp(2).toNumber();
+      values.total = total.todp(2).toString();
     } else {
       values.total = "";
     }
@@ -1237,13 +1246,13 @@ function totalInputHandle(inputs) {
   const totalDP = total.dp();
   if (totalDP > config.quoteDP) {
     total = total.toDecimalPlaces(config.quoteDP);
-    values.total = total.toNumber();
+    values.total = total.toString();
   }
   const quantity = total.div(price);
   return [
     {
       ...values,
-      order_quantity: quantity.toDecimalPlaces(Math.min(config.baseDP, quantity.dp())).toNumber()
+      order_quantity: quantity.toDecimalPlaces(Math.min(config.baseDP, quantity.dp())).toString()
     },
     input,
     value,
@@ -1711,7 +1720,8 @@ var useOrderStream = (params) => {
     // onError: (err) => {
     //   console.error("fetch failed::::", err);
     // },
-    formatter: (data) => data
+    formatter: (data) => data,
+    revalidateOnFocus: false
   });
   const flattenOrders = React.useMemo(() => {
     if (!ordersResponse.data) {
@@ -2346,7 +2356,7 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
   const diffOrderEntry = (prev, current) => {
     if (!prev)
       return null;
-    let key, value;
+    let key, value, preValue;
     const keys = Object.keys(current);
     for (let i = 0; i < keys.length; i++) {
       const k = keys[i];
@@ -2357,12 +2367,13 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
       if (preveValue !== currentValue) {
         key = k;
         value = currentValue;
+        preValue = preveValue;
         break;
       }
     }
     if (!key)
       return null;
-    return { key, value };
+    return { key, value, preValue };
   };
   const maxQty = useMaxQty(symbol, sideValue, isReduceOnly);
   const parseString2Number = (order3, key) => {
@@ -2373,12 +2384,34 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     }
     order3[key] = order3[key].replace(/,/g, "");
   };
+  const needParse = React.useMemo(() => {
+    if (typeof symbolOrOrder === "string") {
+      return null;
+    }
+    return ramda.pick([
+      "order_price",
+      "side",
+      "order_quantity",
+      "visible_quantity",
+      "order_type",
+      "order_type_ext",
+      "symbol",
+      "total",
+      "reduce_only",
+      "trigger_price"
+    ])(
+      //@ts-ignore
+      symbolOrOrder
+    );
+  }, [symbolOrOrder]);
   const parsedData = React.useMemo(() => {
     if (typeof symbolOrOrder === "string") {
       return null;
     }
     if (typeof symbolOrOrder.order_quantity === "string") {
       parseString2Number(symbolOrOrder, "order_quantity");
+    } else if (typeof symbolOrOrder.order_quantity === "number") {
+      symbolOrOrder.order_quantity = new utils.Decimal(symbolOrOrder.order_quantity).toDecimalPlaces(baseDP).toString();
     }
     if (typeof symbolOrOrder.order_price === "string") {
       parseString2Number(symbolOrOrder, "order_price");
@@ -2389,14 +2422,18 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     if (typeof symbolOrOrder.trigger_price === "string") {
       parseString2Number(symbolOrOrder, "trigger_price");
     }
-    if (typeof symbolOrOrder.trigger_price === "string") {
-      symbolOrOrder.trigger_price = symbolOrOrder.trigger_price.replace(/,/g, "");
-    }
-    if (typeof symbolOrOrder.order_quantity === "number") {
-      symbolOrOrder.order_quantity = new utils.Decimal(symbolOrOrder.order_quantity).toDecimalPlaces(baseDP).toString();
-    }
     return symbolOrOrder;
-  }, [symbolOrOrder]);
+  }, [
+    needParse?.order_price,
+    needParse?.order_quantity,
+    needParse?.total,
+    needParse?.trigger_price,
+    needParse?.order_type,
+    needParse?.order_type_ext,
+    needParse?.symbol,
+    needParse?.reduce_only,
+    needParse?.side
+  ]);
   const createOrder = (values) => {
     if (!values.symbol) {
       throw new types.SDKError("symbol is error");
@@ -2518,19 +2555,7 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     prevOrderData.current = parsedData;
     orderDataCache.current = values;
     return values;
-  }, [
-    parsedData?.order_price,
-    parsedData?.side,
-    parsedData?.order_quantity,
-    parsedData?.visible_quantity,
-    parsedData?.order_type,
-    parsedData?.order_type_ext,
-    parsedData?.symbol,
-    parsedData?.total,
-    parsedData?.reduce_only,
-    parsedData?.trigger_price,
-    markPrice
-  ]);
+  }, [parsedData, markPrice]);
   React.useEffect(() => {
     if (!markPrice)
       return;
@@ -4058,7 +4083,7 @@ var woofiDexCrossChainRouterAbi = [
 var nativeTokenAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 var isNativeTokenChecker = (address) => address === nativeTokenAddress;
 var useChains = (networkId, options = {}) => {
-  const { pick: pick3, crossEnabled, wooSwapEnabled, ...swrOptions } = options;
+  const { pick: pick4, crossEnabled, wooSwapEnabled, ...swrOptions } = options;
   const { configStore } = React.useContext(OrderlyContext);
   const field = options?.pick;
   const filterFun = React.useRef(options?.filter);
@@ -5287,6 +5312,7 @@ exports.OrderlyProvider = OrderlyProvider;
 exports.StatusContext = StatusContext;
 exports.StatusProvider = StatusProvider;
 exports.WalletConnectorContext = WalletConnectorContext;
+exports.WsNetworkStatus = WsNetworkStatus;
 exports.cleanStringStyle = cleanStringStyle;
 exports.useAccount = useAccount;
 exports.useAccountInfo = useAccountInfo;