@orderly.network/hooks 0.0.14 → 0.0.15

package/dist/index.d.mts

@@ -3,11 +3,11 @@ export { SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
 import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, WSMessage } from '@orderly.network/core';
 import { SystemStateEnum, ExchangeStatusEnum, OrderSide, OrderEntity, API } from '@orderly.network/types';
-import { WebSocketClient, WS } from '@orderly.network/net';
 export { useEventCallback, useObservable } from 'rxjs-hooks';
 export { default as useConstant } from 'use-constant';
 import * as react from 'react';
 import { FC, PropsWithChildren } from 'react';
+import { WS } from '@orderly.network/net';
 import * as swr__internal from 'swr/_internal';
 import * as swr_subscription from 'swr/subscription';
 
@@ -59,8 +59,6 @@ declare const useAppState: () => {
     exchangeState: ExchangeStatusEnum;
 };
 
-declare const useWebSocketClient: () => WebSocketClient;
-
 declare const DataSourceProvider: FC<PropsWithChildren>;
 
 declare const useWS: () => WS;
@@ -285,4 +283,4 @@ declare namespace index {
   };
 }
 
-export { DataSourceProvider, OrderStatus, OrderlyAppConfig, OrderlyContext, OrderlyContextState, OrderlyProvider, index as apis, useAccount, useAccountInfo, useAppState, useChains, useCollateral, useFetures, useFundingRate$1 as useFundingRate, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePrivateObserve, usePrivateQuery, useQuery, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradeStream, useTradingView, useWS, useWebSocketClient };
+export { DataSourceProvider, OrderStatus, OrderlyAppConfig, OrderlyContext, OrderlyContextState, OrderlyProvider, index as apis, useAccount, useAccountInfo, useAppState, useChains, useCollateral, useFetures, useFundingRate$1 as useFundingRate, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePrivateObserve, usePrivateQuery, useQuery, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradeStream, useTradingView, useWS };

package/dist/index.d.ts

@@ -3,11 +3,11 @@ export { SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
 import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, WSMessage } from '@orderly.network/core';
 import { SystemStateEnum, ExchangeStatusEnum, OrderSide, OrderEntity, API } from '@orderly.network/types';
-import { WebSocketClient, WS } from '@orderly.network/net';
 export { useEventCallback, useObservable } from 'rxjs-hooks';
 export { default as useConstant } from 'use-constant';
 import * as react from 'react';
 import { FC, PropsWithChildren } from 'react';
+import { WS } from '@orderly.network/net';
 import * as swr__internal from 'swr/_internal';
 import * as swr_subscription from 'swr/subscription';
 
@@ -59,8 +59,6 @@ declare const useAppState: () => {
     exchangeState: ExchangeStatusEnum;
 };
 
-declare const useWebSocketClient: () => WebSocketClient;
-
 declare const DataSourceProvider: FC<PropsWithChildren>;
 
 declare const useWS: () => WS;
@@ -285,4 +283,4 @@ declare namespace index {
   };
 }
 
-export { DataSourceProvider, OrderStatus, OrderlyAppConfig, OrderlyContext, OrderlyContextState, OrderlyProvider, index as apis, useAccount, useAccountInfo, useAppState, useChains, useCollateral, useFetures, useFundingRate$1 as useFundingRate, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePrivateObserve, usePrivateQuery, useQuery, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradeStream, useTradingView, useWS, useWebSocketClient };
+export { DataSourceProvider, OrderStatus, OrderlyAppConfig, OrderlyContext, OrderlyContextState, OrderlyProvider, index as apis, useAccount, useAccountInfo, useAppState, useChains, useCollateral, useFetures, useFundingRate$1 as useFundingRate, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePrivateObserve, usePrivateQuery, useQuery, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradeStream, useTradingView, useWS };

package/dist/index.js

@@ -6,10 +6,10 @@ var net = require('@orderly.network/net');
 var useSWRMutation = require('swr/mutation');
 var useConstant = require('use-constant');
 var core = require('@orderly.network/core');
-var rxjsHooks = require('rxjs-hooks');
 var types = require('@orderly.network/types');
 var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
+var rxjsHooks = require('rxjs-hooks');
 var ramda = require('ramda');
 var useSWRSubscription = require('swr/subscription');
 var utils = require('@orderly.network/utils');
@@ -231,10 +231,16 @@ var useAccount = () => {
     }
     return account5;
   });
-  const state = rxjsHooks.useObservable(
-    () => account4.state$,
-    account4.stateValue
-  );
+  const [state, setState] = React.useState(account4.stateValue);
+  const statusChangeHandler = (nextState) => {
+    setState(() => nextState);
+  };
+  React.useEffect(() => {
+    account4.on("change:status", statusChangeHandler);
+    return () => {
+      account4.off("change:status", statusChangeHandler);
+    };
+  }, []);
   const login = React.useCallback(
     (address) => {
       account4.login(address);
@@ -355,27 +361,6 @@ var useAppState = () => {
     }
   );
 };
