@hyperix/hooks 0.2.6 → 0.2.8

package/dist/use-trade-history.d.ts

@@ -23,16 +23,18 @@ export type InfiniteTradeHistoryData = {
     pages: TradeHistoryPage[];
 };
 export type InfiniteTradeHistoryPageParam = {
+    latest?: boolean;
     startTime: number;
     endTime: number;
 };
-export type UseInfiniteTradeHistoryOptions = Omit<UseInfiniteQueryOptions<TradeHistoryPage, Error, InfiniteTradeHistoryData, [
+type InfiniteTradeHistoryQueryKey = [
     "infinite-trade-history",
     `0x${string}`,
     boolean,
     number,
     number | undefined
-], InfiniteTradeHistoryPageParam>, "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam" | "select"> & {
+];
+export type UseInfiniteTradeHistoryOptions = Omit<UseInfiniteQueryOptions<TradeHistoryPage, Error, InfiniteTradeHistoryData, InfiniteTradeHistoryQueryKey, InfiniteTradeHistoryPageParam>, "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam" | "select"> & {
     aggregateByTime?: boolean;
     endTime?: number;
     pageDurationMs?: number;
@@ -45,3 +47,4 @@ export declare function useTradeHistory(user: `0x${string}`, options?: UseUserFi
     error?: string;
 };
 export declare function useInfiniteTradeHistory(user: `0x${string}`, options?: UseInfiniteTradeHistoryOptions): UseInfiniteQueryResult<InfiniteTradeHistoryData, Error>;
+export {};

package/dist/use-trade-history.js

@@ -1,4 +1,4 @@
-import { useInfiniteQuery, } from "@tanstack/react-query";
+import { useInfiniteQuery, useQueryClient, } from "@tanstack/react-query";
 import Decimal from "decimal.js";
 import { useMemo } from "react";
 import { infoClient } from "./config/hl.js";
@@ -63,6 +63,16 @@ function mergeTradeHistoryFills(pages, realtimeFills) {
     }
     return sortTradeHistory([...fillsByKey.values()]);
 }
+function getLatestPageFromFills(user, fills, fallbackEndTime, pageDurationMs) {
+    const endTime = fills[0]?.time ?? fallbackEndTime;
+    const startTime = Math.max(0, endTime - pageDurationMs);
+    return {
+        user,
+        startTime,
+        endTime,
+        fills: fills.filter((fill) => fill.time >= startTime && fill.time <= endTime),
+    };
+}
 export function useTradeHistory(user, options = {}) {
     const userFillsState = useUserFills(user, options);
     const symbolConverter = useSymbolConverter();
@@ -83,36 +93,77 @@ export function useTradeHistory(user, options = {}) {
     };
 }
 export function useInfiniteTradeHistory(user, options = {}) {
-    const { aggregateByTime = true, enabled: enabledOverride, endTime, pageDurationMs = DEFAULT_TRADE_HISTORY_PAGE_DURATION_MS, realtime = true, ...queryOptions } = options;
+    const { aggregateByTime = true, enabled: enabledOverride, endTime, pageDurationMs = DEFAULT_TRADE_HISTORY_PAGE_DURATION_MS, realtime = false, ...queryOptions } = options;
     const enabled = enabledOverride ?? Boolean(user);
     const symbolConverter = useSymbolConverter();
-    const realtimeState = useTradeHistory(user, {
+    const queryClient = useQueryClient();
+    const queryKey = [
+        "infinite-trade-history",
+        user,
+        aggregateByTime,
+        pageDurationMs,
+        endTime,
+    ];
+    const selectTradeHistoryData = useMemo(() => (data) => ({
+        pages: data.pages,
+        user,
+        fills: mergeTradeHistoryFills(data.pages, []),
+    }), [user]);
+    useUserFills(user, {
         aggregateByTime,
         enabled: enabled && realtime,
+        onUpdate: (event) => {
+            const realtimeFills = sortTradeHistory(event.fills.map((fill) => formatTradeHistoryFill(fill, symbolConverter?.getSpotByPairId(fill.coin))));
+            if (realtimeFills.length === 0) {
+                return;
+            }
+            queryClient.setQueryData(queryKey, (previousData) => {
+                const [latestPage, ...olderPages] = previousData?.pages ?? [];
+                if (!previousData || !latestPage) {
+                    return previousData;
+                }
+                const fills = mergeTradeHistoryFills([latestPage], realtimeFills);
+                return {
+                    ...previousData,
+                    pages: [
+                        {
+                            ...latestPage,
+                            endTime: Math.max(latestPage.endTime, fills[0]?.time ?? 0),
+                            fills,
+                        },
+                        ...olderPages,
+                    ],
+                };
+            });
+        },
     });
     return useInfiniteQuery({
-        queryKey: [
-            "infinite-trade-history",
-            user,
-            aggregateByTime,
-            pageDurationMs,
-            endTime,
-        ],
+        queryKey,
         queryFn: async ({ pageParam }) => {
-            const fills = await infoClient.userFillsByTime({
-                user,
-                startTime: pageParam.startTime,
-                endTime: pageParam.endTime,
-                aggregateByTime,
-            });
+            const rawFills = pageParam.latest
+                ? await infoClient.userFills({
+                    user,
+                    aggregateByTime,
+                })
+                : await infoClient.userFillsByTime({
+                    user,
+                    startTime: pageParam.startTime,
+                    endTime: pageParam.endTime,
+                    aggregateByTime,
+                });
+            const fills = sortTradeHistory(rawFills.map((fill) => formatTradeHistoryFill(fill, symbolConverter?.getSpotByPairId(fill.coin))));
+            if (pageParam.latest) {
+                return getLatestPageFromFills(user, fills, pageParam.endTime, pageDurationMs);
+            }
             return {
                 user,
                 startTime: pageParam.startTime,
                 endTime: pageParam.endTime,
-                fills: sortTradeHistory(fills.map((fill) => formatTradeHistoryFill(fill, symbolConverter?.getSpotByPairId(fill.coin)))),
+                fills,
             };
         },
         initialPageParam: {
+            latest: endTime === undefined,
             startTime: Math.max(0, (endTime ?? Date.now()) - pageDurationMs),
             endTime: endTime ?? Date.now(),
         },
@@ -129,15 +180,7 @@ export function useInfiniteTradeHistory(user, options = {}) {
                 endTime: nextEndTime,
             };
         },
-        select: (data) => {
-            const realtimeFills = realtimeState.data?.fills ?? [];
-            return {
-                pages: data.pages,
-                pageParams: data.pageParams,
-                user,
-                fills: mergeTradeHistoryFills(data.pages, realtimeFills),
-            };
-        },
+        select: selectTradeHistoryData,
         ...queryOptions,
         enabled,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperix/hooks",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",