@orderly.network/hooks 0.0.12 → 0.0.13

package/dist/index.js

@@ -90,9 +90,6 @@ var fetcher = (url, init = {}, queryOptions) => net.get(url, init, queryOptions
 var useQuery = (query, options) => {
   const { apiBaseUrl } = React.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");
   }
@@ -125,36 +122,51 @@ var useAccountInstance = () => {
 
 // src/useMutation.ts
 var fetcher2 = (url, options) => {
-  return net.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 net.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 net.mutate(url, init);
 };
-var useMutation = (url, options, method = "POST") => {
+var useMutation = (url, method = "POST", options) => {
   const { apiBaseUrl } = React.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__default.default(
-    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
       })
@@ -180,7 +192,7 @@ var signatureMiddleware = (useSWRNext) => {
         const signer = account4.signer;
         const payload = {
           method: "GET",
-          url: fullUrl
+          url
         };
         const signature = yield signer.sign(payload);
         return fetcher4(fullUrl, {
@@ -398,7 +410,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__default.default(
     `${symbol}@ticker`,
@@ -635,7 +652,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) {
@@ -663,7 +680,7 @@ var useSymbolsInfo = () => {
 // src/orderly/useTokenInfo.ts
 var useTokenInfo = () => {
   const { data = {} } = useQuery(
-    "/public/token",
+    "/v1/public/token",
     {
       focusThrottleInterval: 1e3 * 60 * 60 * 24,
       revalidateOnFocus: false,
@@ -810,7 +827,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,
@@ -864,9 +881,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);
@@ -968,15 +985,18 @@ var positionsPath = ramda.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] = React.useMemo(() => {
     if (!holding || !markPrices) {
       return [utils.zero, utils.zero];
@@ -1034,8 +1054,8 @@ var useCollateral = (options = { dp: 6 }) => {
 var positionsPath2 = ramda.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();
@@ -1133,7 +1153,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 = {
@@ -1254,10 +1273,9 @@ var OrderFactory = class {
     }
   }
 };
-
-// src/orderly/useOrderEntry.ts
 var useOrderEntry = (symbol, side, reduceOnly = false, options) => {
-  const [mutation] = useMutation("/order");
+  const { mutate: mutate2 } = useSWR.useSWRConfig();
+  const [doCreateOrder] = useMutation("/v1/order");
   const { freeCollateral } = useCollateral();
   const symbolInfo = useSymbolsInfo();
   const tokenInfo = useTokenInfo();
@@ -1298,9 +1316,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 = React.useCallback(
@@ -1339,7 +1362,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] = React.useState(data);
   const ws = useWebSocketClient();
   React.useEffect(() => {
@@ -1374,11 +1402,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__default.default("tickers", (_, { next }) => {
     const unsubscribe = ws.subscribe(
       // { event: "subscribe", topic: "markprices" },
@@ -1427,12 +1457,15 @@ var useFundingRate = (symbol) => {
     throw new Error("useFuturesForSymbol requires a symbol");
   }
   const [countDown, setCountDown] = React.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
+      }
     }
-  });
+  );
   React.useEffect(() => {
     if (!data)
       return;
@@ -1484,7 +1517,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"],
@@ -1494,7 +1529,7 @@ var useOrderStream = ({
       if (symbol) {
         search.set(`symbol`, symbol);
       }
-      return `/orders?${search.toString()}`;
+      return `/v1/orders?${search.toString()}`;
     },
     {
       initialSize: 1,
@@ -1505,21 +1540,35 @@ var useOrderStream = ({
   );
   const orders = React.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 = React.useCallback(() => {
-  }, [res.data]);
-  const updateOrder = React.useCallback((id, data) => {
+  }, [ordersResponse.data]);
+  const updateOrder = React.useCallback((orderId, order2) => {
+    console.log("updateOrder", order2, orderId);
+    return doUpdateOrder(__spreadProps(__spreadValues({}, order2), { order_id: orderId }));
   }, []);
-  const cancelOrder = React.useCallback((id) => {
+  const cancelOrder = React.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,
@@ -1543,7 +1592,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 };
 };
@@ -1619,14 +1668,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
@@ -1639,7 +1688,7 @@ var useFundingRateBySymbol = (symbol) => {
 
 // src/apis/useFundingRate.ts
 var useFundingRate2 = (symbol) => {
-  return useQuery(`/public/funding_rate`);
+  return useQuery(`/v1/public/funding_rate`);
 };
 
 Object.defineProperty(exports, 'useSWR', {