@qntx/nostr 0.11.0 → 0.13.0

package/dist/{relay-DXtwUEdX.mjs → relay-DIR77xQ2.mjs}

@@ -1,12 +1,12 @@
-import { d as normalizeURL, f as nowSeconds, v as MessageError, x as WasmPoisonedError, y as NostrError } from "./util-DDpPkiED.mjs";
-import { n as verifyEvent } from "./verifier-CjH1vnP2.mjs";
-import { n as canonicalizeFilters, o as matchFilters, r as filterFingerprint, t as canonicalizeFilter } from "./filter-B16P33dz.mjs";
-import { n as createSubscriptionId, r as encodeClientMessage, s as parseRelayMessage, t as assertSubscriptionId } from "./message-pYfVKxPn.mjs";
-import { t as NoSignerError } from "./error-UHkqzWL7.mjs";
+import { b as MessageError, f as normalizeURL, p as nowSeconds, w as toError, x as NostrError } from "./util-DfsyJ9nz.mjs";
+import { n as verifyEvent } from "./verifier-DEHUy4AD.mjs";
+import { n as canonicalizeFilters, r as filterFingerprint, s as matchFilters, t as canonicalizeFilter } from "./filter-3jOh4uLN.mjs";
+import { n as createSubscriptionId, r as encodeClientMessage, s as parseRelayMessage, t as assertSubscriptionId } from "./message-BMfreCQc.mjs";
+import { t as NoSignerError } from "./error-Dyb89ahb.mjs";
 import { i as throwIfAborted, n as onAbort, r as raceSignal, t as abortReason } from "./abort-DBq2STPj.mjs";
-import { t as invokeSafely } from "./report-CHld4uWj.mjs";
+import { t as invokeSafely } from "./report-D2BM5dgn.mjs";
 import { isAuthRequired, makeAuthEvent } from "./nips/nip42.mjs";
-import { t as Emitter } from "./emitter-DkCY6NkU.mjs";
+import { t as Emitter } from "./emitter-u4kJqQDk.mjs";
 import { Nip77Error, runNegSession } from "./nips/nip77.mjs";
 //#region src/relay/error.ts
 /** Base class for relay errors; carries the relay URL when known. */
@@ -49,20 +49,6 @@ var RelaySuspendedError = class extends RelayError {
 	}
 };
 //#endregion
-//#region src/relay/websocket.ts
-let impl;
-try {
-	if (globalThis.WebSocket !== void 0) impl = globalThis.WebSocket;
-} catch {}
-/** Inject a WebSocket implementation (required on Node unless undici/global is present). */
-function useWebSocketImplementation(websocketImplementation) {
-	impl = websocketImplementation;
-}
-function getWebSocketImplementation() {
-	if (!impl) throw new RelayConnectionError("No WebSocket implementation available; call useWebSocketImplementation() or run in a browser");
-	return impl;
-}
-//#endregion
 //#region src/relay/auth.ts
 var RelayAuth = class {
 	#challenge;
@@ -266,7 +252,7 @@ var CountTracker = class {
 	}
 	#finish(waiter) {
 		this.clearTimer(waiter);
-		this.#entries.delete(waiter.id);
+		if (this.#entries.get(waiter.id) === waiter) this.#entries.delete(waiter.id);
 	}
 };
 //#endregion
@@ -298,11 +284,11 @@ var Subscription = class {
 		this.filters = filters;
 		this.closeOnEose = opts.closeOnEose === true;
 		this.#handlers = {
-			onevent: opts.onevent,
-			oneose: opts.oneose,
-			onclose: opts.onclose,
+			onEvent: opts.onEvent,
+			onEose: opts.onEose,
+			onClose: opts.onClose,
 			alreadyHaveEvent: opts.alreadyHaveEvent,
-			receivedEvent: opts.receivedEvent
+			onEventSeen: opts.onEventSeen
 		};
 		if (opts.eoseTimeoutMs !== void 0) this.#eoseTimer = setTimeout(() => {
 			this.#eoseTimer = void 0;
