@peerbit/shared-log 13.0.5-5d63b4f → 13.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/shared-log",
-  "version": "13.0.5-5d63b4f",
+  "version": "13.0.5",
   "description": "Shared log",
   "sideEffects": false,
   "type": "module",
@@ -54,35 +54,35 @@
   "dependencies": {
     "@dao-xyz/borsh": "^6.0.0",
     "@libp2p/crypto": "^5.1.10",
-    "@peerbit/log": "6.0.4-5d63b4f",
-    "@peerbit/logger": "2.0.0-5d63b4f",
-    "@peerbit/program": "6.0.2-5d63b4f",
-    "@peerbit/riblt": "1.2.0-5d63b4f",
-    "@peerbit/rpc": "6.0.4-5d63b4f",
-    "@peerbit/any-store": "2.2.5-5d63b4f",
-    "@peerbit/blocks": "4.0.1-5d63b4f",
-    "@peerbit/blocks-interface": "2.0.1-5d63b4f",
-    "@peerbit/cache": "3.0.0-5d63b4f",
-    "@peerbit/crypto": "3.0.0-5d63b4f",
-    "@peerbit/indexer-interface": "3.0.0-5d63b4f",
-    "@peerbit/indexer-sqlite3": "3.0.0-5d63b4f",
-    "@peerbit/pubsub": "5.0.2-5d63b4f",
-    "@peerbit/pubsub-interface": "5.0.1-5d63b4f",
-    "@peerbit/stream-interface": "6.0.1-5d63b4f",
-    "@peerbit/time": "3.0.0-5d63b4f",
     "json-stringify-deterministic": "^1.0.7",
     "p-each-series": "^3.0.0",
     "p-defer": "^4.0.0",
     "p-queue": "^8.0.1",
     "pidusage": "^4.0.1",
     "pino": "^9.4.0",
-    "uint8arrays": "^5.1.0"
+    "uint8arrays": "^5.1.0",
+    "@peerbit/log": "6.0.4",
+    "@peerbit/logger": "2.0.0",
+    "@peerbit/program": "6.0.2",
+    "@peerbit/riblt": "1.2.0",
+    "@peerbit/rpc": "6.0.4",
+    "@peerbit/any-store": "2.2.5",
+    "@peerbit/blocks": "4.0.1",
+    "@peerbit/blocks-interface": "2.0.1",
+    "@peerbit/cache": "3.0.0",
+    "@peerbit/crypto": "3.0.0",
+    "@peerbit/indexer-interface": "3.0.0",
+    "@peerbit/indexer-sqlite3": "3.0.0",
+    "@peerbit/pubsub": "5.0.2",
+    "@peerbit/pubsub-interface": "5.0.1",
+    "@peerbit/stream-interface": "6.0.1",
+    "@peerbit/time": "3.0.0"
   },
   "devDependencies": {
-    "@peerbit/test-utils": "3.0.4-5d63b4f",
     "@types/libsodium-wrappers": "^0.7.14",
     "@types/pidusage": "^2.0.5",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "@peerbit/test-utils": "3.0.4"
   },
   "scripts": {
     "clean": "aegir clean",

package/src/index.ts

@@ -2887,14 +2887,17 @@ export class SharedLog<
 					// ignore discovery failures
 				}
 
