@orderly.network/hooks 1.3.2 → 1.4.0-alpha.0

package/esm/orderly/useOrderEntryNext/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/orderly/useOrderEntryNext/index.ts"],"names":[],"mappings":""}

package/esm/orderly/useOrderEntryNext/index.js

@@ -0,0 +1,2 @@
+
+//# sourceMappingURL=index.js.map

package/esm/orderly/useOrderEntryNext/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/orderly/useOrderEntryNext/index.ts"],"names":[],"rangeMappings":"","mappings":""}

package/esm/orderly/{useOrderStream.d.ts → useOrderStream/useOrderStream.d.ts}

@@ -1,17 +1,21 @@
-import { OrderSide, OrderEntity, OrderStatus } from "@orderly.network/types";
-export interface UserOrdersReturn {
-    data: any[];
-    loading: boolean;
-    update: (order: any) => void;
-    cancel: (order: any) => void;
-}
-type Params = {
+import { OrderSide, OrderEntity, OrderStatus, API, AlgoOrderRootType } from "@orderly.network/types";
+type CombineOrderType = AlgoOrderRootType | "ALL";
+export declare const useOrderStream: (params: {
     symbol?: string;
     status?: OrderStatus;
     size?: number;
     side?: OrderSide;
-};
-export declare const useOrderStream: (params: Params, options?: {
+    /**
+     * Include the order type
+     * @default ["ALL"]
+     */
+    includes?: CombineOrderType[];
+    /**
+     * Exclude the order type
+     * @default []
+     */
+    excludes?: CombineOrderType[];
+}, options?: {
     /**
      * Keep the state update alive
      */
@@ -21,15 +25,18 @@ export declare const useOrderStream: (params: Params, options?: {
      */
     stopOnUnmount?: boolean;
 }) => readonly [any[] | null, {
-    readonly total: any;
+    readonly total: number;
     readonly isLoading: boolean;
     readonly refresh: import("swr/_internal").KeyedMutator<any[]>;
     readonly loadMore: () => void;
-    readonly cancelAllOrders: () => void;
+    readonly cancelAllOrders: () => Promise<[any, any]>;
+    readonly cancelAllAlgoOrders: () => Promise<[any, any]>;
     readonly updateOrder: (orderId: string, order: OrderEntity) => Promise<any>;
     readonly cancelOrder: (orderId: number, symbol?: string) => Promise<any>;
     readonly updateAlgoOrder: (orderId: string, order: OrderEntity) => Promise<any>;
     readonly cancelAlgoOrder: (orderId: number, symbol?: string) => Promise<any>;
+    readonly cancelTPSLChildOrder: (orderId: number, rootAlgoOrderId: number) => Promise<any>;
+    readonly updateTPSLOrder: (orderId: number, childOrders: API.AlgoOrder["child_orders"]) => Promise<any>;
     readonly errors: {
         readonly cancelOrder: unknown;
         readonly updateOrder: unknown;

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

@@ -0,0 +1 @@
+{"version":3,"file":"useOrderStream.d.ts","sourceRoot":"","sources":["../../../src/orderly/useOrderStream/useOrderStream.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,SAAS,EACT,WAAW,EACX,WAAW,EACX,GAAG,EACH,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAWhC,KAAK,gBAAgB,GAAG,iBAAiB,GAAG,KAAK,CAAC;AAElD,eAAO,MAAM,cAAc,WAIjB;IACN,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B;;;OAGG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B,YACS;IACR;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;;;;;;;oCAwKyC,MAAM,SAAS,WAAW;oCAoD1B,MAAM,WAAW,MAAM;wCA7CnB,MAAM,SAAS,WAAW;wCAoD1B,MAAM,WAAW,MAAM;6CAazD,MAAM,mBAAmB,MAAM,KAAG,QAAQ,GAAG,CAAC;wCAmB7C,MAAM,eACF,IAAI,SAAS,CAAC,cAAc,CAAC;;;;;;;;;;;;;EA0C/C,CAAC"}

package/esm/orderly/{useOrderStream.js → useOrderStream/useOrderStream.js}

@@ -1,22 +1,25 @@
-import { usePrivateInfiniteQuery } from "../usePrivateInfiniteQuery";
+import { usePrivateInfiniteQuery } from "../../usePrivateInfiniteQuery";
 import { useCallback, useEffect, useMemo } from "react";
-import { OrderStatus } from "@orderly.network/types";
-import { useMarkPricesStream } from "./useMarkPricesStream";
-import { useMutation } from "../useMutation";
-import version from "../version";
-import { useDataCenterContext } from "../dataProvider";
-import { generateKeyFun } from "../utils/swr";
-import { useEventEmitter } from "../useEventEmitter";
+import { OrderStatus, AlgoOrderRootType } from "@orderly.network/types";
+import { useMarkPricesStream } from "../useMarkPricesStream";
+import { useMutation } from "../../useMutation";
+import version from "../../version";
+import { useDataCenterContext } from "../../dataProvider";
+import { generateKeyFun } from "../../utils/swr";
+import { SDKError } from "@orderly.network/types";
 export const useOrderStream = (/**
    * Orders query params
    */ params, options)=>{
-    const { status, symbol, side, size = 100 } = params;
+    const { status, symbol, side, size = 100, includes = [
+        "ALL"
+    ], excludes = [] } = params;
     const { data: markPrices = {} } = useMarkPricesStream();
-    const ee = useEventEmitter();
     const { regesterKeyHandler, unregisterKeyHandler } = useDataCenterContext();
     const [doCancelOrder, { error: cancelOrderError, isMutating: cancelMutating }] = useMutation("/v1/order", "DELETE");
+    const [doCancelAllOrders] = useMutation("/v1/orders", "DELETE");
     const [doUpdateOrder, { error: updateOrderError, isMutating: updateMutating }] = useMutation("/v1/order", "PUT");
     const [doCanceAlgolOrder, { error: cancelAlgoOrderError, isMutating: cancelAlgoMutating }] = useMutation("/v1/algo/order", "DELETE");
+    const [doCancelAllAlgoOrders] = useMutation("/v1/algo/orders", "DELETE");
     const [doUpdateAlgoOrder, { error: updateAlgoOrderError, isMutating: updateAlgoMutating }] = useMutation("/v1/algo/order", "PUT");
     useEffect(()=>{
         const formatKey = (value)=>value ? `:${value}` : "";
@@ -55,9 +58,25 @@ export const useOrderStream = (/**
         if (!ordersResponse.data) {
             return null;
         }
-        return ordersResponse.data?.map((item)=>item.rows)?.flat();
+        let orders = ordersResponse.data?.map((item)=>item.rows)?.flat();
+        // return ordersResponse.data?.map((item) => item.rows)?.flat();
+        if (includes.includes("ALL") && excludes.length === 0) {
+            return orders;
+        }
+        if (includes.includes("ALL") && excludes.length > 0) {
+            return orders?.filter((item)=>!excludes.includes(item.algo_type));
+        }
+        if (includes.length > 0 && excludes.length === 0) {
+            return orders?.filter((item)=>includes.includes(item.algo_type));
+        }
+        if (includes.length > 0 && excludes.length > 0) {
+            return orders?.filter((item)=>includes.includes(item.algo_type) && !excludes.includes(item.algo_type));
+        }
+        return orders;
     }, [
-        ordersResponse.data
+        ordersResponse.data,
+        includes,
+        excludes
     ]);
     // console.log(ordersResponse.data);
     const orders = useMemo(()=>{
@@ -68,10 +87,17 @@ export const useOrderStream = (/**
             return flattenOrders;
         }
         return flattenOrders.map((item)=>{
-            return {
+            const order = {
                 ...item,
                 mark_price: markPrices[item.symbol] ?? 0
             };
+            ///TODO: remove this when BE provides the correct data
+            // console.log("------------->>>>>>>>", order);
+            if (order.algo_type === AlgoOrderRootType.POSITIONAL_TP_SL || order.algo_type === AlgoOrderRootType.TP_SL) {
+                order.quantity = order.child_orders[0].quantity;
+            }
+            ///-----------------todo end----------------
+            return order;
         });
     }, [
         flattenOrders,
@@ -79,13 +105,33 @@ export const useOrderStream = (/**
         status
     ]);
     const total = useMemo(()=>{
-        return ordersResponse.data?.[0]?.meta?.total || 0;
+        return orders?.length || 0;
+    // return ordersResponse.data?.[0]?.meta?.total || 0;
     }, [
-        ordersResponse.data?.[0]?.meta?.total
+        orders?.length
     ]);
     /**
    * cancel all orders
-   */ const cancelAllOrders = useCallback(()=>{}, [
+   */ const cancelAllOrders = useCallback(()=>{
+        return Promise.all([
+            doCancelAllOrders(null),
+            doCancelAllAlgoOrders(null, {
+                algo_type: "STOP"
+            })
+        ]);
+    }, [
+        ordersResponse.data
+    ]);
+    const cancelAllAlgoOrders = useCallback(()=>{
+        return Promise.all([
+            doCancelAllAlgoOrders(null, {
+                algo_type: "TP_SL"
+            }),
+            doCancelAllAlgoOrders(null, {
+                algo_type: "POSITIONAL_TP_SL"
+            })
+        ]);
+    }, [
         ordersResponse.data
     ]);
     const _updateOrder = useCallback((orderId, order, type)=>{
@@ -112,16 +158,7 @@ export const useOrderStream = (/**
     /**
    * update algo order
    */ const updateAlgoOrder = useCallback((orderId, order)=>{
-        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)
-            });
-            //------------fix end----------------
-            return res;
-        });
+        return _updateOrder(orderId, order, "algoOrder");
     }, []);
     const _cancelOrder = useCallback((orderId, type, symbol)=>{
         switch(type){
@@ -171,6 +208,31 @@ export const useOrderStream = (/**
     const loadMore = ()=>{
         ordersResponse.setSize(ordersResponse.size + 1);
     };
+    // const cancelTPSLOrder = useCallback((orderId:number, symbol:string)=>{
+    //   return
+    // });
+    const cancelTPSLChildOrder = useCallback((orderId, rootAlgoOrderId)=>{
+        return doUpdateAlgoOrder({
+            order_id: rootAlgoOrderId,
+            child_orders: [
+                {
+                    order_id: orderId,
+                    is_activated: false
+                }
+            ]
+        });
+    }, []);
+    const updateTPSLOrder = useCallback((/**
+       * the root algo order id
+       */ orderId, childOrders)=>{
+        if (!Array.isArray(childOrders)) {
+            throw new SDKError("children orders is required");
+        }
+        return doUpdateAlgoOrder({
+            order_id: orderId,
+            children_orders: childOrders
+        });
+    }, []);
     return [
         orders,
         {
@@ -179,10 +241,13 @@ export const useOrderStream = (/**
             refresh: ordersResponse.mutate,
             loadMore,
             cancelAllOrders,
+            cancelAllAlgoOrders,
             updateOrder,
             cancelOrder,
             updateAlgoOrder,
             cancelAlgoOrder,
+            cancelTPSLChildOrder,
+            updateTPSLOrder,
             errors: {
                 cancelOrder: cancelOrderError,
                 updateOrder: updateOrderError,

package/esm/orderly/useOrderStream/useOrderStream.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/orderly/useOrderStream/useOrderStream.ts"],"sourcesContent":["import { usePrivateInfiniteQuery } from \"../../usePrivateInfiniteQuery\";\nimport { useCallback, useEffect, useMemo } from \"react\";\nimport {\n  OrderSide,\n  OrderEntity,\n  OrderStatus,\n  API,\n  AlgoOrderRootType,\n} from \"@orderly.network/types\";\nimport { useMarkPricesStream } from \"../useMarkPricesStream\";\nimport { useMutation } from \"../../useMutation\";\nimport version from \"../../version\";\nimport { useDataCenterContext } from \"../../dataProvider\";\nimport { generateKeyFun } from \"../../utils/swr\";\nimport { useEventEmitter } from \"../../useEventEmitter\";\nimport { SDKError } from \"@orderly.network/types\";\n\ntype CreateOrderType = \"normalOrder\" | \"algoOrder\";\n\ntype CombineOrderType = AlgoOrderRootType | \"ALL\";\n\nexport const useOrderStream = (\n  /**\n   * Orders query params\n   */\n  params: {\n    symbol?: string;\n    status?: OrderStatus;\n    size?: number;\n    side?: OrderSide;\n    /**\n     * Include the order type\n     * @default [\"ALL\"]\n     */\n    includes?: CombineOrderType[];\n    /**\n     * Exclude the order type\n     * @default []\n     */\n    excludes?: CombineOrderType[];\n  },\n  options?: {\n    /**\n     * Keep the state update alive\n     */\n    keeplive?: boolean;\n    /**\n     * Stop the state update when the component unmount\n     */\n    stopOnUnmount?: boolean;\n  }\n) => {\n  const {\n    status,\n    symbol,\n    side,\n    size = 100,\n    includes = [\"ALL\"],\n    excludes = [],\n  } = params;\n\n  const { data: markPrices = {} } = useMarkPricesStream();\n\n  const { regesterKeyHandler, unregisterKeyHandler } = useDataCenterContext();\n  const [\n    doCancelOrder,\n    { error: cancelOrderError, isMutating: cancelMutating },\n  ] = useMutation(\"/v1/order\", \"DELETE\");\n\n  const [doCancelAllOrders] = useMutation(\"/v1/orders\", \"DELETE\");\n\n  const [\n    doUpdateOrder,\n    { error: updateOrderError, isMutating: updateMutating },\n  ] = useMutation(\"/v1/order\", \"PUT\");\n\n  const [\n    doCanceAlgolOrder,\n    { error: cancelAlgoOrderError, isMutating: cancelAlgoMutating },\n  ] = useMutation(\"/v1/algo/order\", \"DELETE\");\n\n  const [doCancelAllAlgoOrders] = useMutation(\"/v1/algo/orders\", \"DELETE\");\n\n  const [\n    doUpdateAlgoOrder,\n    { error: updateAlgoOrderError, isMutating: updateAlgoMutating },\n  ] = useMutation(\"/v1/algo/order\", \"PUT\");\n\n  useEffect(() => {\n    const formatKey = (value?: string) => (value ? `:${value}` : \"\");\n    const key = `orders${formatKey(status)}${formatKey(symbol)}${formatKey(\n      side\n    )}`;\n    regesterKeyHandler?.(key, generateKeyFun({ status, symbol, side, size }));\n\n    return () => {\n      if (!options?.stopOnUnmount) return;\n\n      unregisterKeyHandler(key);\n    };\n  }, [status, symbol, side, options?.keeplive]);\n\n  const ordersResponse = usePrivateInfiniteQuery(\n    generateKeyFun({ status, symbol, side, size }),\n    {\n      initialSize: 1,\n      // revalidateFirstPage: false,\n      // onError: (err) => {\n      //   console.error(\"fetch failed::::\", err);\n      // },\n      formatter: (data) => data,\n      revalidateOnFocus: false,\n    }\n  );\n\n  const flattenOrders = useMemo(() => {\n    if (!ordersResponse.data) {\n      return null;\n    }\n    let orders = ordersResponse.data?.map((item) => item.rows)?.flat();\n\n    // return ordersResponse.data?.map((item) => item.rows)?.flat();\n\n    if (includes.includes(\"ALL\") && excludes.length === 0) {\n      return orders;\n    }\n\n    if (includes.includes(\"ALL\") && excludes.length > 0) {\n      return orders?.filter((item) => !excludes.includes(item.algo_type));\n    }\n\n    if (includes.length > 0 && excludes.length === 0) {\n      return orders?.filter((item) => includes.includes(item.algo_type));\n    }\n\n    if (includes.length > 0 && excludes.length > 0) {\n      return orders?.filter(\n        (item) =>\n          includes.includes(item.algo_type) &&\n          !excludes.includes(item.algo_type)\n      );\n    }\n\n    return orders;\n  }, [ordersResponse.data, includes, excludes]);\n\n  // console.log(ordersResponse.data);\n\n  const orders = useMemo(() => {\n    if (!flattenOrders) {\n      return null;\n    }\n\n    if (status !== OrderStatus.NEW && status !== OrderStatus.INCOMPLETE) {\n      return flattenOrders;\n    }\n    return flattenOrders.map((item) => {\n      const order = {\n        ...item,\n        mark_price: (markPrices as any)[item.symbol] ?? 0,\n      };\n\n      ///TODO: remove this when BE provides the correct data\n      // console.log(\"------------->>>>>>>>\", order);\n      if (\n        order.algo_type === AlgoOrderRootType.POSITIONAL_TP_SL ||\n        order.algo_type === AlgoOrderRootType.TP_SL\n      ) {\n        order.quantity = order.child_orders[0].quantity;\n      }\n      ///-----------------todo end----------------\n\n      return order;\n    });\n  }, [flattenOrders, markPrices, status]);\n\n  const total = useMemo(() => {\n    return orders?.length || 0;\n    // return ordersResponse.data?.[0]?.meta?.total || 0;\n  }, [orders?.length]);\n\n  /**\n   * cancel all orders\n   */\n  const cancelAllOrders = useCallback(() => {\n    return Promise.all([\n      doCancelAllOrders(null),\n      doCancelAllAlgoOrders(null, { algo_type: \"STOP\" }),\n    ]);\n  }, [ordersResponse.data]);\n\n  const cancelAllAlgoOrders = useCallback(() => {\n    return Promise.all([\n      doCancelAllAlgoOrders(null, { algo_type: \"TP_SL\" }),\n      doCancelAllAlgoOrders(null, { algo_type: \"POSITIONAL_TP_SL\" }),\n    ]);\n  }, [ordersResponse.data]);\n\n  const _updateOrder = useCallback(\n    (orderId: string, order: OrderEntity, type: CreateOrderType) => {\n      switch (type) {\n        case \"algoOrder\":\n          return doUpdateAlgoOrder({\n            order_id: orderId,\n            price: order[\"order_price\"],\n            quantity: order[\"order_quantity\"],\n            trigger_price: order[\"trigger_price\"],\n          });\n        default:\n          return doUpdateOrder({ ...order, order_id: orderId });\n      }\n    },\n    []\n  );\n\n  /**\n   * update order\n   */\n  const updateOrder = useCallback((orderId: string, order: OrderEntity) => {\n    return _updateOrder(orderId, order, \"normalOrder\");\n  }, []);\n\n  /**\n   * update algo order\n   */\n  const updateAlgoOrder = useCallback((orderId: string, order: OrderEntity) => {\n    return _updateOrder(orderId, order, \"algoOrder\");\n  }, []);\n\n  const _cancelOrder = useCallback(\n    (orderId: number, type: CreateOrderType, symbol?: string) => {\n      switch (type) {\n        case \"algoOrder\":\n          return doCanceAlgolOrder(null, {\n            // @ts-ignore\n            order_id: orderId,\n            symbol,\n            source: `SDK${version}`,\n          }).then((res: any) => {\n            if (res.success) {\n              ordersResponse.mutate();\n              return res;\n            } else {\n              throw new Error(res.message);\n            }\n          });\n        default:\n          return doCancelOrder(null, {\n            order_id: orderId,\n            symbol,\n            source: `SDK_${version}`,\n          }).then((res: any) => {\n            if (res.success) {\n              // return ordersResponse.mutate().then(() => {\n              //   return res;\n              // });\n              //Optimistic Updates\n              // ordersResponse.mutate();\n              return res;\n            } else {\n              throw new Error(res.message);\n            }\n          });\n      }\n    },\n    []\n  );\n  /**\n   * calcel order\n   */\n  const cancelOrder = useCallback((orderId: number, symbol?: string) => {\n    return _cancelOrder(orderId, \"normalOrder\", symbol);\n  }, []);\n\n  /**\n   * calcel algo order\n   */\n  const cancelAlgoOrder = useCallback((orderId: number, symbol?: string) => {\n    return _cancelOrder(orderId, \"algoOrder\", symbol);\n  }, []);\n\n  const loadMore = () => {\n    ordersResponse.setSize(ordersResponse.size + 1);\n  };\n\n  // const cancelTPSLOrder = useCallback((orderId:number, symbol:string)=>{\n  //   return\n  // });\n\n  const cancelTPSLChildOrder = useCallback(\n    (orderId: number, rootAlgoOrderId: number): Promise<any> => {\n      return doUpdateAlgoOrder({\n        order_id: rootAlgoOrderId,\n        child_orders: [\n          {\n            order_id: orderId,\n            is_activated: false,\n          },\n        ],\n      });\n    },\n    []\n  );\n\n  const updateTPSLOrder = useCallback(\n    (\n      /**\n       * the root algo order id\n       */\n      orderId: number,\n      childOrders: API.AlgoOrder[\"child_orders\"]\n    ) => {\n      if (!Array.isArray(childOrders)) {\n        throw new SDKError(\"children orders is required\");\n      }\n      return doUpdateAlgoOrder({\n        order_id: orderId,\n        children_orders: childOrders,\n      });\n    },\n    []\n  );\n\n  return [\n    orders,\n    {\n      total,\n      isLoading: ordersResponse.isLoading,\n      refresh: ordersResponse.mutate,\n      loadMore,\n      cancelAllOrders,\n      cancelAllAlgoOrders,\n      updateOrder,\n      cancelOrder,\n      updateAlgoOrder,\n      cancelAlgoOrder,\n      cancelTPSLChildOrder,\n      updateTPSLOrder,\n      errors: {\n        cancelOrder: cancelOrderError,\n        updateOrder: updateOrderError,\n        cancelAlgoOrder: cancelAlgoOrderError,\n        updateAlgoOrder: updateAlgoOrderError,\n      },\n      submitting: {\n        cancelOrder: cancelMutating,\n        updateOrder: updateMutating,\n        cancelAlgoOrder: cancelAlgoMutating,\n        updateAlglOrder: updateAlgoMutating,\n      },\n    },\n  ] as const;\n};\n"],"names":["usePrivateInfiniteQuery","useCallback","useEffect","useMemo","OrderStatus","AlgoOrderRootType","useMarkPricesStream","useMutation","version","useDataCenterContext","generateKeyFun","SDKError","useOrderStream","params","options","status","symbol","side","size","includes","excludes","data","markPrices","regesterKeyHandler","unregisterKeyHandler","doCancelOrder","error","cancelOrderError","isMutating","cancelMutating","doCancelAllOrders","doUpdateOrder","updateOrderError","updateMutating","doCanceAlgolOrder","cancelAlgoOrderError","cancelAlgoMutating","doCancelAllAlgoOrders","doUpdateAlgoOrder","updateAlgoOrderError","updateAlgoMutating","formatKey","value","key","stopOnUnmount","keeplive","ordersResponse","initialSize","formatter","revalidateOnFocus","flattenOrders","orders","map","item","rows","flat","length","filter","algo_type","NEW","INCOMPLETE","order","mark_price","POSITIONAL_TP_SL","TP_SL","quantity","child_orders","total","cancelAllOrders","Promise","all","cancelAllAlgoOrders","_updateOrder","orderId","type","order_id","price","trigger_price","updateOrder","updateAlgoOrder","_cancelOrder","source","then","res","success","mutate","Error","message","cancelOrder","cancelAlgoOrder","loadMore","setSize","cancelTPSLChildOrder","rootAlgoOrderId","is_activated","updateTPSLOrder","childOrders","Array","isArray","children_orders","isLoading","refresh","errors","submitting","updateAlglOrder"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/esm/orderly/{usePositionStream.d.ts → usePositionStream/usePositionStream.d.ts}

@@ -10,7 +10,7 @@ export interface PositionReturn {
 export declare const usePositionStream: (symbol?: string, options?: SWRConfiguration & {
     calcMode?: PriceMode;
 }) => readonly [{
-    readonly rows: API.PositionExt[] | null;
+    readonly rows: API.PositionTPSLExt[] | null;
     readonly aggregated: any;
     readonly totalCollateral: Decimal;
     readonly totalValue: Decimal;

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

@@ -0,0 +1 @@
+{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../../src/orderly/usePositionStream/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAG5C,OAAO,EACL,KAAK,GAAG,EACR,WAAW,EAIZ,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AASvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;EAiStD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}

package/esm/orderly/{usePositionStream.js → usePositionStream/usePositionStream.js}

@@ -1,14 +1,17 @@
 import { useEffect, useMemo, useState } from "react";
-import { usePrivateQuery } from "../usePrivateQuery";
+import { usePrivateQuery } from "../../usePrivateQuery";
 import { account, positions } from "@orderly.network/perp";
-import { createGetter } from "../utils/createGetter";
-import { useFundingRates } from "./useFundingRates";
-import { useSymbolsInfo } from "./useSymbolsInfo";
-import { useMarkPricesStream } from "./useMarkPricesStream";
+import { createGetter } from "../../utils/createGetter";
+import { useFundingRates } from "../useFundingRates";
+import { AlgoOrderRootType, OrderStatus } from "@orderly.network/types";
+import { useSymbolsInfo } from "../useSymbolsInfo";
+import { useMarkPricesStream } from "../useMarkPricesStream";
 import { pathOr, propOr } from "ramda";
-import { parseHolding } from "../utils/parseHolding";
+import { parseHolding } from "../../utils/parseHolding";
 import { zero } from "@orderly.network/utils";
-import { useMarketsStream } from "./useMarketsStream";
+import { useMarketsStream } from "../useMarketsStream";
+import { useOrderStream } from "../orderlyHooks";
+import { findPositionTPSLFromOrders, findTPSLFromOrder } from "./utils";
 export const usePositionStream = (/**
    * If symbol is passed, only the position of that symbol will be returned.
    */ symbol, options)=>{
@@ -31,6 +34,16 @@ export const usePositionStream = (/**
         onError: (err)=>{}
     });
     const { data: markPrices } = useMarkPricesStream();
+    // get TP/SL orders;
+    const [tpslOrders] = useOrderStream({
+        status: OrderStatus.INCOMPLETE,
+        includes: [
+            AlgoOrderRootType.POSITIONAL_TP_SL,
+            AlgoOrderRootType.TP_SL
+        ]
+    });
+    //
+    // console.log("---------------");
     const [priceMode, setPriceMode] = useState(options?.calcMode || "markPrice");
     useEffect(()=>{
         if (options?.calcMode && priceMode !== options?.calcMode) {
@@ -40,8 +53,6 @@ export const usePositionStream = (/**
         options?.calcMode
     ]);
     const { data: tickers } = useMarketsStream();
-    // console.log("mark prices", markPrices);
-    // console.log("tickers", tickers);
     const tickerPrices = useMemo(()=>{
         const data = Object.create(null);
         tickers?.forEach((item)=>{
@@ -172,6 +183,8 @@ export const usePositionStream = (/**
         const total = totalCollateral.toNumber();
         let rows = formatedPositions[0].filter((item)=>item.position_qty !== 0).map((item)=>{
             const info = symbolInfo?.[item.symbol];
+            const related_order = Array.isArray(tpslOrders) ? findPositionTPSLFromOrders(tpslOrders, item.symbol) : undefined;
+            const tp_sl_pricer = !!related_order ? findTPSLFromOrder(related_order) : undefined;
             const MMR = positions.MMR({
                 baseMMR: info("base_mmr"),
                 baseIMR: info("base_imr"),
@@ -186,13 +199,12 @@ export const usePositionStream = (/**
                     markPrice: item.mark_price,
                     MMR
                 }),
-                // est_liq_price: positions.liqPrice({
-                //   markPrice: item.mark_price,
-                //   totalCollateral: total,
-                //   positionQty: item.position_qty,
-                //   MMR,
-                // }),
-                mmr: MMR
+                tp_trigger_price: tp_sl_pricer?.tp_trigger_price,
+                sl_trigger_price: tp_sl_pricer?.sl_trigger_price,
+                mmr: MMR,
+                // has_position_tp_sl:
+                //   !tp_sl_pricer?.sl_trigger_price && !tp_sl_pricer?.tp_trigger_price,
+                algo_order: related_order
             };
         });
         // calculate est_liq_price
@@ -214,13 +226,9 @@ export const usePositionStream = (/**
         formatedPositions,
         symbolInfo,
         accountInfo,
-        totalCollateral
+        totalCollateral,
+        tpslOrders
     ]);
-    // useEffect(() => {
-    //   ee.on("positions:changed", () => {
-    //     updatePositions();
-    //   });
-    // }, []);
     const positionInfoGetter = createGetter(data, 1);
     return [
         {

package/esm/orderly/usePositionStream/usePositionStream.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/orderly/usePositionStream/usePositionStream.ts"],"sourcesContent":["import { useEffect, useMemo, useState } from \"react\";\nimport { usePrivateQuery } from \"../../usePrivateQuery\";\nimport { account, positions } from \"@orderly.network/perp\";\nimport { type SWRConfiguration } from \"swr\";\nimport { createGetter } from \"../../utils/createGetter\";\nimport { useFundingRates } from \"../useFundingRates\";\nimport {\n  type API,\n  OrderEntity,\n  AlgoOrderType,\n  AlgoOrderRootType,\n  OrderStatus,\n} from \"@orderly.network/types\";\nimport { useSymbolsInfo } from \"../useSymbolsInfo\";\nimport { useMarkPricesStream } from \"../useMarkPricesStream\";\nimport { pathOr, propOr } from \"ramda\";\nimport { parseHolding } from \"../../utils/parseHolding\";\nimport { Decimal, zero } from \"@orderly.network/utils\";\nimport { useMarketsStream } from \"../useMarketsStream\";\nimport { useOrderStream } from \"../orderlyHooks\";\nimport {\n  findPositionTPSLFromOrders,\n  findTPSLFromOrder,\n  findTPSLFromOrders,\n} from \"./utils\";\n\ntype PriceMode = \"markPrice\" | \"lastPrice\";\n\nexport interface PositionReturn {\n  data: any[];\n  loading: boolean;\n  close: (\n    order: Pick<OrderEntity, \"order_type\" | \"order_price\" | \"side\">\n  ) => void;\n}\n\nexport const usePositionStream = (\n  /**\n   * If symbol is passed, only the position of that symbol will be returned.\n   */\n  symbol?: string,\n  options?: SWRConfiguration & { calcMode?: PriceMode }\n) => {\n  const symbolInfo = useSymbolsInfo();\n  const { data: accountInfo } =\n    usePrivateQuery<API.AccountInfo>(\"/v1/client/info\");\n\n  const { data: holding } = usePrivateQuery<API.Holding[]>(\n    \"/v1/client/holding\",\n    {\n      formatter: (data) => {\n        return data.holding;\n      },\n    }\n  );\n\n  const fundingRates = useFundingRates();\n\n  const {\n    data,\n    error,\n    mutate: refreshPositions,\n  } = usePrivateQuery<API.PositionInfo>(`/v1/positions`, {\n    // revalidateOnFocus: false,\n    // revalidateOnReconnect: false,\n    // dedupingInterval: 200,\n    // keepPreviousData: false,\n    // revalidateIfStale: true,\n    ...options,\n\n    formatter: (data) => data,\n    onError: (err) => {},\n  });\n\n  const { data: markPrices } = useMarkPricesStream();\n\n  // get TP/SL orders;\n\n  const [tpslOrders] = useOrderStream({\n    status: OrderStatus.INCOMPLETE,\n    includes: [AlgoOrderRootType.POSITIONAL_TP_SL, AlgoOrderRootType.TP_SL],\n  });\n  //\n\n  // console.log(\"---------------\");\n\n  const [priceMode, setPriceMode] = useState(options?.calcMode || \"markPrice\");\n\n  useEffect(() => {\n    if (options?.calcMode && priceMode !== options?.calcMode) {\n      setPriceMode(options?.calcMode);\n    }\n  }, [options?.calcMode]);\n\n  const { data: tickers } = useMarketsStream();\n\n  const tickerPrices = useMemo(() => {\n    const data: Record<string, number> = Object.create(null);\n    tickers?.forEach((item) => {\n      // @ts-ignore\n      data[item.symbol] = item[\"24h_close\"];\n    });\n    return data;\n  }, [tickers]);\n\n  const formatedPositions = useMemo<[API.PositionExt[], any] | null>(() => {\n    if (!data?.rows || symbolInfo.isNil || !accountInfo) return null;\n\n    const filteredData =\n      typeof symbol === \"undefined\" || symbol === \"\"\n        ? data.rows\n        : data.rows.filter((item) => {\n            return item.symbol === symbol;\n          });\n\n    let unrealPnL_total = zero,\n      notional_total = zero,\n      unsettlementPnL_total = zero;\n\n    const formatted = filteredData.map((item: API.Position) => {\n      // const price = (markPrices as any)[item.symbol] ?? item.mark_price;\n      const unRealizedPrice = propOr(\n        item.mark_price,\n        item.symbol,\n        priceMode === \"markPrice\" ? markPrices : tickerPrices\n      ) as unknown as number;\n\n      const price = propOr(\n        item.mark_price,\n        item.symbol,\n        markPrices\n      ) as unknown as number;\n\n      const info = symbolInfo[item.symbol];\n      //\n\n      const notional = positions.notional(item.position_qty, price);\n\n      const unrealPnl = positions.unrealizedPnL({\n        qty: item.position_qty,\n        openPrice: item?.average_open_price,\n        markPrice: unRealizedPrice,\n      });\n\n      const imr = account.IMR({\n        maxLeverage: accountInfo.max_leverage,\n        baseIMR: info(\"base_imr\"),\n        IMR_Factor: accountInfo.imr_factor[item.symbol] as number,\n        positionNotional: notional,\n        ordersNotional: 0,\n        IMR_factor_power: 4 / 5,\n      });\n\n      const unrealPnlROI = positions.unrealizedPnLROI({\n        positionQty: item.position_qty,\n        openPrice: item.average_open_price,\n        IMR: imr,\n        unrealizedPnL: unrealPnl,\n      });\n\n      const unsettlementPnL = positions.unsettlementPnL({\n        positionQty: item.position_qty,\n        markPrice: price,\n        costPosition: item.cost_position,\n        sumUnitaryFunding: fundingRates[item.symbol]?.(\n          \"sum_unitary_funding\",\n          0\n        ),\n        lastSumUnitaryFunding: item.last_sum_unitary_funding,\n      });\n\n      unrealPnL_total = unrealPnL_total.add(unrealPnl);\n      notional_total = notional_total.add(notional);\n      unsettlementPnL_total = unsettlementPnL_total.add(unsettlementPnL);\n\n      return {\n        ...item,\n        mark_price: price,\n        mm: 0,\n        notional,\n        unsettlement_pnl: unsettlementPnL,\n        unrealized_pnl: unrealPnl,\n        unrealized_pnl_ROI: unrealPnlROI,\n      };\n    });\n\n    return [\n      formatted,\n      {\n        unrealPnL: unrealPnL_total.toNumber(),\n        notional: notional_total.toNumber(),\n        unsettledPnL: unsettlementPnL_total.toNumber(),\n      },\n    ];\n  }, [\n    data?.rows,\n    symbolInfo,\n    accountInfo,\n    markPrices,\n    priceMode,\n    tickerPrices,\n    symbol,\n    holding,\n  ]);\n\n  // const showSymbol = useCallback((symbol: string) => {\n  //   setVisibleSymbol(symbol);\n  // }, []);\n\n  const [totalCollateral, totalValue, totalUnrealizedROI] = useMemo<\n    [Decimal, Decimal, number]\n  >(() => {\n    if (!holding || !markPrices) {\n      return [zero, zero, 0];\n    }\n    const unsettlemnedPnL = pathOr(0, [1, \"unsettledPnL\"])(formatedPositions);\n    const unrealizedPnL = pathOr(0, [1, \"unrealPnL\"])(formatedPositions);\n\n    const [USDC_holding, nonUSDC] = parseHolding(holding, markPrices);\n\n    const totalCollateral = account.totalCollateral({\n      USDCHolding: USDC_holding,\n      nonUSDCHolding: nonUSDC,\n      unsettlementPnL: unsettlemnedPnL,\n    });\n\n    const totalValue = account.totalValue({\n      totalUnsettlementPnL: unsettlemnedPnL,\n      USDCHolding: USDC_holding,\n      nonUSDCHolding: nonUSDC,\n    });\n\n    const totalUnrealizedROI = account.totalUnrealizedROI({\n      totalUnrealizedPnL: unrealizedPnL,\n      totalValue: totalValue.toNumber(),\n    });\n\n    return [totalCollateral, totalValue, totalUnrealizedROI];\n  }, [holding, formatedPositions, markPrices]);\n\n  const positionsRows = useMemo<API.PositionTPSLExt[] | null>(() => {\n    if (!formatedPositions) return null;\n\n    if (!symbolInfo || !accountInfo) return formatedPositions[0];\n\n    const total = totalCollateral.toNumber();\n\n    let rows = formatedPositions[0]\n      .filter((item) => item.position_qty !== 0)\n      .map((item) => {\n        const info = symbolInfo?.[item.symbol];\n\n        const related_order = Array.isArray(tpslOrders)\n          ? findPositionTPSLFromOrders(tpslOrders, item.symbol)\n          : undefined;\n\n        const tp_sl_pricer = !!related_order\n          ? findTPSLFromOrder(related_order)\n          : undefined;\n\n        const MMR = positions.MMR({\n          baseMMR: info(\"base_mmr\"),\n          baseIMR: info(\"base_imr\"),\n          IMRFactor: accountInfo.imr_factor[item.symbol] as number,\n          positionNotional: item.notional,\n          IMR_factor_power: 4 / 5,\n        });\n\n        return {\n          ...item,\n          mm: positions.maintenanceMargin({\n            positionQty: item.position_qty,\n            markPrice: item.mark_price,\n            MMR,\n          }),\n          tp_trigger_price: tp_sl_pricer?.tp_trigger_price,\n          sl_trigger_price: tp_sl_pricer?.sl_trigger_price,\n\n          mmr: MMR,\n\n          // has_position_tp_sl:\n          //   !tp_sl_pricer?.sl_trigger_price && !tp_sl_pricer?.tp_trigger_price,\n          algo_order: related_order,\n        };\n      });\n\n    // calculate est_liq_price\n    rows = rows.map((item) => {\n      const est_liq_price = positions.liqPrice({\n        markPrice: item.mark_price,\n        totalCollateral: total,\n        positionQty: item.position_qty,\n        positions: rows,\n        MMR: item.mmr,\n      });\n      return {\n        ...item,\n        est_liq_price,\n      };\n    });\n\n    return rows;\n  }, [formatedPositions, symbolInfo, accountInfo, totalCollateral, tpslOrders]);\n\n  const positionInfoGetter = createGetter<\n    Omit<API.PositionInfo, \"rows\">,\n    keyof Omit<API.PositionInfo, \"rows\">\n  >(data as any, 1);\n\n  return [\n    {\n      rows: positionsRows,\n      aggregated: {\n        ...(formatedPositions?.[1] ?? {}),\n        unrealPnlROI: totalUnrealizedROI,\n      },\n      totalCollateral,\n      totalValue,\n      totalUnrealizedROI,\n    },\n    positionInfoGetter,\n    {\n      // close: onClosePosition,\n      loading: false,\n      // showSymbol,\n      error,\n      // loadMore: () => {},\n      refresh: refreshPositions,\n    },\n  ] as const;\n};\n\nexport const pathOr_unsettledPnLPathOr = pathOr(0, [\n  0,\n  \"aggregated\",\n  \"unsettledPnL\",\n]);\n"],"names":["useEffect","useMemo","useState","usePrivateQuery","account","positions","createGetter","useFundingRates","AlgoOrderRootType","OrderStatus","useSymbolsInfo","useMarkPricesStream","pathOr","propOr","parseHolding","zero","useMarketsStream","useOrderStream","findPositionTPSLFromOrders","findTPSLFromOrder","usePositionStream","symbol","options","symbolInfo","data","accountInfo","holding","formatter","fundingRates","error","mutate","refreshPositions","onError","err","markPrices","tpslOrders","status","INCOMPLETE","includes","POSITIONAL_TP_SL","TP_SL","priceMode","setPriceMode","calcMode","tickers","tickerPrices","Object","create","forEach","item","formatedPositions","rows","isNil","filteredData","filter","unrealPnL_total","notional_total","unsettlementPnL_total","formatted","map","unRealizedPrice","mark_price","price","info","notional","position_qty","unrealPnl","unrealizedPnL","qty","openPrice","average_open_price","markPrice","imr","IMR","maxLeverage","max_leverage","baseIMR","IMR_Factor","imr_factor","positionNotional","ordersNotional","IMR_factor_power","unrealPnlROI","unrealizedPnLROI","positionQty","unsettlementPnL","costPosition","cost_position","sumUnitaryFunding","lastSumUnitaryFunding","last_sum_unitary_funding","add","mm","unsettlement_pnl","unrealized_pnl","unrealized_pnl_ROI","unrealPnL","toNumber","unsettledPnL","totalCollateral","totalValue","totalUnrealizedROI","unsettlemnedPnL","USDC_holding","nonUSDC","USDCHolding","nonUSDCHolding","totalUnsettlementPnL","totalUnrealizedPnL","positionsRows","total","related_order","Array","isArray","undefined","tp_sl_pricer","MMR","baseMMR","IMRFactor","maintenanceMargin","tp_trigger_price","sl_trigger_price","mmr","algo_order","est_liq_price","liqPrice","positionInfoGetter","aggregated","loading","refresh","pathOr_unsettledPnLPathOr"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/esm/orderly/usePositionStream/utils.d.ts

@@ -0,0 +1,8 @@
+import { API, AlgoOrderEntity } from "@orderly.network/types";
+export declare const findTPSLFromOrders: (orders: API.AlgoOrder[], symbol: string) => Partial<AlgoOrderEntity> | undefined;
+export declare const findTPSLFromOrder: (order: API.AlgoOrder) => {
+    tp_trigger_price?: number | undefined;
+    sl_trigger_price?: number | undefined;
+};
+export declare const findPositionTPSLFromOrders: (orders: API.AlgoOrder[], symbol: string) => API.AlgoOrder | undefined;
+//# sourceMappingURL=utils.d.ts.map

package/esm/orderly/usePositionStream/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/orderly/usePositionStream/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,eAAe,EAIhB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,kBAAkB,WACrB,IAAI,SAAS,EAAE,UACf,MAAM,KACb,QAAQ,eAAe,CAAC,GAAG,SAO7B,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,IAAI,SAAS;;;CA6BrB,CAAC;AAEF,eAAO,MAAM,0BAA0B,WAC7B,IAAI,SAAS,EAAE,UACf,MAAM,KACb,IAAI,SAAS,GAAG,SAalB,CAAC"}

package/esm/orderly/usePositionStream/utils.js

@@ -0,0 +1,34 @@
+import { AlgoOrderType, AlgoOrderRootType, OrderStatus } from "@orderly.network/types";
+export const findTPSLFromOrders = (orders, symbol)=>{
+    const order = findPositionTPSLFromOrders(orders, symbol);
+    // console.log("!!!!!", order);
+    if (!order) return;
+    return findTPSLFromOrder(order);
+};
+export const findTPSLFromOrder = (order)=>{
+    let tp_trigger_price;
+    let sl_trigger_price;
+    const tpOrder = order.child_orders.find((order)=>order.algo_type === AlgoOrderType.TAKE_PROFIT);
+    const slOrder = order.child_orders.find((order)=>order.algo_type === AlgoOrderType.STOP_LOSS);
+    if (tpOrder) {
+        tp_trigger_price = tpOrder.trigger_price;
+    // take_profit_qty =  tpOrder.quantity ;
+    }
+    if (slOrder) {
+        sl_trigger_price = slOrder.trigger_price;
+    // stop_loss_qty = slOrder.quantity;
+    }
+    return {
+        tp_trigger_price,
+        sl_trigger_price
+    };
+};
+export const findPositionTPSLFromOrders = (orders, symbol)=>{
+    return orders?.find((order)=>{
+        // console.log(order.symbol, symbol, order.algo_type);
+        return order.symbol === symbol && order.algo_type === AlgoOrderRootType.POSITIONAL_TP_SL && (order.root_algo_status === OrderStatus.NEW || order.root_algo_status === OrderStatus.REPLACED || order.root_algo_status === OrderStatus.PARTIAL_FILLED);
+    });
+// return order;
+};
+
+//# sourceMappingURL=utils.js.map

package/esm/orderly/usePositionStream/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/orderly/usePositionStream/utils.ts"],"sourcesContent":["import {\n  API,\n  AlgoOrderEntity,\n  AlgoOrderType,\n  AlgoOrderRootType,\n  OrderStatus,\n} from \"@orderly.network/types\";\n\nexport const findTPSLFromOrders = (\n  orders: API.AlgoOrder[],\n  symbol: string\n): Partial<AlgoOrderEntity> | undefined => {\n  const order = findPositionTPSLFromOrders(orders, symbol);\n\n  // console.log(\"!!!!!\", order);\n\n  if (!order) return;\n  return findTPSLFromOrder(order);\n};\n\nexport const findTPSLFromOrder = (\n  order: API.AlgoOrder\n): {\n  tp_trigger_price?: number;\n  sl_trigger_price?: number;\n} => {\n  let tp_trigger_price;\n\n  let sl_trigger_price;\n\n  const tpOrder = order.child_orders.find(\n    (order: any) => order.algo_type === AlgoOrderType.TAKE_PROFIT\n  );\n  const slOrder = order.child_orders.find(\n    (order: any) => order.algo_type === AlgoOrderType.STOP_LOSS\n  );\n\n  if (tpOrder) {\n    tp_trigger_price = tpOrder.trigger_price;\n    // take_profit_qty =  tpOrder.quantity ;\n  }\n  if (slOrder) {\n    sl_trigger_price = slOrder.trigger_price;\n    // stop_loss_qty = slOrder.quantity;\n  }\n\n  return {\n    tp_trigger_price,\n    sl_trigger_price,\n  };\n};\n\nexport const findPositionTPSLFromOrders = (\n  orders: API.AlgoOrder[],\n  symbol: string\n): API.AlgoOrder | undefined => {\n  return orders?.find((order) => {\n    // console.log(order.symbol, symbol, order.algo_type);\n    return (\n      order.symbol === symbol &&\n      order.algo_type === AlgoOrderRootType.POSITIONAL_TP_SL &&\n      (order.root_algo_status === OrderStatus.NEW ||\n        order.root_algo_status === OrderStatus.REPLACED ||\n        order.root_algo_status === OrderStatus.PARTIAL_FILLED)\n    );\n  });\n\n  // return order;\n};\n"],"names":["AlgoOrderType","AlgoOrderRootType","OrderStatus","findTPSLFromOrders","orders","symbol","order","findPositionTPSLFromOrders","findTPSLFromOrder","tp_trigger_price","sl_trigger_price","tpOrder","child_orders","find","algo_type","TAKE_PROFIT","slOrder","STOP_LOSS","trigger_price","POSITIONAL_TP_SL","root_algo_status","NEW","REPLACED","PARTIAL_FILLED"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAGEA,aAAa,EACbC,iBAAiB,EACjBC,WAAW,QACN,yBAAyB;AAEhC,OAAO,MAAMC,qBAAqB,CAChCC,QACAC;IAEA,MAAMC,QAAQC,2BAA2BH,QAAQC;IAEjD,+BAA+B;IAE/B,IAAI,CAACC,OAAO;IACZ,OAAOE,kBAAkBF;AAC3B,EAAE;AAEF,OAAO,MAAME,oBAAoB,CAC/BF;IAKA,IAAIG;IAEJ,IAAIC;IAEJ,MAAMC,UAAUL,MAAMM,YAAY,CAACC,IAAI,CACrC,CAACP,QAAeA,MAAMQ,SAAS,KAAKd,cAAce,WAAW;IAE/D,MAAMC,UAAUV,MAAMM,YAAY,CAACC,IAAI,CACrC,CAACP,QAAeA,MAAMQ,SAAS,KAAKd,cAAciB,SAAS;IAG7D,IAAIN,SAAS;QACXF,mBAAmBE,QAAQO,aAAa;IACxC,wCAAwC;IAC1C;IACA,IAAIF,SAAS;QACXN,mBAAmBM,QAAQE,aAAa;IACxC,oCAAoC;IACtC;IAEA,OAAO;QACLT;QACAC;IACF;AACF,EAAE;AAEF,OAAO,MAAMH,6BAA6B,CACxCH,QACAC;IAEA,OAAOD,QAAQS,KAAK,CAACP;QACnB,sDAAsD;QACtD,OACEA,MAAMD,MAAM,KAAKA,UACjBC,MAAMQ,SAAS,KAAKb,kBAAkBkB,gBAAgB,IACrDb,CAAAA,MAAMc,gBAAgB,KAAKlB,YAAYmB,GAAG,IACzCf,MAAMc,gBAAgB,KAAKlB,YAAYoB,QAAQ,IAC/ChB,MAAMc,gBAAgB,KAAKlB,YAAYqB,cAAc,AAAD;IAE1D;AAEA,gBAAgB;AAClB,EAAE"}

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;AAIjD,eAAO,MAAM,sBAAsB;uBAEd,MAAM,KAAK,IAAI,MAAM,EAAE,cAAc,CAAC;UA4K1D,CAAC"}
+{"version":3,"file":"usePrivateDataObserver.d.ts","sourceRoot":"","sources":["../../src/orderly/usePrivateDataObserver.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMjD,eAAO,MAAM,sBAAsB;uBAEd,MAAM,KAAK,IAAI,MAAM,EAAE,cAAc,CAAC;UAgK1D,CAAC"}

package/esm/orderly/usePrivateDataObserver.js

@@ -1,39 +1,35 @@
-import { useEffect, useRef } from "react";
+import { useEffect } from "react";
 import { useWS } from "../useWS";
 import { mutate } from "swr";
 import { useAccount } from "../useAccount";
 import { unstable_serialize } from "swr/infinite";
 import { useEventEmitter } from "../useEventEmitter";
-import { updateOrdersHandler } from "../utils/swr";
+import { updateOrdersHandler, updateAlgoOrdersHandler } from "../utils/swr";
+import { AlgoOrderMergeHandler } from "../services/orderMerge/algoOrderMergeHandler";
+import { object2underscore } from "../utils/ws";
 export const usePrivateDataObserver = (options)=>{
     const ws = useWS();
     // const { mutate } = useSWRConfig();
     const ee = useEventEmitter();
     const { state } = useAccount();
     // TODO: remove this when the WS service provides the correct data
-    const algoOrderCacheQuneue = useRef([]);
+    // const algoOrderCacheQuneue = useRef<API.AlgoOrder[]>([]);
     const updateOrders = (data, isAlgoOrder)=>{
-        const map = options.getKeysMap("orders");
-        // 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)=>{
+        const keysMap = options.getKeysMap("orders");
+        keysMap.forEach((getKey, key)=>{
             mutate(unstable_serialize((index, prevData)=>[
                     getKey(index, prevData),
                     state.accountId
                 ]), (prevData)=>{
-                return updateOrdersHandler(key, data, prevData);
+                try {
+                    if (isAlgoOrder) {
+                        const result = updateAlgoOrdersHandler(key, data, prevData);
+                        return result;
+                    }
+                    return updateOrdersHandler(key, data, prevData);
+                } catch (error) {
+                    return prevData;
+                }
             }, {
                 revalidate: false
             });
@@ -43,9 +39,10 @@ export const usePrivateDataObserver = (options)=>{
         //   ...data,
         //   status: data.status || (data as WSMessage.AlgoOrder).algoStatus,
         // });
+        const formattedData = isAlgoOrder ? AlgoOrderMergeHandler.groupOrders(data) : object2underscore(data);
         ee.emit("orders:changed", {
-            ...data,
-            status: data.status || data.algoStatus
+            ...formattedData,
+            status: isAlgoOrder ? formattedData.algo_status : data.status
         });
     };
     // orders
@@ -65,17 +62,7 @@ export const usePrivateDataObserver = (options)=>{
         if (!state.accountId) return;
         const unsubscribe = ws.privateSubscribe("algoexecutionreport", {
             onMessage: (data)=>{
-                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);
+                updateOrders(data, true);
             }
         });
         return ()=>unsubscribe?.();
@@ -138,16 +125,16 @@ export const usePrivateDataObserver = (options)=>{
     }, [
         state.accountId
     ]);
-    // cache algo orders
-    useEffect(()=>{
-        const handler = (data)=>{
-            algoOrderCacheQuneue.current.push(data);
-        };
-        ee.on("algoOrder:cache", handler);
-        return ()=>{
-            ee.off("algoOrder:cache", handler);
-        };
-    }, []);
+// cache algo orders
+// useEffect(() => {
+//   const handler = (data: API.AlgoOrder) => {
+//     algoOrderCacheQuneue.current.push(data);
+//   };
+//   ee.on("algoOrder:cache", handler);
+//   return () => {
+//     ee.off("algoOrder:cache", handler);
+//   };
+// }, []);
 };
 
 //# sourceMappingURL=usePrivateDataObserver.js.map