@peerbit/react 0.0.21 → 0.0.22

package/lib/esm/useCount.d.ts

@@ -2,7 +2,7 @@ import { Documents } from "@peerbit/document";
 import * as indexerTypes from "@peerbit/indexer-interface";
 type QueryOptons = {
     query: indexerTypes.Query[] | indexerTypes.QueryLike;
-    id: string;
+    id?: string;
 };
 export declare const useCount: <T extends Record<string, any>>(db?: Documents<T, any, any>, options?: {
     debounce?: number;

package/lib/esm/useCount.js

@@ -34,7 +34,10 @@ export const useCount = (db, options) => {
             db.events.removeEventListener("change", handleChange);
             debounced.cancel();
         };
-    }, [db?.closed ? undefined : db?.rootAddress, options?.id]);
+    }, [
+        db?.closed ? undefined : db?.rootAddress,
+        options?.id ?? options?.query,
+    ]);
     return count;
 };
 //# sourceMappingURL=useCount.js.map

package/lib/esm/useCount.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCount.js","sourceRoot":"","sources":["../../src/useCount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAMlD,MAAM,CAAC,MAAM,QAAQ,GAAG,CACpB,EAA2B,EAC3B,OAGe,EACjB,EAAE;IACA,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,CAAS,CAAC,CAAC,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO;QACX,CAAC;QAED,MAAM,EAAE,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;YAC5B,IAAI,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC;oBACzB,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,WAAW,EAAE,IAAI;iBACpB,CAAC,CAAC;gBACH,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC;gBACzB,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;oBAC/B,OAAO;gBACX,CAAC;gBACD,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,uBAAuB,CACrC,EAAE,EACF,OAAO,EAAE,QAAQ,IAAI,IAAI,CAC5B,CAAC;QAEF,MAAM,YAAY,GAAG,GAAG,EAAE;YACtB,SAAS,EAAE,CAAC;QAChB,CAAC,CAAC;QAEF,SAAS,EAAE,CAAC;QACZ,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEnD,OAAO,GAAG,EAAE;YACR,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACtD,SAAS,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5D,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC"}
+{"version":3,"file":"useCount.js","sourceRoot":"","sources":["../../src/useCount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAMlD,MAAM,CAAC,MAAM,QAAQ,GAAG,CACpB,EAA2B,EAC3B,OAGe,EACjB,EAAE;IACA,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAS,CAAC,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,CAAS,CAAC,CAAC,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO;QACX,CAAC;QAED,MAAM,EAAE,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;YAC5B,IAAI,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC;oBACzB,KAAK,EAAE,OAAO,EAAE,KAAK;oBACrB,WAAW,EAAE,IAAI;iBACpB,CAAC,CAAC;gBACH,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC;gBACzB,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;oBAC/B,OAAO;gBACX,CAAC;gBACD,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,uBAAuB,CACrC,EAAE,EACF,OAAO,EAAE,QAAQ,IAAI,IAAI,CAC5B,CAAC;QAEF,MAAM,YAAY,GAAG,GAAG,EAAE;YACtB,SAAS,EAAE,CAAC;QAChB,CAAC,CAAC;QAEF,SAAS,EAAE,CAAC;QACZ,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEnD,OAAO,GAAG,EAAE;YACR,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACtD,SAAS,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC,CAAC;IACN,CAAC,EAAE;QACC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW;QACxC,OAAO,EAAE,EAAE,IAAI,OAAO,EAAE,KAAK;KAChC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC"}

package/lib/esm/useQuery.d.ts

@@ -6,32 +6,33 @@ type QueryLike = {
 };
 type QueryOptions = {
     query: QueryLike;
-    id: string;
+    id?: string;
+};
+type WaitForReplicatorsOption = {
+    warmup?: number;
+    eager?: boolean;
 };
 export declare const useQuery: <T extends Record<string, any>, I extends Record<string, any>, R extends boolean | undefined = true, RT = R extends false ? WithContext<I> : WithContext<T>>(db?: Documents<T, I>, options?: {
     resolve?: R;
-    waitForReplicators?: boolean | {
-        timeout?: number;
-    };
-    transform?: (result: WithContext<RT>) => Promise<WithContext<RT>>;
+    transform?: (r: RT) => Promise<RT>;
     debounce?: number;
     debug?: boolean | {
         id: string;
     };
     reverse?: boolean;
     batchSize?: number;
+    prefetch?: boolean;
     onChange?: {
-        merge?: boolean | ((change: DocumentsChange<T>) => DocumentsChange<T> | Promise<DocumentsChange<T>> | undefined);
-        update?: (prev: WithContext<RT>[], change: DocumentsChange<T>) => WithContext<RT>[];
+        merge?: boolean | ((c: DocumentsChange<T>) => DocumentsChange<T> | Promise<DocumentsChange<T>> | undefined);
+        update?: (prev: RT[], change: DocumentsChange<T>) => RT[];
     };
     local?: boolean;
-    remote?: boolean | {
-        eager?: boolean;
-    };
+    remote?: boolean | WaitForReplicatorsOption;
 } & QueryOptions) => {
-    items: WithContext<RT>[];
-    loadMore: () => Promise<void>;
+    items: RT[];
+    loadMore: () => Promise<boolean | undefined>;
     isLoading: boolean;
-    empty: boolean;
+    empty: () => boolean;
+    id: string | undefined;
 };
 export {};

package/lib/esm/useQuery.js

@@ -1,17 +1,11 @@
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef, useReducer } from "react";
 import { ClosedError, } from "@peerbit/document";
 import { AbortError } from "@peerbit/time";
