@peerbit/document 13.1.3 → 13.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/document",
-  "version": "13.1.3",
+  "version": "13.1.5",
   "description": "Document store implementation",
   "type": "module",
   "sideEffects": false,
@@ -59,19 +59,19 @@
     "@multiformats/multiaddr": "^13.0.1",
     "p-defer": "^4.0.0",
     "uint8arrays": "^5.1.0",
-    "@peerbit/cache": "3.1.0",
     "@peerbit/indexer-cache": "0.2.8",
-    "@peerbit/document-interface": "3.2.46",
     "@peerbit/indexer-interface": "3.0.5",
+    "@peerbit/cache": "3.1.0",
+    "@peerbit/document-interface": "3.2.47",
+    "@peerbit/indexer-simple": "1.2.9",
     "@peerbit/crypto": "3.1.2",
-    "@peerbit/indexer-simple": "1.2.8",
-    "@peerbit/indexer-sqlite3": "3.0.8",
-    "@peerbit/log": "6.2.3",
+    "@peerbit/log": "6.2.4",
     "@peerbit/logger": "2.0.1",
-    "@peerbit/program": "6.0.33",
-    "@peerbit/rpc": "6.1.1",
+    "@peerbit/indexer-sqlite3": "3.0.8",
     "@peerbit/pubsub": "5.3.0",
-    "@peerbit/shared-log": "13.2.3",
+    "@peerbit/program": "6.0.34",
+    "@peerbit/rpc": "6.1.2",
+    "@peerbit/shared-log": "13.2.5",
     "@peerbit/stream-interface": "6.0.11"
   },
   "optionalDependencies": {
@@ -84,10 +84,10 @@
     "pidusage": "^4.0.1",
     "uuid": "^10.0.0",
     "@peerbit/log-rust": "1.1.2",
-    "@peerbit/native-backbone": "0.1.2",
-    "@peerbit/test-utils": "3.1.3",
-    "peerbit": "5.3.3",
-    "@peerbit/time": "3.0.0"
+    "@peerbit/native-backbone": "0.1.4",
+    "@peerbit/time": "3.0.0",
+    "@peerbit/test-utils": "3.1.5",
+    "peerbit": "5.3.5"
   },
   "repository": {
     "type": "git",
@@ -102,6 +102,7 @@
     "clean": "aegir clean",
     "build": "aegir build --no-bundle",
     "test": "aegir test --target node",
+    "test:document-rust-core": "npm run build && PEERBIT_SHARED_LOG_RUST_CORE=1 aegir test -t node --grep '^(?!.*(uses the validated local append path|uses the independent native prepared batch path|uses native shared-log planning for replicated target-none puts|uses commit-only local puts when coordinate persistence is deferred|can delete without being replicator)).*(native conformance guard |operations basic |operations get |operations index |operations search |iterate sort |count approximate |query distribution |returnIndexed |caching |custom index |prefetch )'",
     "lint": "aegir lint",
     "test:cov": "aegir test -t node --cov"
   }

package/src/program.ts

@@ -112,6 +112,16 @@ export class NativeDocumentModeError extends Error {
 
 type MaybePromise<T> = Promise<T> | T;
 
+/**
+ * True when an error signals that an entry's payload bytes were never
+ * materialized on the JS side (a hollow entry backed by a native block store).
+ * `DecryptedThing.getValue` throws `Error("Missing data")` in that case. Used to
+ * decide whether the auto-mode append/delete read-back should recover the
+ * operation from the storage-bytes / block-store path instead.
+ */
+const isMissingPayloadDataError = (error: unknown): boolean =>
+	error instanceof Error && error.message === "Missing data";
+
 const isPromiseLike = <T>(value: MaybePromise<T>): value is Promise<T> =>
 	!!value && typeof (value as Promise<T>).then === "function";
 
@@ -2837,17 +2847,44 @@ export class Documents<
 			return;
 		}
 		ensureInitialized?.();
-		return entry.getPayloadValue();
+		try {
+			return await entry.getPayloadValue();
+		} catch (error) {
+			// Auto (non-native document) mode with a native block store: the entry
+			// materialized in the entry index can be a hollow shell whose in-memory
+			// payload bytes were never loaded (the native store keeps the block
+			// bytes at the storage layer, not on the JS entry). `getPayloadValue`
+			// then throws "Missing data". The block itself is present, so recover
+			// the operation via the storage-bytes / block-store read path. This is
+			// a no-op for the pure-JS backend, where `getPayloadValue` succeeds.
+			if (!isMissingPayloadDataError(error)) {
+				throw error;
+			}
+			const operation = await this.getPlainEntryOperationFromStorage(entry);
+			if (operation) {
+				return operation;
+			}
+			throw error;
+		}
 	}
 
 	private async getPlainEntryOperationFromStorage(
 		entry: Entry<Operation>,
 	): Promise<Operation | undefined> {
-		let storageBytes: Uint8Array;
+		let storageBytes: Uint8Array | undefined;
 		try {
 			storageBytes =
 				Entry.getPreparedStorageBytes(entry) ?? entry.getStorageBytes();
 		} catch {
+			// The entry object is hollow (its payload bytes never materialized on
+			// the JS side), so it cannot re-serialize itself. Fall through to the
+			// block-store fallback below.
+			storageBytes = undefined;
+		}
+		// Fall back to the raw block held by the block store, keyed by the entry
+		// hash, whenever the entry could not (or did not) yield its own bytes.
+		storageBytes ??= await this.getEntryStorageBytesFromBlocks(entry);
+		if (!storageBytes) {
 			return;
 		}
 		try {
@@ -2869,6 +2906,21 @@ export class Documents<
 		}
 	}
 
