@peerbit/document 10.0.4 → 10.1.0

package/src/program.ts

@@ -50,7 +50,8 @@ import {
 	coerceWithIndexed,
 } from "./search.js";
 
-const logger: ReturnType<typeof loggerFn> = loggerFn({ module: "document" });
+const logger = loggerFn("peerbit:program:document");
+const warn = logger.newScope("warn");
 
 export class OperationError extends Error {
 	constructor(message?: string) {
@@ -67,13 +68,13 @@ type CanPerformPut<T> = {
 	entry: Entry<PutOperation>;
 };
 
-type CanPerformDelete<T> = {
+type CanPerformDelete = {
 	type: "delete";
 	operation: DeleteOperation;
 	entry: Entry<DeleteOperation>;
 };
 
-export type CanPerformOperations<T> = CanPerformPut<T> | CanPerformDelete<T>;
+export type CanPerformOperations<T> = CanPerformPut<T> | CanPerformDelete;
 export type CanPerform<T> = (
 	properties: CanPerformOperations<T>,
 ) => MaybePromise<boolean>;
@@ -367,7 +368,7 @@ export class Documents<
 			}
 		} catch (error) {
 			if (error instanceof BorshError) {
-				logger.warn("Received payload that could not be decoded, skipping");
+				warn("Received payload that could not be decoded, skipping");
 				return false;
 			}
 			throw error;
@@ -512,7 +513,7 @@ export class Documents<
 			if (error instanceof AccessError) {
 				return false; // we cant index because we can not decrypt
 			} else if (error instanceof BorshError) {
-				logger.warn("Received payload that could not be decoded, skipping");
+				warn("Received payload that could not be decoded, skipping");
 				return false;
 			}
 			throw error;
@@ -632,6 +633,7 @@ export class Documents<
 		change: Change<Operation>,
 		reference?: { document: T; operation: PutOperation; unique?: boolean },
 	): Promise<void> {
+		logger.trace("handleChanges called", change);
 		const isAppendOperation =
 			change?.added.length === 1 ? !!change.added[0] : false;
 		const removedSet = new Map<string, ShallowOrFullEntry<Operation>>();

package/src/resumable-iterator.ts

@@ -6,6 +6,9 @@ import {
 	type SearchRequestIndexed,
 } from "@peerbit/document-interface";
 import type * as indexerTypes from "@peerbit/indexer-interface";
+import { logger as loggerFn } from "@peerbit/logger";
+
+const iteratorLogger = loggerFn("peerbit:document:index:iterate");
 
 export class ResumableIterators<T extends Record<string, any>> {
 	constructor(
@@ -23,6 +26,11 @@ export class ResumableIterators<T extends Record<string, any>> {
 		request: SearchRequest | SearchRequestIndexed | IterationRequest,
 		options?: { keepAlive?: boolean },
 	) {
+		iteratorLogger("iterate:start", {
+			id: request.idString,
+			fetch: request.fetch,
+			keepAlive: Boolean(options?.keepAlive),
+		});
 		const iterator = this.index.iterate(request);
 		const firstResult = await iterator.next(request.fetch);
 		const keepAlive = options?.keepAlive === true;
@@ -34,6 +42,12 @@ export class ResumableIterators<T extends Record<string, any>> {
 			};
 			this.queues.add(request.idString, cachedIterator);
 		}
+		iteratorLogger("iterate:queued", {
+			id: request.idString,
+			keepAlive,
+			done: iterator.done() === true,
+			batch: firstResult.length,
+		});
 		/* console.debug(
 			"[ResumableIterators] iterateAndFetch",
 			request.idString,
@@ -52,6 +66,9 @@ export class ResumableIterators<T extends Record<string, any>> {
 	) {
 		const iterator = this.queues.get(request.idString);
 		if (!iterator) {
+			iteratorLogger.error("Iterator missing", {
+				id: request.idString,
+			});
 			throw new Error(
 				"Missing iterator for request with id: " + request.idString,
 			);
@@ -67,6 +84,20 @@ export class ResumableIterators<T extends Record<string, any>> {
 				? request.amount
 				: iterator.request.fetch;
 		const next = await iterator.iterator.next(fetchAmount);
+		let pending: number | undefined;
+		try {
+			pending = await iterator.iterator.pending();
+		} catch {
+			pending = undefined;
+		}
+		iteratorLogger("iterate:next", {
+			id: request.idString,
+			fetch: fetchAmount,
+			keepAlive: iterator.keepAlive,
+			resultLength: next.length,
+			pending,
+			done: iterator.iterator.done?.(),
+		});
 		/* console.debug(
 			"[ResumableIterators] next",
 			request.idString,
@@ -80,10 +111,16 @@ export class ResumableIterators<T extends Record<string, any>> {
 	}
 
 	close(close: { idString: string }) {
+		iteratorLogger("iterate:close", {
+			id: close.idString,
+		});
 		this.clear(close.idString);
 	}
 
 	private clear(id: string) {
+		iteratorLogger("iterate:clear", {
+			id,
+		});
 		this.queues.del(id);
 	}
 
@@ -97,9 +134,16 @@ export class ResumableIterators<T extends Record<string, any>> {
 			return undefined;
 		}
 		const pending = await iterator.iterator.pending();
+		// debug
+		// console.error("[resumable:getPending]", { id, pending, keepAlive: iterator.keepAlive });
 		if (pending === 0 && iterator.iterator.done() && !iterator.keepAlive) {
 			this.clear(id);
 		}
+		iteratorLogger("iterate:pending", {
+			id,
+			pending,
+			keepAlive: iterator.keepAlive,
+		});
 		return pending;
 	}
 }