@serfab/cadre-core 1.13.0 → 1.15.0

package/dist/peer-dial.d.ts

@@ -16,17 +16,60 @@
  * borrowing a node from a cadre-host whose only reachable address was the
  * forwarded loopback one never connected for this reason.
  *
- * So the addresses are dialed here, each as its own `dial()` with its own time
- * limit ({@link PeerDialBudget.perAddressMs}), inside a limit for the whole peer
- * ({@link PeerDialBudget.totalMs}). One address per call also means libp2p's
- * sorter has nothing to reorder, so the order is chosen here
- * ({@link directBeforeRelayed}).
- *
- * Dependency-free apart from `control-stream.ts`, so any module may import it
- * without creating an import cycle.
+ * So the addresses are dialed here, each as its own transport-manager dial
+ * ({@link dialAddr}) with its own time limit ({@link PeerDialBudget.perAddressMs}),
+ * inside a limit for the whole peer ({@link PeerDialBudget.totalMs}). One address
+ * per call also means libp2p's sorter has nothing to reorder, so the order is
+ * chosen here ({@link directBeforeRelayed}). The dial goes around libp2p's dial
+ * queue because the queue joins any dial of a peer to a queued job for that peer
+ * id, whatever address the new dial names — see {@link dialAddr}. Every address
+ * is bound to the peer the caller expects ({@link withTrailingPeerId}) so the
+ * handshake verifies who answered.
+ *
+ * Dependency-free apart from `control-stream.ts` and `link-budget.ts`, so any
+ * module may import it without creating an import cycle. That is why the two
+ * address helpers ({@link trailingPeerId}, {@link withTrailingPeerId}) live here
+ * rather than in `peer-record.ts`, which pulls in the crypto plugin.
  */
-import type { Connection, PeerId } from '@libp2p/interface';
+import type { Connection, Libp2pStatus, PeerId } from '@libp2p/interface';
 import type { Multiaddr } from '@multiformats/multiaddr';
+/**
+ * The peer id a multiaddr terminates in, or `null` when it names none.
+ *
+ * The LAST `/p2p/` component is the dial target: a circuit address
+ * (`…/p2p/<relay>/p2p-circuit/p2p/<target>`) names the relay first and the peer
+ * being reached last. Replaces the deprecated `Multiaddr.getPeerId()`, which
+ * cannot express that distinction.
+ */
+export declare function trailingPeerId(addr: Multiaddr): string | null;
+/**
+ * `addr` guaranteed to terminate in `/p2p/<peerId>` — the shape every dial needs,
+ * since the upgrader verifies that id during the handshake — or `null` when it
+ * cannot, because the address already terminates in a DIFFERENT peer id and
+ * therefore does not reach `peerId` at all.
+ *
+ * Three input shapes, matching what a `CadrePeer` record can legitimately carry:
+ *
+ * - no `/p2p/` component (`/ip4/1.2.3.4/tcp/4001`) — the suffix is appended;
+ * - a relay hop with the destination missing (`…/p2p/<relay>/p2p-circuit`) — the
+ *   last component is the circuit, not a peer id, so the suffix is appended and
+ *   the address becomes the full `…/p2p/<relay>/p2p-circuit/p2p/<peerId>`;
+ * - already terminating in `/p2p/<X>` — returned untouched when `X` is `peerId`,
+ *   dropped otherwise.
+ *
+ * This is deliberately the same rule libp2p applies internally in
+ * `calculateMultiaddrs` (append when the LAST component is not `p2p`) followed by
+ * its wrong-peer-id filter, so a normalized list matches what libp2p would have
+ * built anyway. Normalizing before a list dial is what keeps a list from mixing
+ * suffixed and unsuffixed entries, which `getPeerAddress` rejects outright
+ * ("Multiaddrs must all have the same peer id or have no peer id") — taking the
+ * whole peer down with it, not just the odd address.
+ *
+ * Throws when `peerId` does not parse as a peer id (the encapsulation validates
+ * it). Never use before signature verification: verification runs against the
+ * original on-record strings.
+ */
+export declare function withTrailingPeerId(addr: Multiaddr, peerId: string): Multiaddr | null;
 /**
  * Default limit on ONE address's dial attempt, in ms, at the DEFAULT declared link round trip:
  * `RELAYED_DIAL_ROUND_TRIPS` (5) x `DECLARED_LINK_ROUND_TRIP_MS` (3500 ms) plus
@@ -103,14 +146,60 @@ export interface PeerDialBudget {
 }
 /** {@link PeerDialBudget} built from the two defaults above. */
 export declare const DEFAULT_PEER_DIAL_BUDGET: Readonly<PeerDialBudget>;
