@ghostlytools/cli 1.3.7 → 1.3.9

package/dist/assets/{src-gJqfoRKI.js → src-Dg1bvMNv.js}

@@ -864,12 +864,16 @@ var firstWriter = (who) => !who.write || who.background ? null : who.group ? "gr
 * packets) and reads from it only when "Also use Pkarr relays" is on. Adding a
 * relay is one line here; see docs/RELAYS.md for how one is chosen.
 */
-var DEFAULT_RELAYS = ["https://pkarr.pubky.org", "https://pkarr.pubky.app"];
+var DEFAULT_RELAYS = [
+	"https://pkarr.pubky.org",
+	"https://pkarr.pubky.app",
+	"https://pkarr.miguelmedeiros.dev"
+];
 /**
 * Relay lists that were the defaults once: a profile that still has one gets today's defaults. When a relay
 * joins `DEFAULT_RELAYS`, the list as it was goes here, so profiles on the old defaults move with it.
 */
-var PREVIOUS_DEFAULT_RELAYS = [];
+var PREVIOUS_DEFAULT_RELAYS = [["https://pkarr.pubky.org", "https://pkarr.pubky.app"]];
 /** The defaults for `relays` when it is one of the old default lists, `relays` itself otherwise. */
 function currentRelays(relays) {
 	const same = (a, b) => a.length === b.length && a.every((relay, i) => relay === b[i]);
@@ -886,8 +890,8 @@ var WRITE_FIRST_MS = 5e3;
 var CHAT_RESERVE_MOST_SHARE = 5 / 6;
 /**
 * A 1:1 chat's signaling (a new offer or answer, and its reads for the answer to its offer, `signal`) may go over a
-* relay's minute by this fraction of it: 6 on a relay of 30, 12 on one of 60, 1 on relay.pkarr.org's 5 (it allows 10),
-* and never more than that in any minute; its reads leave the last of those to a write. Everything else still stops at
+* relay's minute by this fraction of it: 6 on a relay of 30, 12 on one of 60, 1 on a relay of 5 (relay.pkarr.org and
+* pkarr.miguelmedeiros.dev allow 10), and never more than that in any minute; its reads leave the last of those to a write. Everything else still stops at
 * the limit. The minute before a chat leaves DHT only can be spent by then (the pairing, the texts over the DHT), and
 * its offer or answer, the one thing the contact waits for, then waited 40 s for requests to age out while the
 * contact's attempt gave up: the matrix's extension chat stayed "On DHT · retrying live" 46 times in 120 (2026-09-30).
@@ -895,7 +899,7 @@ var CHAT_RESERVE_MOST_SHARE = 5 / 6;
 var SIGNALING_ALLOWANCE_SHARE = 1 / 5;
 /**
 * A group edge's requests for a member that may be back may go over a relay's minute by this fraction of it (4 on a
-* relay of 30, 8 on one of 60, none on relay.pkarr.org's 5): its reads of a member that went away and its packet
+* relay of 30, 8 on one of 60, none on a relay of 5): its reads of a member that went away and its packet
 * written meanwhile, which that member reads first when it is back (`watch`), its offer or answer, and its reads for
 * the answer to its offer (`signal`). Its reads leave the last of those to a write and go
 * one at a time (`GROUP_OVER_PACE_MS`), so the allowance lasts until the member is back, and the read that finds its
@@ -991,15 +995,17 @@ var READ_TURNS_KEPT = 512;
 var NETWORK_ERROR_COOLDOWN_MS = 2e4;
 /**
 * Relays whose limit per address is far from the others': this client's share of theirs, a minute, in place of
-* `REQUESTS_PER_MINUTE`. relay.pkarr.org (not a default, see docs/RELAYS.md) allows 10 (`x-ratelimit-limit`), which a
-* browser cannot read without CORS exposing it. pkarr.pubky.app allows 1000 (pkarr.pubky.org, on the same address,
+* `REQUESTS_PER_MINUTE`. relay.pkarr.org (not a default, see docs/RELAYS.md) and pkarr.miguelmedeiros.dev (a default
+* since 2026-10-17) allow 10 (`x-ratelimit-limit`), which a browser cannot read without CORS exposing it: half of it
+* leaves room for a second app behind the same address. pkarr.pubky.app allows 1000 (pkarr.pubky.org, on the same address,
 * 50): 60 of ours leaves room for many peers behind one address, and a page that pairs three contacts in a minute,
 * about ten requests a relay each, still has requests to spare there (2026-09-28). Writes go to every relay and
 * count once one took them; reads go to a relay with requests left.
 */
 var RELAY_REQUESTS_PER_MINUTE = {
 	"https://relay.pkarr.org": 5,
-	"https://pkarr.pubky.app": 60
+	"https://pkarr.pubky.app": 60,
+	"https://pkarr.miguelmedeiros.dev": 5
 };
 /**
 * The hedge delay for a key whose last read found nothing (404): a relay takes 3 to 5 s to say so (it asks the DHT
@@ -1556,11 +1562,20 @@ var RelayTransport = class {
 		}
 		throw new Error("No Pkarr relay reachable");
 	}
-	/** The order a key's read asks the relays in: in turn per key (see `resolve`), relays found slow lately last. */
+	/**
+	* The order a key's read asks the relays in: in turn per key (see `resolve`), relays found slow lately last. A relay
+	* with a small share of its own (`RELAY_REQUESTS_PER_MINUTE` under `REQUESTS_PER_MINUTE`: pkarr.miguelmedeiros.dev's 5)
+	* takes no turns: it comes after the others, for when they refuse, fail or are slow, unless every relay is one. In the
+	* turn, it was spent in seconds and the relay after it took its turns too: pkarr.pubky.org got two reads in three and
+	* pkarr.pubky.app, with twice its share, one. Its few requests are then left for writes, which go to every relay.
+	*/
 	readOrder(pubKeyZ32) {
+		const full = this.relays.filter((relay) => !((RELAY_REQUESTS_PER_MINUTE[relay] ?? Infinity) < 30));
+		const ring = full.length ? full : this.relays;
 		const last = this.lastReadFrom.get(pubKeyZ32), lastAt = last === void 0 ? -1 : this.relays.indexOf(last);
-		const start = lastAt >= 0 ? lastAt + 1 : this.cursor++;
-		const turn = this.relays.map((_, i) => this.relays[(start + i) % this.relays.length]);
+		const after = lastAt < 0 ? -1 : ring.findIndex((relay) => this.relays.indexOf(relay) > lastAt);
+		const start = lastAt < 0 ? this.cursor++ : after < 0 ? 0 : after;
+		const turn = [...ring.map((_, i) => ring[(start + i) % ring.length]), ...this.relays.filter((relay) => !ring.includes(relay))];
 		const now = Date.now(), slow = (relay) => (this.slowUntil.get(relay) ?? 0) > now;
 		return [...turn.filter((relay) => !slow(relay)), ...turn.filter(slow)];
 	}
@@ -1810,9 +1825,9 @@ var RelayTransport = class {
 		this.spentGroupOver.set(relay, groupOver);
 		if (isGroupSignal(who) && !who.write && recent.length >= limit && groupOver.length > 0) wait = Math.max(wait, groupOver[groupOver.length - 1] + GROUP_OVER_PACE_MS - now);
 		if (who.background && !starved) {
-			wait = Math.max(wait, over(recentBackground, this.backgroundPerMinute));
+			wait = Math.max(wait, over(recentBackground, Math.min(this.backgroundPerMinute, Math.ceil(limit * 2 / 3))));
 			const signaling = this.urgentAt + SIGNALING_WINDOW_MS - now;
-			if (signaling > 0 && !who.door) wait = Math.max(wait, Math.min(signaling, over(recentBackground, this.backgroundWhileSignaling)));
+			if (signaling > 0 && !who.door) wait = Math.max(wait, Math.min(signaling, over(recentBackground, Math.min(this.backgroundWhileSignaling, Math.ceil(limit / 6)))));
 		}
 		const burst = (this.spentGroupUrgent.get(relay) ?? []).filter((at) => now - at < GROUP_BURST_MS);
 		this.spentGroupUrgent.set(relay, burst);
@@ -6116,6 +6131,15 @@ var LinkSession = class {
 		this.departedUntil = Date.now() + DEPARTED_READ_MS;
 		this.expectPeer();
 	}
+	/**
+	* Nothing a read finds can be acted on for a while (a dial waiting out its backoff, whose end has a look of its own):
+	* the windows that look fast for the contact (`expectPeer`, `watchPeer`) end, and the link reads at its pace from the
+	* next read on. An offer of this side's out keeps its window.
+	*/
+	calm() {
+		if (this.rtcSignal !== null) return;
+		this.fastPollUntil = this.fastStepsAfter = this.expectUntil = this.watchUntil = 0;
+	}
 	/** The data link carries chat and services while it is up. */
 	setDataLinkOpen(open) {
 		this.connected = open;
@@ -6833,6 +6857,10 @@ var DataLink = class {
 			return null;
 		}
 	}
+	/** The peer connection this link holds now (null when idle): a later one is another attempt. */
+	get connection() {
+		return this.pc;
+	}
 	close() {
 		const stalled = Date.now() - this.connectingSince >= STALLED_EVIDENCE_MS;
 		const evidence = stalled ? this.directEvidence() : null;
@@ -16504,14 +16532,28 @@ function unpack(bytes, withLoad, max) {
 * the same set. Only when there is none (a group's first minute), the one that has been a hub longest. And when none said so lately, a hub asking (`me`)
 * that sees no other fresh hub in the beacon is the door alone, listed or not: its own entry may not have reached the
 * relays yet (a new group's first hub, whose write the relays' budget holds back), and there is nobody to agree with.
+*
+* A hub that says since when it is one (`mine.since`) counts itself among those of the first minute, listed or not, so
+* the first hub whose entry is held back still reads itself as the door beside a newer hub's entry. And one that became
+* a hub less than a minute ago, reading no other hub but knowing of one (`mine.known`: the member who let it in, whose
+* entry may be the one held back), is not the door alone: that hub still is.
 */
-function doorHubs(hubs, now = Date.now(), me) {
+function doorHubs(hubs, now = Date.now(), me, mine) {
 	const lately = hubs.filter((h) => now - h.ts < COMMUNITY_TOPOLOGY.beaconEveryMs * 1.5);
 	const settled = lately.filter((h) => now - (h.since ?? h.ts) >= 6e4);
 	const since = (h) => Math.floor((h.since ?? h.ts) / 1e3);
-	const first = [...lately].sort((a, b) => since(a) - since(b) || (a.key < b.key ? -1 : 1)).slice(0, 1);
+	const self = mine && me !== void 0 && !lately.some((h) => h.key === me) ? [{
+		key: me,
+		ts: now,
+		load: 0,
+		since: mine.since
+	}] : [];
+	const first = [...lately, ...self].sort((a, b) => since(a) - since(b) || (a.key < b.key ? -1 : 1)).slice(0, 1);
 	const door = (settled.length ? settled : first).map((h) => h.key);
-	if (door.length || me === void 0 || freshHubs(hubs, now).some((h) => h.key !== me)) return door;
+	if (me === void 0) return door;
+	const alone = !freshHubs(hubs, now).some((h) => h.key !== me);
+	if (alone && mine && now - mine.since < 6e4 && mine.known.some((key) => key !== me) && door.every((key) => key === me)) return [];
+	if (door.length || !alone) return door;
 	return [me];
 }
 var HEAD_BYTES = 52;
@@ -17463,6 +17505,13 @@ function parseEngineError(text) {
 /** Unanswered offers are repeated less and less often: 1.5, 3, 6, then every 12 minutes. */
 /** After a failed attempt: 20 s, then doubling up to 3 min. Someone opening the chat starts it over. */
 var AUTO_CONNECT_RETRY_MS = 2e4;
+/**
+* Back after a restart (`resume`), a first automatic dial that failed within this long reached nobody (a HyperDHT hole
+* punch aborted at once on loopback, 4-13 ms): it is tried again after `INSTANT_FAIL_RETRY_MS`, once, before it counts.
+* Counted, it held the chat 40 s while the app's other chats came back in 0.5-3 s (DHT-direct lab, 2026-10-17).
+*/
+var INSTANT_FAIL_MS = 100;
+var INSTANT_FAIL_RETRY_MS = 3e3;
 /** A group link with nothing to dial looks fast for the member's `_tr` on this many attempts, then at its own pace. */
 var PACKET_TRANSPORTS_FAST_ATTEMPTS = 3;
 /** A native transport that fails this many attempts in a row is skipped for `DEMOTE_MS`, while another remains (WISP 100). */
@@ -17478,6 +17527,8 @@ var RESUME_WAIT_MS = 1e4;
 * 7 ms on loopback and under 0.5 s over a relayed Iroh.
 */
 var CROSSED_PROBE_MS = 1500;
+/** Frames a connection waiting on `probeCrossed` keeps for the session that may take it: a handshake's few. */
+var PROBE_EARLY_FRAMES = 8;
 /** A WebRTC attempt under way, not yet open: what a member's packet saying it has no WebRTC ends (`peerPacketTransports`). */
 var WEBRTC_ATTEMPT = /* @__PURE__ */ new Set([
 	"offering",
@@ -17970,18 +18021,30 @@ var GhostLink = class {
 	resuming;
 	/** Until then, a dial waits for the native endpoint `resuming` names to start (it is knocked on as it does). */
 	resumeWaitUntil = 0;
+	/** The contact's other native transports were knocked on while this resume waited (`knockWhileResuming`). */
+	resumeKnocked = false;
 	/** What the last live session ran on, kept after it ended: a wake resumes on it (`resumeAfterAbsence`). */
 	lastLiveOn;
 	/** `resuming` is a wake's, not a restart's. */
 	resumingWoke = false;
 	/** Until then, a session that ends was lost while the app was away (`WAKE_LOST_MS`). */
 	wokeUntil = 0;
+	/** Back after a restart, the first automatic dial is still to go (`INSTANT_FAIL_MS`). */
+	resumeDial = false;
+	/** That dial failed at once: the next waits `INSTANT_FAIL_RETRY_MS`, not `dialWait`'s backoff. */
+	instantRetry = false;
 	constructor(options) {
 		this.options = options;
 		this.apps = new AppSessions(options.appsOpen);
 		if (options.pairing?.credentials.signer && (options.dht || options.params.deliveryMode === "dht")) throw new Error("A link that signs through a signer has no DHT delivery");
 		this.deliveryMode = options.params.deliveryMode ?? "stream";
-		this.tracker = options.pairingProgress && options.pairing && !options.pairing.credentials.peerKey && this.deliveryMode !== "dht" ? new PairingTracker(options.pairingProgress.role, options.pairingProgress.startedAt, (progress) => {
+		const dhtState = options.dht?.state;
+		const takenAtStart = !!options.pairing?.credentials.peerKey && !!dhtState?.inviteTaken && !dhtState.wasLive;
+		const firstPairing = options.pairingProgress ?? (takenAtStart ? {
+			role: "joiner",
+			startedAt: options.madeAt ?? Date.now()
+		} : void 0);
+		this.tracker = firstPairing && options.pairing && (!options.pairing.credentials.peerKey || takenAtStart) && this.deliveryMode !== "dht" ? new PairingTracker(firstPairing.role, firstPairing.startedAt, (progress) => {
 			traceLink(this.myPubKeyZ32, "progress", {
 				stage: progress.stage,
 				attempt: progress.attempt,
@@ -18086,6 +18149,7 @@ var GhostLink = class {
 		this.fallback = options.native?.fallback ?? true;
 		this.automatic = options.native?.automatic ?? !options.native?.preferred;
 		this.resuming = options.pairing?.credentials.peerKey && options.params.profile ? options.resume : void 0;
+		this.resumeDial = !!this.resuming && !options.packetTransports;
 		const events = options.events ?? {};
 		this.session = new LinkSession({
 			params: options.params,
@@ -18217,7 +18281,7 @@ var GhostLink = class {
 				if (this.rtcStartedUnpinned) this.openedUnpinned.add(channel);
 				const plan = this.switcher.pending;
 				if (plan?.choices.includes("webrtc/1") && this.paired?.state.status === "ready") this.attachCandidate(channel, void 0, plan).catch(() => {});
-				else if (this.activeBinding) channel.close();
+				else if (this.activeBinding) this.rtcOverHeld(channel);
 				else this.attach(channel);
 			},
 			onClose: () => {
@@ -18344,6 +18408,10 @@ var GhostLink = class {
 			upgrade: () => !!this.options.upgradeSupport && this.sessionCapabilities.agreed("upgrade/1")
 		});
 		if (options.native?.automatic === false) this.switcher.choseApart();
+		if (takenAtStart) {
+			this.tracker?.pinnedOverDht();
+			this.tracker?.failed("taken", false, INVITE_TAKEN);
+		}
 	}
 	get myPubKeyZ32() {
 		return this.session.identity.pubKeyZ32;
@@ -19706,6 +19774,22 @@ var GhostLink = class {
 		this.knockedEarly = epoch;
 		this.knockEarly(epoch, direct);
 	}
+	/**
+	* Back after a restart on a native transport whose endpoint has not started yet (Iroh waits up to 10 s for its relay,
+	* and does not start at all with the relay out of reach): the contact's other direct transports that are up here are
+	* knocked on meanwhile, once per resume, as a resume over WebRTC knocks as its offer goes out. The contact still holds
+	* its old session and reads slowly; before, the chat waited out `RESUME_WAIT_MS` and then the race's 8 s (20.5-22.9 s
+	* between two CLIs, bh-zero43). The first live wins, and the resumed transport is still knocked once it starts.
+	*/
+	knockWhileResuming() {
+		if (this.resumeKnocked || !this.fallback || !this.peerFallback || this.dialing || this.channel) return;
+		const relayed = this.upgradesFromRelay() ? [] : this.relayedTransports;
+		const offer = this.transportOffer();
+		const direct = TRANSPORTS.filter((t) => t !== "webrtc/1" && t !== this.resuming && this.endpoints.has(t) && offer.includes(t) && !!this.peerTransports?.includes(t) && !relayed.includes(t) && this.canDial(t));
+		if (!direct.length) return;
+		this.resumeKnocked = true;
+		this.knockEarly(this.connectionEpoch, direct, () => true);
+	}
 	async knockEarly(epoch, transports, standing = () => this.offerOut) {
 		this.knockingEarly = true;
 		try {
@@ -20077,12 +20161,16 @@ var GhostLink = class {
 	*/
 	maybeAutoConnect(presence) {
 		if (this.stopped || this.leaving || this.yielding || this.streamBlocked || this.keyStopped || !this.options.autoConnect || !presence.online || this.channel || this.dialing || this.dataLink.state !== "idle") return;
-		if (this.resuming && this.resuming !== "webrtc/1" && !this.endpoints.has(this.resuming) && Date.now() < this.resumeWaitUntil) return;
+		if (this.resuming && this.resuming !== "webrtc/1" && !this.endpoints.has(this.resuming) && Date.now() < this.resumeWaitUntil) {
+			this.knockWhileResuming();
+			return;
+		}
 		if (this.departed) {
 			if (presence.lastPacketAt === this.departed.packet && Date.now() < this.departed.until) return;
 			this.departed = null;
 		}
-		if ((!!this.tracker && !this.tracker.done && this.tracker.progress.stage !== "on-dht" ? this.options.pairingProgress?.role : void 0) === "inviter") {
+		const pairing = !!this.tracker && !this.tracker.done && this.tracker.progress.stage !== "on-dht";
+		if ((pairing ? this.options.pairingProgress?.role : void 0) === "inviter") {
 			this.peerSeenAt ||= Date.now();
 			if (Date.now() - this.peerSeenAt < 2500 && !this.nothingToAwait()) {
 				this.session.expectPeer();
@@ -20101,6 +20189,7 @@ var GhostLink = class {
 				failures: this.autoConnectFailures,
 				left: wait - (Date.now() - this.lastAutoConnectAt)
 			});
+			if (!pairing && !this.options.packetTransports && this.myPubKeyZ32 < this.options.params.peerPubKeyZ32 && Date.now() >= this.lostUntil) this.session.calm();
 			this.lookAtRetry();
 			return;
 		}
@@ -20114,11 +20203,18 @@ var GhostLink = class {
 	* 12 s: the pairing turned `on-dht` and the next dial waited 160 s, though nothing had been tried.
 	*/
 	autoDial() {
-		const tries = this.anythingToDial();
-		this.lastAutoConnectAt = Date.now();
+		const tries = this.anythingToDial(), started = Date.now();
+		const resumeDial = tries && this.resumeDial;
+		if (tries) this.resumeDial = false;
+		this.instantRetry = false;
+		this.lastAutoConnectAt = started;
 		if (tries) this.autoConnectFailures++;
 		this.dial().catch((error) => {
-			if (tries) this.tracker?.failed("transport", true);
+			if (resumeDial && Date.now() - started < INSTANT_FAIL_MS && this.lastAutoConnectAt === started && this.autoConnectFailures > 0) {
+				this.autoConnectFailures--;
+				this.instantRetry = true;
+				traceLink(this.myPubKeyZ32, "dial-instant-fail", { ms: Date.now() - started });
+			} else if (tries) this.tracker?.failed("transport", true);
 			this.dialFailed(error instanceof Error ? error.message : String(error));
 			this.lookAtRetry();
 		});
@@ -20191,6 +20287,7 @@ var GhostLink = class {
 	}
 	/** How long after the last automatic dial the next one may go. A first pairing tries again sooner: the contact just read the invite and is waiting. */
 	dialWait() {
+		if (this.instantRetry) return INSTANT_FAIL_RETRY_MS;
 		return !!this.tracker && !this.tracker.done && this.tracker.progress.stage !== "on-dht" ? Math.min(PAIRING_RETRY_MS * 2 ** this.autoConnectFailures, PAIRING_MAX_RETRY_MS) : Math.min(AUTO_CONNECT_RETRY_MS * 2 ** this.autoConnectFailures, AUTO_CONNECT_MAX_RETRY_MS);
 	}
 	/** The name this side shows, told to a paired peer directly. */
@@ -21068,9 +21165,25 @@ var GhostLink = class {
 		}
 		this.replaceWith(channel, binding);
 	}
+	/**
+	* The contact's WebRTC opened while this side holds a native session, with no switch under way. A contact offers only
+	* with no session of its own: its app is back after a crash, with no way to the held transport (its Iroh relay out of
+	* reach, its listener not up yet), and the held session is dead without this side having heard. Closed at once, the
+	* contact counted a failed dial and waited its backoff: live again 52.8 s after its start (two CLIs over a chosen Iroh
+	* whose relay stopped, bug hunt 2026-10-17). The held session is pinged as for a crossing (`probeCrossed`): heard from,
+	* the WebRTC closes, as before; silent, it takes over. Before the pin, or while the held one authenticates, it closes.
+	*/
+	rtcOverHeld(channel) {
+		const held = this.channel;
+		if (!held || this.candidate || !this.options.pairing?.credentials.peerKey || !this.options.params.profile || this.paired?.state.status !== "ready") {
+			channel.close();
+			return;
+		}
+		this.probeCrossed(held, channel);
+	}
 	replaceWith(channel, binding) {
 		traceLink(this.myPubKeyZ32, "replacing", {
-			transport: binding.transport,
+			transport: binding?.transport ?? "webrtc/1",
 			held: this.paired?.state.transport
 		});
 		this.attach(channel, binding, {
@@ -21090,7 +21203,7 @@ var GhostLink = class {
 	probeCrossed(held, channel, binding) {
 		this.dropCrossedProbe();
 		traceLink(this.myPubKeyZ32, "dial-crossed", {
-			transport: binding.transport,
+			transport: binding?.transport ?? "webrtc/1",
 			held: true,
 			probe: true
 		});
@@ -21098,6 +21211,16 @@ var GhostLink = class {
 		try {
 			this.sendPing(held, false);
 		} catch {}
+		const early = [];
+		channel.onMessage = (data) => {
+			if (early.length < PROBE_EARLY_FRAMES) early.push(data);
+		};
+		const take = (attach) => {
+			channel.onMessage = null;
+			attach();
+			const read = channel.onMessage;
+			for (const data of early) read?.(data);
+		};
 		const timer = setTimeout(() => {
 			if (this.crossedProbe?.channel !== channel) return;
 			this.crossedProbe = null;
@@ -21106,15 +21229,15 @@ var GhostLink = class {
 				return;
 			}
 			if (!this.channel) {
-				this.attach(channel, binding);
+				take(() => this.attach(channel, binding));
 				return;
 			}
 			if (this.channel === held && this.framesHeard !== heard) {
 				channel.close();
 				return;
 			}
-			traceLink(this.myPubKeyZ32, "crossed-held-silent", { transport: binding.transport });
-			this.replaceWith(channel, binding);
+			traceLink(this.myPubKeyZ32, "crossed-held-silent", { transport: binding?.transport ?? "webrtc/1" });
+			take(() => this.replaceWith(channel, binding));
 		}, CROSSED_PROBE_MS);
 		channel.onClose = () => {
 			if (this.crossedProbe?.channel === channel) {
@@ -21251,8 +21374,9 @@ var GhostLink = class {
 						this.activeBinding = binding;
 						this.channelSince = Date.now();
 						oldPaired?.stop();
+						const oldRtc = oldBinding ? null : this.dataLink.connection;
 						if (oldChannel) this.retire(oldChannel, () => {
-							if (!oldBinding && this.activeBinding) this.dataLink.close();
+							if (oldRtc && this.activeBinding && this.dataLink.connection === oldRtc) this.dataLink.close();
 						}, !oldBinding);
 						this.session.setDataLinkOpen(true);
 						if (migration.plan) switched = {
@@ -21906,6 +22030,7 @@ var GhostLink = class {
 		traceLink(this.myPubKeyZ32, "wake-resume", { transport });
 		if (transport !== "webrtc/1") {
 			this.resumeWaitUntil = Date.now() + RESUME_WAIT_MS;
+			this.resumeKnocked = false;
 			return;
 		}
 		if (this.dataLink.state === "answering" && this.answeringEpoch === this.connectionEpoch) {
@@ -31257,4 +31382,4 @@ function appStoreDecision(held, read) {
 //#endregion
 export { COMMUNITY_EDIT_FRAME as $, buttonLabelClash as $a, currentRelays as $c, revokesIdentity as $i, GROUP_FILE_LIMITS as $n, extractParamsFromSdp as $o, WAKE_CALL_INTERVAL_MS as $r, ENROLL_DONE as $s, didDhtFromPublicKey as $t, CommunitySession as A, forwardedAgain as Aa, devicePingFrame as Ac, isPublicAddress as Ai, pubkyProofFile as An, rosterAdmin as Ao, newerHead as Ar, handoffOfferFrame as As, verifyAtprotoRecordProof as At, knockRecords as B, readReaction as Ba, TURN_MAX as Bc, capsDescriptors as Bi, findEndpoint as Bn, GhostlyHttpError as Bo, transferStalled as Br, readHandoffHave as Bs, didWebDocumentUrl as Bt, sha256Paced as C, parseImageMeta as Ca, DEVICES_CAPABILITY as Cc, readManifest as Ci, randomBytes as Cl, isBitcoinAddress as Cn, canonicalJsonBytes as Co, beaconRecords as Cr, handoffContext as Cs, atprotoProofRkey as Ct, openGroupTyping as D, RateWindow as Da, deviceEchoNonce as Dc, domainTxtRecord as Di, utf8Encode as Dl, newPubkyProofFolder as Dn, MEMBER_KEY as Do, lobbyRecords as Dr, handoffEphemeral as Ds, parseAtprotoDidDocument as Dt, groupTypingEpoch as E, EDIT_RATE_WINDOW_MS as Ea, deviceEchoFrame as Ec, dnsProofName as Ei, utf8Decode as El, isPubkyProofFolder as En, MAX_GROUP_CHAIN as Eo, lobbyKeys as Er, handoffDigest as Es, normalizeAtprotoHandle as Et, KNOCK_TTL_MS as F, ReactionWindow as Fa, TURN_RAISE_READ_TIMEOUT_MS as Fc, recordsName as Fi, resolveLightningDestination as Fn, AWAITING_PEER_MS as Fo, readLobby as Fr, handoffVersions as Fs, checkDidJws as Ft, groupWakeFrame as G, replySnippet as Ga, signTurnRelease as Gc, IdentityCheckUnavailable as Gi, INVITE_TAKEN as Gn, decodeControl as Go, typingActivity as Gr, sealHandoffPiece as Gs, normalizeDid as Gt, readKnocks as H, wireReaction as Ha, nextTurnPosition as Hc, IDENTITY_MAX_EVIDENCE as Hi, parseCashuRequestPayload as Hn, parseLocalTarget as Ho, TYPING_REFRESH_MS as Hr, readHandoffPake as Hs, didWebFileNames as Ht, decodeGroupEntryLink as I, nextReactionNumber as Ia, TURN_SETTLE_MS as Ic, txtValue as Ii, decodeBolt11 as In, DHT_POLL_INTERVALS as Io, shouldBeHub as Ir, newHandoffId as Is, checkDidSignature as It, GROUP_LIMITS as J, PR_CHECKS as Ja, turnName as Jc, emptyIdentityLedger as Ji, pairedMessageFits as Jn, RTC_CONFIG as Jo, mayPin as Jr, readSetUpdate as Js, parseDidSignaturePaste as Jt, groupWakes as K, BUTTON_ID as Ka, turnInstance as Kc, IdentityExchange as Ki, LIVENESS_PING_MS as Kn, encodeControl as Ko, GROUP_PIN_FRAME as Kr, SET_ACK as Ks, parseDid as Kt, encodeGroupEntryLink as L, queueReaction as La, classifyTurnRead as Lc, wellKnownUrl as Li, ENDPOINT as Ln, EXPECT_PEER_MS as Lo, ChatFiles as Lr, readHandoffAck as Ls, didGhostlyServiceEntry as Lt, communityHasFrame as M, COMMUNITY_REACTION_FRAME as Ma, seedSigner as Mc, normalizeDomain as Mi, homeserverWebEndpoint as Mn, verifyCommitSignature as Mo, rankHubs as Mr, handoffReleaseFrame as Ms, DID_FILE_MAX_BYTES as Mt, decodeCommunityLink as N, GROUP_REACTION_FRAME as Na, webCryptoSigner as Nc, recordsFromTxt as Ni, pubkyHomeserverOf as Nn, edgeParams as No, readBeacon as Nr, handoffRetryAfter as Ns, DID_JWS_MAX_LENGTH as Nt, sealGroupTyping as O, dhtEditId as Oa, deviceKeyZ32 as Oc, domainWellKnownFile as Oi, normalizePubkyKey as On, commitHash as Oo, mergeBeacon as Or, handoffHelloFrame as Os, shortAtprotoDid as Ot, encodeCommunityLink as P, REACTION_LIMITS as Pa, TURN_PUT_WINDOW_MS as Pc, recordsFromWellKnown as Pi, requestLnurlInvoice as Pn, DirectPathWatch as Po, readBeaconHead as Pr, handoffStreamKey as Ps, DidError as Pt, frameBytes as Q, appCardId as Qa, RelayTransport as Qc, receivedIdentityStatus as Qi, parseEngineError as Qn, callSignalHeardAt as Qo, readPin as Qr, verifySetUpdate as Qs, didDhtDocument as Qt, entryParams as R, reactionEmoji as Ra, turnPutSummary as Rc, CapsExchange as Ri, cashuRequestPayload as Rn, RELAY_POLL_INTERVALS as Ro, FILE_LIMITS as Rr, readHandoffCancel as Rs, didJwsAlg as Rt, readAppBundleAsync as S, parseVideoMeta as Sa, ownInviteRefusal as Sc, newMailbox as Si, isZ32Key as Sl, sparkInvoiceDetails as Sn, canonicalJson as So, beaconKeys as Sr, handoffCancelFrame as Ss, atprotoProofRecord as St, GroupTypingBoard as T, EDIT_BUFFER_MS as Ta, HANDOFF_CAPABILITY as Tc, decodeDnsResponse as Ti, toZ32 as Tl, isPubkyKey as Tn, GROUP_MEMBER_CAP as To, freshHubs as Tr, handoffDataFrame as Ts, isAtprotoDid as Tt, GROUP_WAKE_FRAME as U, pairedReplyAuthor as Ua, readTurnPacket as Uc, IDENTITY_MAX_VALIDITY as Ui, parseFedimintRequestPayload as Un, webLocalFetch as Uo, TypingSender as Ur, readHandoffTurnFrame as Us, didWebFileUrl as Ut, mergeKnocks as V, validReactionNumber as Va, firstDeviceSetSecret as Vc, dialDescriptors as Vi, isFederationId as Vn, formatLocalTarget as Vo, TYPING_KINDS as Vr, readHandoffHello as Vs, didWebFile as Vt, GroupWakeLimiter as W, readReply as Wa, signTurnPacket as Wc, IDENTITY_REVOCATION_LABEL as Wi, GhostLink as Wn, LIMITS as Wo, sanitizeTypingStatus as Wr, readHandoffVerified as Ws, didWebHost as Wt, GROUP_READ_NOTE as X, RUN_RESULTS as Xa, turnVerifierMark as Xc, identityStatement as Xi, engineError as Xn, buildSdpFromSignal as Xo, pinIsNewer as Xr, setUpdateFrame as Xs, staticDidDocument as Xt, GROUP_REACTED_FRAME as Y, PR_STATES as Ya, turnStatedVerifier as Yc, identityRevocationValue as Yi, pairedMessageFrame as Yn, answersOffer as Yo, nextPinNumber as Yr, setAckFrame as Ys, signingKeys as Yt, GroupSession as Z, STATUS_CARD_LIMITS as Za, DEFAULT_RELAYS as Zc, newIdentityBinding as Zi, engineText as Zn, callRtcConfig as Zo, pinNumberHolds as Zr, signTombstone as Zs, strictBase64Url as Zt, assembleAppBundle as _, VOICE_LIMITS as _a, createChatInvite as _c, HOLD_DATED_BACK_MS as _i, MAX_AVATAR_LENGTH as _l, validatePaymentTarget as _n, isAppRef as _o, MESH_HUBS as _r, filePartName as _s, ATPROTO_DECLARED_SCOPE as _t, planAppUpdate as a, automaticTransport as aa, enrollDigits as ac, wakeRequest as ai, withRequestOptions as al, EVM_TEST_CHAINS as an, arrivalKey as ao, isGroupMessageId as ar, serviceIdFromName as as, groupName as at, pacer as b, parseVoiceMeta as ba, inviteLink as bc, HoldRefusedError as bi, bytesEqual as bl, SPARK_PROVIDER as bn, signAppObject as bo, pickMeshHubs as br, handoffAttemptSucceeded as bs, ATPROTO_PROOF_SCOPE as bt, readAppStore as c, DHT_FILE_TOO_LARGE as ca, enrollHelloFrame as cc, APP_DATA_MAX_BYTES as ci, createRelayPayload as cl, SEPOLIA_TEST_USDT as cn, receivedTimestamp as co, readGroupWant as cr, HANDOFF_DONE as cs, SshSigError as ct, APP_BUNDLE_LIMITS as d, DHT_FILE_CAPABILITY as da, readEnrollHello as dc, APPS_CAPABILITY as di, parseRelayPayload as dl, USDT_PUBLIC_RPC as dn, APP_STATEMENT_LIMITS as do, GROUP_SIGNAL_FRAME as dr, HANDOFF_OFFER as ds, sameSshKey as dt, lastSharedWithMe as ea, ENROLL_GRANT as ec, WakeLimiter as ei, normalizeRelayUrl as el, encodeDidDhtDeactivated as en, cardLine as eo, GROUP_HAVE_FRAME as er, parseCallSignal as es, GROUP_EDIT_FRAME as et, APP_BUNDLE_MAGIC as f, dhtFileId as fa, verifyEnrollProof as fc, BUTTONS_CAPABILITY as fi, createIdentity as fl, WALLET_NETWORKS as fn, appFingerprint as fo, SIGNAL_FRESH_MS as fr, HANDOFF_PAKE as fs, sshSignCommand as ft, appViewOf as g, PLAYABLE_AUDIO as ga, OwnInviteError as gc, HOLD_CAPABILITY as gi, verify as gl, formatPaymentAmount as gn, isAppKey as go, readGroupSignal as gr, HANDOFF_VERIFIED as gs, decodeAnyBitcoinAddress as gt, appDigest as h, sanitizeMime as ha, readDeviceInvite as hc, UPGRADE_CAPABILITY as hi, publicKeyFromZ32 as hl, assertWholeSats as hn, isAppHash as ho, groupSignalFrame as hr, HANDOFF_TIMINGS as hs, BitcoinAddressError as ht, checkAppBeforeRun as i, TRANSPORTS as ia, enrollCancelReason as ic, relayRequest as ii, isDiscoveryBudgetError as il, ETHEREUM_USDT as in, statusCardText as io, groupFileFallback as ir, LEGACY_SERVICES as is, mentionsMember as it, GROUP_READ_NOTE_COMMUNITY as j, readForwarded as ja, newDeviceSetSecret as jc, nip05RootKey as ji, pubkyProofPath as jn, rosterHas as jo, pickHubs as jr, handoffPakeFrame as js, DID_DOCUMENT_MAX_BYTES as jt, COMMUNITY_LIMITS as k, parseLinkPreview as ka, deviceLinkPairing as kc, encodeDnsQuery as ki, pubkyProofCapability as kn, parseGroupCommit as ko, mergeLobby as kr, handoffManifestFrames as ks, AtprotoProofError as kt, readAppStoreSteps as l, DHT_MESSAGE_TTL as la, enrollProofFrame as lc, chatAppId as li, newerPacket as ll, SEPOLIA_TEST_USDT_FAUCET as ln, shownTime as lo, readGroupWantNo as lr, HANDOFF_HAVE as ls, parseSshPublicKey as lt, APP_PERMISSIONS as m, sanitizeFileName as ma, deviceInviteJoinerParams as mc, STATUS_CARD_CAPABILITY as mi, identityFromSeedB64 as ml, assertTokenUnits as mn, checkAppRevokeStatement as mo, SIGNAL_REPLY_MS as mr, HANDOFF_REQUEST as ms, verifyBitcoinMessage as mt, appStoreDecision as n, emptyProofLedger as na, ENROLL_PROOF as nc, newWakeToken as ni, traceLink as nl, resolveDidDht as nn, checkStatusCard as no, GROUP_WANT_NO_FRAME as nr, emptyLinkRecords as ns, carryMentions as nt, APP_STORE_LIMITS as o, irohDescriptor as oa, enrollDoneFrame as oc, checkPushEndpoint as oi, PacketTooLargeError as ol, ONCHAIN_PROVIDER as on, claimedTime as oo, readGroupFileMeta as or, HANDOFF_ACK as os, SSHSIG_MAX_ARMOR as ot, APP_ICON_PATH as p, formatFileSize as pa, createDeviceInvite as pc, EDIT_CAPABILITY as pi, identityFromSeed as pl, arkAddressPrefix as pn, appRef as po, SIGNAL_HOLD_MS as pr, HANDOFF_PIECE_BYTES as ps, verifySshSignature as pt, parseGroupWakeFrame as q, ITEM_STATES as qa, turnKeys as qc, boundVerifiedIdentity as qi, PAIRED_FRAME_TOO_LARGE as qn, CALL_SIGNAL_MAX_AGE_MS as qo, PIN_LIMITS as qr, SET_UPDATE as qs, parseDidDocument as qt, appUpdateDecision as r, validExternalKey as ra, enrollCancelFrame as rc, parseWakeFrame as ri, budgetRetryMs as rl, signDidDhtPacket as rn, sameButtonText as ro, fetchesByItself as rr, HTTP_SERVICE_PROTO as rs, parseCommunityEdit as rt, checkAppStoreIndex as s, irohRelayUrl as sa, enrollGrantFrame as sc, vapidKeysMatch as si, RELAY_PAYLOAD_MAX_BYTES as sl, PaymentPreflightError as sn, heardTime as so, readGroupHave as sr, HANDOFF_CANCEL as ss, SSHSIG_NAMESPACE as st, appRevocationFor as t, PeerProofs as ta, ENROLL_HELLO as tc, deviceWakeRequest as ti, setLinkTraceSink as tl, encodeDidDhtPacket as tn, cardUrl as to, GROUP_WANT_FRAME as tr, signalHasVideo as ts, GROUP_EDIT_TEXT_BYTES as tt, signAppStore as u, peekDhtMailbox as ua, readEnrollGrant as uc, isAppVersion as ui, openRelayPayload as ul, TEST_USDT_FAUCET_AMOUNT as un, APP_PREFIXES as uo, CarriedTransport as ur, HANDOFF_HELLO as us, parseSshSignature as ut, checkAppManifest as v, baseMime as va, decodeInviteCode as vc, HOLD_LIMITS as vi, sanitizeAvatar as vl, walletNetworkOf as vn, readAppRevocation as vo, mayBeHub as vr, handoffAttemptAllowed as vs, ATPROTO_FULL_SCOPE as vt, GROUP_TYPING_FRAME as w, readImageMeta as wa, ENROLL_CAPABILITY as wc, DOMAIN_FILE_MAX_BYTES as wi, toBase64Url as wl, PUBKY_PROOF_MAX_BYTES as wn, readCanonicalJson as wo, doorHubs as wr, handoffContextProof as ws, checkAtprotoProofRecord as wt, readAppBundle as x, voicePeaksOf as xa, inviteOwnership as xc, isHoldUrl as xi, fromBase64Url as xl, sparkAddressKind as xn, signAppRevocation as xo, COMMUNITY_TOPOLOGY as xr, handoffBusyFrame as xs, atprotoDidMethod as xt, isAppUrl as y, fileMessageText as ya, encodeInviteCode as yc, HoldKeys as yi, sanitizeDisplayText as yl, SPARK_NETWORKS as yn, readAppRevocations as yo, meshHubs as yr, handoffAttemptFailed as ys, ATPROTO_PROOF_COLLECTION as yt, knockIdentity as z, reactionIsNewer as za, TURN_LAST_SEQUENCE as zc, DHT_TEXT_CAPABILITY as zi, fedimintRequestPayload as zn, presenceSeenAt as zo, transferEnded as zr, readHandoffDone as zs, didSignedMessages as zt };
 
-//# sourceMappingURL=src-gJqfoRKI.js.map
+//# sourceMappingURL=src-Dg1bvMNv.js.map