@orderly.network/hooks 1.1.5-rc.0 → 1.1.6

package/esm/dataProvider.d.ts

@@ -1,10 +1,11 @@
 import { PropsWithChildren } from "react";
 export type getKeyFunction = (index: number, prevData: any) => string | null;
-interface DataCenterContextValue {
+interface DataCenterContextState {
     regesterKeyHandler: (key: string, handler: getKeyFunction) => void;
+    unregisterKeyHandler: (key: string) => void;
 }
-export declare const DataCenterContext: import("react").Context<DataCenterContextValue>;
-export declare const useDataCenterContext: () => DataCenterContextValue;
+export declare const DataCenterContext: import("react").Context<DataCenterContextState>;
+export declare const useDataCenterContext: () => DataCenterContextState;
 export declare const DataCenterProvider: ({ children }: PropsWithChildren) => import("react/jsx-runtime").JSX.Element | null;
 export {};
 //# sourceMappingURL=dataProvider.d.ts.map

package/esm/dataProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataProvider.d.ts","sourceRoot":"","sources":["../src/dataProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAqC,MAAM,OAAO,CAAC;AAI7E,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,MAAM,GAAG,IAAI,CAAC;AAE7E,UAAU,sBAAsB;IAK9B,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;CACpE;AAED,eAAO,MAAM,iBAAiB,iDAE7B,CAAC;AAEF,eAAO,MAAM,oBAAoB,8BAAsC,CAAC;AAExE,eAAO,MAAM,kBAAkB,iBAAkB,iBAAiB,mDAgCjE,CAAC"}
+{"version":3,"file":"dataProvider.d.ts","sourceRoot":"","sources":["../src/dataProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAqC,MAAM,OAAO,CAAC;AAI7E,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,MAAM,GAAG,IAAI,CAAC;AAE7E,UAAU,sBAAsB;IAK9B,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACnE,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7C;AAED,eAAO,MAAM,iBAAiB,iDAE7B,CAAC;AAEF,eAAO,MAAM,oBAAoB,8BAAsC,CAAC;AAExE,eAAO,MAAM,kBAAkB,iBAAkB,iBAAiB,mDAqCjE,CAAC"}

package/esm/dataProvider.js

@@ -23,7 +23,12 @@ export const DataCenterProvider = ({ children }) => {
         return null;
     return (_jsx(DataCenterContext.Provider, { value: {
             regesterKeyHandler: (key, fun) => {
+                console.log("regesterKeyHandler", key);
                 getKeyHandlerMapRef.current.set(key, fun);
             },
+            unregisterKeyHandler: (key) => {
+                console.log("unregisterKeyHandler", key);
+                getKeyHandlerMapRef.current.delete(key);
+            },
         }, children: children }));
 };

package/esm/index.d.ts

@@ -1,3 +1,4 @@
+import "./utils/dev";
 export { default as version } from "./version";
 export { useQuery } from "./useQuery";
 export { useLazyQuery } from "./useLazyQuery";
@@ -26,7 +27,9 @@ import useSWR, { type SWRConfiguration, SWRConfig } from "swr";
 export { useSWR, SWRConfig, type SWRConfiguration };
 export * from "use-debounce";
 export { useMediaQuery } from "./useMediaQuery";
-export { usePoster, type drawOptions } from "./usePoster";
+export { usePoster } from "./usePoster";
+export { DefaultLayoutConfig } from "./services/painter/layout.config";
+export type { PosterLayoutConfig, DrawOptions, } from "./services/painter/basePaint";
 export * from "./orderly/orderlyHooks";
 export { cleanStringStyle } from "./utils/orderEntryHelper";
 export type { WalletAdapter } from "@orderly.network/core";

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,cAAc,wBAAwB,CAAC;AAGvC,OAAO,MAAM,EAAE,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEpD,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1D,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAErB,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,cAAc,wBAAwB,CAAC;AAEvC,OAAO,MAAM,EAAE,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEpD,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,YAAY,EACV,kBAAkB,EAClB,WAAW,GACZ,MAAM,8BAA8B,CAAC;AAEtC,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/esm/index.js

@@ -1,3 +1,4 @@
+import "./utils/dev";
 export { default as version } from "./version";
 export { useQuery } from "./useQuery";
 export { useLazyQuery } from "./useLazyQuery";
@@ -26,5 +27,6 @@ export { useSWR, SWRConfig };
 export * from "use-debounce";
 export { useMediaQuery } from "./useMediaQuery";
 export { usePoster } from "./usePoster";
+export { DefaultLayoutConfig } from "./services/painter/layout.config";
 export * from "./orderly/orderlyHooks";
 export { cleanStringStyle } from "./utils/orderEntryHelper";

package/esm/orderly/useMarketsStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMarketsStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useMarketsStream.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,eAAO,MAAM,gBAAgB;;CA4D5B,CAAC"}
+{"version":3,"file":"useMarketsStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useMarketsStream.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,eAAO,MAAM,gBAAgB;;CA6D5B,CAAC"}

package/esm/orderly/useMarketsStream.js

@@ -14,6 +14,7 @@ export const useMarketsStream = () => {
         // { event: "subscribe", topic: "markprices" },
         "tickers", {
             onMessage: (message) => {
+                // window.debugPrint(message);
                 next(null, message);
             },
             // onUnsubscribe: () => {

package/esm/orderly/useMaxQty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMaxQty.d.ts","sourceRoot":"","sources":["../../src/orderly/useMaxQty.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,SAAS,EAAe,MAAM,wBAAwB,CAAC;AAgB1E,eAAO,MAAM,SAAS,WACZ,MAAM,QACR,SAAS,eACH,OAAO,WAuIpB,CAAC"}
+{"version":3,"file":"useMaxQty.d.ts","sourceRoot":"","sources":["../../src/orderly/useMaxQty.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,SAAS,EAAe,MAAM,wBAAwB,CAAC;AAe1E,eAAO,MAAM,SAAS,WACZ,MAAM,QACR,SAAS,eACH,OAAO,WA2HpB,CAAC"}

package/esm/orderly/useMaxQty.js

@@ -17,32 +17,6 @@ export const useMaxQty = (symbol, side, reduceOnly = false) => {
     const { totalCollateral } = useCollateral();
     const { data: markPrices } = useMarkPricesStream();
     const [orders] = useOrderStream({ status: OrderStatus.NEW });
-    // const {
-    //   data: orders,
-    //   error,
-    //   mutate: updateOrder,
-    // } = usePrivateQuery<API.Order[]>(`/v1/orders?status=NEW&size=99`, {
-    //   formatter: (data) => data.rows,
-    //   onError: (err) => { },
-    // });
-    // const ws = useWS();
-    // useEffect(() => {
-    //   const unsubscribe = ws.privateSubscribe(
-    //     {
-    //       id: "executionreport_orders",
-    //       event: "subscribe",
-    //       topic: "executionreport",
-    //       ts: Date.now(),
-    //     },
-    //     {
-    //       onMessage: (data: any) => {
-    //         console.log("refresh orders", data);
-    //         updateOrder();
-    //       },
-    //     }
-    //   );
-    //   return () => unsubscribe();
-    // }, []);
     const maxQty = useMemo(() => {
         if (!symbol)
             return 0;
@@ -91,7 +65,7 @@ export const useMaxQty = (symbol, side, reduceOnly = false) => {
             baseMaxQty: getSymbolInfo("base_max"),
             totalCollateral,
             maxLeverage: accountInfo.max_leverage,
-            takerFeeRate: accountInfo.taker_fee_rate,
+            takerFeeRate: accountInfo.futures_taker_fee_rate,
             baseIMR: getSymbolInfo("base_imr"),
             otherIMs,
             positionQty,
@@ -110,5 +84,18 @@ export const useMaxQty = (symbol, side, reduceOnly = false) => {
         totalCollateral,
         reduceOnly,
     ]);
+    // debugPrint({
+    //   maxQty,
+    //   totalCollateral,
+    //   side,
+    //   // reduceOnly,
+    //   orders: orders?.map((o) => o.quantity),
+    //   // positionsData,
+    //   // markPrices,
+    //   // accountInfo,
+    //   // symbolInfo,
+    //   // symbol,
+    // });
+    // console.log("maxQty", maxQty);
     return Math.max(maxQty, 0);
 };

package/esm/orderly/useOrderEntry.js

@@ -9,7 +9,7 @@ import { useCollateral } from "./useCollateral";
 import { useMaxQty } from "./useMaxQty";
 import { OrderFactory, availableOrderTypes } from "../utils/createOrder";
 import { useMarkPrice } from "./useMarkPrice";
-import { order } from "@orderly.network/perp";
+import { order as orderUtils } from "@orderly.network/perp";
 import { useEventEmitter } from "../useEventEmitter";
 import { useDebouncedCallback } from "use-debounce";
 export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
@@ -182,7 +182,7 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
     ]);
     const isStopOrder = parsedData?.order_type === OrderType.STOP_LIMIT ||
         parsedData?.order_type === OrderType.STOP_MARKET;
-    const [doCreateOrder, { data, error, reset, isMutating }] = useMutation(isStopOrder ? "/v1/algo/order" : "/v1/order");
+    const [doCreateOrder, { isMutating }] = useMutation(isStopOrder ? "/v1/algo/order" : "/v1/order");
     // const maxQty = 3;
     const createOrder = (values) => {
         if (!values.symbol) {
@@ -233,9 +233,16 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
                         // ...omit(["order_price"], values),
                         ...data,
                     })).then((res) => {
-                        // console.log("res::::", res);
+                        console.log("--------------------res::::", res);
                         // resolve(res);
                         if (res.success) {
+                            // TODO: remove when the WS service is fixed
+                            if (Array.isArray(res.data.rows)) {
+                                ee.emit("algoOrder:cache", {
+                                    ...res.data.rows[0],
+                                    trigger_price: data.trigger_price,
+                                });
+                            }
                             resolve(res.data);
                         }
                         else {
@@ -348,7 +355,7 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
         }
         ee.on("orderbook:update", onOrderbookUpdate);
         return () => {
-            ee.off("orderbook_update", onOrderbookUpdate);
+            ee.off("orderbook:update", onOrderbookUpdate);
         };
     }, [optionsValue?.watchOrderbook]);
     useEffect(() => {
@@ -424,13 +431,19 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
         const { price, quantity } = result;
         if (!price || !quantity)
             return null;
-        const liqPrice = order.estLiqPrice({
+        const orderFee = orderUtils.orderFee({
+            qty: quantity,
+            price,
+            futuresTakeFeeRate: Number(accountInfo["futures_taker_fee_rate"]) / 10000,
+        });
+        const liqPrice = orderUtils.estLiqPrice({
             markPrice,
             baseIMR,
             baseMMR,
             totalCollateral,
             positions,
             IMR_Factor: accountInfo["imr_factor"][symbol],
+            orderFee,
             newOrder: {
                 qty: quantity,
                 price,
@@ -458,7 +471,7 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
         const result = getPriceAndQty(formattedOrder);
         if (result === null || !result.price || !result.quantity)
             return null;
-        const leverage = order.estLeverage({
+        const leverage = orderUtils.estLeverage({
             totalCollateral,
             positions,
             newOrder: {

package/esm/orderly/useOrderStream.d.ts

@@ -11,7 +11,16 @@ type Params = {
     size?: number;
     side?: OrderSide;
 };
-export declare const useOrderStream: (params: Params) => readonly [any[] | null, {
+export declare const useOrderStream: (params: Params, options?: {
+    /**
+     * Keep the state update alive
+     */
+    keeplive?: boolean;
+    /**
+     * Stop the state update when the component unmount
+     */
+    stopOnUnmount?: boolean;
+}) => readonly [any[] | null, {
     readonly total: any;
     readonly isLoading: boolean;
     readonly refresh: import("swr/_internal").KeyedMutator<any[]>;

package/esm/orderly/useOrderStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderStream.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAQhC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC7B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAC9B;AAID,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,cAAc,WAAY,MAAM;;;;;;oCAyHD,MAAM,SAAS,WAAW;oCAoD1B,MAAM,WAAW,MAAM;wCA7CnB,MAAM,SAAS,WAAW;wCAoD1B,MAAM,WAAW,MAAM;;;;;;;;;;;;;EAkCtE,CAAC"}
+{"version":3,"file":"useOrderStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderStream.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAUhC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC7B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAC9B;AAID,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,cAAc,WAIjB,MAAM,YAEJ;IACR;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;;;;;;oCA+GyC,MAAM,SAAS,WAAW;oCA8D1B,MAAM,WAAW,MAAM;wCAvDnB,MAAM,SAAS,WAAW;wCA8D1B,MAAM,WAAW,MAAM;;;;;;;;;;;;;EAkCtE,CAAC"}

package/esm/orderly/useOrderStream.js

@@ -5,40 +5,32 @@ import { useMarkPricesStream } from "./useMarkPricesStream";
 import { useMutation } from "../useMutation";
 import version from "../version";
 import { useDataCenterContext } from "../dataProvider";
-export const useOrderStream = (params) => {
+import { generateKeyFun } from "../utils/swr";
+import { useEventEmitter } from "../useEventEmitter";
+export const useOrderStream = (
+/**
+ * Orders query params
+ */
+params, options) => {
     const { status, symbol, side, size = 100 } = params;
     const { data: markPrices = {} } = useMarkPricesStream();
-    const { regesterKeyHandler } = useDataCenterContext();
+    const ee = useEventEmitter();
+    const { regesterKeyHandler, unregisterKeyHandler } = useDataCenterContext();
     const [doCancelOrder, { error: cancelOrderError, isMutating: cancelMutating },] = useMutation("/v1/order", "DELETE");
     const [doUpdateOrder, { error: updateOrderError, isMutating: updateMutating },] = useMutation("/v1/order", "PUT");
     const [doCanceAlgolOrder, { error: cancelAlgoOrderError, isMutating: cancelAlgoMutating },] = useMutation("/v1/algo/order", "DELETE");
     const [doUpdateAlgoOrder, { error: updateAlgoOrderError, isMutating: updateAlgoMutating },] = useMutation("/v1/algo/order", "PUT");
-    const getKey = (pageIndex, previousPageData) => {
-        // reached the end
-        if (previousPageData && !previousPageData.rows?.length)
-            return null;
-        const search = new URLSearchParams([
-            ["size", size.toString()],
-            ["page", `${pageIndex + 1}`],
-            ["source_type", "ALL"],
-        ]);
-        if (status) {
-            search.set(`status`, status);
-        }
-        if (symbol) {
-            search.set(`symbol`, symbol);
-        }
-        if (side) {
-            search.set(`side`, side);
-        }
-        return `/v1/orders?${search.toString()}`;
-    };
     useEffect(() => {
         const formatKey = (value) => (value ? `:${value}` : "");
         const key = `orders${formatKey(status)}${formatKey(symbol)}${formatKey(side)}`;
-        regesterKeyHandler(key, getKey);
-    }, [status, symbol, side]);
-    const ordersResponse = usePrivateInfiniteQuery(getKey, {
+        regesterKeyHandler?.(key, generateKeyFun({ status, symbol, side, size }));
+        return () => {
+            if (!options?.stopOnUnmount)
+                return;
+            unregisterKeyHandler(key);
+        };
+    }, [status, symbol, side, options?.keeplive]);
+    const ordersResponse = usePrivateInfiniteQuery(generateKeyFun({ status, symbol, side, size }), {
         initialSize: 1,
         // revalidateFirstPage: false,
         // onError: (err) => {
@@ -53,6 +45,7 @@ export const useOrderStream = (params) => {
         }
         return ordersResponse.data?.map((item) => item.rows)?.flat();
     }, [ordersResponse.data]);
+    // console.log(ordersResponse.data);
     const orders = useMemo(() => {
         if (!flattenOrders) {
             return null;
@@ -97,7 +90,17 @@ export const useOrderStream = (params) => {
      * update algo order
      */
     const updateAlgoOrder = useCallback((orderId, order) => {
-        return _updateOrder(orderId, order, "algoOrder");
+        return _updateOrder(orderId, order, "algoOrder").then((res) => {
+            // TODO: remove this when the WS service provides the correct data
+            ee.emit("algoOrder:cache", {
+                // ...res.data.rows[0],
+                ...order,
+                order_id: Number(orderId),
+                // trigger_price: price,
+            });
+            //------------fix end----------------
+            return res;
+        });
     }, []);
     const _cancelOrder = useCallback((orderId, type, symbol) => {
         switch (type) {

package/esm/orderly/useOrderbookStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderbookStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderbookStream.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB,CAAC;AAyFF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,GAAG,SAAS,SAClB,MAAM,WACJ,OAAO,QACV,aAAa,KAClB,aAqDF,CAAC;AAgCF,eAAO,MAAM,cAAc,SAAU,aAAa,UAAU,aAAa;;;CAWxE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACL,aAAa,YACZ,gBAAgB;;;;;;;;;;;2BA2HgB,MAAM;;;;;;;;;IAmDjD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"useOrderbookStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderbookStream.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB,CAAC;AAyFF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,GAAG,SAAS,SAClB,MAAM,WACJ,OAAO,QACV,aAAa,KAClB,aAyDF,CAAC;AAgCF,eAAO,MAAM,cAAc,SAAU,aAAa,UAAU,aAAa;;;CAWxE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACL,aAAa,YACZ,gBAAgB;;;;;;;;;;;2BAgIgB,MAAM;;;;;;;;;IAmDjD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/esm/orderly/useOrderbookStream.js

@@ -95,18 +95,22 @@ export const reduceOrderbook = (depth, level, padding, data) => {
                 if (askPrice <= bidPrice) {
                     // console.log("xxxxxxxxxxx reset ask list begin", [...asks], { ...asks[0] });
                     asks.shift();
-                    // let logStr = "";
+                    let logStr = "";
                     for (let index = 0; index < asks.length; index++) {
                         if (index === 0) {
                             const quantity = asks[index][1] + askQty;
                             asks[index][1] = quantity;
                             asks[index][2] = quantity;
-                            asks[index][3] += newAmount;
+                            // asks[index][3] += newAmount;
+                            // FIXME: fix this code later
+                            asks[index][3] = Math.ceil(quantity) * asks[index][0];
                         }
                         else {
-                            asks[index][3] += newAmount;
+                            // asks[index][3] += newAmount;
+                            // FIXME: fix this code later
+                            asks[index][3] = asks[index][0] * asks[index][1] + asks[index - 1][3];
                         }
-                        // logStr += `index: ${index} ${asks[index]}\n`;
+                        logStr += `index: ${index} ${asks[index]}\n`;
                     }
                     // console.log("xxxxxxxxxxx reset ask list end", logStr);
                 }
@@ -184,6 +188,8 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
     // const [level, setLevel] = useState(() => options?.level ?? 10);
     const config = useSymbolsInfo()[symbol];
     const [depth, setDepth] = useState();
+    // markPrice, lastPrice
+    const prevMiddlePrice = useRef(0);
     const depths = useMemo(() => {
         const tick = config("quote_tick");
         return [tick, tick * 10, tick * 100, tick * 1000];
@@ -231,6 +237,7 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
             ignore = true;
             // clean the data;
             setData(INIT_DATA);
+            prevMiddlePrice.current = 0;
         };
     }, [symbol]);
     // const {data:markPrices} = useMarkPricesStream();
@@ -259,6 +266,7 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
         });
         return () => {
             ignore = true;
+            prevMiddlePrice.current = 0;
             subscription?.(); //unsubscribe
         };
     }, [symbol, requestData]);
@@ -269,12 +277,10 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
         //
         setDepth(() => depth);
     }, []);
-    // markPrice, lastPrice
-    const prevMiddlePrice = useRef(0);
     const middlePrice = useMemo(() => {
         let asksFrist = 0, bidsFirst = 0;
         if (data.asks.length > 0) {
-            asksFrist = data.asks[data.asks.length - 1][0];
+            asksFrist = data.asks[0][0];
         }
         if (data.bids.length > 0) {
             bidsFirst = data.bids[0][0];
@@ -282,7 +288,7 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
         if (isNaN(asksFrist) || isNaN(bidsFirst) || !ticker)
             return 0;
         return [asksFrist, bidsFirst, ticker["24h_close"]].sort()[1];
-    }, [ticker, data]);
+    }, [ticker?.["24h_close"], data]);
     useEffect(() => {
         prevMiddlePrice.current = middlePrice;
     }, [middlePrice]);
@@ -292,11 +298,12 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
     });
     // emit the asks0 and bids0
     useEffect(() => {
-        eventEmitter.emit("orderbook:update", [
-            reducedData.asks?.[0]?.[0],
-            reducedData.bids?.[0]?.[0],
-        ]);
-    }, [reducedData.asks?.[0]?.[0], reducedData.bids?.[0]?.[0]]);
+        const updateData = [
+            reducedData.asks?.[reducedData.asks.length - 1]?.[0],
+            reducedData.bids?.[0]?.[0]
+        ];
+        eventEmitter.emit("orderbook:update", updateData);
+    }, [reducedData.asks?.[reducedData.asks.length - 1]?.[0], reducedData.bids?.[0]?.[0]]);
     return [
         {
             asks: reducedData.asks.slice(-level),

package/esm/orderly/usePositionStream.js

@@ -102,7 +102,7 @@ symbol, options) => {
                 notional,
                 unsettlement_pnl: unsettlementPnL,
                 unrealized_pnl: unrealPnl,
-                unsettled_pnl_ROI: unrealPnlROI,
+                unrealized_pnl_ROI: unrealPnlROI,
             };
         });
         return [

package/esm/orderly/usePrivateDataObserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePrivateDataObserver.d.ts","sourceRoot":"","sources":["../../src/orderly/usePrivateDataObserver.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,eAAO,MAAM,sBAAsB;uBAEd,MAAM,KAAK,IAAI,MAAM,EAAE,cAAc,CAAC;UAgI1D,CAAC"}
+{"version":3,"file":"usePrivateDataObserver.d.ts","sourceRoot":"","sources":["../../src/orderly/usePrivateDataObserver.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAIjD,eAAO,MAAM,sBAAsB;uBAEd,MAAM,KAAK,IAAI,MAAM,EAAE,cAAc,CAAC;UA4K1D,CAAC"}

package/esm/orderly/usePrivateDataObserver.js

@@ -1,41 +1,60 @@
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { useWS } from "../useWS";
-import { useSWRConfig } from "swr";
+import { mutate } from "swr";
 import { useAccount } from "../useAccount";
 import { unstable_serialize } from "swr/infinite";
-import { useDebouncedCallback } from "use-debounce";
 import { useEventEmitter } from "../useEventEmitter";
-import { parseJSON } from "../utils/json";
+import { updateOrdersHandler } from "../utils/swr";
 export const usePrivateDataObserver = (options) => {
     const ws = useWS();
-    const { mutate } = useSWRConfig();
+    // const { mutate } = useSWRConfig();
     const ee = useEventEmitter();
     const { state } = useAccount();
-    const updateOrders = useDebouncedCallback((data) => {
+    // TODO: remove this when the WS service provides the correct data
+    const algoOrderCacheQuneue = useRef([]);
+    const updateOrders = (data, isAlgoOrder) => {
         const map = options.getKeysMap("orders");
-        const orderStatus = getSessionStorage("orderly_order_status", "positions");
-        map.forEach((getKey, key) => {
-            if ((orderStatus === "history" && key === "orders") ||
-                (orderStatus === "positions" && key === "orders:NEW") ||
-                key.includes("INCOMPLETE") || // always update pending list
-                key.includes(orderStatus)) {
-                mutate(unstable_serialize((index, prevData) => [
-                    getKey(index, prevData),
-                    state.accountId,
-                ]));
+        // console.log("$$$$$$$$$$$$", data, algoOrderCacheQuneue.current);
+        if (isAlgoOrder) {
+            /// TODO: remove this when the WS service provides the correct data
+            if (algoOrderCacheQuneue.current.length) {
+                const index = algoOrderCacheQuneue.current.findIndex((item) => item.order_id === data.algoOrderId);
+                if (index > -1) {
+                    data = {
+                        ...data,
+                        ...algoOrderCacheQuneue.current[index],
+                    };
+                    algoOrderCacheQuneue.current.splice(index, 1);
+                }
             }
+        }
+        map.forEach((getKey, key) => {
+            mutate(unstable_serialize((index, prevData) => [
+                getKey(index, prevData),
+                state.accountId,
+            ]), (prevData) => {
+                return updateOrdersHandler(key, data, prevData);
+            }, {
+                revalidate: false,
+            });
+        });
+        //  emit events;
+        // ee.emit("orders:changed", {
+        //   ...data,
+        //   status: data.status || (data as WSMessage.AlgoOrder).algoStatus,
+        // });
+        ee.emit("orders:changed", {
+            ...data,
+            status: data.status || data.algoStatus,
         });
-        // update the orders history list;
-        // ee.emit("orders:changed");
-    }, 500);
+    };
     // orders
     useEffect(() => {
         if (!state.accountId)
             return;
         const unsubscribe = ws.privateSubscribe("executionreport", {
             onMessage: (data) => {
-                updateOrders(data);
-                ee.emit("orders:changed", data);
+                updateOrders(data, false);
             },
         });
         return () => unsubscribe?.();
@@ -46,13 +65,18 @@ export const usePrivateDataObserver = (options) => {
             return;
         const unsubscribe = ws.privateSubscribe("algoexecutionreport", {
             onMessage: (data) => {
-                updateOrders(data);
-                if (Array.isArray(data)) {
-                    data.forEach((item) => ee.emit("orders:changed", { ...item, status: item.algoStatus }));
-                }
-                else {
-                    ee.emit("orders:changed", { ...data, status: data.algoStatus });
-                }
+                setTimeout(() => {
+                    if (Array.isArray(data)) {
+                        data.forEach((item) => {
+                            updateOrders(item, true);
+                            // ee.emit("orders:changed", { ...item, status: item.algoStatus });
+                        });
+                    }
+                    else {
+                        updateOrders(data, true);
+                        // ee.emit("orders:changed", { ...data, status: data.algoStatus });
+                    }
+                }, 100);
             },
         });
         return () => unsubscribe?.();
@@ -109,18 +133,14 @@ export const usePrivateDataObserver = (options) => {
             unsubscribe?.();
         };
     }, [state.accountId]);
-};
-const getSessionStorage = (key, initialValue) => {
-    // Prevent build error "window is undefined" but keep keep working
-    if (typeof window === "undefined") {
-        return initialValue;
-    }
-    try {
-        const item = window.sessionStorage.getItem(key);
-        return item ? parseJSON(item) : initialValue;
-    }
-    catch (error) {
-        console.warn(`Error reading sessionStorage key “${key}”:`, error);
-        return initialValue;
-    }
+    // cache algo orders
+    useEffect(() => {
+        const handler = (data) => {
+            algoOrderCacheQuneue.current.push(data);
+        };
+        ee.on("algoOrder:cache", handler);
+        return () => {
+            ee.off("algoOrder:cache", handler);
+        };
+    }, []);
 };

package/esm/services/painter/backgroundPaint.d.ts

@@ -1,9 +1,9 @@
-import { BasePaint, type drawOptions } from "./basePaint";
+import { BasePaint, type DrawOptions } from "./basePaint";
 export declare class BackgroundPaint extends BasePaint {
     private img;
-    draw(options: drawOptions): Promise<void>;
-    _drawColor(options: drawOptions): void;
-    _drawImage(options: drawOptions): Promise<void>;
+    draw(options: DrawOptions): Promise<void>;
+    _drawColor(options: DrawOptions): void;
+    _drawImage(options: DrawOptions): Promise<void>;
     private loadImg;
 }
 //# sourceMappingURL=backgroundPaint.d.ts.map