+/** What {@link dialAddr} reads of a connection the node holds, to decide whether to hand it back instead of dialing. */
+export interface ReusableConnection {
+    remotePeer: {
+        toString(): string;
+    };
+    status?: Connection['status'];
+    limits?: Connection['limits'];
+    /** Whether the connection is direct rather than relayed; absent counts as direct. */
+    direct?: boolean;
+}
 /** The slice of a libp2p node {@link dialPeerAddrs} uses. */
 export interface AddrDialer {
     /** This node's id, to recognise an address that relays through this node ({@link relaysThrough}). */
     readonly peerId: PeerId;
+    /** libp2p's lifecycle state: {@link dialAddr} refuses to start an attempt once it is not `started`. */
+    readonly status?: Libp2pStatus;
+    /**
+     * The connections this node holds to `peerId`. {@link dialAddr} returns an open one without relay
+     * limits rather than opening a second — what libp2p's dial queue did (`findExistingConnection`)
+     * and the transport manager does not. Optional so a double need not provide it, and typed by
+     * what is read of each connection so the strand redial's node slice (bare `remotePeer`s, which
+     * never count as open) satisfies it without a cast.
+     */
+    getConnections?(peerId?: PeerId): ReadonlyArray<ReusableConnection>;
     dial(addr: Multiaddr, options: {
         signal: AbortSignal;
     }): Promise<Connection>;
 }
+/**
+ * Dial ONE address outside libp2p's dial queue. The queue joins any new dial to a queued job
+ * for the same peer id, whatever address the new dial names, and a joined job ends only when
+ * every caller has aborted — so while another caller dials this peer (FRET's membership probe,
+ * an Optimystic cluster client), a per-address attempt through the queue waits on whatever
+ * address that job is on instead of its own. The transport manager dials exactly the address
+ * given; the two gater hooks the queue would have consulted are run here, and the upgrader
+ * still runs `denyOutboundConnection` and verifies the peer id the address carries during the
+ * Noise handshake, so the address must carry the id of the peer expected to answer
+ * ({@link withTrailingPeerId}). An open connection to that peer without relay limits is handed
+ * back instead of dialing ({@link reusableConnection}), as the queue would have. A relayed
+ * address still passes through the queue for its relay leg (the circuit transport dials the
+ * relay by peer id).
+ *
+ * The queue would also have aborted the attempt at shutdown; here the node's `status` is
+ * checked before dialing and its `stop` event aborts an attempt in flight. Without
+ * `transportManager.dial` (libp2p internals moved) the attempt goes through the queue, logged.
+ *
+ * What else the queue did that this does not: record the outcome in the peer store
+ * (`LAST_DIAL_SUCCESS_KEY` / `LAST_DIAL_FAILURE_KEY`, read only by libp2p's own address sorter,
+ * which these dials do not use); apply `maxParallelDials` and `maxDialQueueLength`; and refuse
+ * a dial of this node's own id before touching the network — the upgrader still throws
+ * `Can not dial self` after the handshake, `dialPeerAddrs` drops addresses relaying through this
+ * node, `applySeed` skips itself, and the reconcile pass never lists itself.
+ */
+export declare function dialAddr(dialer: AddrDialer, addr: Multiaddr, signal: AbortSignal, label: string): Promise<Connection>;
 /**
  * Thrown by {@link dialPeerAddrs} when it was given addresses but every one reaches the peer by
  * relaying through this node, so none was dialed.
@@ -125,25 +214,46 @@ export declare class SelfRelayOnlyError extends Error {
     constructor(label: string);
 }
 /**
- * Dial one peer from `addrs`, one address per `dial()` call, and return the
+ * No connection to the peer formed, so nothing was sent to it. `cause` is what the dial threw:
+ * {@link dialPeerAddrs}'s error naming every address and why it failed, or a
+ * {@link SelfRelayOnlyError}.
+ *
+ * Kept apart from failures after a connection formed so a caller can tell "this device could not
+ * reach the peer" from "the peer was reached and then something else failed" without reading
+ * libp2p's error text. `SeedBootstrapService.deliverSeed` throws it, and so `CadreNode.claimNode`.
+ */
+export declare class PeerUnreachableError extends Error {
+    readonly peerId: string;
+    constructor(peerId: string, cause: unknown);
+}
+/**
+ * Dial `peerId` from `addrs`, one address per {@link dialAddr} call, and return the
  * first connection that forms. Direct addresses are tried before relayed ones
  * ({@link directBeforeRelayed}); otherwise the given order is kept.
  *
- * Addresses that relay through this node are dropped first ({@link relaysThrough}):
- * dialing one could only fail with `Can not dial self`. When that leaves nothing
- * of a non-empty list, this throws {@link SelfRelayOnlyError} without dialing.
+ * Every address is first bound to `peerId` ({@link withTrailingPeerId}), so the
+ * handshake verifies that the peer expected is the one that answered; an address
+ * naming another peer is dropped and logged. When that leaves nothing of a
+ * non-empty list — every address names someone else, or `peerId` does not parse —
+ * this throws without dialing.
+ *
+ * Addresses that relay through this node are dropped next ({@link relaysThrough}):
+ * dialing one could only fail with `Can not dial self`. When that leaves nothing,
+ * this throws {@link SelfRelayOnlyError} without dialing.
  *
- * Addresses naming a transport this node lacks are not filtered out first: a
- * one-address `dial()` rejects those at once (`NoValidAddressesError`), so they
+ * Addresses naming a transport this node lacks are not filtered out first: the
+ * transport manager rejects those at once (`TransportUnavailableError`), so they
  * cost a log line, not time.
  *
  * Otherwise throws when no address connects — see {@link tryAddrsInTurn} for the error.
  *
+ * @param peerId The peer every address must reach, as every caller already holds it
+ *   (a `CadrePeer` row key, a seed peer's id, a strand member's id).
  * @param label Names the dial in timeout messages and logs, e.g.
  *   `reconcileControlCohort dial of sibling <peerId>`; each attempt reads
  *   `<label> via <addr>`.
  */
