@optimystic/db-p2p 0.13.5 → 0.14.0

package/README.md

@@ -93,9 +93,9 @@ graph TD
     
     %% Network communication
     B -.->|"/db-p2p/repo/1.0.0"| C
-    E -.->|"/db-p2p/cluster/1.0.0"| G1
-    E -.->|"/db-p2p/cluster/1.0.0"| G2
-    E -.->|"/db-p2p/cluster/1.0.0"| G3
+    E -.->|"/optimystic/<network>/cluster/1.0.0"| G1
+    E -.->|"/optimystic/<network>/cluster/1.0.0"| G2
+    E -.->|"/optimystic/<network>/cluster/1.0.0"| G3
 ```
 
 ### Repo Layer: External Client Interface
@@ -203,7 +203,7 @@ Handles incoming consensus requests from coordinators:
 
 ```typescript
 class ClusterService implements Startable {
-  // Protocol: /db-p2p/cluster/1.0.0
+  // Protocol: /optimystic/<network>/cluster/1.0.0 (built from protocolPrefix)
   // Handles ClusterRecord updates for consensus
 }
 ```
@@ -319,8 +319,8 @@ The package integrates deeply with libp2p for networking:
 // Node creation with integrated services
 const node = await createLibp2pNode({
   services: {
-    repo: repoService({ protocol: '/db-p2p/repo/1.0.0' }),
-    cluster: clusterService({ protocol: '/db-p2p/cluster/1.0.0' })
+    repo: repoService({ protocolPrefix: '/optimystic/<network>' }),
+    cluster: clusterService({ protocolPrefix: '/optimystic/<network>' })
   }
 });
 

package/dist/src/cluster/block-transfer-service.d.ts

@@ -1,5 +1,5 @@
 import type { Startable } from '@libp2p/interface';
-import type { IRepo, PeerId, IPeerNetwork } from '@optimystic/db-core';
+import type { IRepo, PeerId, IPeerNetwork, ActionId, ActionRev, IBlock, BlockId } from '@optimystic/db-core';
 import { ProtocolClient } from '../protocol-client.js';
 export declare const buildBlockTransferProtocol: (protocolPrefix?: string) => string;
 /** Request to transfer blocks */
@@ -11,6 +11,16 @@ export interface BlockTransferRequest {
     reason: 'rebalance' | 'replication' | 'recovery';
     /** For push: base64-encoded block data per block ID */
     blockData?: Record<string, string>;
+    /**
+     * For push: the source's revision metadata per block ID. Carries the sender's
+     * `state.latest` so the replica's `latest` matches the source instead of being
+     * fabricated. Optional: an older sender omits it and the receiver falls back to a
+     * deterministic rev-1 replica (see {@link IBlockStorage.saveReplica}).
+     */
+    blockMeta?: Record<string, {
+        rev: number;
+        actionId: ActionId;
+    }>;
 }
 /** Response with block data */
 export interface BlockTransferResponse {
@@ -19,6 +29,21 @@ export interface BlockTransferResponse {
     /** Block IDs that couldn't be found/transferred */
     missing: string[];
 }
+/**
+ * Repo capability the service needs: read access for `handlePull` plus a local
+ * "save replica" path for `handlePush`. The replica path must land in the node's
+ * *local* storage (not the cluster-coordinated repo), so it is a distinct method
+ * from the `IRepo` commit funnel. `StorageRepo` implements this.
+ */
+export interface IBlockReplicaStore extends IRepo {
+    /**
+     * Persist a replica of a block received out-of-band (churn re-replication).
+     * Seeds metadata if absent, advances `latest` monotonically, and makes the block
+     * durably servable via `get`. Idempotent for a fixed `(rev, actionId)`; a no-op
+     * (still durable) when an equal-or-newer revision is already present.
+     */
+    saveReplicatedBlock(blockId: BlockId, block: IBlock, source?: ActionRev): Promise<void>;
+}
 export interface BlockTransferServiceInit {
     protocolPrefix?: string;
 }
@@ -27,7 +52,7 @@ export interface BlockTransferServiceComponents {
         handle: (...args: any[]) => Promise<void>;
         unhandle: (...args: any[]) => Promise<void>;
     };
-    repo: IRepo;
+    repo: IBlockReplicaStore;
 }
 /**
  * Libp2p service that handles incoming block transfer requests.
@@ -45,9 +70,13 @@ export declare class BlockTransferService implements Startable {
     stop(): Promise<void>;
     private handleRequest;
     private handlePull;
+    /**
+     * Persist pushed blocks into local storage so the new owner holds a durable
+     * replica after churn. A block is reported `accepted` only if it was both
+     * received (parseable) AND successfully persisted; a parse or persist failure
+     * surfaces it as `missing` so the sender does not falsely treat it as replicated.
+     */
     private handlePush;
-    private readRequest;
-    private sendResponse;
 }
 /** Factory for creating BlockTransferService following the libp2p service pattern. */
 export declare const blockTransferService: (init?: BlockTransferServiceInit) => (components: BlockTransferServiceComponents) => BlockTransferService;
@@ -57,9 +86,39 @@ export declare const blockTransferService: (init?: BlockTransferServiceInit) =>
 export declare class BlockTransferClient extends ProtocolClient {
     private readonly protocol;
     constructor(peerId: PeerId, peerNetwork: IPeerNetwork, protocolPrefix?: string);
-    /** Pull blocks from the remote peer. */
-    pullBlocks(blockIds: string[], reason?: BlockTransferRequest['reason']): Promise<BlockTransferResponse>;
-    /** Push blocks to the remote peer. */
-    pushBlocks(blockIds: string[], blockDataBuffers: Uint8Array[], reason?: BlockTransferRequest['reason']): Promise<BlockTransferResponse>;
+    /**
+     * Pull blocks from the remote peer.
+     *
+     * @param options Optional per-call deadlines/cancellation forwarded to the
+     *   underlying request. `dialTimeoutMs` bounds connecting; `responseTimeoutMs`
+     *   bounds waiting for the reply once connected; `signal` cancels the whole
+     *   request. Omitting all of them preserves the previous uncapped behavior.
+     */
+    pullBlocks(blockIds: string[], reason?: BlockTransferRequest['reason'], options?: {
+        signal?: AbortSignal;
+        dialTimeoutMs?: number;
+        responseTimeoutMs?: number;
+    }): Promise<BlockTransferResponse>;
+    /**
+     * Push blocks to the remote peer.
+     *
+     * @param blockMeta Optional per-block source revision metadata (the sender's
+     *   `state.latest`). When provided, the receiver replicates at the source's
+     *   `(rev, actionId)`; when omitted, it falls back to a deterministic rev-1 replica.
+     * @param options Optional per-call deadlines/cancellation forwarded to the
+     *   underlying request. `dialTimeoutMs` bounds connecting; `responseTimeoutMs`
+     *   bounds waiting for the reply once connected (so a peer that connects but goes
+     *   silent throws {@link ResponseTimeoutError} instead of hanging); `signal`
+     *   cancels the whole request. Omitting all of them preserves the previous
+     *   uncapped behavior.
+     */
+    pushBlocks(blockIds: string[], blockDataBuffers: Uint8Array[], reason?: BlockTransferRequest['reason'], blockMeta?: Record<string, {
+        rev: number;
+        actionId: ActionId;
+    }>, options?: {
+        signal?: AbortSignal;
+        dialTimeoutMs?: number;
+        responseTimeoutMs?: number;
+    }): Promise<BlockTransferResponse>;
 }
 //# sourceMappingURL=block-transfer-service.d.ts.map

package/dist/src/cluster/block-transfer-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block-transfer-service.d.ts","sourceRoot":"","sources":["../../../src/cluster/block-transfer-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAU,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAKvE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AASvD,eAAO,MAAM,0BAA0B,GAAI,iBAAgB,MAAW,KAAG,MACJ,CAAC;AAEtE,iCAAiC;AACjC,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,kCAAkC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,0BAA0B;IAC1B,MAAM,EAAE,WAAW,GAAG,aAAa,GAAG,UAAU,CAAC;IACjD,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,+BAA+B;AAC/B,MAAM,WAAW,qBAAqB;IACrC,qEAAqE;IACrE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,mDAAmD;IACnD,OAAO,EAAE,MAAM,EAAE,CAAC;CAClB;AAID,MAAM,WAAW,wBAAwB;IACxC,cAAc,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,8BAA8B;IAC9C,SAAS,EAAE;QAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;IACtG,IAAI,EAAE,KAAK,CAAC;CACZ;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,YAAW,SAAS;IACrD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8C;gBAGvE,UAAU,EAAE,8BAA8B,EAC1C,IAAI,GAAE,wBAA6B;IAO9B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAOb,aAAa;YA0Bb,UAAU;YAqBV,UAAU;YA2BV,WAAW;YAmBX,YAAY;CAO1B;AAED,sFAAsF;AACtF,eAAO,MAAM,oBAAoB,GAAI,OAAM,wBAA6B,MACtE,YAAY,8BAA8B,yBAA+C,CAAC;AAI5F;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,cAAc;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;gBAGjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,YAAY,EACzB,cAAc,GAAE,MAAW;IAM5B,wCAAwC;IAClC,UAAU,CACf,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,GAAE,oBAAoB,CAAC,QAAQ,CAAe,GAClD,OAAO,CAAC,qBAAqB,CAAC;IAKjC,sCAAsC;IAChC,UAAU,CACf,QAAQ,EAAE,MAAM,EAAE,EAClB,gBAAgB,EAAE,UAAU,EAAE,EAC9B,MAAM,GAAE,oBAAoB,CAAC,QAAQ,CAAe,GAClD,OAAO,CAAC,qBAAqB,CAAC;CAQjC"}
+{"version":3,"file":"block-transfer-service.d.ts","sourceRoot":"","sources":["../../../src/cluster/block-transfer-service.ts"],"names":[],"mappings":"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"}

package/dist/src/cluster/block-transfer-service.js

@@ -29,7 +29,14 @@ export class BlockTransferService {
         if (this.running)
             return;
         await this.registrar.handle(this.protocol, async (data) => {
-            await this.handleRequest(data.stream);
+            // libp2p invokes the stream handler with the Stream as the FIRST positional argument
+            // (see cluster/repo/dispute services, which all use `(stream, connection)`). The block-
+            // transfer handler previously read `data.stream`, which is `undefined` for the positional
+            // shape — so `readRequest` ran `pipe(undefined, ...)` → "Empty pipeline", the receiver
+            // never replied, and every push/pull dialled this service hung with no response. Unwrap
+            // defensively (older shape passed `{ stream }`), mirroring sync/service.ts.
+            const stream = data?.stream ?? data;
+            await this.handleRequest(stream);
         });
         this.running = true;
         log('started on %s', this.protocol);
@@ -42,31 +49,43 @@ export class BlockTransferService {
         log('stopped');
     }
     async handleRequest(stream) {
+        const self = this;
         try {
-            const request = await this.readRequest(stream);
-            log('request type=%s blocks=%d reason=%s', request.type, request.blockIds.length, request.reason);
-            let response;
-            if (request.type === 'pull') {
-                response = await this.handlePull(request);
-            }
-            else {
-                response = await this.handlePush(request);
-            }
-            await this.sendResponse(stream, response);
-            log('response blocks=%d missing=%d', Object.keys(response.blocks).length, response.missing.length);
-        }
-        catch (error) {
-            log('error: %s', error.message);
-            try {
-                await this.sendResponse(stream, { blocks: {}, missing: [] });
-            }
-            catch {
-                // ignore send errors
+            // Read the request, process it, and write the response on ONE continuous duplex
+            // pipe (mirrors cluster/repo/dispute services). The earlier read-to-end-then-write
+            // design deadlocked over a real stream: the client sends one length-prefixed request
+            // and holds its write side open awaiting the reply, so a receiver that drained the
+            // source until end-of-stream blocked forever — and the reply, written only after
+            // teardown, hit a closed stream. Yielding the response as soon as the request is read
+            // keeps both sides live.
+            const responses = pipe(stream, (source) => lp.decode(source), async function* (source) {
+                for await (const msg of source) {
+                    const request = JSON.parse(u8ToString(msg.subarray(), 'utf8'));
+                    log('request type=%s blocks=%d reason=%s', request.type, request.blockIds.length, request.reason);
+                    let response;
+                    try {
+                        response = request.type === 'pull'
+                            ? await self.handlePull(request)
+                            : await self.handlePush(request);
+                    }
+                    catch (error) {
+                        log('error: %s', error.message);
+                        response = { blocks: {}, missing: [] };
+                    }
+                    log('response blocks=%d missing=%d', Object.keys(response.blocks).length, response.missing.length);
+                    yield u8FromString(JSON.stringify(response), 'utf8');
+                    return; // one request → one response per stream
+                }
+            }, (source) => lp.encode(source));
+            for await (const chunk of responses) {
+                stream.send(chunk);
             }
+            await stream.close();
         }
-        finally {
+        catch (err) {
+            log('error: %s', err.message);
             try {
-                await stream.close();
+                stream.abort(err instanceof Error ? err : new Error(String(err)));
             }
             catch { /* ignore */ }
         }
@@ -86,52 +105,53 @@ export class BlockTransferService {
         }
         return { blocks, missing };
     }
-    // TODO: handlePush validates incoming block data but does not persist it.
-    // The pushed data is a serialized IBlock, not a full BlockArchive with revisions.
-    // Persistence should be wired when RebalanceMonitor integrates with BlockStorage.saveRestored().
+    /**
+     * Persist pushed blocks into local storage so the new owner holds a durable
+     * replica after churn. A block is reported `accepted` only if it was both
+     * received (parseable) AND successfully persisted; a parse or persist failure
+     * surfaces it as `missing` so the sender does not falsely treat it as replicated.
+     */
     async handlePush(request) {
         const blocks = {};
         const missing = [];
         if (!request.blockData) {
             return { blocks: {}, missing: request.blockIds };
         }
-        // Accept pushed blocks — for each block, validate we received parseable data
         for (const blockId of request.blockIds) {
             const data = request.blockData[blockId];
-            if (data) {
-                // Verify we received valid data
-                try {
-                    JSON.parse(Buffer.from(data, 'base64').toString('utf8'));
-                    blocks[blockId] = data;
-                }
-                catch {
-                    missing.push(blockId);
-                }
+            if (!data) {
+                missing.push(blockId);
+                continue;
             }
-            else {
+            // Decode + parse the wire payload into an IBlock.
+            let block;
+            try {
+                block = JSON.parse(Buffer.from(data, 'base64').toString('utf8'));
+            }
+            catch {
                 missing.push(blockId);
+                continue;
             }
-        }
-        return { blocks, missing };
-    }
-    async readRequest(stream) {
-        const messages = [];
-        await pipe(stream, lp.decode, async (source) => {
-            for await (const msg of source) {
-                messages.push(msg.subarray());
+            // `JSON.parse` accepts `null`/primitives as valid JSON. Persisting a falsy or
+            // header-less "block" would seed metadata with no materialization, making every
+            // later `get` throw. Reject such payloads as missing rather than poison storage.
+            if (block === null || typeof block !== 'object' || block.header === undefined) {
+                log('push:invalid block=%s (not a structurally valid block)', blockId);
+                missing.push(blockId);
+                continue;
+            }
+            // Persist locally. Only a received-AND-persisted block is reported accepted.
+            try {
+                const source = request.blockMeta?.[blockId];
+                await this.repo.saveReplicatedBlock(blockId, block, source);
+                blocks[blockId] = data;
+            }
+            catch (error) {
+                log('persist:fail block=%s err=%s', blockId, error.message);
+                missing.push(blockId);
             }
-        });
-        if (messages.length === 0) {
-            throw new Error('No request received');
-        }
-        return JSON.parse(u8ToString(messages[0], 'utf8'));
-    }
-    async sendResponse(stream, response) {
-        const bytes = u8FromString(JSON.stringify(response), 'utf8');
-        const encoded = pipe([bytes], lp.encode);
-        for await (const chunk of encoded) {
-            stream.send(chunk);
         }
+        return { blocks, missing };
     }
 }
 /** Factory for creating BlockTransferService following the libp2p service pattern. */
@@ -146,19 +166,38 @@ export class BlockTransferClient extends ProtocolClient {
         super(peerId, peerNetwork);
         this.protocol = buildBlockTransferProtocol(protocolPrefix);
     }
-    /** Pull blocks from the remote peer. */
-    async pullBlocks(blockIds, reason = 'rebalance') {
+    /**
+     * Pull blocks from the remote peer.
+     *
+     * @param options Optional per-call deadlines/cancellation forwarded to the
+     *   underlying request. `dialTimeoutMs` bounds connecting; `responseTimeoutMs`
+     *   bounds waiting for the reply once connected; `signal` cancels the whole
+     *   request. Omitting all of them preserves the previous uncapped behavior.
+     */
+    async pullBlocks(blockIds, reason = 'rebalance', options) {
         const request = { type: 'pull', blockIds, reason };
-        return await this.processMessage(request, this.protocol);
+        return await this.processMessage(request, this.protocol, options);
     }
-    /** Push blocks to the remote peer. */
-    async pushBlocks(blockIds, blockDataBuffers, reason = 'rebalance') {
+    /**
+     * Push blocks to the remote peer.
+     *
+     * @param blockMeta Optional per-block source revision metadata (the sender's
+     *   `state.latest`). When provided, the receiver replicates at the source's
+     *   `(rev, actionId)`; when omitted, it falls back to a deterministic rev-1 replica.
+     * @param options Optional per-call deadlines/cancellation forwarded to the
+     *   underlying request. `dialTimeoutMs` bounds connecting; `responseTimeoutMs`
+     *   bounds waiting for the reply once connected (so a peer that connects but goes
+     *   silent throws {@link ResponseTimeoutError} instead of hanging); `signal`
+     *   cancels the whole request. Omitting all of them preserves the previous
+     *   uncapped behavior.
+     */
+    async pushBlocks(blockIds, blockDataBuffers, reason = 'rebalance', blockMeta, options) {
         const blockData = {};
         for (let i = 0; i < blockIds.length; i++) {
             blockData[blockIds[i]] = Buffer.from(blockDataBuffers[i]).toString('base64');
         }
-        const request = { type: 'push', blockIds, reason, blockData };
-        return await this.processMessage(request, this.protocol);
+        const request = { type: 'push', blockIds, reason, blockData, ...(blockMeta ? { blockMeta } : {}) };
+        return await this.processMessage(request, this.protocol, options);
     }
 }
 //# sourceMappingURL=block-transfer-service.js.map

package/dist/src/cluster/block-transfer-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"block-transfer-service.js","sourceRoot":"","sources":["../../../src/cluster/block-transfer-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"block-transfer-service.js","sourceRoot":"","sources":["../../../src/cluster/block-transfer-service.ts"],"names":[],"mappings":"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"}

package/dist/src/cluster/client.d.ts

@@ -1,11 +1,28 @@
 import type { PeerId, IPeerNetwork, ICluster, ClusterRecord } from '@optimystic/db-core';
 import { ProtocolClient } from '../protocol-client.js';
+import { type RpcDeadlineOptions } from '../rpc-deadline.js';
 export declare class ClusterClient extends ProtocolClient implements ICluster {
     readonly protocolPrefix?: string | undefined;
     private constructor();
     /** Create a new client instance */
     static create(peerId: PeerId, peerNetwork: IPeerNetwork, protocolPrefix?: string): ClusterClient;
-    update(record: ClusterRecord, hop?: number): Promise<ClusterRecord>;
+    update(record: ClusterRecord, hop?: number, options?: RpcDeadlineOptions): Promise<ClusterRecord>;
+    /**
+     * Record a coordinator-affinity hint for the block this record's op is
+     * coordinated on, so a follow-up op can dial `peerId` directly.
+     *
+     * The op lives at `record.message.operations[0]` — `record.message` is a
+     * RepoMessage `{ operations: [...] }`, NOT a bare `{ commit }`/`{ pend }`.
+     * Reading `record.message.commit`/`.pend` (the old code) always saw
+     * `undefined`, so this hint was dead code and never recorded anything.
+     *
+     * The key is `blockIdToBytes(<the coordinated block id>)` — the sha256 digest
+     * findCoordinator/recordCoordinator key the cache on — NOT raw utf8 of the id
+     * (which would never be retrieved). Commit anchors on blockIds[0] (where
+     * CoordinatorRepo runs consensus + verifyResponsibility), not tailId. Pend
+     * anchors on a real block id (blockIdsForTransforms), not a structural
+     * transforms field name. ClusterClient only ever carries commit/pend.
+     */
     private recordCoordinatorForRecordIfSupported;
 }
 //# sourceMappingURL=client.d.ts.map

package/dist/src/cluster/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/cluster/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,qBAAa,aAAc,SAAQ,cAAe,YAAW,QAAQ;IACL,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM;IAA/F,OAAO;IAIP,mCAAmC;WACrB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,aAAa;IAIhG,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,GAAE,MAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAsC5E,OAAO,CAAC,qCAAqC;CAc9C"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/cluster/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAA2B,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAEtF,qBAAa,aAAc,SAAQ,cAAe,YAAW,QAAQ;IACL,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM;IAA/F,OAAO;IAIP,mCAAmC;WACrB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,aAAa;IAIjG,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,GAAE,MAAU,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC;IAyCzG;;;;;;;;;;;;;;;OAeG;YACW,qCAAqC;CAWpD"}

package/dist/src/cluster/client.js

@@ -1,5 +1,8 @@
+import { blockIdToBytes, blockIdsForTransforms } from '@optimystic/db-core';
 import { ProtocolClient } from '../protocol-client.js';
 import { peerIdFromString } from '@libp2p/peer-id';
+import { isClusterErrorEnvelope, clusterErrorFromEnvelope } from './cluster-error.js';
+import { withRpcDeadlineDefaults } from '../rpc-deadline.js';
 export class ClusterClient extends ProtocolClient {
     protocolPrefix;
     constructor(peerId, peerNetwork, protocolPrefix) {
@@ -10,62 +13,75 @@ export class ClusterClient extends ProtocolClient {
     static create(peerId, peerNetwork, protocolPrefix) {
         return new ClusterClient(peerId, peerNetwork, protocolPrefix);
     }
-    async update(record, hop = 0) {
+    async update(record, hop = 0, options) {
         const message = {
             operation: 'update',
             record
         };
-        const preferred = (this.protocolPrefix ?? '/db-p2p') + '/cluster/1.0.0';
-        let response;
-        try {
-            response = await this.processMessage(message, preferred);
+        // Every node registers the cluster service under its network-prefixed
+        // protocol id (`/optimystic/<network>/cluster/1.0.0`); the bare
+        // `/db-p2p/cluster/1.0.0` is never registered, so there is no legacy
+        // fallback to attempt — a single dial whose error propagates directly.
+        const protocol = (this.protocolPrefix ?? '/db-p2p') + '/cluster/1.0.0';
+        // Apply the client-level dial/response deadline so a silent cluster peer
+        // can't hang the coordinator forever; an explicit caller override wins.
+        const response = await this.processMessage(message, protocol, withRpcDeadlineDefaults(options));
+        // A member that threw inside `update` replies with a structured error
+        // envelope rather than aborting the stream; rethrow the server's real
+        // error (preserving name/code) so the coordinator sees the true cause.
+        if (isClusterErrorEnvelope(response)) {
+            throw clusterErrorFromEnvelope(response);
         }
-        catch (err) {
-            if (preferred !== '/db-p2p/cluster/1.0.0') {
-                try {
-                    response = await this.processMessage(message, '/db-p2p/cluster/1.0.0');
-                }
-                catch (fallbackErr) {
-                    // Throw original error - fallback protocol is likely not registered
-                    throw err;
-                }
-            }
-            else {
-                throw err;
-            }
-        }
-        if (response?.redirect?.peers?.length) {
+        const redirectResponse = response;
+        if (redirectResponse?.redirect?.peers?.length) {
             if (hop >= 2) {
                 throw new Error('Redirect loop detected in ClusterClient (max hops reached)');
             }
             const currentIdStr = this.peerId.toString();
-            const next = response.redirect.peers.find((p) => p.id !== currentIdStr) ?? response.redirect.peers[0];
+            const next = redirectResponse.redirect.peers.find((p) => p.id !== currentIdStr) ?? redirectResponse.redirect.peers[0];
             const nextId = peerIdFromString(next.id);
             if (next.id === currentIdStr) {
                 throw new Error('Redirect loop detected in ClusterClient (same peer)');
             }
-            this.recordCoordinatorForRecordIfSupported(record, nextId);
+            await this.recordCoordinatorForRecordIfSupported(record, nextId);
             const nextClient = ClusterClient.create(nextId, this.peerNetwork, this.protocolPrefix);
-            return await nextClient.update(record, hop + 1);
+            // Thread the caller's *original* options through the redirect hop (the
+            // recursive call re-applies its own defaults) so the deadline survives a redirect.
+            return await nextClient.update(record, hop + 1, options);
         }
         return response;
     }
-    recordCoordinatorForRecordIfSupported(record, peerId) {
-        const rmsg = record?.message;
-        let tailId;
-        if (rmsg?.commit?.tailId)
-            tailId = rmsg.commit.tailId;
-        else if (rmsg?.pend?.transforms) {
-            const keys = Object.keys(rmsg.pend.transforms);
-            if (keys.length > 0)
-                tailId = keys[0];
-        }
-        if (tailId) {
-            const kbytes = new TextEncoder().encode(tailId);
-            const pn = this.peerNetwork;
-            if (typeof pn?.recordCoordinator === 'function')
-                pn.recordCoordinator(kbytes, peerId);
-        }
+    /**
+     * Record a coordinator-affinity hint for the block this record's op is
+     * coordinated on, so a follow-up op can dial `peerId` directly.
+     *
+     * The op lives at `record.message.operations[0]` — `record.message` is a
+     * RepoMessage `{ operations: [...] }`, NOT a bare `{ commit }`/`{ pend }`.
+     * Reading `record.message.commit`/`.pend` (the old code) always saw
+     * `undefined`, so this hint was dead code and never recorded anything.
+     *
+     * The key is `blockIdToBytes(<the coordinated block id>)` — the sha256 digest
+     * findCoordinator/recordCoordinator key the cache on — NOT raw utf8 of the id
+     * (which would never be retrieved). Commit anchors on blockIds[0] (where
+     * CoordinatorRepo runs consensus + verifyResponsibility), not tailId. Pend
+     * anchors on a real block id (blockIdsForTransforms), not a structural
+     * transforms field name. ClusterClient only ever carries commit/pend.
+     */
+    async recordCoordinatorForRecordIfSupported(record, peerId) {
+        const op = record.message.operations[0];
+        if (!op)
+            return;
+        let id;
+        if ('commit' in op)
+            id = op.commit.blockIds[0];
+        else if ('pend' in op)
+            id = blockIdsForTransforms(op.pend.transforms)[0];
+        if (id == null)
+            return;
+        const kbytes = await blockIdToBytes(id);
+        const pn = this.peerNetwork;
+        if (typeof pn?.recordCoordinator === 'function')
+            pn.recordCoordinator(kbytes, peerId);
     }
 }
 //# sourceMappingURL=client.js.map

package/dist/src/cluster/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/cluster/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/cluster/client.ts"],"names":[],"mappings":"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"}