-				// 2) reuse the same per-hash / replicator / subscriber fallback used by
-				// entry loads so block retries can widen beyond stale explicit hints.
-				return (
-					(await this.resolveCandidatePeersForHash(cid, {
-						signal: opts?.signal,
-						maxPeers: 8,
-					})) ?? []
-				);
+				// 2) fallback to currently connected RPC peers
+				const self = this.node.identity.publicKey.hashcode();
+				const out: string[] = [];
+				const peers = (this.rpc as any)?.peers;
+				for (const h of peers?.keys?.() ?? []) {
+					if (h === self) continue;
+					if (out.includes(h)) continue;
+					out.push(h);
+					if (out.length >= 32) break;
+				}
+				return out;
 			},
 			onPut: async (cid) => {
 				// Best-effort directory announce for "get without remote.from" workflows.
@@ -3021,11 +3024,87 @@ export class SharedLog<
 
 		await this.log.open(this.remoteBlocks, this.node.identity, {
 			keychain: this.node.services.keychain,
-			resolveRemotePeers: (hash, options) =>
-				this.resolveCandidatePeersForHash(hash, {
-					signal: options?.signal,
-					maxPeers: 8,
-				}),
+			resolveRemotePeers: async (hash, options) => {
+				if (options?.signal?.aborted) return undefined;
+
+				const maxPeers = 8;
+				const self = this.node.identity.publicKey.hashcode();
+				const seed = hashToSeed32(hash);
+
+				// Best hint: peers that have recently confirmed having this entry hash.
+				const hinted = this._requestIPruneResponseReplicatorSet.get(hash);
+				if (hinted && hinted.size > 0) {
+					const peers = [...hinted].filter((p) => p !== self);
+					return peers.length > 0
+						? pickDeterministicSubset(peers, seed, maxPeers)
+						: undefined;
+				}
+
+				// Next: peers we already contacted about this hash (may still have it).
+				const contacted = this._requestIPruneSent.get(hash);
+				if (contacted && contacted.size > 0) {
+					const peers = [...contacted].filter((p) => p !== self);
+					return peers.length > 0
+						? pickDeterministicSubset(peers, seed, maxPeers)
+						: undefined;
+				}
+
+					let candidates: string[] | undefined;
+
+					// Prefer the replicator cache; fall back to subscribers if we have no other signal.
+					const replicatorCandidates = [...this.uniqueReplicators].filter(
+						(p) => p !== self,
+					);
+					if (replicatorCandidates.length > 0) {
+						candidates = replicatorCandidates;
+					} else {
+						try {
+							const subscribers = await this._getTopicSubscribers(this.topic);
+							const subscriberCandidates =
+								subscribers?.map((k) => k.hashcode()).filter((p) => p !== self) ??
+								[];
+							candidates =
+								subscriberCandidates.length > 0 ? subscriberCandidates : undefined;
+						} catch {
+							// Best-effort only.
+						}
+
+						if (!candidates || candidates.length === 0) {
+							// Last resort: peers we are already directly connected to. This avoids
+							// depending on global membership knowledge in early-join scenarios.
+							const peerMap = (this.node.services.pubsub as any)?.peers;
+							if (peerMap?.keys) {
+								candidates = [...peerMap.keys()];
+							}
+						}
+
+						if (!candidates || candidates.length === 0) {
+							// Even if the pubsub stream has no established peer streams yet, we may
+							// still have a libp2p connection to one or more peers (e.g. bootstrap).
+							const connectionManager = (this.node.services.pubsub as any)?.components
+								?.connectionManager;
+							const connections = connectionManager?.getConnections?.() ?? [];
+							const connectionHashes: string[] = [];
+							for (const conn of connections) {
+								const peerId = conn?.remotePeer;
+								if (!peerId) continue;
+								try {
+									connectionHashes.push(getPublicKeyFromPeerId(peerId).hashcode());
+								} catch {
+									// Best-effort only.
+								}
+							}
+							if (connectionHashes.length > 0) {
+								candidates = connectionHashes;
+							}
+						}
+					}
+
+					if (!candidates || candidates.length === 0) return undefined;
+					const peers = candidates.filter((p) => p !== self);
+					if (peers.length === 0) return undefined;
+					return pickDeterministicSubset(peers, seed, maxPeers);
+				},
 			...this._logProperties,
 			onChange: async (change) => {
 				await this.onChange(change);
@@ -3413,80 +3492,6 @@ export class SharedLog<
 		this._replicatorLivenessTargetsSize = -1;
 	}
 
-	private async resolveCandidatePeersForHash(
-		hash: string,
-		options?: { signal?: AbortSignal; maxPeers?: number },
-	): Promise<string[] | undefined> {
-		if (options?.signal?.aborted) return undefined;
-
-		const maxPeers = options?.maxPeers ?? 8;
-		const self = this.node.identity.publicKey.hashcode();
-		const seed = hashToSeed32(hash);
-
-		const hinted = this._requestIPruneResponseReplicatorSet.get(hash);
-		if (hinted && hinted.size > 0) {
-			const peers = [...hinted].filter((p) => p !== self);
-			return peers.length > 0
-				? pickDeterministicSubset(peers, seed, maxPeers)
-				: undefined;
-		}
-
-		const contacted = this._requestIPruneSent.get(hash);
-		if (contacted && contacted.size > 0) {
-			const peers = [...contacted].filter((p) => p !== self);
-			return peers.length > 0
-				? pickDeterministicSubset(peers, seed, maxPeers)
-				: undefined;
-		}
-
-		let candidates: string[] | undefined;
-		const replicatorCandidates = [...this.uniqueReplicators].filter((p) => p !== self);
-		if (replicatorCandidates.length > 0) {
-			candidates = replicatorCandidates;
-		} else {
-			try {
-				const subscribers = await this._getTopicSubscribers(this.topic);
-				const subscriberCandidates =
-					subscribers?.map((k) => k.hashcode()).filter((p) => p !== self) ?? [];
-				candidates =
-					subscriberCandidates.length > 0 ? subscriberCandidates : undefined;
-			} catch {
-				// Best-effort only.
-			}
-
-			if (!candidates || candidates.length === 0) {
-				const peerMap = (this.node.services.pubsub as any)?.peers;
-				if (peerMap?.keys) {
-					candidates = [...peerMap.keys()];
-				}
-			}
-
-			if (!candidates || candidates.length === 0) {
-				const connectionManager = (this.node.services.pubsub as any)?.components
-					?.connectionManager;
-				const connections = connectionManager?.getConnections?.() ?? [];
-				const connectionHashes: string[] = [];
-				for (const conn of connections) {
-					const peerId = conn?.remotePeer;
-					if (!peerId) continue;
-					try {
-						connectionHashes.push(getPublicKeyFromPeerId(peerId).hashcode());
-					} catch {
-						// Best-effort only.
-					}
-				}
-				if (connectionHashes.length > 0) {
-					candidates = connectionHashes;
-				}
-			}
-		}
-
-		if (!candidates || candidates.length === 0) return undefined;
-		const peers = candidates.filter((p) => p !== self);
-		if (peers.length === 0) return undefined;
-		return pickDeterministicSubset(peers, seed, maxPeers);
-	}
-
 	private async runReplicatorLivenessSweep() {
 		if (this.closed || this._closeController.signal.aborted) {
 			return;