-export declare function dialPeerAddrs(dialer: AddrDialer, addrs: readonly Multiaddr[], budget: PeerDialBudget, label: string): Promise<Connection>;
+export declare function dialPeerAddrs(dialer: AddrDialer, peerId: string, addrs: readonly Multiaddr[], budget: PeerDialBudget, label: string): Promise<Connection>;
 /**
  * Run `attempt` against each address in the given order until one succeeds, and
  * return its result.
@@ -158,17 +268,17 @@ export declare function dialPeerAddrs(dialer: AddrDialer, addrs: readonly Multia
  * failed, in order, with the first failure as `cause` — so the report shows the
  * address that mattered, not only whichever happened to be tried last.
  *
- * Between attempts this waits for one macrotask (`setTimeout(0)`). libp2p's dial
- * queue lets a new `dial()` join any queued dial job for the same peer id
- * WITHOUT checking whether that job has already finished, and an aborted job
- * leaves the queue a few microtasks after its callers are rejected. Timing out
- * one address and immediately dialing the next for the same peer therefore
- * joins the dying job, which rejects the new dial with `AbortError` before it
- * touches the network — the next address is never tried. Seen against libp2p
- * 3.1.3, and the queue's join is unchanged in 3.3.11; `test/peer-dial.spec.ts`
- * dials real nodes so an upgrade that changes it shows up there. All of the
- * queue's cleanup runs as microtasks, so it has finished by the time a
- * macrotask runs.
+ * Between attempts this waits for one macrotask (`setTimeout(0)`). A direct
+ * address is dialed outside libp2p's dial queue ({@link dialAddr}), but a relayed
+ * address still passes through it for the relay leg, and the queue lets a new
+ * dial join any queued job for the same peer id WITHOUT checking whether that
+ * job has already finished: an aborted job leaves the queue a few microtasks
+ * after its callers are rejected, so a next attempt through the same relay made
+ * at once would join the dying job and be rejected with `AbortError` before it
+ * touches the network. All of the queue's cleanup runs as microtasks, so it has
+ * finished by the time a macrotask runs. Seen against libp2p 3.1.3, and the
+ * queue's join is unchanged in 3.3.11; `test/peer-dial.spec.ts` dials real nodes
+ * so an upgrade that changes it shows up there.
  */
 export declare function tryAddrsInTurn<T>(addrs: readonly Multiaddr[], budget: PeerDialBudget, label: string, attempt: (addr: Multiaddr, signal: AbortSignal, attemptMs: number) => Promise<T>): Promise<T>;
 /**
@@ -184,3 +294,9 @@ export declare function tryAddrsInTurn<T>(addrs: readonly Multiaddr[], budget: P
  * bounded amount of time, so the caller's order is the better guide.
  */
 export declare function directBeforeRelayed(addrs: readonly Multiaddr[]): Multiaddr[];