-var WS_NAME = "websocketClient";
-var useWebSocketClient = () => {
-  const ws = useConstant__default.default(() => {
-    let websocketClient = core.SimpleDI.get(WS_NAME);
-    if (!websocketClient) {
-      websocketClient = new net.WebSocketClient({
-        accountId: "OqdphuyCtYWxwzhxyLLjOWNdFP7sQt8RPWzmb5xY",
-        networkId: "testnet",
-        onSigntureRequest: (accountId) => __async(void 0, null, function* () {
-          const signer = core.getMockSigner();
-          const timestamp = (/* @__PURE__ */ new Date()).getTime();
-          const result = yield signer.signText(timestamp.toString());
-          return __spreadProps(__spreadValues({}, result), { timestamp });
-        })
-      });
-      core.SimpleDI.registerByName(WS_NAME, websocketClient);
-    }
-    return websocketClient;
-  });
-  return ws;
-};
 var DataSourceContext = React.createContext({});
 var DataSourceProvider = (props) => {
   console.log("render DataSourceProvider");
@@ -384,15 +369,19 @@ var DataSourceProvider = (props) => {
   });
   return /* @__PURE__ */ React__default.default.createElement(DataSourceContext.Provider, { value: {} }, props.children);
 };
-var WS_NAME2 = "nativeWebsocketClient";
+var WS_NAME = "nativeWebsocketClient";
 var useWS = () => {
+  useAccount();
+  const { configStore } = React.useContext(OrderlyContext);
   const ws = useConstant__default.default(() => {
-    let websocketClient = core.SimpleDI.get(WS_NAME2);
+    let websocketClient = core.SimpleDI.get(WS_NAME);
     const account4 = core.SimpleDI.get(core.Account.instanceName);
     if (!websocketClient) {
       websocketClient = new net.WS({
         // accountId: "OqdphuyCtYWxwzhxyLLjOWNdFP7sQt8RPWzmb5xY",
         networkId: "testnet",
+        publicUrl: configStore.get("publicWsUrl"),
+        privateUrl: configStore.get("privateWsUrl"),
         onSigntureRequest: (accountId) => __async(void 0, null, function* () {
           const signer = account4.signer;
           const timestamp = (/* @__PURE__ */ new Date()).getTime();
@@ -400,7 +389,7 @@ var useWS = () => {
           return __spreadProps(__spreadValues({}, result), { timestamp });
         })
       });
-      core.SimpleDI.registerByName(WS_NAME2, websocketClient);
+      core.SimpleDI.registerByName(WS_NAME, websocketClient);
     }
     return websocketClient;
   });
@@ -649,8 +638,6 @@ function createGetter(data, depth = 2) {
     }
   });
 }
-
-// src/orderly/useSymbolsInfo.ts
 var useSymbolsInfo = () => {
   const { data = {} } = useQuery(`/v1/public/info`, {
     focusThrottleInterval: 1e3 * 60 * 60 * 24,
@@ -664,7 +651,11 @@ var useSymbolsInfo = () => {
       for (let index = 0; index < data2.rows.length; index++) {
         const item = data2.rows[index];
         const arr = item.symbol.split("_");
+        const base_dp = utils.getPrecisionByNumber(item.base_tick);
+        const quote_dp = utils.getPrecisionByNumber(item.quote_tick);
         obj[item.symbol] = __spreadProps(__spreadValues({}, item), {
+          base_dp,
+          quote_dp,
           base: arr[1],
           quote: arr[2],
           type: arr[0],
@@ -1361,6 +1352,29 @@ var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
     symbolConfig: symbolInfo[symbol]()
   };
 };
+var WS_NAME2 = "websocketClient";
+var useWebSocketClient = () => {
+  const ws = useConstant__default.default(() => {
+    let websocketClient = core.SimpleDI.get(WS_NAME2);
+    if (!websocketClient) {
+      websocketClient = new net.WebSocketClient({
+        accountId: "OqdphuyCtYWxwzhxyLLjOWNdFP7sQt8RPWzmb5xY",
+        networkId: "testnet",
+        onSigntureRequest: (accountId) => __async(void 0, null, function* () {
+          const signer = core.getMockSigner();
+          const timestamp = (/* @__PURE__ */ new Date()).getTime();
+          const result = yield signer.signText(timestamp.toString());
+          return __spreadProps(__spreadValues({}, result), { timestamp });
+        })
+      });
+      core.SimpleDI.registerByName(WS_NAME2, websocketClient);
+    }
+    return websocketClient;
+  });
+  return ws;
+};
+
+// src/orderly/useFetures.ts
 var useFetures = () => {
   const { data, isLoading, error } = useQuery(
     `/v1/public/futures`,
@@ -1739,6 +1753,5 @@ exports.useTopicObserve = useTopicObserve;
 exports.useTradeStream = useTradeStream;
 exports.useTradingView = useTradingView;
 exports.useWS = useWS;
-exports.useWebSocketClient = useWebSocketClient;
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.js.map