-const logWithId = (options, ...args) => {
-    if (!options?.debug)
-        return;
-    if (typeof options.debug === "boolean") {
-        console.log(...args);
-    }
-    else if (typeof options.debug.id === "string") {
-        console.log(options.debug.id, ...args);
-    }
-};
+import { NoPeersError } from "@peerbit/shared-log";
+import { v4 as uuid } from "uuid";
+/* ────────────── main hook ────────────── */
 export const useQuery = (db, options) => {
+    /* ────────────── state & refs ────────────── */
     const [all, setAll] = useState([]);
     const allRef = useRef([]);
     const [isLoading, setIsLoading] = useState(false);
@@ -19,103 +13,113 @@ export const useQuery = (db, options) => {
     const iteratorRef = useRef(null);
     const emptyResultsRef = useRef(false);
     const closeControllerRef = useRef(null);
-    const updateAll = (combined, fromChange) => {
-        logWithId(options, "Loading more items, new combined length", combined.length, "from change", fromChange);
+    const waitedOnceRef = useRef(false);
+    const resetResultsOnReset = useRef(true);
+    const [id, setId] = useState(undefined);
+    const [resetCounter, invokeReset] = useReducer((n) => n + 1, 0);
+    const reverseRef = useRef(options?.reverse);
+    useEffect(() => {
+        reverseRef.current = options?.reverse;
+    }, [options?.reverse]);
+    /* ────────────── util ────────────── */
+    const log = (...a) => {
+        if (!options?.debug)
+            return;
+        if (typeof options.debug === "boolean")
+            console.log(...a);
+        else
+            console.log(options.debug.id, ...a);
+    };
+    const updateAll = (combined) => {
         allRef.current = combined;
         setAll(combined);
     };
     const reset = (fromRef) => {
-        if (iteratorRef.current != null && iteratorRef.current !== fromRef) {
+        const toClose = iteratorRef.current;
+        if (toClose && fromRef && toClose !== fromRef) {
             return;
         }
+        iteratorRef.current = null;
         closeControllerRef.current?.abort();
         closeControllerRef.current = new AbortController();
         emptyResultsRef.current = false;
-        logWithId(options, "reset", {
-            id: iteratorRef.current?.id,
-            size: allRef.current.length,
-        });
-        !iteratorRef.current?.iterator.done() &&
-            iteratorRef.current?.iterator?.close();
-        iteratorRef.current = null;
-        setAll([]);
+        toClose?.iterator.close();
+        if (resetResultsOnReset.current) {
+            allRef.current = [];
+            setAll([]);
+        }
         setIsLoading(false);
         loadingMoreRef.current = false;
-        allRef.current = [];
+        log(options, "Iterator reset", toClose?.id, fromRef?.id);
+        setId(undefined);
     };
-    // Initialize the iterator only once or when query changes
     useEffect(() => {
-        if (!db || db.closed || options?.query === null) {
+        resetResultsOnReset.current = true;
+        waitedOnceRef.current = false;
+    }, [db, options?.id ?? options?.query, options?.resolve, options?.reverse]);
+    /* ────────────── effect: (re)create iterator ────────────── */
+    useEffect(() => {
+        if (!db || db.closed || options?.query == null) {
             reset(null);
             return;
         }
         const initIterator = () => {
-            // Don't make this async, it will cause issues with the iterator refs
-            try {
-                // Initialize the iterator and load initial batch.
-                const ref = {
-                    id: options?.id,
-                    iterator: db.index.iterate(options?.query ?? {}, {
-                        local: options?.local ?? true,
-                        remote: options?.remote ?? true,
-                        resolve: options?.resolve,
-                    }),
-                };
-                iteratorRef.current = ref;
-                logWithId(options, "Initializing iterator", {
-                    id: options?.id,
-                    options: options,
-                });
-                loadMore(); // initial load
-                return ref;
-            }
-            catch (error) {
-                console.error("Error initializing iterator", error);
-                return null;
+            let id = options?.id ?? uuid();
+            const ref = {
+                id,
+                iterator: db.index.iterate(options.query ?? {}, {
+                    local: options?.local ?? true,
+                    remote: options.remote == null || options.remote === false
+                        ? false
+                        : typeof options.remote === "object"
+                            ? options.remote
+                            : true,
+                    resolve: options?.resolve,
+                }),
+                itemsConsumed: 0,
+            };
+            iteratorRef.current = ref;
+            if (options?.prefetch) {
+                loadMore();
             }
+            setId(id);
+            log("Iterator initialised", ref.id);
+            return ref;
         };
-        // Reset state when the db or query changes.
         reset(iteratorRef.current);
         const newIteratorRef = initIterator();
-        let handleChange = undefined;
-        if (options?.onChange && options?.onChange?.merge !== false) {
-            let mergeFunction = typeof options.onChange.merge === "function"
+        /* live-merge listener (optional) */
+        let handleChange;
+        if (options?.onChange && options.onChange.merge !== false) {
+            const mergeFn = typeof options.onChange.merge === "function"
                 ? options.onChange.merge
-                : (change) => change;
+                : (c) => c;
             handleChange = async (e) => {
-                // while we are iterating, we might get new documents.. so this method inserts them where they should be
-                let filteredChange = await mergeFunction(e.detail);
-                if (!filteredChange ||
-                    (filteredChange.added.length === 0 &&
-                        filteredChange.removed.length === 0)) {
+                log(options, "Merge change", e.detail, "iterator", newIteratorRef.id);
+                const filtered = await mergeFn(e.detail);
+                if (!filtered ||
+                    (filtered.added.length === 0 &&
+                        filtered.removed.length === 0))
                     return;
-                }
-                let merged = [];
+                let merged;
                 if (options.onChange?.update) {
                     merged = [
-                        ...options.onChange.update(allRef.current, filteredChange),
+                        ...options.onChange?.update(allRef.current, filtered),
                     ];
                 }
                 else {
-                    merged = await db.index.updateResults(allRef.current, filteredChange, options?.query || {}, options?.resolve ?? true);
-                    logWithId(options, "After update", allRef.current, merged);
-                    const expectedDiff = filteredChange.added.length -
-                        filteredChange.removed.length;
+                    merged = await db.index.updateResults(allRef.current, filtered, options.query || {}, options.resolve ?? true);
+                    log(options, "After update", allRef.current, merged);
+                    const expectedDiff = filtered.added.length - filtered.removed.length;
                     if (merged === allRef.current ||
                         (expectedDiff !== 0 &&
                             merged.length === allRef.current.length)) {
                         // no change
-                        logWithId(options, "no change after merge");
+                        log(options, "no change after merge");
                         return;
                     }
                 }
-                logWithId(options, "handleChange", {
-                    added: e.detail.added.length,
-                    removed: e.detail.removed.length,
-                    merged: merged.length,
-                    allRef: allRef.current.length,
-                });
-                updateAll(options?.reverse ? merged.reverse() : merged, e.detail);
+                updateAll(options?.reverse ? merged.reverse() : merged);
             };
             db.events.addEventListener("change", handleChange);
         }
@@ -126,99 +130,130 @@ export const useQuery = (db, options) => {
         };
     }, [
         db?.closed ? undefined : db?.address,
-        options?.id != null ? options?.id : options?.query,
+        options?.id ?? options?.query,
         options?.resolve,
+        options?.reverse,
+        resetCounter,
     ]);
-    // Define the loadMore function
+    /* ────────────── loadMore (once-wait aware) ────────────── */
     const batchSize = options?.batchSize ?? 10;
+    const shouldWait = () => {
+        if (waitedOnceRef.current) {
+            return false;
+        }
+        if (options?.remote === false)
+            return false;
+        if (options?.remote === true)
+            return true;
+        if (options?.remote == null)
+            return true;
+        if (typeof options?.remote === "object") {
+            return true;
+        }
+        return true;
+    };
+    const reloadAfterTime = () => {
+        if (typeof options?.remote === "object" && options.remote.eager) {
+            return options.remote.warmup ?? db?.log.timeUntilRoleMaturity;
+        }
+        return undefined;
+    };
+    const markWaited = () => {
+        waitedOnceRef.current = true;
+    };
     const loadMore = async () => {
-        if (!iteratorRef.current ||
+        const iterator = iteratorRef.current;
+        if (!iterator ||
             emptyResultsRef.current ||
-            iteratorRef.current.iterator.done() ||
+            iterator.iterator.done() ||
             loadingMoreRef.current) {
-            logWithId(options, "loadMore: already loading or no more items", {
-                isLoading,
-                emptyResultsRef: emptyResultsRef.current,
-                iteratorRef: !iteratorRef.current,
-            });
-            return;
+            return false;
         }
-        const iterator = iteratorRef.current;
         setIsLoading(true);
         loadingMoreRef.current = true;
         try {
-            // Fetch next batchSize number of items:
-            logWithId(options, "wait for replicators for iterator " + iterator.id);
-            if (options?.waitForReplicators !== false) {
-                let timeout = 5e3;
-                if (typeof options?.waitForReplicators === "object") {
-                    timeout = options.waitForReplicators.timeout ?? 1e4;
-                }
-                await db?.log
+            /* ── optional replicate-wait ── */
+            if (shouldWait()) {
+                log(options, "Wait for replicators", iterator.id);
+                let isEager = typeof options?.remote === "object" && options.remote.eager;
+                const waitTimeout = typeof options?.remote === "object" &&
+                    typeof options?.remote.warmup === "number"
+                    ? options?.remote.warmup
+                    : 5_000;
+                let shouldResetAfterMaturity = isEager && !waitedOnceRef.current;
+                let promise = db?.log
                     .waitForReplicators({
-                    timeout,
+                    timeout: waitTimeout,
                     signal: closeControllerRef.current?.signal,
                 })
                     .catch((e) => {
-                    if (e instanceof AbortError) {
-                        // Ignore abort error
+                    if (e instanceof AbortError ||
+                        e instanceof NoPeersError)
                         return;
-                    }
                     console.warn("Remote replicators not ready", e);
+                })
+                    .finally(() => {
+                    markWaited();
+                    if (shouldResetAfterMaturity) {
+                        resetResultsOnReset.current = false; // don't reset results， because we expect to get same or more results
+                        invokeReset();
+                    }
                 });
+                if (!shouldResetAfterMaturity) {
+                    await promise;
+                }
             }
-            logWithId(options, "loadMore: loading more items for iterator " +
-                iteratorRef.current?.id, "should resolve?: " + options?.resolve, "query local?: " + options?.local, "query remote?: " + options?.remote, "isReplicating: " + (await db?.log.isReplicating()));
+            else {
+                log(options, "Skip wait for replicators", iterator.id);
+            }
+            /* ── fetch next batch ── */
+            log(options, "Retrieve next batch", iterator.id);
             let newItems = await iterator.iterator.next(batchSize);
             if (options?.transform) {
-                newItems = await Promise.all(newItems.map((item) => options.transform(item)));
+                log(options, "Transform start", iterator.id);
+                newItems = await Promise.all(newItems.map(options.transform));
+                log(options, "Transform end", iterator.id);
             }
+            /* iterator might have been reset while we were async… */
             if (iteratorRef.current !== iterator) {
-                // If the iterator has changed, we should not update the state
-                // This can happen if the iterator was closed and a new one was created
-                logWithId(options, "Iterator ref changed, not updating state", {
-                    refBefore: iterator.id,
-                    currentRef: iteratorRef.current?.id,
-                    ignoredItems: newItems.length,
-                });
-                return;
+                log(options, "Iterator reset while loading more");
+                return false;
             }
-            logWithId(options, "loadMore: loaded more items for iterator " +
-                iteratorRef.current?.id, "new items length", newItems.length, "all items length", allRef.current.length);
+            iterator.itemsConsumed += newItems.length;
             emptyResultsRef.current = newItems.length === 0;
-            if (newItems.length > 0) {
-                let prev = allRef.current;
-                let prevHash = new Set(prev.map((x) => x.__context.head));
-                let newItemsNoHash = newItems.filter((x) => !prevHash.has(x.__context.head));
-                if (newItemsNoHash.length === 0) {
-                    logWithId(options, "no new items after dedup, not updating state. Prev length", prev.length);
+            if (newItems.length) {
+                log("Loaded more items for iterator", iterator.id, "current id", iteratorRef.current?.id, "new items", newItems.length, "previous results", allRef.current.length, "batchSize", batchSize, "items consumed", iterator.itemsConsumed);
+                const prev = allRef.current;
+                const dedup = new Set(prev.map((x) => x.__context.head));
+                const unique = newItems.filter((x) => !dedup.has(x.__context.head));
+                if (!unique.length)
                     return;
-                }
-                const combined = options?.reverse
-                    ? [...newItemsNoHash.reverse(), ...prev]
-                    : [...prev, ...newItemsNoHash];
-                updateAll(combined, null);
+                const combined = reverseRef.current
+                    ? [...unique.reverse(), ...prev]
+                    : [...prev, ...unique];
+                updateAll(combined);
             }
             else {
-                logWithId(options, "no new items, not updating state for iterator " +
-                    iteratorRef.current?.id +
-                    " existing results length", allRef.current.length);
+                log(options, "No new items", iterator.id);
             }
+            return !iterator.iterator.done();
         }
-        catch (error) {
-            if (error instanceof ClosedError) {
-                // Handle closed database gracefully
-                logWithId(options, "Database closed error");
-            }
-            else {
-                throw error;
-            }
+        catch (e) {
+            if (!(e instanceof ClosedError))
+                throw e;
         }
         finally {
             setIsLoading(false);
             loadingMoreRef.current = false;
         }
     };
-    return { items: all, loadMore, isLoading, empty: emptyResultsRef.current };
+    /* ────────────── public API ────────────── */
+    return {
+        items: all,
+        loadMore,
+        isLoading,
+        empty: () => emptyResultsRef.current,
+        id: id,
+    };
 };
 //# sourceMappingURL=useQuery.js.map

package/lib/esm/useQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/useQuery.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/useQuery.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@peerbit/react",
-    "version": "0.0.21",
+    "version": "0.0.22",
     "homepage": "https://dao-xyz.github.io/peerbit-examples",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -70,5 +70,5 @@
             "last 1 safari version"
         ]
     },
-    "gitHead": "6e2a023d63cd34b6058da13820562d64b8101253"
+    "gitHead": "0aeb9e6d47a916b922efd66f4b14ac982664a9bd"
 }

package/src/useCount.tsx

@@ -5,7 +5,7 @@ import { debounceLeadingTrailing } from "./utils";
 
 type QueryOptons = {
     query: indexerTypes.Query[] | indexerTypes.QueryLike;
-    id: string;
+    id?: string;
 };
 export const useCount = <T extends Record<string, any>>(
     db?: Documents<T, any, any>,
@@ -54,7 +54,10 @@ export const useCount = <T extends Record<string, any>>(
             db.events.removeEventListener("change", handleChange);
             debounced.cancel();
         };
-    }, [db?.closed ? undefined : db?.rootAddress, options?.id]);
+    }, [
+        db?.closed ? undefined : db?.rootAddress,
+        options?.id ?? options?.query,
+    ]);
 
     return count;
 };

package/src/useQuery.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect, useRef, useReducer } from "react";
 import {
     ClosedError,
     Documents,
@@ -8,26 +8,19 @@ import {
 } from "@peerbit/document";
 import * as indexerTypes from "@peerbit/indexer-interface";
 import { AbortError } from "@peerbit/time";
+import { NoPeersError } from "@peerbit/shared-log";
+import { v4 as uuid } from "uuid";
 
+/* ────────────── helper types ────────────── */
 type QueryLike = {
     query?: indexerTypes.Query[] | indexerTypes.QueryLike;
     sort?: indexerTypes.Sort[] | indexerTypes.Sort | indexerTypes.SortLike;
 };
-type QueryOptions = { query: QueryLike; id: string };
+type QueryOptions = { query: QueryLike; id?: string };
 
-const logWithId = (
-    options: { debug?: boolean | { id: string } } | undefined,
-    ...args: any[]
-) => {
-    if (!options?.debug) return;
-
-    if (typeof options.debug === "boolean") {
-        console.log(...args);
-    } else if (typeof options.debug.id === "string") {
-        console.log(options.debug.id, ...args);
-    }
-};
+type WaitForReplicatorsOption = { warmup?: number; eager?: boolean };
 
+/* ────────────── main hook ────────────── */
 export const useQuery = <
     T extends Record<string, any>,
     I extends Record<string, any>,
@@ -37,167 +30,179 @@ export const useQuery = <
     db?: Documents<T, I>,
     options?: {
         resolve?: R;
-        waitForReplicators?: boolean | { timeout?: number };
-        transform?: (result: WithContext<RT>) => Promise<WithContext<RT>>;
+        transform?: (r: RT) => Promise<RT>;
         debounce?: number;
         debug?: boolean | { id: string };
         reverse?: boolean;
-        batchSize?: number; // You can set a default batch size here
+        batchSize?: number;
+        prefetch?: boolean;
         onChange?: {
             merge?:
                 | boolean
                 | ((
-                      change: DocumentsChange<T>
+                      c: DocumentsChange<T>
                   ) =>
                       | DocumentsChange<T>
                       | Promise<DocumentsChange<T>>
-                      | undefined); // if true, the iterator will be updated with new documents
-            update?: (
-                prev: WithContext<RT>[],
-                change: DocumentsChange<T>
-            ) => WithContext<RT>[];
+                      | undefined);
+            update?: (prev: RT[], change: DocumentsChange<T>) => RT[];
         };
-        local?: boolean; // if true, (default is true) the iterator will only return local documents
-        remote?:
-            | boolean
-            | {
-                  eager?: boolean;
-              };
+        local?: boolean;
+        remote?: boolean | WaitForReplicatorsOption;
     } & QueryOptions
 ) => {
-    const [all, setAll] = useState<WithContext<RT>[]>([]);
-    const allRef = useRef<WithContext<RT>[]>([]);
+    /* ── «Item» is the concrete element type flowing through the hook ── */
+    type Item = RT;
+
+    /* ────────────── state & refs ────────────── */
+    const [all, setAll] = useState<Item[]>([]);
+    const allRef = useRef<Item[]>([]);
     const [isLoading, setIsLoading] = useState(false);
-    const loadingMoreRef = useRef(false);
+    const loadingMoreRef = useRef<boolean>(false);
     const iteratorRef = useRef<{
         id?: string;
-        iterator: ResultsIterator<WithContext<RT>>;
+        iterator: ResultsIterator<Item>;
+        itemsConsumed: number;
     } | null>(null);
     const emptyResultsRef = useRef(false);
     const closeControllerRef = useRef<AbortController | null>(null);
+    const waitedOnceRef = useRef(false);
+    const resetResultsOnReset = useRef(true);
 
-    const updateAll = (
-        combined: WithContext<RT>[],
-        fromChange?: DocumentsChange<any> | null
-    ) => {
-        logWithId(
-            options,
-            "Loading more items, new combined length",
-            combined.length,
-            "from change",
-            fromChange
-        );
+    const [id, setId] = useState<string | undefined>(undefined);
+    const [resetCounter, invokeReset] = useReducer((n) => n + 1, 0);
 
-        allRef.current = combined;
+    const reverseRef = useRef(options?.reverse);
+    useEffect(() => {
+        reverseRef.current = options?.reverse;
+    }, [options?.reverse]);
+
+    /* ────────────── util ────────────── */
+    const log = (...a: any[]) => {
+        if (!options?.debug) return;
+        if (typeof options.debug === "boolean") console.log(...a);
+        else console.log(options.debug.id, ...a);
+    };
 
+    const updateAll = (combined: Item[]) => {
+        allRef.current = combined;
         setAll(combined);
     };
 
     const reset = (
         fromRef: {
             id?: string;
-            iterator: ResultsIterator<WithContext<RT>>;
+            iterator: ResultsIterator<Item>;
         } | null
     ) => {
-        if (iteratorRef.current != null && iteratorRef.current !== fromRef) {
+        const toClose = iteratorRef.current;
+        if (toClose && fromRef && toClose !== fromRef) {
             return;
         }
+
+        iteratorRef.current = null;
+
         closeControllerRef.current?.abort();
         closeControllerRef.current = new AbortController();
-
         emptyResultsRef.current = false;
-        logWithId(options, "reset", {
-            id: iteratorRef.current?.id,
-            size: allRef.current.length,
-        });
 
-        !iteratorRef.current?.iterator.done() &&
-            iteratorRef.current?.iterator?.close();
-        iteratorRef.current = null;
-        setAll([]);
+        toClose?.iterator.close();
+
+        if (resetResultsOnReset.current) {
+            allRef.current = [];
+            setAll([]);
+        }
+
         setIsLoading(false);
         loadingMoreRef.current = false;
-        allRef.current = [];
+        log(options, "Iterator reset", toClose?.id, fromRef?.id);
+        setId(undefined);
     };
 
-    // Initialize the iterator only once or when query changes
     useEffect(() => {
-        if (!db || db.closed || options?.query === null) {
+        resetResultsOnReset.current = true;
+        waitedOnceRef.current = false;
+    }, [db, options?.id ?? options?.query, options?.resolve, options?.reverse]);
+
+    /* ────────────── effect: (re)create iterator ────────────── */
+    useEffect(() => {
+        if (!db || db.closed || options?.query == null) {
             reset(null);
             return;
         }
 
         const initIterator = () => {
-            // Don't make this async, it will cause issues with the iterator refs
-            try {
-                // Initialize the iterator and load initial batch.
-
-                const ref = {
-                    id: options?.id,
-                    iterator: db.index.iterate(options?.query ?? {}, {
-                        local: options?.local ?? true,
-                        remote: options?.remote ?? true,
-                        resolve: options?.resolve as any,
-                    }) as any as ResultsIterator<WithContext<RT>>,
-                };
-                iteratorRef.current = ref;
-
-                logWithId(options, "Initializing iterator", {
-                    id: options?.id,
-                    options: options,
-                });
-
-                loadMore(); // initial load
-                return ref;
-            } catch (error) {
-                console.error("Error initializing iterator", error);
-                return null;
+            let id = options?.id ?? uuid();
+            const ref = {
+                id,
+                iterator: db.index.iterate(options.query ?? {}, {
+                    local: options?.local ?? true,
+                    remote:
+                        options.remote == null || options.remote === false
+                            ? false
+                            : typeof options.remote === "object"
+                            ? options.remote
+                            : true,
+                    resolve: options?.resolve,
+                }) as ResultsIterator<Item>,
+                itemsConsumed: 0,
+            };
+            iteratorRef.current = ref;
+            if (options?.prefetch) {
+                loadMore();
             }
+            setId(id);
+
+            log("Iterator initialised", ref.id);
+            return ref;
         };
 
-        // Reset state when the db or query changes.
         reset(iteratorRef.current);
-
         const newIteratorRef = initIterator();
 
+        /* live-merge listener (optional) */
         let handleChange:
-            | undefined
-            | ((e: CustomEvent<DocumentsChange<T>>) => void | Promise<void>) =
-            undefined;
-        if (options?.onChange && options?.onChange?.merge !== false) {
-            let mergeFunction =
+            | ((e: CustomEvent<DocumentsChange<T>>) => void | Promise<void>)
+            | undefined;
+
+        if (options?.onChange && options.onChange.merge !== false) {
+            const mergeFn =
                 typeof options.onChange.merge === "function"
                     ? options.onChange.merge
-                    : (change: DocumentsChange<T>) => change;
+                    : (c: DocumentsChange<T>) => c;
+
             handleChange = async (e: CustomEvent<DocumentsChange<T>>) => {
-                // while we are iterating, we might get new documents.. so this method inserts them where they should be
-                let filteredChange = await mergeFunction(e.detail);
+                log(
+                    options,
+                    "Merge change",
+                    e.detail,
+                    "iterator",
+                    newIteratorRef.id
+                );
+                const filtered = await mergeFn(e.detail);
                 if (
-                    !filteredChange ||
-                    (filteredChange.added.length === 0 &&
-                        filteredChange.removed.length === 0)
-                ) {
+                    !filtered ||
+                    (filtered.added.length === 0 &&
+                        filtered.removed.length === 0)
+                )
                     return;
-                }
-                let merged: WithContext<RT>[] = [];
+
+                let merged: Item[];
                 if (options.onChange?.update) {
                     merged = [
-                        ...options.onChange.update(
-                            allRef.current,
-                            filteredChange
-                        ),
+                        ...options.onChange?.update(allRef.current, filtered),
                     ];
                 } else {
                     merged = await db.index.updateResults(
-                        allRef.current,
-                        filteredChange,
-                        options?.query || {},
-                        options?.resolve ?? true
+                        allRef.current as WithContext<RT>[],
+                        filtered,
+                        options.query || {},
+                        options.resolve ?? true
                     );
-                    logWithId(options, "After update", allRef.current, merged);
+
+                    log(options, "After update", allRef.current, merged);
                     const expectedDiff =
-                        filteredChange.added.length -
-                        filteredChange.removed.length;
+                        filtered.added.length - filtered.removed.length;
 
                     if (
                         merged === allRef.current ||
@@ -205,23 +210,14 @@ export const useQuery = <
                             merged.length === allRef.current.length)
                     ) {
                         // no change
-                        logWithId(options, "no change after merge");
+                        log(options, "no change after merge");
                         return;
                     }
                 }
 
-                logWithId(options, "handleChange", {
-                    added: e.detail.added.length,
-                    removed: e.detail.removed.length,
-                    merged: merged.length,
-                    allRef: allRef.current.length,
-                });
-
-                updateAll(
-                    options?.reverse ? merged.reverse() : merged,
-                    e.detail
-                );
+                updateAll(options?.reverse ? merged.reverse() : merged);
             };
+
             db.events.addEventListener("change", handleChange);
         }
 
@@ -232,137 +228,162 @@ export const useQuery = <
         };
     }, [
         db?.closed ? undefined : db?.address,
-        options?.id != null ? options?.id : options?.query,
+        options?.id ?? options?.query,
         options?.resolve,
+        options?.reverse,
+        resetCounter,
     ]);
 
-    // Define the loadMore function
+    /* ────────────── loadMore (once-wait aware) ────────────── */
     const batchSize = options?.batchSize ?? 10;
+
+    const shouldWait = (): boolean => {
+        if (waitedOnceRef.current) {
+            return false;
+        }
+        if (options?.remote === false) return false;
+        if (options?.remote === true) return true;
+        if (options?.remote == null) return true;
+        if (typeof options?.remote === "object") {
+            return true;
+        }
+        return true;
+    };
+
+    const reloadAfterTime = (): number | undefined => {
+        if (typeof options?.remote === "object" && options.remote.eager) {
+            return options.remote.warmup ?? db?.log.timeUntilRoleMaturity;
+        }
+        return undefined;
+    };
+
+    const markWaited = () => {
+        waitedOnceRef.current = true;
+    };
+
     const loadMore = async () => {
+        const iterator = iteratorRef.current;
         if (
-            !iteratorRef.current ||
+            !iterator ||
             emptyResultsRef.current ||
-            iteratorRef.current.iterator.done() ||
+            iterator.iterator.done() ||
             loadingMoreRef.current
         ) {
-            logWithId(options, "loadMore: already loading or no more items", {
-                isLoading,
-                emptyResultsRef: emptyResultsRef.current,
-                iteratorRef: !iteratorRef.current,
-            });
-            return;
+            return false;
         }
-        const iterator = iteratorRef.current;
 
         setIsLoading(true);
         loadingMoreRef.current = true;
+
         try {
-            // Fetch next batchSize number of items:
-            logWithId(
-                options,
-                "wait for replicators for iterator " + iterator.id
-            );
-            if (options?.waitForReplicators !== false) {
-                let timeout = 5e3;
-                if (typeof options?.waitForReplicators === "object") {
-                    timeout = options.waitForReplicators.timeout ?? 1e4;
-                }
-                await db?.log
+            /* ── optional replicate-wait ── */
+            if (shouldWait()) {
+                log(options, "Wait for replicators", iterator.id);
+
+                let isEager =
+                    typeof options?.remote === "object" && options.remote.eager;
+                const waitTimeout =
+                    typeof options?.remote === "object" &&
+                    typeof options?.remote.warmup === "number"
+                        ? options?.remote.warmup
+                        : 5_000;
+
+                let shouldResetAfterMaturity =
+                    isEager && !waitedOnceRef.current;
+                let promise = db?.log
                     .waitForReplicators({
-                        timeout,
+                        timeout: waitTimeout,
                         signal: closeControllerRef.current?.signal,
                     })
                     .catch((e) => {
-                        if (e instanceof AbortError) {
-                            // Ignore abort error
+                        if (
+                            e instanceof AbortError ||
+                            e instanceof NoPeersError
+                        )
                             return;
-                        }
                         console.warn("Remote replicators not ready", e);
+                    })
+                    .finally(() => {
+                        markWaited();
+                        if (shouldResetAfterMaturity) {
+                            resetResultsOnReset.current = false; // don't reset results， because we expect to get same or more results
+                            invokeReset();
+                        }
                     });
+                if (!shouldResetAfterMaturity) {
+                    await promise;
+                }
+            } else {
+                log(options, "Skip wait for replicators", iterator.id);
             }
 
-            logWithId(
-                options,
-                "loadMore: loading more items for iterator " +
-                    iteratorRef.current?.id,
-                "should resolve?: " + options?.resolve,
-                "query local?: " + options?.local,
-                "query remote?: " + options?.remote,
-                "isReplicating: " + (await db?.log.isReplicating())
-            );
-
-            let newItems: WithContext<RT>[] = await iterator.iterator.next(
-                batchSize
-            );
-
+            /* ── fetch next batch ── */
+            log(options, "Retrieve next batch", iterator.id);
+            let newItems = await iterator.iterator.next(batchSize);
             if (options?.transform) {
-                newItems = await Promise.all(
-                    newItems.map((item) => options.transform!(item))
-                );
+                log(options, "Transform start", iterator.id);
+
+                newItems = await Promise.all(newItems.map(options.transform));
+                log(options, "Transform end", iterator.id);
             }
 
+            /* iterator might have been reset while we were async… */
+
             if (iteratorRef.current !== iterator) {
-                // If the iterator has changed, we should not update the state
-                // This can happen if the iterator was closed and a new one was created
-                logWithId(options, "Iterator ref changed, not updating state", {
-                    refBefore: iterator.id,
-                    currentRef: iteratorRef.current?.id,
-                    ignoredItems: newItems.length,
-                });
-                return;
+                log(options, "Iterator reset while loading more");
+                return false;
             }
 
-            logWithId(
-                options,
-                "loadMore: loaded more items for iterator " +
-                    iteratorRef.current?.id,
-                "new items length",
-                newItems.length,
-                "all items length",
-                allRef.current.length
-            );
+            iterator.itemsConsumed += newItems.length;
 
             emptyResultsRef.current = newItems.length === 0;
 
-            if (newItems.length > 0) {
-                let prev = allRef.current;
-                let prevHash = new Set(prev.map((x) => x.__context.head));
-                let newItemsNoHash = newItems.filter(
-                    (x) => !prevHash.has(x.__context.head)
+            if (newItems.length) {
+                log(
+                    "Loaded more items for iterator",
+                    iterator.id,
+                    "current id",
+                    iteratorRef.current?.id,
+                    "new items",
+                    newItems.length,
+                    "previous results",
+                    allRef.current.length,
+                    "batchSize",
+                    batchSize,
+                    "items consumed",
+                    iterator.itemsConsumed
                 );
-                if (newItemsNoHash.length === 0) {
-                    logWithId(
-                        options,
-                        "no new items after dedup, not updating state. Prev length",
-                        prev.length
-                    );
-                    return;
-                }
-                const combined = options?.reverse
-                    ? [...newItemsNoHash.reverse(), ...prev]
-                    : [...prev, ...newItemsNoHash];
-                updateAll(combined, null);
-            } else {
-                logWithId(
-                    options,
-                    "no new items, not updating state for iterator " +
-                        iteratorRef.current?.id +
-                        " existing results length",
-                    allRef.current.length
+                const prev = allRef.current;
+                const dedup = new Set(
+                    prev.map((x) => (x as any).__context.head)
                 );
-            }
-        } catch (error) {
-            if (error instanceof ClosedError) {
-                // Handle closed database gracefully
-                logWithId(options, "Database closed error");
+                const unique = newItems.filter(
+                    (x) => !dedup.has((x as any).__context.head)
+                );
+                if (!unique.length) return;
+
+                const combined = reverseRef.current
+                    ? [...unique.reverse(), ...prev]
+                    : [...prev, ...unique];
+                updateAll(combined);
             } else {
-                throw error;
+                log(options, "No new items", iterator.id);
             }
+            return !iterator.iterator.done();
+        } catch (e) {
+            if (!(e instanceof ClosedError)) throw e;
         } finally {
             setIsLoading(false);
             loadingMoreRef.current = false;
         }
     };
 
-    return { items: all, loadMore, isLoading, empty: emptyResultsRef.current };
+    /* ────────────── public API ────────────── */
+    return {
+        items: all,
+        loadMore,
+        isLoading,
+        empty: () => emptyResultsRef.current,
+        id: id,
+    };
 };