+/**
+ * Yield one macrotask: libp2p's dial queue drops an aborted job only on the next turn, so a
+ * dialer that moves on to another address after an abort waits this long first. Shared with
+ * the cadre invitation dialer (`cadre-invite-protocol.ts`).
+ */
+export declare function nextMacrotask(): Promise<void>;

package/dist/peer-dial.js

@@ -16,20 +16,72 @@
  * borrowing a node from a cadre-host whose only reachable address was the
  * forwarded loopback one never connected for this reason.
  *
- * So the addresses are dialed here, each as its own `dial()` with its own time
- * limit ({@link PeerDialBudget.perAddressMs}), inside a limit for the whole peer
- * ({@link PeerDialBudget.totalMs}). One address per call also means libp2p's
- * sorter has nothing to reorder, so the order is chosen here
- * ({@link directBeforeRelayed}).
+ * So the addresses are dialed here, each as its own transport-manager dial
+ * ({@link dialAddr}) with its own time limit ({@link PeerDialBudget.perAddressMs}),
+ * inside a limit for the whole peer ({@link PeerDialBudget.totalMs}). One address
+ * per call also means libp2p's sorter has nothing to reorder, so the order is
+ * chosen here ({@link directBeforeRelayed}). The dial goes around libp2p's dial
+ * queue because the queue joins any dial of a peer to a queued job for that peer
+ * id, whatever address the new dial names — see {@link dialAddr}. Every address
+ * is bound to the peer the caller expects ({@link withTrailingPeerId}) so the
+ * handshake verifies who answered.
  *
- * Dependency-free apart from `control-stream.ts`, so any module may import it
- * without creating an import cycle.
+ * Dependency-free apart from `control-stream.ts` and `link-budget.ts`, so any
+ * module may import it without creating an import cycle. That is why the two
+ * address helpers ({@link trailingPeerId}, {@link withTrailingPeerId}) live here
+ * rather than in `peer-record.ts`, which pulls in the crypto plugin.
  */
 import debug from 'debug';
 import { peerIdFromString } from '@libp2p/peer-id';
 import { withDeadline } from './control-stream.js';
 import { relayedDialBudgetMs } from './link-budget.js';
 const log = debug('sereus:cadre:peer-dial');