@@ -327,21 +313,21 @@ var Subscription = class {
 	}
 	/**
 	* Local close: idempotent; clears the EOSE timer and abort listener, detaches via `onLocalClose`
-	* (sends CLOSE / leaves the live group), then fires `onclose`.
+	* (sends CLOSE / leaves the live group), then fires `onClose`.
 	*/
 	close(reason = "closed by client") {
 		if (this.#closed) return;
 		this.#closed = true;
 		this.#teardown();
 		this.#onLocalClose(this);
-		invokeSafely(() => this.#handlers.onclose?.(reason));
+		invokeSafely(() => this.#handlers.onClose?.(reason));
 	}
 	/** Remote/transport termination: like {@link close} but `onLocalClose` is not called. */
 	end(reason) {
 		if (this.#closed) return;
 		this.#closed = true;
 		this.#teardown();
-		invokeSafely(() => this.#handlers.onclose?.(reason));
+		invokeSafely(() => this.#handlers.onClose?.(reason));
 	}
 	#teardown() {
 		if (this.#eoseTimer !== void 0) {
@@ -351,7 +337,7 @@ var Subscription = class {
 		this.#abortDispose?.();
 		this.#abortDispose = void 0;
 	}
-	/** Mark EOSE: fires `oneose`, then closes when `closeOnEose`. No-op when closed or EOSE'd. */
+	/** Mark EOSE: fires `onEose`, then closes when `closeOnEose`. No-op when closed or EOSE'd. */
 	markEose() {
 		if (this.#closed || this.#eosed) return;
 		this.#eosed = true;
@@ -359,7 +345,7 @@ var Subscription = class {
 			clearTimeout(this.#eoseTimer);
 			this.#eoseTimer = void 0;
 		}
-		invokeSafely(() => this.#handlers.oneose?.());
+		invokeSafely(() => this.#handlers.onEose?.());
 		if (this.closeOnEose) this.close("eose");
 	}
 	/** Clear `eosed` for a replayed REQ (AUTH retry / reconnect). */
@@ -375,9 +361,9 @@ var Subscription = class {
 	resetAuthRetry() {
 		this.#authRetried = false;
 	}
-	/** `receivedEvent` for every EVENT id, before watermark/alreadyHaveEvent/verify. */
+	/** `onEventSeen` for every EVENT id, before watermark/alreadyHaveEvent/verify. */
 	notifyReceived(id) {
-		invokeSafely(() => this.#handlers.receivedEvent?.(id));
+		invokeSafely(() => this.#handlers.onEventSeen?.(id));
 	}
 	alreadyHas(id) {
 		let have = false;
@@ -389,10 +375,10 @@ var Subscription = class {
 	isAtWatermark(id) {
 		return this.#idsAtWatermark.has(id);
 	}
-	/** Verified event: advance the watermark, then fire `onevent`. */
+	/** Verified event: advance the watermark, then fire `onEvent`. */
 	deliver(event) {
 		this.noteVerified(event);
-		invokeSafely(() => this.#handlers.onevent?.(event));
+		invokeSafely(() => this.#handlers.onEvent?.(event));
 	}
 	/**
 	* Advance the reconnect watermark after a verified EVENT. A far-future `created_at` (buggy or
@@ -429,16 +415,17 @@ function subscriptionToAsyncIterable(start, opts) {
 	let head = 0;
 	let done = false;
 	let error;
-	let wake;
+	let waiters = [];
 	let closer;
 	let localClose = false;
 	let disposeAbort;
 	const notify = () => {
-		wake?.();
-		wake = void 0;
+		const pending = waiters;
+		waiters = [];
+		for (const wake of pending) wake();
 	};
 	const waitForWake = async () => new Promise((resolve) => {
-		wake = resolve;
+		waiters.push(resolve);
 	});
 	const closeLocal = (reason) => {
 		localClose = true;
@@ -448,14 +435,11 @@ function subscriptionToAsyncIterable(start, opts) {
 		notify();
 	};
 	closer = start({
-		onevent(event) {
+		onEvent(event) {
 			queue.push(event);
 			notify();
 		},
-		oneose() {
-			if (opts?.includeEose === false) closeLocal("eose");
-		},
-		onclose(reason) {
+		onClose(reason) {
 			if (opts?.signal?.aborted === true) localClose = true;
 			if (!localClose && reason) error = new RelayClosedError(reason);
 			done = true;
@@ -524,6 +508,9 @@ async function fetchFilters(subscribe, filters, opts) {
 	let end = { type: "timeout" };
 	await new Promise((resolve, reject) => {
 		let settled = false;
+		let timer;
+		let sub;
+		let pendingCloseReason = "fetch complete";
 		const done = (err) => {
 			if (settled) return;
 			settled = true;
@@ -532,43 +519,54 @@ async function fetchFilters(subscribe, filters, opts) {
 			let reason = "aborted";
 			if (err instanceof Error) reason = err.message;
 			else if (err === void 0) reason = "fetch complete";
-			sub.close(reason);
+			pendingCloseReason = reason;
+			sub?.close(reason);
 			if (err === void 0) resolve();
 			else reject(err);
 		};
 		const disposeAbort = onAbort(opts.signal, () => {
 			if (opts.signal !== void 0) done(abortReason(opts.signal));
 		});
-		const timer = setTimeout(() => {
+		try {
+			sub = subscribe(filters, {
+				id: opts.id,
+				signal: opts.signal,
+				closeOnEose: true,
+				onEvent(event) {
+					if (seen.has(event.id)) return;
+					seen.add(event.id);
+					events.push(event);
+				},
+				onEose() {
+					end = { type: "eose" };
+					done();
+				},
+				onClose(reason) {
+					if (settled) return;
+					if (opts.signal?.aborted === true) {
+						done(abortReason(opts.signal));
+						return;
+					}
+					end = {
+						type: "closed",
+						reason
+					};
+					done();
+				}
+			});
+		} catch (error) {
+			disposeAbort();
+			reject(error);
+			return;
+		}
+		if (settled) {
+			sub.close(pendingCloseReason);
+			return;
+		}
+		timer = setTimeout(() => {
 			end = { type: "timeout" };
 			done();
 		}, opts.timeoutMs);
-		const sub = subscribe(filters, {
-			id: opts.id,
-			signal: opts.signal,
-			closeOnEose: true,
-			onevent(event) {
-				if (seen.has(event.id)) return;
-				seen.add(event.id);
-				events.push(event);
-			},
-			oneose() {
-				end = { type: "eose" };
-				done();
-			},
-			onclose(reason) {
-				if (settled) return;
-				if (opts.signal?.aborted === true) {
-					done(abortReason(opts.signal));
-					return;
-				}
-				end = {
-					type: "closed",
-					reason
-				};
-				done();
-			}
-		});
 	});
 	return {
 		events,
@@ -1086,25 +1084,32 @@ var SubscriptionRegistry = class {
 		return true;
 	}
 	closeAll(reason) {
-		const groups = [...this.#liveBySubId.values()];
+		const subs = [...this.#subs.values()];
+		const groups = /* @__PURE__ */ new Set();
+		for (const sub of subs) {
+			const group = this.#liveBySubId.get(sub.id);
+			if (group !== void 0) groups.add(group);
+		}
 		for (const group of groups) invokeSafely(() => {
 			this.#endLiveGroup(group, {
 				sendClose: false,
 				reason
 			});
 		});
-		for (const sub of this.#subs.values()) sub.end(reason);
-		this.#subs.clear();
-		this.#liveByFp.clear();
-		this.#liveBySubId.clear();
+		for (const sub of subs) {
+			if (this.#subs.get(sub.id) === sub) this.#subs.delete(sub.id);
+			sub.end(reason);
+		}
 	}
 	#openExclusive(filters, opts) {
 		const sub = new Subscription(filters, opts, (closed) => {
+			if (this.#subs.get(closed.id) !== closed) return;
 			this.#subs.delete(closed.id);
 			try {
 				if (this.#isOpen()) this.#send(["CLOSE", closed.id]);
 			} catch {}
 		});
+		if (sub.closed) return sub;
 		this.#subs.set(sub.id, sub);
 		if (this.#isOpen()) this.#send([
 			"REQ",
@@ -1167,8 +1172,8 @@ var SubscriptionRegistry = class {
 	}
 	#forgetLiveGroup(group, reason) {
 		if (this.#liveByFp.get(group.fp) === group) this.#liveByFp.delete(group.fp);
-		this.#liveBySubId.delete(group.sub.id);
-		this.#subs.delete(group.sub.id);
+		if (this.#liveBySubId.get(group.sub.id) === group) this.#liveBySubId.delete(group.sub.id);
+		if (this.#subs.get(group.sub.id) === group.sub) this.#subs.delete(group.sub.id);
 		group.sub.end(reason);
 	}
 	#detachLive(group, handle) {
@@ -1194,7 +1199,10 @@ var SubscriptionRegistry = class {
 	#deliverLiveEvent(group, event) {
 		const { sub } = group;
 		const attachments = [...group.attachments];
-		for (const att of attachments) att.notifyReceived(event.id);
+		for (const att of attachments) {
+			if (att.closed) continue;
+			att.notifyReceived(event.id);
+		}
 		if (sub.isAtWatermark(event.id)) return;
 		const recipients = [];
 		for (const att of attachments) {
@@ -1280,7 +1288,9 @@ var Relay = class Relay {
 	#events = new Emitter();
 	constructor(url, opts = {}) {
 		this.url = normalizeURL(url);
-		this.#WS = opts.websocketImplementation ?? getWebSocketImplementation();
+		const wsImpl = opts.websocketImplementation ?? globalThis.WebSocket;
+		if (wsImpl === void 0) throw new RelayConnectionError("no WebSocket implementation; pass websocketImplementation");
+		this.#WS = wsImpl;
 		this.#verify = opts.verifyEvent ?? verifyEvent;
 		this.#publishTimeoutMs = opts.publishTimeoutMs ?? 4400;
 		this.#connectTimeoutMs = opts.connectTimeoutMs ?? 5e3;
@@ -1694,9 +1704,14 @@ var Relay = class Relay {
 	subscribe(filters, opts = {}) {
 		if (filters.length === 0) throw new MessageError("REQ requires at least one filter");
 		if (!this.#isOpen() && !this.#enableReconnect) throw new RelayClosedError("not connected", this.url);
+		if (opts.id !== void 0) this.#assertWireIdFree(assertSubscriptionId(opts.id));
 		const canonical = canonicalizeFilters(filters);
 		return this.#subscriptions.open(canonical, opts);
 	}
+	/** Caller-chosen ids must not shadow an in-flight REQ or COUNT on this relay. */
+	#assertWireIdFree(id) {
+		if (this.#subscriptions.get(id) !== void 0 || this.#countRequests.get(id) !== void 0) throw new MessageError(`duplicate subscription id: ${id}`);
+	}
 	#acceptEvent(event) {
 		if (this.#verifyDead) return false;
 		try {
@@ -1704,12 +1719,9 @@ var Relay = class Relay {
 			if (!ok) this.#events.emit("invalidevent", void 0);
 			return ok;
 		} catch (error) {
-			if (error instanceof WasmPoisonedError) {
-				this.#verifyDead = true;
-				this.#events.emit("notice", "wasm-poisoned: instance aborted");
-				return false;
-			}
-			throw error;
+			this.#verifyDead = true;
+			this.#events.emit("verifiererror", toError(error));
+			return false;
 		}
 	}
 	/** AsyncIterable of events for filters until the subscription is closed. */
@@ -1758,6 +1770,7 @@ var Relay = class Relay {
 		throwIfAborted(opts?.signal);
 		const canonical = canonicalizeFilters(filters);
 		const id = opts?.id === void 0 ? this.nextSubId("count") : createSubscriptionId(opts.id);
+		if (opts?.id !== void 0) this.#assertWireIdFree(id);
 		const timeoutMs = opts?.timeoutMs ?? this.#publishTimeoutMs;
 		return this.#countRequests.track(id, {
 			timeoutMs,
@@ -1814,6 +1827,6 @@ var Relay = class Relay {
 	}
 };
 //#endregion
-export { getWebSocketImplementation as a, RelayConnectionError as c, RelaySuspendedError as d, RelayTimeoutError as f, subscriptionToAsyncIterable as i, RelayError as l, Relay as n, useWebSocketImplementation as o, RelayStatus as r, RelayClosedError as s, DEFAULT_REQUEST_TIMEOUT_MS as t, RelayPublishError as u };
+export { RelayClosedError as a, RelayPublishError as c, subscriptionToAsyncIterable as i, RelaySuspendedError as l, Relay as n, RelayConnectionError as o, RelayStatus as r, RelayError as s, DEFAULT_REQUEST_TIMEOUT_MS as t, RelayTimeoutError as u };
 
-//# sourceMappingURL=relay-DXtwUEdX.mjs.map
+//# sourceMappingURL=relay-DIR77xQ2.mjs.map