@orderly.network/hooks 0.0.12 → 0.0.13

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import React, { createContext, useContext, useCallback, useState, useEffect, useMemo } from 'react';
-import useSWR from 'swr';
+import useSWR, { useSWRConfig } from 'swr';
 export { default as useSWR } from 'swr';
-import { WebSocketClient, WS, get, post, del } from '@orderly.network/net';
+import { WebSocketClient, WS, get, mutate } from '@orderly.network/net';
 import useSWRMutation from 'swr/mutation';
 import useConstant from 'use-constant';
 export { default as useConstant } from 'use-constant';
@@ -82,9 +82,6 @@ var fetcher = (url, init = {}, queryOptions) => get(url, init, queryOptions == n
 var useQuery = (query, options) => {
   const { apiBaseUrl } = useContext(OrderlyContext);
   const _a = options || {}, { formatter } = _a, swrOptions = __objRest(_a, ["formatter"]);
-  if (typeof query === "string" && !query.startsWith("/public")) {
-    throw new Error("useQuery is only for public api");
-  }
   if (typeof apiBaseUrl === "undefined") {
     throw new Error("please add OrderlyProvider to your app");
   }
@@ -117,36 +114,51 @@ var useAccountInstance = () => {
 
 // src/useMutation.ts
 var fetcher2 = (url, options) => {
-  return post(url, options.arg.data, {
+  console.log("muation fetcher", url, options);
+  const init = {
+    method: options.arg.method,
     headers: __spreadValues({}, options.arg.signature)
-  });
-};
-var deleteFetcher = (url, options) => {
-  return del(url, options.arg.data, {
-    headers: __spreadValues({}, options.arg.signature)
-  });
+  };
+  if (options.arg.data) {
+    init.body = JSON.stringify(options.arg.data);
+  }
+  if (typeof options.arg.params === "object" && Object.keys(options.arg.params).length) {
+    let search = new URLSearchParams(options.arg.params);
+    url = `${url}?${search.toString()}`;
+  }
+  return mutate(url, init);
 };
-var useMutation = (url, options, method = "POST") => {
+var useMutation = (url, method = "POST", options) => {
   const { apiBaseUrl } = useContext(OrderlyContext);
+  let fullUrl = url;
   if (!url.startsWith("http")) {
-    url = `${apiBaseUrl}${url}`;
+    fullUrl = `${apiBaseUrl}${url}`;
   }
   const account4 = useAccountInstance();
   const signer = account4.signer;
   const { trigger, data, error, reset, isMutating } = useSWRMutation(
-    url,
-    method === "POST" ? fetcher2 : deleteFetcher,
+    fullUrl,
+    // method === "POST" ? fetcher : deleteFetcher,
+    fetcher2,
     options
   );
-  const mutation = (data2) => __async(void 0, null, function* () {
+  const mutation = (data2, params) => __async(void 0, null, function* () {
+    let newUrl = url;
+    if (typeof params === "object" && Object.keys(params).length) {
+      let search = new URLSearchParams(params);
+      newUrl = `${url}?${search.toString()}`;
+    }
     const payload = {
       method,
-      url,
+      url: newUrl,
       data: data2
     };
+    console.log("payload", payload);
     const signature = yield signer.sign(payload);
     return trigger({
       data: data2,
+      params,
+      method,
       signature: __spreadProps(__spreadValues({}, signature), {
         "orderly-account-id": account4.accountId
       })
@@ -172,7 +184,7 @@ var signatureMiddleware = (useSWRNext) => {
         const signer = account4.signer;
         const payload = {
           method: "GET",
-          url: fullUrl
+          url
         };
         const signature = yield signer.sign(payload);
         return fetcher4(fullUrl, {
@@ -390,7 +402,12 @@ var useTickerStream = (symbol) => {
   if (!symbol) {
     throw new Error("useFuturesForSymbol requires a symbol");
   }
-  const { data: info } = useQuery(`/public/futures/${symbol}`);
+  const { data: info } = useQuery(
+    `/v1/public/futures/${symbol}`,
+    {
+      revalidateOnFocus: false
+    }
+  );
   const ws = useWS();
   const { data: ticker } = useSWRSubscription(
     `${symbol}@ticker`,
@@ -627,7 +644,7 @@ function createGetter(data, depth = 2) {
 
 // src/orderly/useSymbolsInfo.ts
 var useSymbolsInfo = () => {
-  const { data = {} } = useQuery(`/public/info`, {
+  const { data = {} } = useQuery(`/v1/public/info`, {
     focusThrottleInterval: 1e3 * 60 * 60 * 24,
     revalidateOnFocus: false,
     formatter(data2) {
@@ -655,7 +672,7 @@ var useSymbolsInfo = () => {
 // src/orderly/useTokenInfo.ts
 var useTokenInfo = () => {
   const { data = {} } = useQuery(
-    "/public/token",
+    "/v1/public/token",
     {
       focusThrottleInterval: 1e3 * 60 * 60 * 24,
       revalidateOnFocus: false,
@@ -802,7 +819,7 @@ var getCalculateHandler = (fieldName) => {
 // src/orderly/useFundingRates.ts
 var useFundingRates = () => {
   const { data } = useQuery(
-    `/public/funding_rates`,
+    `/v1/public/funding_rates`,
     {
       focusThrottleInterval: 1e3 * 60 * 60 * 24,
       revalidateOnFocus: false,
@@ -856,9 +873,9 @@ var usePositionStream = (symbol, options) => {
     symbol
   );
   const symbolInfo = useSymbolsInfo();
-  const { data: accountInfo } = usePrivateQuery("/client/info");
+  const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const fundingRates = useFundingRates();
-  const { data, error } = usePrivateQuery(`/positions`, __spreadProps(__spreadValues({}, options), {
+  const { data, error } = usePrivateQuery(`/v1/positions`, __spreadProps(__spreadValues({}, options), {
     formatter: (data2) => data2,
     onError: (err) => {
       console.log("usePositionStream error", err);
@@ -960,15 +977,18 @@ var positionsPath = pathOr([], [0, "rows"]);
 var useCollateral = (options = { dp: 6 }) => {
   const { dp } = options;
   const positions2 = usePositionStream();
-  const { data: orders } = usePrivateQuery(`/orders`);
-  const { data: accountInfo } = usePrivateQuery("/client/info");
+  const { data: orders } = usePrivateQuery(`/v1/orders`);
+  const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const symbolInfo = useSymbolsInfo();
   const { data: markPrices } = useMarkPricesStream();
-  const { data: holding } = usePrivateQuery("/client/holding", {
-    formatter: (data) => {
-      return data.holding;
+  const { data: holding } = usePrivateQuery(
+    "/v1/client/holding",
+    {
+      formatter: (data) => {
+        return data.holding;
+      }
     }
-  });
+  );
   const [totalCollateral, totalValue] = useMemo(() => {
     if (!holding || !markPrices) {
       return [zero, zero];
@@ -1026,8 +1046,8 @@ var useCollateral = (options = { dp: 6 }) => {
 var positionsPath2 = pathOr([], [0, "rows"]);
 var useMaxQty = (symbol, side, reduceOnly = false) => {
   const positionsData = usePositionStream();
-  const { data: orders } = usePrivateQuery(`/orders`);
-  const { data: accountInfo } = usePrivateQuery("/client/info");
+  const { data: orders } = usePrivateQuery(`/v1/orders`);
+  const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const symbolInfo = useSymbolsInfo();
   const { totalCollateral } = useCollateral();
   const { data: markPrices } = useMarkPricesStream();
@@ -1125,7 +1145,6 @@ var BaseOrderCreator = class {
   baseValidate(values, configs) {
     const errors = {};
     const { maxQty } = configs;
-    console.log("baseValidate", values, configs);
     const { order_quantity, total } = values;
     if (!order_quantity) {
       errors.order_quantity = {
@@ -1246,10 +1265,9 @@ var OrderFactory = class {
     }
   }
 };
-
-// src/orderly/useOrderEntry.ts
 var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
-  const [mutation] = useMutation("/order");
+  const { mutate: mutate2 } = useSWRConfig();
+  const [doCreateOrder] = useMutation("/v1/order");
   const { freeCollateral } = useCollateral();
   const symbolInfo = useSymbolsInfo();
   const tokenInfo = useTokenInfo();
@@ -1290,9 +1308,14 @@ var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
         throw new Error("symbol is null");
       }
       const data = orderCreator.create(values);
-      return mutation(__spreadProps(__spreadValues({}, data), {
+      return doCreateOrder(__spreadProps(__spreadValues({}, data), {
         symbol
-      }));
+      })).then((res) => {
+        if (res.success) {
+          mutate2("/v1/orders?size=100&page=1$status=NEW");
+        }
+        return res;
+      });
     });
   };
   const calculate = useCallback(
@@ -1331,7 +1354,12 @@ var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
   };
 };
 var useFetures = () => {
-  const { data, isLoading, error } = useQuery(`/public/futures`);
+  const { data, isLoading, error } = useQuery(
+    `/v1/public/futures`,
+    {
+      revalidateOnFocus: false
+    }
+  );
   const [sortedData, setSortedData] = useState(data);
   const ws = useWebSocketClient();
   useEffect(() => {
@@ -1366,11 +1394,13 @@ var useFetures = () => {
 
 // src/orderly/useAccountInfo.ts
 var useAccountInfo = () => {
-  return usePrivateQuery("/client/info");
+  return usePrivateQuery("/v1/client/info");
 };
 var useMarketsStream = () => {
   const ws = useWS();
-  const { data: futures } = useQuery(`/public/futures`);
+  const { data: futures } = useQuery(`/v1/public/futures`, {
+    revalidateOnFocus: false
+  });
   const { data: tickers } = useSWRSubscription("tickers", (_, { next }) => {
     const unsubscribe = ws.subscribe(
       // { event: "subscribe", topic: "markprices" },
@@ -1419,12 +1449,15 @@ var useFundingRate = (symbol) => {
     throw new Error("useFuturesForSymbol requires a symbol");
   }
   const [countDown, setCountDown] = useState("00:00:00");
-  const { data } = useQuery(`/public/funding_rate/${symbol}`, {
-    fallbackData: {
-      est_funding_rate: 0,
-      next_funing_time: 0
+  const { data } = useQuery(
+    `/v1/public/funding_rate/${symbol}`,
+    {
+      fallbackData: {
+        est_funding_rate: 0,
+        next_funing_time: 0
+      }
     }
-  });
+  );
   useEffect(() => {
     if (!data)
       return;
@@ -1476,7 +1509,9 @@ var useOrderStream = ({
   symbol
 } = {}) => {
   const { data: markPrices = {} } = useMarkPricesStream();
-  const res = usePrivateInfiniteQuery(
+  const [doCancelOrder] = useMutation("/v1/order", "DELETE");
+  const [doUpdateOrder] = useMutation("/v1/order", "PUT");
+  const ordersResponse = usePrivateInfiniteQuery(
     (pageIndex, previousPageData) => {
       const search = new URLSearchParams([
         ["size", "100"],
@@ -1486,7 +1521,7 @@ var useOrderStream = ({
       if (symbol) {
         search.set(`symbol`, symbol);
       }
-      return `/orders?${search.toString()}`;
+      return `/v1/orders?${search.toString()}`;
     },
     {
       initialSize: 1,
@@ -1497,21 +1532,35 @@ var useOrderStream = ({
   );
   const orders = useMemo(() => {
     var _a;
-    if (!res.data) {
+    if (!ordersResponse.data) {
       return null;
     }
-    return (_a = res.data) == null ? void 0 : _a.flat().map((item) => {
+    return (_a = ordersResponse.data) == null ? void 0 : _a.flat().map((item) => {
       var _a2;
       return __spreadProps(__spreadValues({}, item), {
         mark_price: (_a2 = markPrices[item.symbol]) != null ? _a2 : 0
       });
     });
-  }, [res.data, markPrices]);
+  }, [ordersResponse.data, markPrices]);
   const cancelAllOrders = useCallback(() => {
-  }, [res.data]);
-  const updateOrder = useCallback((id, data) => {
+  }, [ordersResponse.data]);
+  const updateOrder = useCallback((orderId, order2) => {
+    console.log("updateOrder", order2, orderId);
+    return doUpdateOrder(__spreadProps(__spreadValues({}, order2), { order_id: orderId }));
   }, []);
-  const cancelOrder = useCallback((id) => {
+  const cancelOrder = useCallback((orderId, symbol2) => {
+    return doCancelOrder(null, {
+      order_id: orderId,
+      symbol: symbol2
+    }).then((res) => {
+      if (res.success) {
+        return ordersResponse.mutate().then(() => {
+          return res;
+        });
+      } else {
+        throw new Error(res.message);
+      }
+    });
   }, []);
   return [
     orders,
@@ -1535,7 +1584,7 @@ var useTradeStream = (symbol) => {
     throw new Error("useTradeStream: symbol is required");
   }
   const { data, isLoading } = useQuery(
-    `/public/market_trades?symbol=${symbol}&limit=20`
+    `/v1/public/market_trades?symbol=${symbol}&limit=20`
   );
   return { data, isLoading };
 };
@@ -1611,14 +1660,14 @@ __export(apis_exports, {
 
 // src/apis/useInfo.ts
 var useInfo = () => {
-  return useQuery("/public/info", {
+  return useQuery("/v1/public/info", {
     // refreshInterval: 1000 * 60 * 60 * 24,
   });
 };
 
 // src/apis/useToken.ts
 var useToken = () => {
-  return useQuery("/public/token");
+  return useQuery("/v1/public/token");
 };
 
 // src/apis/useFundingRateBySymbol.ts
@@ -1631,7 +1680,7 @@ var useFundingRateBySymbol = (symbol) => {
 
 // src/apis/useFundingRate.ts
 var useFundingRate2 = (symbol) => {
-  return useQuery(`/public/funding_rate`);
+  return useQuery(`/v1/public/funding_rate`);
 };
 
 export { DataSourceProvider, OrderStatus, OrderlyContext, OrderlyProvider, apis_exports as apis, useAccount, useAccountInfo, useAppState, useChains, useCollateral, useFetures, useFundingRate, useMarginRatio, useMarkPrice, useMarkPricesStream, useMarketsStream, useMaxQty, useMutation, useOrderEntry, useOrderStream, useOrderbookStream, usePositionStream, usePrivateObserve, usePrivateQuery, useQuery, useSymbolsInfo, useTickerStream, useTokenInfo, useTopicObserve, useTradeStream, useTradingView, useWS, useWebSocketClient };