+/**
+ * The peer id a multiaddr terminates in, or `null` when it names none.
+ *
+ * The LAST `/p2p/` component is the dial target: a circuit address
+ * (`…/p2p/<relay>/p2p-circuit/p2p/<target>`) names the relay first and the peer
+ * being reached last. Replaces the deprecated `Multiaddr.getPeerId()`, which
+ * cannot express that distinction.
+ */
+export function trailingPeerId(addr) {
+    const p2p = addr.getComponents().filter((c) => c.name === 'p2p');
+    return p2p.length > 0 ? (p2p[p2p.length - 1].value ?? null) : null;
+}
+/**
+ * `addr` guaranteed to terminate in `/p2p/<peerId>` — the shape every dial needs,
+ * since the upgrader verifies that id during the handshake — or `null` when it
+ * cannot, because the address already terminates in a DIFFERENT peer id and
+ * therefore does not reach `peerId` at all.
+ *
+ * Three input shapes, matching what a `CadrePeer` record can legitimately carry:
+ *
+ * - no `/p2p/` component (`/ip4/1.2.3.4/tcp/4001`) — the suffix is appended;
+ * - a relay hop with the destination missing (`…/p2p/<relay>/p2p-circuit`) — the
+ *   last component is the circuit, not a peer id, so the suffix is appended and
+ *   the address becomes the full `…/p2p/<relay>/p2p-circuit/p2p/<peerId>`;
+ * - already terminating in `/p2p/<X>` — returned untouched when `X` is `peerId`,
+ *   dropped otherwise.
+ *
+ * This is deliberately the same rule libp2p applies internally in
+ * `calculateMultiaddrs` (append when the LAST component is not `p2p`) followed by
+ * its wrong-peer-id filter, so a normalized list matches what libp2p would have
+ * built anyway. Normalizing before a list dial is what keeps a list from mixing
+ * suffixed and unsuffixed entries, which `getPeerAddress` rejects outright
+ * ("Multiaddrs must all have the same peer id or have no peer id") — taking the
+ * whole peer down with it, not just the odd address.
+ *
+ * Throws when `peerId` does not parse as a peer id (the encapsulation validates
+ * it). Never use before signature verification: verification runs against the
+ * original on-record strings.
+ */
+export function withTrailingPeerId(addr, peerId) {
+    const components = addr.getComponents();
+    if (components[components.length - 1]?.name !== 'p2p') {
+        return addr.encapsulate(`/p2p/${peerId}`);
+    }
+    return trailingPeerId(addr) === peerId ? addr : null;
+}
 /**
  * Default limit on ONE address's dial attempt, in ms, at the DEFAULT declared link round trip:
  * `RELAYED_DIAL_ROUND_TRIPS` (5) x `DECLARED_LINK_ROUND_TRIP_MS` (3500 ms) plus
@@ -102,6 +154,140 @@ export const DEFAULT_PEER_DIAL_BUDGET = {
     perAddressMs: DEFAULT_CONTROL_COHORT_PER_ADDRESS_DIAL_TIMEOUT_MS,
     totalMs: DEFAULT_CONTROL_COHORT_DIAL_TIMEOUT_MS,
 };
+/**
+ * Dial ONE address outside libp2p's dial queue. The queue joins any new dial to a queued job
+ * for the same peer id, whatever address the new dial names, and a joined job ends only when
+ * every caller has aborted — so while another caller dials this peer (FRET's membership probe,
+ * an Optimystic cluster client), a per-address attempt through the queue waits on whatever
+ * address that job is on instead of its own. The transport manager dials exactly the address
+ * given; the two gater hooks the queue would have consulted are run here, and the upgrader
+ * still runs `denyOutboundConnection` and verifies the peer id the address carries during the
+ * Noise handshake, so the address must carry the id of the peer expected to answer
+ * ({@link withTrailingPeerId}). An open connection to that peer without relay limits is handed
+ * back instead of dialing ({@link reusableConnection}), as the queue would have. A relayed
+ * address still passes through the queue for its relay leg (the circuit transport dials the
+ * relay by peer id).
+ *
+ * The queue would also have aborted the attempt at shutdown; here the node's `status` is
+ * checked before dialing and its `stop` event aborts an attempt in flight. Without
+ * `transportManager.dial` (libp2p internals moved) the attempt goes through the queue, logged.
+ *
+ * What else the queue did that this does not: record the outcome in the peer store
+ * (`LAST_DIAL_SUCCESS_KEY` / `LAST_DIAL_FAILURE_KEY`, read only by libp2p's own address sorter,
+ * which these dials do not use); apply `maxParallelDials` and `maxDialQueueLength`; and refuse
+ * a dial of this node's own id before touching the network — the upgrader still throws
+ * `Can not dial self` after the handshake, `dialPeerAddrs` drops addresses relaying through this
+ * node, `applySeed` skips itself, and the reconcile pass never lists itself.
+ */
+export async function dialAddr(dialer, addr, signal, label) {
+    if (dialer.status !== undefined && dialer.status !== 'started') {
+        throw new Error(`${label}: not dialed, the node is ${dialer.status}`);
+    }
+    const components = dialer.components;
+    const manager = components?.transportManager;
+    if (typeof manager?.dial !== 'function') {
+        log('%s: no transportManager.dial on this node — libp2p internals moved? dialing through the queue', label);
+        return dialer.dial(addr, { signal });
+    }
+    const target = boundPeer(addr, label);
+    const open = reusableConnection(dialer, target, addr);
+    if (open !== undefined) {
+        log('%s: reusing the open connection to %s', label, target);
+        return open;
+    }
+    const attempt = attemptSignal(dialer, signal, label);
+    try {
+        await assertDialAllowed(components?.connectionGater, target, addr, label);
+        if (attempt.signal.aborted) {
+            throw attempt.signal.reason;
+        }
+        // NOTE: a relayed address's relay leg still goes through the dial queue (the circuit
+        // transport dials the relay by peer id), so another dial of the relay can join it. Fine
+        // while a relay connection is normally already open for the reservation; revisit if a
+        // relayed attempt is ever seen timing out while a dial of the relay by id is in flight.
+        return await manager.dial(addr, { signal: attempt.signal });
+    }
+    catch (err) {
+        // A transport reports an aborted connect as its own failure ("Could not connect to …");
+        // why it was aborted — the deadline, or the stop — is the error worth surfacing.
+        throw attempt.signal.aborted ? attempt.signal.reason : err;
+    }
+    finally {
+        attempt.release();
+    }
+}
+/**
+ * The signal one attempt dials under: aborted when the caller's `signal` aborts, with its
+ * reason, or when the node stops. Linked before anything in the attempt awaits (the gater
+ * hooks are async), so neither event can fall between the check and the dial; a `signal`
+ * already aborted on entry aborts it at once, since no `abort` event will come. `release`
+ * unhooks both listeners.
+ */
+function attemptSignal(dialer, signal, label) {
+    const events = dialer;
+    const controller = new AbortController();
+    const onAbort = () => controller.abort(signal.reason);
+    const onStop = () => controller.abort(new Error(`${label}: the node stopped`));
+    signal.addEventListener('abort', onAbort, { once: true });
+    events.addEventListener?.('stop', onStop);
+    if (signal.aborted) {
+        onAbort();
+    }
+    return {
+        signal: controller.signal,
+        release: () => {
+            signal.removeEventListener('abort', onAbort);
+            events.removeEventListener?.('stop', onStop);
+        },
+    };
+}
+/**
+ * The peer `addr` is bound to, or `undefined` when it names none. Throws, naming the address,
+ * when the id it carries does not parse: the upgrader would reject the same address after
+ * connecting, so failing before the network costs nothing and says why.
+ */
+function boundPeer(addr, label) {
+    const id = trailingPeerId(addr);
+    if (id === null) {
+        return undefined;
+    }
+    try {
+        return peerIdFromString(id);
+    }
+    catch (err) {
+        throw new Error(`${label}: ${addr.toString()} does not end in a peer id that parses`, { cause: err });
+    }
+}
+/**
+ * An open connection to `target` without relay limits, when the node holds one — the rule
+ * libp2p's dial queue applied before dialing (`findExistingConnection`): a direct connection is
+ * preferred, and a relayed one is not reused for a direct address, so the dial can upgrade the
+ * link. `undefined` when the node holds none, or does not expose its connections.
+ *
+ * Returned as the `Connection` it is on a real node. A double that reports an open connection
+ * must supply what its caller uses of one.
+ */
+function reusableConnection(dialer, target, addr) {
+    if (target === undefined || dialer.getConnections === undefined) {
+        return undefined;
+    }
+    const expected = target.toString();
+    const open = dialer.getConnections(target)
+        .filter((c) => c.status === 'open' && c.limits === undefined && c.remotePeer.toString() === expected);
+    const existing = open.find((c) => c.direct !== false) ?? open[0];
+    if (existing === undefined || (existing.direct === false && !isRelayed(addr))) {
+        return undefined;
+    }
+    return existing;
+}
+async function assertDialAllowed(gater, target, addr, label) {
+    if (target !== undefined && await gater?.denyDialPeer?.(target)) {
+        throw new Error(`${label}: the connection gater denies dialing ${target.toString()}`);
+    }
+    if (await gater?.denyDialMultiaddr?.(addr)) {
+        throw new Error(`${label}: the connection gater denies dialing ${addr.toString()}`);
+    }
+}
 /**
  * Thrown by {@link dialPeerAddrs} when it was given addresses but every one reaches the peer by
  * relaying through this node, so none was dialed.
@@ -119,30 +305,81 @@ export class SelfRelayOnlyError extends Error {
     }
 }
 /**
- * Dial one peer from `addrs`, one address per `dial()` call, and return the
+ * No connection to the peer formed, so nothing was sent to it. `cause` is what the dial threw:
+ * {@link dialPeerAddrs}'s error naming every address and why it failed, or a
+ * {@link SelfRelayOnlyError}.
+ *
+ * Kept apart from failures after a connection formed so a caller can tell "this device could not
+ * reach the peer" from "the peer was reached and then something else failed" without reading
+ * libp2p's error text. `SeedBootstrapService.deliverSeed` throws it, and so `CadreNode.claimNode`.
+ */
+export class PeerUnreachableError extends Error {
+    constructor(peerId, cause) {
+        super(`Could not reach ${peerId}: ${cause instanceof Error ? cause.message : String(cause)}`, { cause });
+        this.peerId = peerId;
+        this.name = 'PeerUnreachableError';
+    }
+}
+/**
+ * Dial `peerId` from `addrs`, one address per {@link dialAddr} call, and return the
  * first connection that forms. Direct addresses are tried before relayed ones
  * ({@link directBeforeRelayed}); otherwise the given order is kept.
  *
- * Addresses that relay through this node are dropped first ({@link relaysThrough}):
- * dialing one could only fail with `Can not dial self`. When that leaves nothing
- * of a non-empty list, this throws {@link SelfRelayOnlyError} without dialing.
+ * Every address is first bound to `peerId` ({@link withTrailingPeerId}), so the
+ * handshake verifies that the peer expected is the one that answered; an address
+ * naming another peer is dropped and logged. When that leaves nothing of a
+ * non-empty list — every address names someone else, or `peerId` does not parse —
+ * this throws without dialing.
  *
- * Addresses naming a transport this node lacks are not filtered out first: a
- * one-address `dial()` rejects those at once (`NoValidAddressesError`), so they
+ * Addresses that relay through this node are dropped next ({@link relaysThrough}):
+ * dialing one could only fail with `Can not dial self`. When that leaves nothing,
+ * this throws {@link SelfRelayOnlyError} without dialing.
+ *
+ * Addresses naming a transport this node lacks are not filtered out first: the
+ * transport manager rejects those at once (`TransportUnavailableError`), so they
  * cost a log line, not time.
  *
  * Otherwise throws when no address connects — see {@link tryAddrsInTurn} for the error.
  *
+ * @param peerId The peer every address must reach, as every caller already holds it
+ *   (a `CadrePeer` row key, a seed peer's id, a strand member's id).
  * @param label Names the dial in timeout messages and logs, e.g.
  *   `reconcileControlCohort dial of sibling <peerId>`; each attempt reads
  *   `<label> via <addr>`.
  */
