@orderly.network/hooks 1.0.7 → 1.0.8

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';
@@ -98,6 +99,7 @@ interface OrderlyConfigContextState {
 }
 declare const OrderlyContext: react.Context<OrderlyConfigContextState>;
 declare const OrderlyProvider: react.Provider<OrderlyConfigContextState>;
+declare const useOrderlyContext: () => OrderlyConfigContextState;
 
 declare type RequireAtLeastOne<T, R extends keyof T = keyof T> = Omit<T, R> & {
     [K in R]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<R, K>>>;
@@ -109,7 +111,7 @@ interface ConfigProviderProps {
     brokerId: string;
     networkId: NetworkId;
 }
-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;
 
 declare type ConnectedChain = {
     id: string;
@@ -339,6 +341,7 @@ declare const useDeposit: (options?: useDepositOptions | undefined) => {
 declare const useHoldingStream: () => {
     data: API.Holding[] | undefined;
     usdc: API.Holding | undefined;
+    balance: any;
     isLoading: boolean;
 };
 
@@ -429,4 +432,4 @@ declare const useSwap: () => {
     status: WS_WalletStatusEnum;
 };
 
-export { ConfigProviderProps, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };
+export { ConfigProviderProps, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, useOrderlyContext, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };

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';
@@ -98,6 +99,7 @@ interface OrderlyConfigContextState {
 }
 declare const OrderlyContext: react.Context<OrderlyConfigContextState>;
 declare const OrderlyProvider: react.Provider<OrderlyConfigContextState>;
+declare const useOrderlyContext: () => OrderlyConfigContextState;
 
 declare type RequireAtLeastOne<T, R extends keyof T = keyof T> = Omit<T, R> & {
     [K in R]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<R, K>>>;
@@ -109,7 +111,7 @@ interface ConfigProviderProps {
     brokerId: string;
     networkId: NetworkId;
 }
-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;
 
 declare type ConnectedChain = {
     id: string;
@@ -339,6 +341,7 @@ declare const useDeposit: (options?: useDepositOptions | undefined) => {
 declare const useHoldingStream: () => {
     data: API.Holding[] | undefined;
     usdc: API.Holding | undefined;
+    balance: any;
     isLoading: boolean;
 };
 
@@ -429,4 +432,4 @@ declare const useSwap: () => {
     status: WS_WalletStatusEnum;
 };
 
-export { ConfigProviderProps, OrderlyConfigContextState, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };
+export { ConfigProviderProps, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, WalletConnectorContext, useAccount, useAccountInfo, useAccountInstance, useBoolean, useChain, useChains, useCollateral, useConfig, useCrossSwap, useDeposit, useEventEmitter, useFundingRate, useHoldingStream, useIndexPrice, useLazyQuery, useLeverage, useLocalStorage, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketTradeStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, useOrderlyContext, usePositionStream, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useSessionStorage, useSettleSubscription, useSwap, useSymbolsInfo, useTickerStream, useWS, useWalletConnector, useWalletSubscription, useWithdraw, useWooCrossSwapQuery, useWooSwapQuery };

package/dist/index.js

@@ -8,6 +8,7 @@ var useConstant4 = require('use-constant');
 var core = require('@orderly.network/core');
 var types = require('@orderly.network/types');
 var useSWRInfinite = require('swr/infinite');
+var jsxRuntime = require('react/jsx-runtime');
 var utils = require('@orderly.network/utils');
 var useSWRSubscription = require('swr/subscription');
 var ramda = require('ramda');
@@ -30,6 +31,9 @@ var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
 });
 var OrderlyProvider = OrderlyContext.Provider;
+var useOrderlyContext = () => {
+  return React.useContext(OrderlyContext);
+};
 
 // src/useConfig.ts
 var useConfig = (key, defaultValue) => {
@@ -472,7 +476,7 @@ var OrderlyConfigProvider = (props) => {
   if (!account5) {
     return null;
   }
-  return /* @__PURE__ */ React__default.default.createElement(
+  return /* @__PURE__ */ jsxRuntime.jsx(
     OrderlyProvider,
     {
       value: {
@@ -480,10 +484,9 @@ var OrderlyConfigProvider = (props) => {
         keyStore: innerKeyStore,
         getWalletAdapter: innerGetWalletAdapter,
         networkId
-        // apiBaseUrl,
-      }
-    },
-    props.children
+      },
+      children: props.children
+    }
   );
 };
 var WalletConnectorContext = React.createContext({});
@@ -1100,8 +1103,8 @@ var usePositionStream = (symbol, options) => {
   const fundingRates = useFundingRates();
   const {
     data,
-    error,
-    mutate: updatePositions
+    error
+    // mutate: updatePositions,
   } = usePrivateQuery(`/v1/positions`, {
     // revalidateOnFocus: false,
     // revalidateOnReconnect: false,
@@ -1113,10 +1116,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)
@@ -1265,41 +1264,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(
@@ -1314,7 +1278,7 @@ var useHoldingStream = () => {
     const usdc2 = data?.find((item) => item.token === "USDC");
     return usdc2;
   }, [data]);
-  useSWRSubscription__default.default("holding", (_, { next }) => {
+  const { data: balance } = useSWRSubscription__default.default("holding", (_, { next }) => {
     const unsubscribe = ws.privateSubscribe(
       {
         id: "balance",
@@ -1346,6 +1310,7 @@ var useHoldingStream = () => {
   return {
     data,
     usdc,
+    balance,
     isLoading
   };
 };
@@ -1576,37 +1541,11 @@ var useCollateral = (options = { dp: 6 }) => {
 var positionsPath2 = ramda.pathOr([], [0, "rows"]);
 var useMaxQty = (symbol, side, reduceOnly = false) => {
   const positionsData = usePositionStream();
+  const [orders] = useOrderStream({ status: types.OrderStatus.NEW });
   const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   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 maxQty = React.useMemo(() => {
     if (!symbol)
       return 0;
@@ -3571,6 +3510,17 @@ var usePrivateDataObserver = () => {
   const ws = useWS();
   const { mutate: mutate2 } = useSWR.useSWRConfig();
   const { state } = useAccount();
+  React.useEffect(() => {
+    console.log("----!!!usePrivateDataObserver!!!----");
+  }, []);
+  React.useEffect(() => {
+    const unsubscribe = ws.privateSubscribe("executionreport", {
+      onMessage: (data) => {
+        console.log(data);
+      }
+    });
+    return () => unsubscribe?.();
+  }, [state.accountId]);
   React.useEffect(() => {
     if (!state.accountId)
       return;
@@ -3578,6 +3528,7 @@ var usePrivateDataObserver = () => {
     const unsubscribe = ws.privateSubscribe("position", {
       onMessage: (data) => {
         const { positions: nextPostions } = data;
+        console.log("ws-----data-----", data);
         mutate2(key, (prevPositions) => {
           if (!!prevPositions) {
             return {
@@ -4265,6 +4216,7 @@ exports.useMutation = useMutation;
 exports.useOrderEntry = useOrderEntry;
 exports.useOrderStream = useOrderStream;
 exports.useOrderbookStream = useOrderbookStream;
+exports.useOrderlyContext = useOrderlyContext;
 exports.usePositionStream = usePositionStream;
 exports.usePreLoadData = usePreLoadData;
 exports.usePrivateDataObserver = usePrivateDataObserver;