@peerbit/document 12.3.4 → 12.3.5-3f16953

package/dist/src/search.js

@@ -753,7 +753,24 @@ let DocumentIndex = (() => {
                     this.documentEvents.removeEventListener("change", this.handleDocumentChange);
                 }
                 this.clearAllResultQueues();
-                await this.index?.stop?.();
+                await this._resumableIterators.clearAll();
+                if (this.iteratorKeepAliveTimers) {
+                    for (const timer of this.iteratorKeepAliveTimers.values()) {
+                        clearTimeout(timer);
+                    }
+                    this.iteratorKeepAliveTimers.clear();
+                }
+                try {
+                    await this.index?.stop?.();
+                }
+                catch (error) {
+                    // Be defensive during teardown: stopping an already-stopped index shouldn't
+                    // prevent closing the program and releasing timers/iterators.
+                    if (error instanceof indexerTypes.NotStartedError) {
+                        return closed;
+                    }
+                    throw error;
+                }
             }
             return closed;
         }
@@ -762,13 +779,35 @@ let DocumentIndex = (() => {
             if (dropped) {
                 this.documentEvents.removeEventListener("change", this.handleDocumentChange);
                 this.clearAllResultQueues();
-                await this.index?.drop?.();
-                await this.index?.stop?.();
+                await this._resumableIterators.clearAll();
+                if (this.iteratorKeepAliveTimers) {
+                    for (const timer of this.iteratorKeepAliveTimers.values()) {
+                        clearTimeout(timer);
+                    }
+                    this.iteratorKeepAliveTimers.clear();
+                }
+                try {
+                    await this.index?.drop?.();
+                }
+                catch (error) {
+                    if (!(error instanceof indexerTypes.NotStartedError)) {
+                        throw error;
+                    }
+                }
+                try {
+                    await this.index?.stop?.();
+                }
+                catch (error) {
+                    if (!(error instanceof indexerTypes.NotStartedError)) {
+                        throw error;
+                    }
+                }
             }
             return dropped;
         }
         async get(key, options) {
             let deferred;
+            let baseRemote;
             // Normalize the id key early so listeners can use it
             let idKey = key instanceof indexerTypes.IdKey ? key : indexerTypes.toId(key);
             if (options?.waitFor) {
@@ -801,11 +840,12 @@ let DocumentIndex = (() => {
                 this.documentEvents.addEventListener("change", listener);
                 deferred.promise.then(cleanup);
                 // Prepare remote options without mutating caller options
-                const baseRemote = options?.remote === false
-                    ? undefined
-                    : typeof options?.remote === "object"
-                        ? { ...options.remote }
-                        : {};
+                baseRemote =
+                    options?.remote === false
+                        ? undefined
+                        : typeof options?.remote === "object"
+                            ? { ...options.remote }
+                            : {};
                 if (baseRemote) {
                     const waitPolicy = baseRemote.wait;
                     if (!waitPolicy ||
@@ -842,7 +882,10 @@ let DocumentIndex = (() => {
                     });
                 }
             }
-            const result = (await this.getDetailed(idKey, options))?.[0]?.results[0];
+            const initialOptions = baseRemote
+                ? { ...options, remote: baseRemote }
+                : options;
+            const result = (await this.getDetailed(idKey, initialOptions))?.[0]?.results[0];
             // if no results, and we have remote joining options, we wait for the timout and if there are joining peers we re-query
             if (!result) {
                 return deferred?.promise;
@@ -1142,6 +1185,8 @@ let DocumentIndex = (() => {
                     fromQuery: (fromQuery || query),
                     resolveResults: resolveFlag,
                 };
+                // Don't keep Node alive just to GC old remote iterator state.
+                prevQueued.timeout.unref?.();
                 if (fromQuery instanceof types.IterationRequest &&
                     fromQuery.pushUpdates) {
                     prevQueued.pushMode = fromQuery.pushUpdates;
@@ -1228,6 +1273,8 @@ let DocumentIndex = (() => {
                 }
                 this._resumableIterators.close({ idString });
             }, delay);
+            // This is a best-effort cleanup timer; it should not keep Node alive.
+            timer.unref?.();
             timers.set(idString, timer);
         }
         cancelIteratorKeepAlive(idString) {
@@ -1409,12 +1456,7 @@ let DocumentIndex = (() => {
             const local = typeof options?.local === "boolean" ? options?.local : true;
             let remote = undefined;
             if (typeof options?.remote === "boolean") {
-                if (options?.remote) {
-                    remote = {};
-                }
-                else {
-                    remote = undefined;
-                }
+                remote = options.remote ? {} : undefined;
             }
             else {
                 remote = options?.remote || {};
@@ -1443,14 +1485,69 @@ let DocumentIndex = (() => {
                     // don't wait for responses
                     throw new Error("Unexpected");
                 }
-                const replicatorGroups = options?.remote?.from
+                const coverProps = remote.domain ?? { args: undefined };
+                const isDefaultDomainArgs = !("range" in coverProps) &&
+                    (!("args" in coverProps) || coverProps.args == null);
+                let replicatorGroups = options?.remote?.from
                     ? options?.remote?.from
-                    : await this._log.getCover(remote.domain ?? { args: undefined }, {
+                    : await this._log.getCover(coverProps, {
                         roleAge: remote.minAge,
                         eager: remote.reach?.eager,
                         reachableOnly: !!remote.wait, // when we want to merge joining we can ignore pending to be online peers and instead consider them once they become online
                         signal: options?.signal,
                     });
+                // Cold start: cover can be temporarily empty/self-only while replication metadata
+                // converges. For remote search, it's sometimes better to at least try currently
+                // connected peers, but only if we have evidence that a remote replicator exists.
+                if (!options?.remote?.from && isDefaultDomainArgs) {
+                    const selfHash = this.node.identity.publicKey.hashcode();
+                    const remoteCount = replicatorGroups.filter((h) => h !== selfHash).length;
+                    if (remoteCount === 0) {
+                        const waitEnabled = Boolean(remote.wait);
+                        const coverIsSelfOnly = replicatorGroups.length === 1 && replicatorGroups[0] === selfHash;
+                        // If the cover is explicitly empty (no shards), don't override it unless
+                        // the caller requested waiting for joins (e.g. get(waitFor)).
+                        if (!waitEnabled && !coverIsSelfOnly) {
+                            // no-op
+                        }
+                        else {
+                            let hasKnownRemoteReplicator = false;
+                            if (!waitEnabled) {
+                                try {
+                                    const replicators = await this._log.getReplicators();
+                                    for (const hash of replicators.keys()) {
+                                        if (hash !== selfHash) {
+                                            hasKnownRemoteReplicator = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                                catch {
+                                    // Best-effort only.
+                                }
+                            }
+                            if (waitEnabled || hasKnownRemoteReplicator) {
+                                const peerMap = this.node.services
+                                    .pubsub?.peers;
+                                if (peerMap?.keys) {
+                                    const extra = [];
+                                    for (const hash of peerMap.keys()) {
+                                        if (!hash || hash === selfHash)
+                                            continue;
+                                        extra.push(hash);
+                                        if (extra.length >= 8)
+                                            break;
+                                    }
+                                    if (extra.length > 0) {
+                                        replicatorGroups = [
+                                            ...new Set([...replicatorGroups, ...extra]),
+                                        ];
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
                 if (replicatorGroups) {
                     const responseHandler = async (results) => {
                         const resultInitialized = await introduceEntries(queryRequest, results, this.documentType, this.indexedType, this._sync, options);
@@ -1575,9 +1672,8 @@ let DocumentIndex = (() => {
             // Set fetch to search size, or max value (default to max u32 (4294967295))
             const coercedRequest = coerceQuery(queryRequest, options, this.compatibility);
             coercedRequest.fetch = coercedRequest.fetch ?? 0xffffffff;
-            // So that the iterator is pre-fetching the right amount of entries
+            // Use an iterator so large results respect message size limits.
             const iterator = this.iterate(coercedRequest, options);
-            // So that this call will not do any remote requests
             const allResults = [];
             while (iterator.done() !== true &&
                 coercedRequest.fetch > allResults.length) {
@@ -1838,36 +1934,42 @@ let DocumentIndex = (() => {
             let discoveredTargetHashes;
             if (typeof options?.remote === "object") {
                 let waitForTime = undefined;
+                const waitPolicy = typeof options.remote.wait === "object"
+                    ? options.remote.wait
+                    : undefined;
+                const waitBehavior = waitPolicy?.behavior ?? "keep-open";
                 if (options.remote.wait) {
-                    let t0 = +new Date();
                     waitForTime =
                         typeof options.remote.wait === "boolean"
                             ? DEFAULT_TIMEOUT
                             : (options.remote.wait.timeout ?? DEFAULT_TIMEOUT);
-                    let setDoneIfTimeout = false;
-                    maybeSetDone = () => {
-                        if (t0 + waitForTime < +new Date()) {
-                            cleanup();
-                            done = true;
-                        }
-                        else {
-                            setDoneIfTimeout = true;
-                        }
-                    };
-                    unsetDone = () => {
-                        setDoneIfTimeout = false;
-                        done = false;
-                    };
-                    let timeout = setTimeout(() => {
-                        if (setDoneIfTimeout) {
-                            cleanup();
-                            done = true;
-                        }
-                    }, waitForTime);
-                    cleanup = () => {
-                        this.clearResultsQueue(queryRequestCoerced);
-                        clearTimeout(timeout);
-                    };
+                    if (waitBehavior === "keep-open") {
+                        let t0 = +new Date();
+                        let setDoneIfTimeout = false;
+                        maybeSetDone = () => {
+                            if (t0 + waitForTime < +new Date()) {
+                                cleanup();
+                                done = true;
+                            }
+                            else {
+                                setDoneIfTimeout = true;
+                            }
+                        };
+                        unsetDone = () => {
+                            setDoneIfTimeout = false;
+                            done = false;
+                        };
+                        let timeout = setTimeout(() => {
+                            if (setDoneIfTimeout) {
+                                cleanup();
+                                done = true;
+                            }
+                        }, waitForTime);
+                        cleanup = () => {
+                            this.clearResultsQueue(queryRequestCoerced);
+                            clearTimeout(timeout);
+                        };
+                    }
                 }
                 if (options.remote.reach?.discover) {
                     const discoverTimeout = waitForTime ??
@@ -1891,9 +1993,6 @@ let DocumentIndex = (() => {
                     warmupPromise = prior.then(() => discoverPromise);
                     options.remote.reach.eager = true; // include the results from the discovered peer even if it is not mature
                 }
-                const waitPolicy = typeof options.remote.wait === "object"
-                    ? options.remote.wait
-                    : undefined;
                 if (waitPolicy?.behavior === "block" &&
                     (waitPolicy.until ?? "any") === "any") {
                     const blockPromise = this.waitForCoverReady({
@@ -2300,25 +2399,19 @@ let DocumentIndex = (() => {
             };
             let close = async () => {
                 cleanupAndDone();
-                // send close to remote
+                // send close to remote (only peers that actually served results / had an active buffer)
                 const closeRequest = new types.CloseIteratorRequest({
                     id: queryRequestCoerced.id,
                 });
-                const promises = [];
-                for (const [peer, buffer] of peerBufferMap) {
-                    if (buffer.kept === 0) {
-                        peerBufferMap.delete(peer);
-                        continue;
-                    }
-                    if (peer !== this.node.identity.publicKey.hashcode()) {
-                        // Close remote
-                        promises.push(this._query.send(closeRequest, {
-                            ...options,
-                            mode: new SilentDelivery({ to: [peer], redundancy: 1 }),
-                        }));
-                    }
-                }
-                await Promise.all(promises);
+                const selfHash = this.node.identity.publicKey.hashcode();
+                const remotePeers = [...peerBufferMap.entries()]
+                    .filter(([peer, buffer]) => peer !== selfHash && buffer.kept > 0)
+                    .map(([peer]) => peer);
+                peerBufferMap.clear();
+                await Promise.allSettled(remotePeers.map((peer) => this._query.send(closeRequest, {
+                    ...options,
+                    mode: new SilentDelivery({ to: [peer], redundancy: 1 }),
+                })));
             };
             options?.signal && options.signal.addEventListener("abort", close);
             let doneFn = () => {
@@ -2746,10 +2839,17 @@ let DocumentIndex = (() => {
                     return cleanupDefaultUpdates();
                 };
             }
-            if (typeof options?.remote === "object" && options?.remote.wait) {
+            const remoteConfig = options && typeof options.remote === "object" ? options.remote : undefined;
+            const remoteWaitPolicy = remoteConfig && typeof remoteConfig.wait === "object"
+                ? remoteConfig.wait
+                : undefined;
+            const remoteWaitBehavior = remoteWaitPolicy?.behavior ?? "keep-open";
+            const keepRemoteWaitOpen = !!remoteConfig?.wait &&
+                remoteWaitBehavior === "keep-open";
+            if (keepRemoteWaitOpen) {
                 // was used to account for missed results when a peer joins; omitted in this minimal handler
                 updateDeferred = pDefer();
-                const waitForTime = typeof options.remote.wait === "object" && options.remote.wait.timeout;
+                const waitForTime = remoteWaitPolicy?.timeout;
                 const prevMaybeSetDone = maybeSetDone;
                 maybeSetDone = () => {
                     prevMaybeSetDone();
@@ -2764,7 +2864,7 @@ let DocumentIndex = (() => {
                 fetchedFirstForRemote = new Set();
                 joinListener = this.createReplicatorJoinListener({
                     signal: ensureController().signal,
-                    eager: options.remote.reach?.eager,
+                    eager: remoteConfig?.reach?.eager,
                     onPeer: async (pk) => {
                         if (done)
                             return;
@@ -2823,7 +2923,7 @@ let DocumentIndex = (() => {
                     }
                 };
             }
-            const remoteWaitActive = typeof options?.remote === "object" && !!options.remote.wait;
+            const remoteWaitActive = keepRemoteWaitOpen;
             const waitForUpdateAndResetDeferred = async () => {
                 if (remoteWaitActive) {
                     // wait until: join fetch adds results, cleanup runs, or the join-wait times out