@orderly.network/hooks 0.0.36 → 0.0.38

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import useSWR, { SWRConfiguration, SWRResponse } from 'swr';
-export { SWRConfiguration, default as useSWR } from 'swr';
+export { SWRConfig, SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
 import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import useSWR, { SWRConfiguration, SWRResponse } from 'swr';
-export { SWRConfiguration, default as useSWR } from 'swr';
+export { SWRConfig, SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
 import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';

package/dist/index.js

@@ -601,6 +601,7 @@ function createGetter(data, depth = 2) {
 var useSymbolsInfo = () => {
   const { data = {} } = useQuery(`/v1/public/info`, {
     focusThrottleInterval: 1e3 * 60 * 60 * 24,
+    dedupingInterval: 1e3 * 60 * 60 * 24,
     revalidateOnFocus: false,
     formatter(data2) {
       var _a;
@@ -887,16 +888,21 @@ function quantityInputHandle(inputs) {
     quantity = quantity.toDecimalPlaces(config.baseDP);
     values.order_quantity = quantity.toNumber();
   }
-  let price = markPrice;
-  if (values.order_type === types.OrderType.LIMIT && !!values.order_price) {
-    price = Number(values.order_price);
+  if (values.order_type === types.OrderType.MARKET) {
+    const price = markPrice;
+    values.total = quantity.mul(price).todp(2).toNumber();
+  }
+  if (values.order_type === types.OrderType.LIMIT) {
+    if (values.order_price) {
+      const price = Number(values.order_price);
+      const total = quantity.mul(price);
+      values.total = total.todp(2).toNumber();
+    } else {
+      values.total = "";
+    }
   }
-  const total = quantity.mul(price);
-  total.dp();
   return [
-    __spreadProps(__spreadValues({}, values), {
-      total: total.todp(2).toNumber()
-    }),
+    __spreadValues({}, values),
     input,
     value,
     markPrice,
@@ -1023,7 +1029,7 @@ var parseHolding = (holding, markPrices) => {
 var usePositionStream = (symbol, options) => {
   var _a;
   const symbolInfo = useSymbolsInfo();
-  useAccount();
+  useEventEmitter();
   const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const { data: holding } = usePrivateQuery(
     "/v1/client/holding",
@@ -1034,13 +1040,11 @@ var usePositionStream = (symbol, options) => {
     }
   );
   const fundingRates = useFundingRates();
-  const { data, error } = usePrivateQuery(`/v1/positions`, __spreadProps(__spreadValues({
-    // revalidateOnFocus: false,
-    // revalidateOnReconnect: false,
-    dedupingInterval: 5e3,
-    keepPreviousData: false,
-    revalidateIfStale: true
-  }, options), {
+  const {
+    data,
+    error
+    // mutate: updatePositions,
+  } = usePrivateQuery(`/v1/positions`, __spreadProps(__spreadValues({}, options), {
     formatter: (data2) => data2,
     onError: (err) => {
       console.log("usePositionStream error", err);
@@ -1480,8 +1484,9 @@ var OrderFactory = class {
     }
   }
 };
+
+// src/orderly/useOrderEntry.ts
 var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
-  const { mutate: mutate2 } = useSWR.useSWRConfig();
   const [doCreateOrder] = useMutation("/v1/order");
   const { freeCollateral } = useCollateral();
   const symbolInfo = useSymbolsInfo();
@@ -1525,12 +1530,7 @@ var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
       const data = orderCreator.create(values);
       return doCreateOrder(__spreadProps(__spreadValues({}, data), {
         symbol
-      })).then((res) => {
-        if (res.success) {
-          mutate2("/v1/orders?size=100&page=1$status=NEW");
-        }
-        return res;
-      });
+      }));
     });
   };
   const calculate = React2.useCallback(
@@ -1782,7 +1782,6 @@ var useOrderStream = ({
   const cancelAllOrders = React2.useCallback(() => {
   }, [ordersResponse.data]);
   const updateOrder = React2.useCallback((orderId, order2) => {
-    console.log("updateOrder", order2, orderId);
     return doUpdateOrder(__spreadProps(__spreadValues({}, order2), { order_id: orderId }));
   }, []);
   const cancelOrder = React2.useCallback((orderId, symbol2) => {
@@ -1948,6 +1947,7 @@ var usePrivateDataObserver = () => {
   const ws = useWS();
   const { mutate: mutate2 } = useSWR.useSWRConfig();
   const ee = useEventEmitter();
+  const { state } = useAccount();
   React2.useEffect(() => {
     console.log("subscribe: executionreport");
     const unsubscribe = ws.privateSubscribe("executionreport", {
@@ -1958,19 +1958,56 @@ var usePrivateDataObserver = () => {
     return () => unsubscribe == null ? void 0 : unsubscribe();
   }, []);
   React2.useEffect(() => {
-    console.log("subscribe: position");
+    console.log("subscribe: position: %s", state.accountId);
+    if (!state.accountId)
+      return;
+    const key = ["/v1/positions", state.accountId];
     const unsubscribe = ws.privateSubscribe("position", {
       onMessage: (data) => {
         const { positions: nextPostions } = data;
-        console.info("refresh positions", nextPostions);
-        mutate2("/v1/positions");
+        console.info("refresh positions:", nextPostions, state.accountId);
+        mutate2(key, (prevPositions) => {
+          console.log("prevPositions:::::", prevPositions);
+          if (!!prevPositions) {
+            return __spreadProps(__spreadValues({}, prevPositions), {
+              rows: prevPositions.rows.map((row) => {
+                const item = nextPostions.find(
+                  (item2) => item2.symbol === row.symbol
+                );
+                if (item) {
+                  return {
+                    symbol: item.symbol,
+                    position_qty: item.positionQty,
+                    cost_position: item.costPosition,
+                    last_sum_unitary_funding: item.lastSumUnitaryFunding,
+                    pending_long_qty: item.pendingLongQty,
+                    pending_short_qty: item.pendingShortQty,
+                    settle_price: item.settlePrice,
+                    average_open_price: item.averageOpenPrice,
+                    unsettled_pnl: item.unsettledPnl,
+                    mark_price: item.markPrice,
+                    est_liq_price: item.estLiqPrice,
+                    timestamp: Date.now(),
+                    imr: item.imr,
+                    mmr: item.mmr,
+                    IMR_withdraw_orders: item.imrwithOrders,
+                    MMR_with_orders: item.mmrwithOrders,
+                    pnl_24_h: item.pnl24H,
+                    fee_24_h: item.fee24H
+                  };
+                }
+                return row;
+              })
+            });
+          }
+        });
       }
     });
     return () => {
       console.log("unsubscribe: private subscription position");
       unsubscribe == null ? void 0 : unsubscribe();
     };
-  }, []);
+  }, [state.accountId]);
 };
 var useExecutionReport = () => {
   const ws = useWS();
@@ -2013,6 +2050,10 @@ var useFundingRateBySymbol = (symbol) => {
   return useQuery(`/public/funding_rate/${symbol}`);
 };
 
+Object.defineProperty(exports, 'SWRConfig', {
+  enumerable: true,
+  get: function () { return useSWR.SWRConfig; }
+});
 Object.defineProperty(exports, 'useSWR', {
   enumerable: true,
   get: function () { return useSWR__default.default; }