-export async function dialPeerAddrs(dialer, addrs, budget, label) {
-    const dialable = withoutSelfRelayed(dialer, addrs, label);
-    if (addrs.length > 0 && dialable.length === 0) {
+export async function dialPeerAddrs(dialer, peerId, addrs, budget, label) {
+    const bound = boundTo(peerId, addrs, label);
+    if (addrs.length > 0 && bound.length === 0) {
+        throw new Error(`${label}: none of the ${addrs.length} candidate addresses binds to ${peerId}`);
+    }
+    const dialable = withoutSelfRelayed(dialer, bound, label);
+    if (bound.length > 0 && dialable.length === 0) {
         throw new SelfRelayOnlyError(label);
     }
-    return tryAddrsInTurn(directBeforeRelayed(dialable), budget, label, (addr, signal) => dialer.dial(addr, { signal }));
+    return tryAddrsInTurn(directBeforeRelayed(dialable), budget, label, (addr, signal) => dialAddr(dialer, addr, signal, label));
+}
+/**
+ * `addrs` each bound to `peerId` ({@link withTrailingPeerId}). An address naming another peer
+ * is dropped, as is every address when `peerId` cannot be encapsulated (it does not parse);
+ * each drop is logged with its reason.
+ */
+function boundTo(peerId, addrs, label) {
+    const bound = [];
+    for (const addr of addrs) {
+        try {
+            const withId = withTrailingPeerId(addr, peerId);
+            if (withId === null) {
+                log('%s: dropping %s — it names a peer other than %s', label, addr.toString(), peerId);
+            }
+            else {
+                bound.push(withId);
+            }
+        }
+        catch (err) {
+            log('%s: cannot bind %s to %s: %o', label, addr.toString(), peerId, err);
+        }
+    }
+    return bound;
 }
 /**
  * Run `attempt` against each address in the given order until one succeeds, and
@@ -158,17 +395,17 @@ export async function dialPeerAddrs(dialer, addrs, budget, label) {
  * failed, in order, with the first failure as `cause` — so the report shows the
  * address that mattered, not only whichever happened to be tried last.
  *
- * Between attempts this waits for one macrotask (`setTimeout(0)`). libp2p's dial
- * queue lets a new `dial()` join any queued dial job for the same peer id
- * WITHOUT checking whether that job has already finished, and an aborted job
- * leaves the queue a few microtasks after its callers are rejected. Timing out
- * one address and immediately dialing the next for the same peer therefore
- * joins the dying job, which rejects the new dial with `AbortError` before it
- * touches the network — the next address is never tried. Seen against libp2p
- * 3.1.3, and the queue's join is unchanged in 3.3.11; `test/peer-dial.spec.ts`
- * dials real nodes so an upgrade that changes it shows up there. All of the
- * queue's cleanup runs as microtasks, so it has finished by the time a
- * macrotask runs.
+ * Between attempts this waits for one macrotask (`setTimeout(0)`). A direct
+ * address is dialed outside libp2p's dial queue ({@link dialAddr}), but a relayed
+ * address still passes through it for the relay leg, and the queue lets a new
+ * dial join any queued job for the same peer id WITHOUT checking whether that
+ * job has already finished: an aborted job leaves the queue a few microtasks
+ * after its callers are rejected, so a next attempt through the same relay made
+ * at once would join the dying job and be rejected with `AbortError` before it
+ * touches the network. All of the queue's cleanup runs as microtasks, so it has
+ * finished by the time a macrotask runs. Seen against libp2p 3.1.3, and the
+ * queue's join is unchanged in 3.3.11; `test/peer-dial.spec.ts` dials real nodes
+ * so an upgrade that changes it shows up there.
  */
 export async function tryAddrsInTurn(addrs, budget, label, attempt) {
     const deadline = Date.now() + budget.totalMs;
@@ -207,8 +444,11 @@ export async function tryAddrsInTurn(addrs, budget, label, attempt) {
  * bounded amount of time, so the caller's order is the better guide.
  */
 export function directBeforeRelayed(addrs) {
-    const relayed = (addr) => addr.getComponents().some((c) => c.name === 'p2p-circuit');
-    return [...addrs.filter((addr) => !relayed(addr)), ...addrs.filter(relayed)];
+    return [...addrs.filter((addr) => !isRelayed(addr)), ...addrs.filter(isRelayed)];
+}
+/** Whether `addr` reaches its target through a circuit relay. */
+function isRelayed(addr) {
+    return addr.getComponents().some((c) => c.name === 'p2p-circuit');
 }
 /** `addrs` without those that relay through `dialer` itself, each dropped one logged. */
 function withoutSelfRelayed(dialer, addrs, label) {
@@ -263,7 +503,12 @@ function allAttemptsFailed(label, failures) {
     const detail = failures.map((f) => `${f.addr.toString()} — ${f.error.message}`).join('; ');
     return new Error(`${label} failed for all ${failures.length} candidate addresses: ${detail}`, { cause: failures[0].error });
 }
-function nextMacrotask() {
+/**
+ * Yield one macrotask: libp2p's dial queue drops an aborted job only on the next turn, so a
+ * dialer that moves on to another address after an abort waits this long first. Shared with
+ * the cadre invitation dialer (`cadre-invite-protocol.ts`).
+ */
+export function nextMacrotask() {
     return new Promise((resolve) => setTimeout(resolve, 0));
 }
 //# sourceMappingURL=peer-dial.js.map

package/dist/peer-dial.js.map

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