+	private async getEntryStorageBytesFromBlocks(
+		entry: Entry<Operation>,
+	): Promise<Uint8Array | undefined> {
+		const hash = entry.hash;
+		if (!hash) {
+			return;
+		}
+		try {
+			const bytes = await this.log.log.blocks.get(hash);
+			return bytes ?? undefined;
+		} catch {
+			return;
+		}
+	}
+
 	private getNativeDocumentFieldExtractionPlan(
 		path: string | readonly string[],
 	): SimpleDocumentFieldExtractionPlan | undefined {

package/src/search.ts

@@ -403,6 +403,7 @@ export type ReachScope = {
 
 export type RemoteQueryOptions<Q, R, D> = RPCRequestAllOptions<Q, R> & {
 	replicate?: boolean;
+	from?: string[]; // if specified, only query these peers
 	minAge?: number;
 	throwOnMissing?: boolean;
 	retryMissingResponses?: boolean;
@@ -1178,6 +1179,28 @@ export class DocumentIndex<
 		}
 	}
 
+	/** Head entry safe to borsh-serialize into ResultIndexedValue.entries over the
+	 * document RPC. Under the native block store, this._log.log.get can return a
+	 * hollow entry whose payload bytes were never materialized on the JS side;
+	 * serializing it throws and aborts the whole RPC response. The complete entry is
+	 * in the block store keyed by hash, so recover it there. No-op for pure JS. */
+	private async getSerializableHead(
+		hash: string,
+	): Promise<Entry<any> | undefined> {
+		const head = await this._log.log.get(hash);
+		if (!head?.hash) return head ?? undefined;
+		try {
+			head.getStorageBytes(); // = serialize(head); throws on a hollow native entry
+			return head;
+		} catch {
+			try {
+				return await Entry.fromMultihash(this._log.log.blocks, head.hash);
+			} catch {
+				return head; // block absent (e.g. pruned) — preserve today's behavior
+			}
+		}
+	}
+
 	private async wrapPushResults(
 		matches: Array<WithContext<T> | WithContext<I>>,
 		resolve: boolean,
@@ -1219,7 +1242,7 @@ export class DocumentIndex<
 					continue;
 				}
 
-				const head = await this._log.log.get(indexed.__context.head);
+				const head = await this.getSerializableHead(indexed.__context.head);
 				results.push(
 					new types.ResultIndexedValue({
 						context: indexed.__context,
@@ -1230,7 +1253,7 @@ export class DocumentIndex<
 				);
 			} else {
 				const indexed = match as WithContext<I>;
-				const head = await this._log.log.get(indexed.__context.head);
+				const head = await this.getSerializableHead(indexed.__context.head);
 				results.push(
 					new types.ResultIndexedValue({
 						context: indexed.__context,
@@ -1275,7 +1298,7 @@ export class DocumentIndex<
 					continue;
 				}
 
-				const head = await this._log.log.get(entry.value.__context.head);
+				const head = await this.getSerializableHead(entry.value.__context.head);
 				results.push(
 					new types.ResultIndexedValue({
 						context: entry.value.__context,
@@ -1285,7 +1308,7 @@ export class DocumentIndex<
 					}),
 				);
 			} else {
-				const head = await this._log.log.get(entry.value.__context.head);
+				const head = await this.getSerializableHead(entry.value.__context.head);
 				results.push(
 					new types.ResultIndexedValue({
 						context: entry.value.__context,
@@ -3652,7 +3675,7 @@ export class DocumentIndex<
 				);
 			} else {
 				const context = result.value.__context;
-				const head = await this._log.log.get(context.head);
+				const head = await this.getSerializableHead(context.head);
 				if (replicateIndexFlag) {
 					if (!head) {
 						continue;
@@ -4907,7 +4930,12 @@ export class DocumentIndex<
 									...(typeof options?.remote === "object"
 										? options.remote
 										: {}),
-									from: fetchOptions?.from ?? initialRemoteTargets,
+									from:
+										fetchOptions?.from ??
+										initialRemoteTargets ??
+										(typeof options?.remote === "object"
+											? options.remote.from
+											: undefined),
 								}
 							: false,
 					resolve,