@serfab/cadre-core 1.13.0 → 1.15.0

package/dist/strand-move.js

@@ -0,0 +1,438 @@
+/**
+ * Moving a party's strands into another party of the same owner.
+ *
+ * A party's participation in a strand is control-database state: its `Strand` row (a strand
+ * it founded) or `JoinedStrand` row (one it joined), carrying the strand's shared read secret,
+ * and its `StrandPartyKey` row, the membership identity whose public half seats the party's
+ * `Member` / `Manager` rows in the strand database. Nothing in the strand database names a
+ * party, so a strand follows those rows: re-seated in another party under the same member key,
+ * on the same peer, the strand's other members see the same member on the same peer and
+ * nothing on the strand side changes.
+ *
+ * The case this serves is a phone app that founded a one-node cadre of its own (party B) and
+ * then joins the user's main cadre (party A) by switching its one node across
+ * (docs/architecture.md → "An app joins an existing cadre" → "Moving the app's strands"). Two
+ * nodes never run at once, so the move has two ends: {@link exportStrandBundle} reads everything
+ * B's node knows about its strands while it still runs, the embedder carries the bundle across
+ * the switch as data, and {@link adoptStrandBundle} seats it on A's node once the app's key is
+ * an owner there. Nothing is deleted in B; dissolving it is the embedder's later step, once
+ * {@link unheldBundleContent} finds nothing of B's export that A's {@link readStrandHoldings} lacks.
+ *
+ * Built over `CadreNode`'s public surface, so `cadre-node.ts` does not grow by the feature.
+ */
+import debug from 'debug';
+import { sign } from '@optimystic/quereus-plugin-crypto';
+import { isPendingJoinConflict, isStrandIdConflict, pendingJoinId } from './control-database.js';
+import { joinedStrandRow } from './joined-strand-store.js';
+const log = debug('sereus:cadre:strand-move');
+/** {@link adoptStrandBundle} refused before any write: the running node's key is not an owner of its party. */
+export class StrandMoveNotOwnerError extends Error {
+    constructor(partyId) {
+        super(`Cannot adopt strands into party ${partyId}: this node's key is not one of its owners, and every re-seated row is owner-signed`);
+        this.partyId = partyId;
+        this.name = 'StrandMoveNotOwnerError';
+    }
+}
+/** {@link adoptStrandBundle} refused before any write: the bundle was exported from the party the node runs. */
+export class StrandMoveSamePartyError extends Error {
+    constructor(partyId) {
+        super(`Cannot adopt strands into party ${partyId}: the bundle was exported from that same party`);
+        this.partyId = partyId;
+        this.name = 'StrandMoveSamePartyError';
+    }
+}
+/**
+ * Read, from a running node, everything its party knows about its strands: the party's own
+ * strands, the strands it joined (party-wide rows and this machine's unpublished records), each
+ * with its party key, saved routing table and carried addresses; every pending join with its
+ * outcome; and every invitation still redeemable.
+ *
+ * @throws when the node is not started.
+ */
+export async function exportStrandBundle(node) {
+    const database = requireControlDatabase(node, 'export a strand bundle');
+    const now = Date.now();
+    const bundle = {
+        v: 1,
+        partyId: node.partyId,
+        exportedAt: now,
+        strands: await exportStrands(node, database),
+        pendingJoins: await database.queryPendingJoins(),
+        formationInvites: await exportFormationInvites(database, now)
+    };
+    log('export(%s): %d strand(s), %d pending join(s), %d invitation(s)', node.partyId, bundle.strands.length, bundle.pendingJoins.length, bundle.formationInvites.length);
+    return bundle;
+}
+/** One entry per strand id, the party's own first: an id in both `Strand` and `JoinedStrand` exports once, as `own`. */
+async function exportStrands(node, database) {
+    const entries = new Map();
+    for (const row of await database.queryStrands()) {
+        entries.set(row.Id, await exportStrand(node, database, 'own', row));
+    }
+    // Publication needs a control connection, so a one-node party's joins are machine-local
+    // records until it holds one (a relay's or a foreign party's node counts) and `JoinedStrand`
+    // rows after. Both are read.
+    const unpublished = (await node.listUnpublishedJoinedStrands()).map(joinedStrandRow);
+    for (const row of [...await database.queryJoinedStrands(), ...unpublished]) {
+        if (!entries.has(row.Id)) {
+            entries.set(row.Id, await exportStrand(node, database, 'joined', row));
+        }
+    }
+    return [...entries.values()];
+}
+async function exportStrand(node, database, kind, row) {
+    const networkState = node.getStrandNetworkStateStore()?.load(row.Id);
+    return {
+        kind,
+        row: { Id: row.Id, Type: row.Type, MemberPrivateKey: row.MemberPrivateKey },
+        partyKey: await database.queryStrandPartyKey(row.Id),
+        ...(networkState !== undefined && { networkState }),
+        carriedAddrs: node.getCarriedStrandAddrs(row.Id)
+    };
+}
+/**
+ * The invitations still redeemable at export: unexpired, with uses left after the usage
+ * recorded so far. `FormationUsage` rows are append-only history and stay behind, so the
+ * adopting party's count restarts at zero against the reduced cap. A spent or expired
+ * invitation is left out: there is nothing to keep.
+ */
+async function exportFormationInvites(database, now) {
+    const entries = [];
+    for (const row of await database.queryFormationInvites()) {
+        if (isExpired(row.expiresAtMs, now)) {
+            continue;
+        }
+        const usesLeft = row.totalUses === null ? null : row.totalUses - await database.countFormationUsage(row.token);
+        if (usesLeft !== null && usesLeft <= 0) {
+            continue;
+        }
+        entries.push({
+            token: row.token,
+            sAppId: row.sAppId,
+            expiresAtMs: row.expiresAtMs,
+            usesLeft,
+            validationUrl: row.validationUrl,
+            strandId: row.strandId
+        });
+    }
+    return entries;
+}
+/**
+ * Seat `bundle` in the running node's party, every row owner-signed by the node's own identity
+ * key. Refuses up front, with a typed error and no write, when that key is not an owner of the
+ * party ({@link StrandMoveNotOwnerError}) or the bundle came from this very party
+ * ({@link StrandMoveSamePartyError}).
+ *
+ * Strands first, then the invitations, then the pending joins. Every write is idempotent (a row
+ * already present with the same content is skipped and counted as moved), so the same bundle
+ * can be adopted again after a crash or a transient write failure and finishes what is left.
+ * One strand's failure does not stop the others: it is reported under `failed` for the retry.
+ * One transaction over the whole bundle was weighed and declined: the per-row writers already
+ * carry the stamp, signature and retry policy, and the resumable bundle covers a crash between
+ * rows.
+ *
+ * @throws when the node is not started, beside the two typed refusals.
+ */
+export async function adoptStrandBundle(node, bundle) {
+    const database = requireControlDatabase(node, 'adopt a strand bundle');
+    if (bundle.partyId === node.partyId) {
+        throw new StrandMoveSamePartyError(node.partyId);
+    }
+    if (!(await node.wireOwnKeyIfOwner())) {
+        throw new StrandMoveNotOwnerError(node.partyId);
+    }
+    const owner = node.getIdentityOwnerKey();
+    const signer = { ownerKey: owner.publicKeyB64, signMessage: signMessageWith(owner.privateKeyB64) };
+    const report = {
+        fromPartyId: bundle.partyId,
+        moved: [],
+        refused: [],
+        failed: [],
+        invitationsMoved: 0,
+        invitationsDropped: 0,
+        pendingJoinsMoved: 0
+    };
+    for (const entry of bundle.strands) {
+        await adoptStrand(node, database, signer, entry, report);
+    }
+    const settled = settledStrands(report);
+    const now = Date.now();
+    for (const invite of bundle.formationInvites) {
+        await adoptFormationInvite(node, database, invite, settled, report, now);
+    }
+    for (const join of bundle.pendingJoins) {
+        await adoptPendingJoin(database, signer, join, report);
+    }
+    log('adopt(%s ← %s): %d moved, %d refused, %d failed; %d invitation(s) moved, %d dropped; %d pending join(s)', node.partyId, bundle.partyId, report.moved.length, report.refused.length, report.failed.length, report.invitationsMoved, report.invitationsDropped, report.pendingJoinsMoved);
+    return report;
+}
+function settledStrands(report) {
+    return {
+        moved: new Set(report.moved),
+        failed: new Set(report.failed.filter((entry) => entry.kind === 'strand').map((entry) => entry.id))
+    };
+}
+/**
+ * Seat one strand, in the order the adopting node's strand watcher demands. The watcher polls
+ * `Strand` and `JoinedStrand` every five seconds and launches, or offers, a new row at once; a
+ * closed strand's founder launch resolves the party key and, finding none, mints a fresh one,
+ * which would found the strand a second time under a stranger's identity. So the party key is
+ * seated before the row, and the strand's peers (its saved routing table and carried addresses)
+ * before both, so the launch's cohort seed has somewhere to dial. Every step is
+ * insert-if-absent.
+ */
+async function adoptStrand(node, database, signer, entry, report) {
+    const strandId = entry.row.Id;
+    try {
+        const live = await readLiveStrand(database, strandId);
+        const refusal = strandRefusal(entry, live);
+        if (refusal !== null) {
+            log('adopt: strand %s refused: %s', strandId, refusal);
+            report.refused.push({ strandId, reason: refusal });
+            return;
+        }
+        await seatStrandPeers(node, entry);
+        if (entry.partyKey !== null) {
+            await node.ensureStrandPartyKey(strandId, entry.partyKey);
+        }
+        if (entry.kind === 'own') {
+            await node.publishStrand(strandId, entry.row.Type, entry.row.MemberPrivateKey ?? undefined);
+        }
+        else {
+            await seatJoinedStrand(database, signer, entry.row, live.joined);
+        }
+        report.moved.push(strandId);
+    }
+    catch (error) {
+        log('adopt: strand %s (%s) not seated this time; adopt the same bundle again: %o', strandId, entry.kind, error);
+        report.failed.push({ kind: 'strand', id: strandId, reason: errorText(error) });
+    }
+}
+async function readLiveStrand(database, strandId) {
+    return {
+        partyKey: await database.queryStrandPartyKey(strandId),
+        own: await database.queryStrand(strandId),
+        joined: await database.queryJoinedStrand(strandId)
+    };
+}
+/**
+ * Why `entry` can never be seated here, or null. A strand this party already participates in
+ * under its own identity keeps that membership: its `StrandPartyKey` is the key its `Member`
+ * row was seated under, and the bundle's key is another party's seat. A row for the id of the
+ * other kind (the party founded what the bundle joined, or joined what the bundle founded), or
+ * of the same kind with different content, is the same refusal. Decided from a read before any
+ * write, so a retry reports the refusal again instead of failing on a write; the writes
+ * re-check (`ensureStrandPartyKey` and `publishStrand` throw on a mismatch), so a row landing
+ * between the read and the write fails the strand this time and is refused on the retry.
+ */
+function strandRefusal(entry, live) {
+    const strandId = entry.row.Id;
+    if (live.partyKey !== null && live.partyKey !== entry.partyKey) {
+        return `this party already holds its own membership identity for strand ${strandId} and keeps that membership`;
+    }
+    if (entry.kind === 'own' && live.joined !== null) {
+        return `this party already participates in strand ${strandId} as a strand it joined and keeps that membership`;
+    }
+    if (entry.kind === 'joined' && live.own !== null) {
+        return `this party already holds strand ${strandId} as its own and keeps that membership`;
+    }
+    const same = entry.kind === 'own' ? live.own : live.joined;
+    if (same !== null && !sameStrandContent(same, entry.row)) {
+        return `this party already holds strand ${strandId} as ${entry.kind === 'own' ? 'its own' : 'a join'} with different content`;
+    }
+    return null;
+}
+/**
+ * The strand's saved routing table and carried addresses, when this node holds none for it: a
+ * launch here since an earlier attempt may have saved fresher state than the bundle carries.
+ */
+async function seatStrandPeers(node, entry) {
+    const strandId = entry.row.Id;
+    const store = node.getStrandNetworkStateStore();
+    if (entry.networkState !== undefined && store !== null && store.load(strandId) === undefined) {
+        await store.save(strandId, entry.networkState);
+    }
+    if (entry.carriedAddrs.length > 0 && node.getCarriedStrandAddrs(strandId).length === 0) {
+        await node.recordCarriedStrandAddrs(strandId, entry.carriedAddrs);
+    }
+}
+/**
+ * `insertJoinedStrand`, read as done when the identical row is already there: `existing` from
+ * the refusal read (a retry), or one landing between that read and the insert (a sibling's
+ * publish; `strandRefusal` has already compared the content of the first, and the second is
+ * compared here).
+ */
+async function seatJoinedStrand(database, signer, row, existing) {
+    if (existing !== null) {
+        return;
+    }
+    try {
+        await database.insertJoinedStrand(row, signer.ownerKey, signer.signMessage);
+    }
+    catch (error) {
+        if (!isStrandIdConflict(error, 'JoinedStrand')) {
+            throw error;
+        }
+        const landed = await database.queryJoinedStrand(row.Id);
+        if (landed === null || !sameStrandContent(landed, row)) {
+            throw error;
+        }
+        log('adopt: joined strand %s landed concurrently with identical content; adopted', row.Id);
+    }
+}
+/**
+ * Copy one invitation the exporting party handed out. Its envelope names the app's machine,
+ * whose peer id and relay address do not change with the party, so the row here is what keeps
+ * an envelope already handed out redeemable. Dropped and counted: an invitation with a
+ * `ValidationUrl` (its sign-offs verify against a `ValidationKey` row, and which keys may
+ * validate here is this party's owners' decision) and one bound to a strand not seated here,
+ * whether refused above or no longer held by the exporting party (`unpublishStrand` leaves a
+ * bound row behind): the formation recorder would refuse every redemption as a missing host.
+ * Dropped silently: one that expired since the export. One bound to a strand that failed this
+ * time is left for the retry that seats the strand.
+ */
+async function adoptFormationInvite(node, database, invite, settled, report, now) {
+    if (invite.strandId !== null && settled.failed.has(invite.strandId)) {
+        return;
+    }
+    const hostMissing = invite.strandId !== null && !settled.moved.has(invite.strandId);
+    if (invite.validationUrl !== null || hostMissing) {
+        report.invitationsDropped += 1;
+        return;
+    }
+    if (isExpired(invite.expiresAtMs, now)) {
+        return;
+    }
+    try {
+        if (await database.queryFormationInvite(invite.token) === null) {
+            await node.publishFormationInvite(invite.token, invite.sAppId, {
+                expiresAtMs: invite.expiresAtMs ?? undefined,
+                totalUses: invite.usesLeft ?? undefined,
+                strandId: invite.strandId ?? undefined
+            });
+        }
+        report.invitationsMoved += 1;
+    }
+    catch (error) {
+        log('adopt: invitation for sApp %s not seated this time; adopt the same bundle again: %o', invite.sAppId, error);
+        report.failed.push({ kind: 'invitation', id: pendingJoinId(invite.token), reason: errorText(error) });
+    }
+}
+/**
+ * Re-seat one join the exporting party asked for, with its outcome, under a fresh request
+ * stamp. A `joined` outcome's membership invitation matters: for a closed strand it is the seat
+ * the party's membership reconciler has not redeemed yet, and this node's retry loop re-stages
+ * it from the moved row at its next read. A `failed` outcome is history for the user to
+ * dismiss; the seven-day removal cleans it up.
+ *
+ * A request this party already holds for the invitation is read as done, whether an earlier
+ * adoption seated it or the user asked for the same invitation from here. Its outcome is written
+ * only when the live request is still pending and is this bundle's own (every request column
+ * equal), which closes the crash window between the request insert and its outcome insert
+ * without touching a request this party made on its own. A `joined` outcome whose strand was
+ * refused above moves too: its invitation is staged like any other, and the reconciler, finding
+ * the party's member row already seated, burns it unspent or drops it dead.
+ *
+ * NOTE: if party-private app tables land in the control database
+ * (tickets/blocked/decide-party-private-labels-and-app-state.md), they must move with the
+ * strands, and this is the site: one more per-row idempotent write beside the join.
+ */
+async function adoptPendingJoin(database, signer, join, report) {
+    const { StampId: _stampId, outcome, ...request } = join;
+    try {
+        const live = await seatJoinRequest(database, signer, request);
+        if (live !== null && outcome !== null && live.outcome === null) {
+            await database.recordJoinOutcome(live, outcome, signer.ownerKey, signer.signMessage);
+        }
+        report.pendingJoinsMoved += 1;
+    }
+    catch (error) {
+        log('adopt: pending join %s not seated this time; adopt the same bundle again: %o', join.Id, error);
+        report.failed.push({ kind: 'pending-join', id: join.Id, reason: errorText(error) });
+    }
+}
+/**
+ * The live request for `request` after its insert: the row just written, the identical row
+ * already there, or null when the party holds a different request for the invitation (its
+ * own ask, left alone) or a dismissed one whose retired stamp is still held until the reap
+ * pass (the party chose not to have it).
+ */
+async function seatJoinRequest(database, signer, request) {
+    try {
+        return await database.insertJoinRequest(request, signer.ownerKey, signer.signMessage);
+    }
+    catch (error) {
+        if (!isPendingJoinConflict(error)) {
+            throw error;
+        }
+        const existing = await database.queryPendingJoin(request.Id);
+        return existing !== null && sameRequest(existing, request) ? existing : null;
+    }
+}
+function sameRequest(live, request) {
+    return live.Invitation === request.Invitation
+        && live.Disclosure === request.Disclosure
+        && live.RequestedAt === request.RequestedAt
+        && live.ExpiresAt === request.ExpiresAt;
+}
+/**
+ * Every strand id the node's party holds, of either kind (`Strand`, `JoinedStrand` and this
+ * machine's unpublished joins), and every pending join id it holds, whatever the outcome.
+ *
+ * @throws when the node is not started.
+ */
+export async function readStrandHoldings(node) {
+    const database = requireControlDatabase(node, 'read its strand holdings');
+    const strands = [
+        ...await database.queryStrands(),
+        ...await database.queryJoinedStrands(),
+        ...await node.listUnpublishedJoinedStrands()
+    ];
+    return {
+        strandIds: new Set(strands.map((row) => row.Id)),
+        pendingJoinIds: new Set((await database.queryPendingJoins()).map((join) => join.Id))
+    };
+}
+/**
+ * What of `bundle` a party with `holdings` lacks, so the exporting party can be dissolved only
+ * when this is empty. A strand counts as held under any kind: one the adoption refused is in
+ * the holdings (that is why it was refused), so its data stays reachable and only the
+ * exporting party's seat in it is lost. A pending join counts only while open at `nowMs`: a
+ * `joined` one's strand is covered by the strand check, a `failed` one is history, and an
+ * expired one can never be attempted. Formation invitations are not compared: the exporting
+ * node never runs again once dissolved, so one the adoption dropped was unredeemable from then.
+ */
+export function unheldBundleContent(bundle, holdings, nowMs) {
+    return {
+        strandIds: bundle.strands.map((entry) => entry.row.Id).filter((strandId) => !holdings.strandIds.has(strandId)),
+        pendingJoinIds: bundle.pendingJoins
+            .filter((join) => isOpenJoin(join, nowMs) && !holdings.pendingJoinIds.has(join.Id))
+            .map((join) => join.Id)
+    };
+}
+/** No outcome yet, and before `ExpiresAt`: the pending-join runner attempts nothing at or after it. */
+function isOpenJoin(join, nowMs) {
+    return join.outcome === null && nowMs < join.ExpiresAt;
+}
+/** Content only: `Type` and the read secret. `FounderOwnerKey` is provenance, and a moved strand's changes. */
+function sameStrandContent(live, desired) {
+    return live.Type === desired.Type && (live.MemberPrivateKey ?? null) === (desired.MemberPrivateKey ?? null);
+}
+/** The comparison `hasOutstandingFormationInvite` makes, so an invitation the responder would refuse is never copied. */
+function isExpired(expiresAtMs, now) {
+    return expiresAtMs !== null && expiresAtMs <= now;
+}
+function requireControlDatabase(node, action) {
+    const database = node.getControlDatabase();
+    if (database === null) {
+        throw new Error(`CadreNode must be started before it can ${action}`);
+    }
+    return database;
+}
+function signMessageWith(privateKeyB64) {
+    return (message) => sign(message, privateKeyB64, 'ed25519', 'bytes', 'base64url', 'base64url');
+}
+function errorText(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=strand-move.js.map

package/dist/strand-move.js.map

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

package/dist/strand-network-config.js

@@ -89,13 +89,14 @@ export function strandNodeAddrs(network) {
     const kept = relayAddrs.length > 0 ? direct.filter((addr) => !isCircuitListenAddr(addr)) : direct;
     // The search entries are appended AFTER the dedupe on purpose: they are identical
     // strings, and each one must survive as its own listener (see the module doc).
+    // A node given these entries is built with libp2p's relay discovery off whenever it
+    // has a transport list to wrap (`node-transports.ts`), so an empty slot starts no
+    // peer-store scan or random walk; only its supervisor fills it.
     //
-    // NOTE: every bare entry also makes libp2p start its own relay discovery whenever
-    // that listener's slot is empty (launch, and every loss). Measured on a node with
-    // no peer router: one peer-store scan plus a random walk that fails at once
-    // (`NoPeerRoutersError`) per loss event — no dial churn. If strand nodes ever get
-    // a peer router (a DHT), that walk turns into real dials on every relay loss;
-    // cap or disable `circuitRelayTransport`'s discovery then.
+    // NOTE: where discovery stays on (a Node host that passed no `defaultTransports`),
+    // each empty slot still runs one peer-store scan plus a random walk that fails at once
+    // (`NoPeerRoutersError`), measured on a node with no peer router. If strand nodes ever
+    // get a peer router (a DHT), that walk turns into real dials on every relay loss.
     const listenAddrs = [
         ...dedupe(kept.map(ephemeralPortListenAddr)),
         ...relayAddrs.map(() => RELAY_SEARCH_LISTEN_ADDR)

package/dist/strand-network-config.js.map

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

package/dist/strand-peer-redial.d.ts

@@ -0,0 +1,113 @@
+/**
+ * A running strand node redialing the strand's other members itself, when it holds a
+ * connection to none of them, with the dial budget the host's declared link gives a
+ * relayed connection.
+ *
+ * Why. Below cadre-core the only thing that redials a strand peer is FRET's maintenance:
+ * its pings and neighbour announcements open the connection themselves (`dial: true`) under
+ * a fixed 2 000 ms limit on the whole call (`MAINTENANCE_RPC_TIMEOUT_MS` in `p2p-fret`'s
+ * `fret-service.ts`). Opening a relayed connection takes longer than that on a slow link:
+ * about 9 s on a 20 ms per-frame cap with a 70%-busy event loop
+ * (`joiner-first-commit-over-slow-relay`, whose slow-restart arm reproduces this), where
+ * {@link relayedDialBudgetMs} allows 21.5 s at the default declaration. Each such redial is
+ * cut off part-way through the handshake, from both sides, for as long as the link stays that
+ * slow. And after a restart nothing else dials a strand peer: a cross-party strand's launch
+ * seed is empty, and cadre-core's address passes only fill the address book. Two phones that
+ * restarted then never reconnect, and a write either made alone never reaches the other.
+ *
+ * What it does. One loop per strand runtime, started in `StrandInstanceManager`'s runtime
+ * build and stopped with the runtime (stop, quiesce, failed build), so a hibernating strand
+ * never dials. Each look at the node:
+ * - a member connected: nothing to do; look again in {@link STRAND_REDIAL_CHECK_MS}, or as
+ *   soon as a peer disconnects.
+ * - no member connected and none known: likewise nothing (a founder alone, a storage replica
+ *   before anyone arrives).
+ * - no member connected and some known: dial every known member at once
+ *   ({@link dialPeerAddrs}, direct addresses before relayed ones), each address with the
+ *   relayed-dial budget. A round that connects to one goes back to watching; one that does
+ *   not waits a backoff starting at that budget and doubling to
+ *   {@link STRAND_REDIAL_MAX_BACKOFF_MS}.
+ *
+ * Who is known: every peer the node's FRET table holds a verified signed address record for
+ * (`strand-fret-addrs.ts`), plus the launch seed (sibling strand addresses and a formation's
+ * carried addresses). Who counts as connected: a peer FRET labels `'member'` (it has seen it
+ * speak this strand's protocols), or a seed peer. Neither ever includes a configured relay, a
+ * peer FRET labels `'foreign'`, or a peer the revocation gate refuses. The relay matters most:
+ * the strand node is connected to it throughout and FRET files it with a record like any
+ * peer, so counting it would leave this loop idle exactly when it is needed.
+ *
+ * NOTE: this compensates for FRET's 2 000 ms maintenance dial limit, which cannot open a
+ * relayed connection on a slow link (upstream half:
+ * `blocked/fret-maintenance-ping-dial-budget-below-a-relayed-dial`). If FRET's maintenance
+ * dial ever takes a limit derived from the declared link, this loop becomes a backstop and
+ * may be deleted, as `peer-join-backfill.ts` says of itself.
+ */
+import { type AddrDialer, type PeerDialBudget } from './peer-dial.js';
+import { type FretAddrHost } from './strand-fret-addrs.js';
+import { type TimeoutScheduler } from './timeout-scheduler.js';
+/**
+ * Gap between looks while a member is connected or none is known. While a member is
+ * connected a look reads FRET's labels and the connection list and checks no signature
+ * ({@link strandFretMembership}); a disconnect also triggers a look at once.
+ */
+export declare const STRAND_REDIAL_CHECK_MS = 5000;
+/**
+ * Ceiling on the wait between failed rounds. A member that is gone for good is dialed this
+ * often for as long as FRET keeps its record (up to 14 days after it was last confirmed).
+ */
+export declare const STRAND_REDIAL_MAX_BACKOFF_MS: number;
+/** The loop's dial budget and cadence. */
+export interface StrandRedialTimings {
+    /** Limit on one address's dial, and on one member's addresses together. */
+    budget: PeerDialBudget;
+    /** Wait after the first failed round; doubled after each further one. */
+    minBackoffMs: number;
+    /** Ceiling the backoff doubles up to. */
+    maxBackoffMs: number;
+    /** Gap between looks while nothing needs dialing. */
+    checkMs: number;
+}
+/**
+ * The timings at a declared link round trip: {@link relayedDialBudgetMs} per address, the
+ * same whole-budget count per member as the control cohort's dials (dead direct addresses
+ * a record lists ahead of the relayed one that works), and a first backoff of one per-address
+ * budget.
+ */
+export declare function strandRedialTimings(linkRoundTripMs?: number): StrandRedialTimings;
+/** The slice of a strand's libp2p node the loop uses. Structurally satisfied by db-p2p's node. */
+export interface RedialNode extends AddrDialer {
+    services?: FretAddrHost['services'];
+    getConnections(): ReadonlyArray<{
+        remotePeer: {
+            toString(): string;
+        };
+    }>;
+    addEventListener(type: 'peer:disconnect', listener: () => void): void;
+    removeEventListener(type: 'peer:disconnect', listener: () => void): void;
+}
+export interface StrandRedialDeps {
+    /** Names the strand in logs. */
+    label: string;
+    node: RedialNode;
+    /**
+     * The launch seed: multiaddr strings, each naming its peer in a trailing `/p2p/`.
+     *
+     * NOTE: read once, at runtime build. Addresses a re-formation carries while the strand runs
+     * reach the peerStore (`recordFormationStrandAddrs`) but not this loop until the runtime is
+     * rebuilt; if a re-formed strand is seen not reconnecting until relaunch, read the seed per round.
+     */
+    seed: readonly string[];
+    /** Peer ids never dialed nor counted as members: the relays the node reserves on. */
+    excluded: ReadonlySet<string>;
+    /** The revocation gate's current verdict, asked of peers and of this node itself; absent for an open strand. */
+    isRevoked?: (peerId: string) => boolean;
+    /** Omit for real (unref'd) timers. */
+    scheduler?: TimeoutScheduler;
+}
+/** A running redial loop; its only imperative is {@link stop}. */
+export interface StrandPeerRedial {
+    /** Idempotent. No look or round starts after it; dials in flight run out on their own deadlines, and their result is discarded. */
+    stop(): void;
+}
+/** Start the loop; its first look runs at once. */
+export declare function superviseStrandPeerRedial(deps: StrandRedialDeps, timings: StrandRedialTimings): StrandPeerRedial;