@optimystic/db-p2p 1.0.0-beta.3 → 1.1.0

package/src/network/network-manager-service.ts

@@ -1,11 +1,12 @@
 import type { Startable, PeerId, Libp2p } from '@libp2p/interface'
 import { peerIdFromString } from '@libp2p/peer-id'
+import type { RoutingKey } from '@optimystic/db-core'
 import type { FretService } from 'p2p-fret'
 import { hashKey } from 'p2p-fret'
 import { toString as u8ToString } from 'uint8arrays/to-string'
 import type { IPeerReputation } from '../reputation/types.js'
 import { PenaltyReason } from '../reputation/types.js'
-import { RebalanceMonitor, type RebalanceMonitorConfig } from '../cluster/rebalance-monitor.js'
+import { RebalanceMonitor, type RebalanceMonitorConfig, type RebalanceMonitorDeps } from '../cluster/rebalance-monitor.js'
 import { SpreadOnChurnMonitor, type SpreadOnChurnConfig, type SpreadOnChurnDeps } from '../cluster/spread-on-churn.js'
 import type { PartitionDetector } from '../cluster/partition-detector.js'
 import type { ArachnodeFretAdapter } from '../storage/arachnode-fret-adapter.js'
@@ -78,6 +79,7 @@ export class NetworkManagerService implements Startable {
 		partitionDetector: PartitionDetector,
 		fretAdapter: ArachnodeFretAdapter,
 		trackedBlocks: Set<string>,
+		keyNetwork: RebalanceMonitorDeps['keyNetwork'],
 		config?: RebalanceMonitorConfig
 	): RebalanceMonitor {
 		const libp2p = this.getLibp2p()
@@ -87,8 +89,10 @@ export class NetworkManagerService implements Startable {
 		}
 		// trackedBlocks is the shared owned-block set: the node passes the SAME Set instance into
 		// both monitor inits so spread and rebalance act on one source of truth and never drift.
+		// keyNetwork + clusterSize: the monitor decides responsibility by the same cohort rule the
+		// writer, the coordinator and the redirect check use, and caps its floor at that cohort's width.
 		this.rebalanceMonitor = new RebalanceMonitor(
-			{ libp2p, fret, partitionDetector, fretAdapter, trackedBlocks },
+			{ libp2p, fret, partitionDetector, fretAdapter, trackedBlocks, keyNetwork, clusterSize: this.cfg.clusterSize },
 			config
 		)
 		return this.rebalanceMonitor
@@ -258,7 +262,7 @@ export class NetworkManagerService implements Startable {
 		return this.reputation?.isBanned(peerId.toString()) ?? false
 	}
 
-	recordCoordinator(key: Uint8Array, peerId: PeerId): void {
+	recordCoordinator(key: RoutingKey, peerId: PeerId): void {
 		const k = this.toCacheKey(key)
 		this.coordinatorCache.set(k, { id: peerId, expires: Date.now() + this.cfg.cacheTTLs.coordinatorMs })
 	}
@@ -307,8 +311,12 @@ export class NetworkManagerService implements Startable {
 
 	/**
 	 * Compute cluster using FRET's assembleCohort for content-addressed peer selection.
+	 *
+	 * No production caller: `RepoService.checkRedirect` asks the node's key network instead, whose cohort is
+	 * network-membership scoped and matches what the writer routes by. See backlog
+	 * `debt-network-manager-coordinator-selection-is-a-stale-duplicate` before giving this a caller.
 	 */
-	async getCluster(key: Uint8Array): Promise<PeerId[]> {
+	async getCluster(key: RoutingKey): Promise<PeerId[]> {
 		const ck = this.toCacheKey(key);
 		const cached = this.clusterCache.get(ck);
 		if (cached && cached.expires > Date.now()) {
@@ -347,6 +355,9 @@ export class NetworkManagerService implements Startable {
 		}
 
 		// Fallback: peer-centric clustering if FRET unavailable
+		// NOTE: this ranks the raw routing key against peer multihashes, a placement no FRET node shares; fine while
+		// FRET is always registered (Libp2pKeyPeerNetwork cannot route without it); if this method ever regains a caller
+		// on a FRET-less node, rank on hashKey(key) against FRET's peer coordinates instead.
 		const anchor = await this.findNearestPeerToKey(key);
 		const anchorMh = anchor.toMultihash().bytes;
 		const connected: PeerId[] = (libp2p.getConnections?.() ?? []).map((c: any) => c.remotePeer);
@@ -359,7 +370,7 @@ export class NetworkManagerService implements Startable {
 		return ids;
 	}
 
-	async getCoordinator(key: Uint8Array): Promise<PeerId> {
+	async getCoordinator(key: RoutingKey): Promise<PeerId> {
 		const ck = this.toCacheKey(key);
 		const hit = this.coordinatorCache.get(ck);
 		if (hit) {