@qntx/nostr 0.6.0 → 0.8.0

package/dist/{client-CadO5fAX.mjs → client-Cj2lUaVh.mjs}

@@ -1,222 +1,22 @@
-import { g as NostrError, l as normalizeURL } from "./util-LfQirgDk.mjs";
+import { S as toError, u as normalizeURL, v as NostrError, x as errorMessage } from "./util-DMF9AIO0.mjs";
 import { t as Kind } from "./kind-Cxwhhkx8.mjs";
-import { f as sortedEvents, o as itemCompare } from "./event-D8Nfoh4K.mjs";
-import { t as EventBuilder } from "./builder-9tjI6WQ3.mjs";
+import { f as sortedEvents, o as itemCompare } from "./event-CHf47dPM.mjs";
+import { t as EventBuilder } from "./builder-aNU2gGFP.mjs";
 import { n as canonicalizeFilters, o as matchFilters, t as canonicalizeFilter } from "./filter-BQl3GlHt.mjs";
-import { t as NoSignerError } from "./error-B__OMBRY.mjs";
-import { t as invokeSafely } from "./report-CHld4uWj.mjs";
-import { n as fanIn, r as fetchRouted, t as Pool } from "./pool-As20OGxB.mjs";
-import { r as throwIfAborted } from "./abort-Ba8tDrOI.mjs";
+import { t as NoSignerError } from "./error-DlhGW4mJ.mjs";
+import { n as fanIn, r as fetchRouted, t as Pool } from "./pool-vlw74C4t.mjs";
+import { i as throwIfAborted, n as onAbort } from "./abort-DBq2STPj.mjs";
+import { t as Emitter } from "./emitter-DkCY6NkU.mjs";
 import { storageFromItems } from "./nips/nip77.mjs";
 import { isGiftWrapKind, requireNip59Crypto, unwrap } from "./nips/nip59.mjs";
 import { Nip17Error, buildChatMessageRumor, dmRelayListEventBuilder, normalizeRecipients, requireDmRelays, wrapDirectMessage } from "./nips/nip17.mjs";
-import { t as Gossip } from "./gossip-oloDMWEj.mjs";
-import { i as createOutboxFeed, t as createLoaders } from "./loaders-o6YXB_Ri.mjs";
-import { n as toStorageError } from "./error-DrEIM7FO.mjs";
-import { t as MemoryIndex } from "./memory-index-Do1mz0WF.mjs";
-import { t as MemoryEventStore } from "./memory-C2EVx0_O.mjs";
-import { t as ReactiveEventStore } from "./reactive-BfhPp9a3.mjs";
-//#region src/client/builder.ts
-/**
-* Fluent constructor for {@link Client}. The constructor is supplied by {@link Client.builder} so
-* this module never imports the `Client` value, keeping the client/builder dependency
-* one-directional.
-*/
-var ClientBuilder = class {
-	#opts = {};
-	#newClient;
-	constructor(newClient) {
-		this.#newClient = newClient;
-	}
-	signer(signer) {
-		this.#opts = {
-			...this.#opts,
-			signer
-		};
-		return this;
-	}
-	relays(urls) {
-		this.#opts = {
-			...this.#opts,
-			relays: [...urls]
-		};
-		return this;
-	}
-	addRelay(url) {
-		this.#opts = {
-			...this.#opts,
-			relays: [...this.#opts.relays ?? [], url]
-		};
-		return this;
-	}
-	websocketImplementation(impl) {
-		this.#opts = {
-			...this.#opts,
-			websocketImplementation: impl
-		};
-		return this;
-	}
-	verifyEvent(fn) {
-		this.#opts = {
-			...this.#opts,
-			verifyEvent: fn
-		};
-		return this;
-	}
-	connectTimeoutMs(ms) {
-		this.#opts = {
-			...this.#opts,
-			connectTimeoutMs: ms
-		};
-		return this;
-	}
-	publishTimeoutMs(ms) {
-		this.#opts = {
-			...this.#opts,
-			publishTimeoutMs: ms
-		};
-		return this;
-	}
-	automaticAuth(enabled) {
-		this.#opts = {
-			...this.#opts,
-			automaticAuth: enabled
-		};
-		return this;
-	}
-	/** Allow `ws://` relays. Default false. */
-	allowInsecure(allow) {
-		this.#opts = {
-			...this.#opts,
-			allowInsecure: allow
-		};
-		return this;
-	}
-	/** `ws://` URLs allowed despite `allowInsecure` being off. */
-	trustedInsecureUrls(urls) {
-		this.#opts = {
-			...this.#opts,
-			trustedInsecureUrls: urls
-		};
-		return this;
-	}
-	/** Close idle relays after this many ms. Unset = disabled. */
-	idleTimeoutMs(ms) {
-		this.#opts = {
-			...this.#opts,
-			idleTimeoutMs: ms
-		};
-		return this;
-	}
-	/** Soft cap on connected non-pinned relays. */
-	maxRelays(n) {
-		this.#opts = {
-			...this.#opts,
-			maxRelays: n
-		};
-		return this;
-	}
-	/** Relays never closed by idle cleanup or `maxRelays` eviction. */
-	pinnedUrls(urls) {
-		this.#opts = {
-			...this.#opts,
-			pinnedUrls: urls
-		};
-		return this;
-	}
-	/** Forwarded to the pool: suspend a relay delivering too many invalid events. */
-	invalidEventPolicy(policy) {
-		this.#opts = {
-			...this.#opts,
-			invalidEventPolicy: policy
-		};
-		return this;
-	}
-	/** Forwarded to the pool: fired once when a relay is suspended, with the lift time. */
-	onRelaySuspended(cb) {
-		this.#opts = {
-			...this.#opts,
-			onRelaySuspended: cb
-		};
-		return this;
-	}
-	enableReconnect(enabled) {
-		this.#opts = {
-			...this.#opts,
-			enableReconnect: enabled
-		};
-		return this;
-	}
-	enablePing(enabled) {
-		this.#opts = {
-			...this.#opts,
-			enablePing: enabled
-		};
-		return this;
-	}
-	pingIntervalMs(ms) {
-		this.#opts = {
-			...this.#opts,
-			pingIntervalMs: ms
-		};
-		return this;
-	}
-	pingTimeoutMs(ms) {
-		this.#opts = {
-			...this.#opts,
-			pingTimeoutMs: ms
-		};
-		return this;
-	}
-	/**
-	* Local event store. Defaults to {@link MemoryEventStore}. Browser apps that want persistence must
-	* pass {@link IndexedDbEventStore} and `await open()`.
-	*/
-	storage(store) {
-		this.#opts = {
-			...this.#opts,
-			storage: store
-		};
-		return this;
-	}
-	/**
-	* Synchronous reactive index mirroring ingested events. Defaults to a new
-	* {@link ReactiveEventStore}.
-	*/
-	index(index) {
-		this.#opts = {
-			...this.#opts,
-			index
-		};
-		return this;
-	}
-	/** When false, Client will not auto-write events to storage. Default true. */
-	persistEvents(enabled) {
-		this.#opts = {
-			...this.#opts,
-			persistEvents: enabled
-		};
-		return this;
-	}
-	gossip(gossip) {
-		this.#opts = {
-			...this.#opts,
-			gossip
-		};
-		return this;
-	}
-	onstorageerror(fn) {
-		this.#opts = {
-			...this.#opts,
-			onstorageerror: fn
-		};
-		return this;
-	}
-	build() {
-		return this.#newClient(this.#opts);
-	}
-};
-//#endregion
+import { t as Gossip } from "./gossip-DFxIBlsr.mjs";
+import { r as OutboxFeed, t as createLoaders } from "./loaders-BmPkQfzI.mjs";
+import { n as toStorageError } from "./error-BILMe3Gr.mjs";
+import { t as MemoryIndex } from "./memory-index-Cbc83vOZ.mjs";
+import { t as MemoryEventStore } from "./memory-CdJ07kub.mjs";
+import { t as ReactiveEventStore } from "./reactive-Tz0otDIP.mjs";
+import { t as SerialQueue } from "./serial-Bzpw-xz3.mjs";
 //#region src/client/dm.ts
 function giftWrapRelays(gossip, event) {
 	const targets = [];
@@ -248,13 +48,16 @@ async function sendPrivateMessage(deps, recipients, content, opts) {
 		subject: opts?.subject,
 		replyTo: opts?.replyTo
 	});
-	const wraps = await wrapDirectMessage(crypto, list, rumor);
+	const wraps = await wrapDirectMessage(crypto, list, rumor, {
+		expiration: opts?.expiration,
+		ephemeral: opts?.ephemeral
+	});
 	return {
 		rumor,
 		wraps: await Promise.all(wraps.map(async ({ recipient, wrap }) => {
 			const relays = requireDmRelays(recipient, deps.gossip.dmRelays(recipient));
 			const results = await deps.pool.publish(relays, wrap, { timeoutMs: opts?.timeoutMs });
-			if (results.some((r) => r.result?.ok === true) && deps.wantObserve(opts?.observe)) deps.ingest(wrap);
+			if (results.some((r) => r.status === "ok") && opts?.observe !== false) deps.ingest(wrap);
 			return {
 				recipient,
 				wrap,
@@ -267,9 +70,9 @@ async function fetchPrivateMessages(deps, opts) {
 	deps.assertAlive();
 	const crypto = deps.requireNip59Crypto();
 	const self = await crypto.getPublicKey();
-	deps.throwIfAborted(opts?.signal);
+	throwIfAborted(opts?.signal);
 	await deps.hydrateGossip([self]);
-	deps.throwIfAborted(opts?.signal);
+	throwIfAborted(opts?.signal);
 	const relays = requireDmRelays(self, deps.gossip.dmRelays(self));
 	const urls = /* @__PURE__ */ new Map();
 	const events = await deps.pool.fetch(relays, [{
@@ -291,7 +94,7 @@ async function fetchPrivateMessages(deps, opts) {
 		const rumor = await unwrap(crypto, wrap);
 		const wrapUrls = urls.get(wrap.id);
 		const firstUrl = wrapUrls?.values().next().value;
-		if (deps.wantObserve(opts?.observe)) {
+		if (opts?.observe !== false) {
 			deps.ingest(wrap, firstUrl);
 			if (wrapUrls) {
 				for (const url of wrapUrls) if (url !== firstUrl) deps.markSeen(wrap.id, url);
@@ -309,9 +112,9 @@ async function subscribePrivateMessages(deps, opts) {
 	deps.assertAlive();
 	const crypto = deps.requireNip59Crypto();
 	const self = await crypto.getPublicKey();
-	deps.throwIfAborted(opts?.signal);
+	throwIfAborted(opts?.signal);
 	await deps.hydrateGossip([self]);
-	deps.throwIfAborted(opts?.signal);
+	throwIfAborted(opts?.signal);
 	const relays = requireDmRelays(self, deps.gossip.dmRelays(self));
 	const seen = /* @__PURE__ */ new Set();
 	const processed = /* @__PURE__ */ new Set();
@@ -323,13 +126,15 @@ async function subscribePrivateMessages(deps, opts) {
 		pendingUrls.delete(wrapId);
 		for (const url of extra) deps.markSeen(wrapId, url);
 	};
-	let tail = Promise.resolve();
+	const queue = new SerialQueue();
 	let closed = false;
+	let disposeAbort;
 	const markClosed = () => {
 		closed = true;
+		disposeAbort?.();
 	};
 	if (opts?.signal?.aborted === true) markClosed();
-	else opts?.signal?.addEventListener("abort", markClosed, { once: true });
+	else disposeAbort = onAbort(opts?.signal, markClosed);
 	const inner = deps.pool.subscribe(relays, [{
 		kinds: [Kind.GiftWrap, Kind.GiftWrapEphemeral],
 		"#p": [self],
@@ -354,13 +159,7 @@ async function subscribePrivateMessages(deps, opts) {
 		},
 		onevent: (wrap, relayUrl) => {
 			if (closed) return;
-			const prev = tail;
-			let release;
-			tail = new Promise((resolve) => {
-				release = resolve;
-			});
-			(async () => {
-				await prev;
+			queue.run(async () => {
 				try {
 					if (closed) return;
 					const rumor = await unwrap(crypto, wrap);
@@ -370,17 +169,15 @@ async function subscribePrivateMessages(deps, opts) {
 						return;
 					}
 					seen.add(rumor.id);
-					if (deps.wantObserve(opts?.observe)) deps.ingest(wrap, relayUrl);
+					if (opts?.observe !== false) deps.ingest(wrap, relayUrl);
 					flushSeen(wrap.id);
 					opts?.onevent?.({
 						wrap,
 						rumor,
 						relayUrl
 					});
-				} catch {} finally {
-					release?.();
-				}
-			})();
+				} catch {}
+			});
 		}
 	});
 	return { close: (reason) => {
@@ -479,7 +276,7 @@ function mergeSyncSummary(into, other) {
 */
 async function syncToRelay(deps, url, filter, opts) {
 	deps.assertAlive();
-	deps.throwIfAborted(opts?.signal);
+	throwIfAborted(opts?.signal);
 	const direction = opts?.direction ?? SyncDirection.Down;
 	const canon = canonicalizeFilter(filter);
 	const items = await deps.storage.negentropyItems(canon);
@@ -488,37 +285,44 @@ async function syncToRelay(deps, url, filter, opts) {
 		timeoutMs: opts?.timeoutMs,
 		signal: opts?.signal
 	});
+	const sent = [];
+	const received = [];
+	const sendFailures = {};
+	const persistFailures = {};
 	const summary = {
 		local: have,
 		remote: need,
-		sent: [],
-		received: [],
-		sendFailures: {},
-		persistFailures: {}
+		sent,
+		received,
+		sendFailures,
+		persistFailures
 	};
 	if (opts?.dryRun === true) return summary;
 	if ((direction === SyncDirection.Up || direction === SyncDirection.Both) && have.length > 0) {
 		const found = await deps.storage.query([{ ids: have }]);
 		const foundById = new Map(found.map((event) => [event.id, event]));
-		for (const id of have) if (!foundById.has(id)) summary.sendFailures[id] = "event not found in local store";
+		for (const id of have) if (!foundById.has(id)) sendFailures[id] = "event not found in local store";
 		for (let i = 0; i < found.length; i += SYNC_UPLOAD_CONCURRENCY) {
 			const chunk = found.slice(i, i + SYNC_UPLOAD_CONCURRENCY);
 			await Promise.all(chunk.map(async (event) => {
 				try {
 					const results = await deps.pool.publish([url], event, { timeoutMs: opts?.timeoutMs });
-					if (results.some((r) => r.result?.ok === true)) summary.sent.push(event.id);
-					else summary.sendFailures[event.id] = results[0]?.error ?? results[0]?.result?.message ?? "publish failed";
+					if (results.some((r) => r.status === "ok")) sent.push(event.id);
+					else {
+						const [first] = results;
+						sendFailures[event.id] = first === void 0 ? "publish failed" : first.status === "failed" ? errorMessage(first.error) : first.message;
+					}
 				} catch (error) {
-					summary.sendFailures[event.id] = error instanceof Error ? error.message : String(error);
+					sendFailures[event.id] = errorMessage(error);
 				}
 			}));
 		}
 	}
 	if ((direction === SyncDirection.Down || direction === SyncDirection.Both) && need.length > 0) {
-		const shouldObserve = deps.wantObserve(opts?.observe);
+		const shouldObserve = opts?.observe !== false;
 		for (let i = 0; i < need.length; i += SYNC_ID_BATCH) {
 			const batch = need.slice(i, i + SYNC_ID_BATCH);
-			deps.throwIfAborted(opts?.signal);
+			throwIfAborted(opts?.signal);
 			const urlsById = /* @__PURE__ */ new Map();
 			const events = await deps.pool.fetch([url], [{ ids: batch }], {
 				timeoutMs: opts?.timeoutMs,
@@ -530,7 +334,7 @@ async function syncToRelay(deps, url, filter, opts) {
 				} : void 0
 			});
 			if (!shouldObserve) {
-				for (const event of events) summary.received.push(event.id);
+				for (const event of events) received.push(event.id);
 				continue;
 			}
 			const ingestAll = (event) => {
@@ -541,7 +345,7 @@ async function syncToRelay(deps, url, filter, opts) {
 			if (!deps.persistEvents) {
 				for (const event of events) {
 					ingestAll(event);
-					summary.received.push(event.id);
+					received.push(event.id);
 				}
 				continue;
 			}
@@ -549,14 +353,14 @@ async function syncToRelay(deps, url, filter, opts) {
 			try {
 				results = await deps.storage.putMany(events);
 			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				for (const event of events) summary.persistFailures[event.id] = message;
+				const thrown = toError(error);
+				for (const event of events) persistFailures[event.id] = thrown;
 				break;
 			}
 			for (const [j, event] of events.entries()) {
 				if (results[j] === "rejected" || results[j] === "invalid") continue;
 				ingestAll(event);
-				summary.received.push(event.id);
+				received.push(event.id);
 			}
 		}
 	}
@@ -569,7 +373,7 @@ async function syncToRelay(deps, url, filter, opts) {
 */
 async function sync(deps, filter, opts) {
 	deps.assertAlive();
-	const urls = deps.defaultRelays(opts?.relays ? [...opts.relays] : void 0);
+	const urls = deps.defaultRelays(opts?.relays);
 	const results = await Promise.allSettled(urls.map(async (url) => syncToRelay(deps, url, filter, opts)));
 	let merged = emptySummary();
 	let fulfilled = 0;
@@ -583,49 +387,44 @@ async function sync(deps, filter, opts) {
 }
 //#endregion
 //#region src/client/client.ts
+function isFilterList(filter) {
+	return Array.isArray(filter);
+}
+function toFilterList(filter) {
+	return canonicalizeFilters(isFilterList(filter) ? filter : [filter]);
+}
 /** Layer-5 facade: signer + default relays + pool + loaders + gossip + event store. */
-var Client = class Client {
+var Client = class {
 	pool;
 	loaders;
 	gossip;
 	storage;
 	index;
-	onstorageerror;
 	#signer;
 	#relays;
 	#shutdown = false;
 	#persistEvents;
 	#persistQueue = [];
 	#flushing;
+	#events = new Emitter();
+	#dmDeps;
+	#syncDeps;
 	constructor(opts = {}) {
-		this.#signer = opts.signer;
+		const { signer, relays, automaticAuth, gossip, storage, index, persistEvents, ...poolOptions } = opts;
+		this.#signer = signer;
 		this.#relays = [];
-		for (const raw of opts.relays ?? []) {
+		for (const raw of relays ?? []) {
 			const url = normalizeURL(raw);
 			if (!this.#relays.includes(url)) this.#relays.push(url);
 		}
-		this.gossip = opts.gossip ?? new Gossip();
-		this.storage = opts.storage ?? new MemoryEventStore();
-		this.index = opts.index ?? new ReactiveEventStore();
-		this.#persistEvents = opts.persistEvents ?? true;
-		this.onstorageerror = opts.onstorageerror;
+		this.gossip = gossip ?? new Gossip();
+		this.storage = storage ?? new MemoryEventStore();
+		this.index = index ?? new ReactiveEventStore();
+		this.#persistEvents = persistEvents ?? true;
 		this.pool = new Pool({
-			websocketImplementation: opts.websocketImplementation,
-			verifyEvent: opts.verifyEvent,
-			enablePing: opts.enablePing,
-			pingIntervalMs: opts.pingIntervalMs,
-			pingTimeoutMs: opts.pingTimeoutMs,
-			connectTimeoutMs: opts.connectTimeoutMs,
-			publishTimeoutMs: opts.publishTimeoutMs,
-			enableReconnect: opts.enableReconnect ?? true,
-			allowInsecure: opts.allowInsecure,
-			trustedInsecureUrls: opts.trustedInsecureUrls,
-			idleTimeoutMs: opts.idleTimeoutMs,
-			maxRelays: opts.maxRelays,
-			pinnedUrls: opts.pinnedUrls,
-			invalidEventPolicy: opts.invalidEventPolicy,
-			onRelaySuspended: opts.onRelaySuspended,
-			automaticallyAuth: opts.automaticAuth ?? true ? () => async (template) => {
+			...poolOptions,
+			enableReconnect: poolOptions.enableReconnect ?? true,
+			automaticallyAuth: automaticAuth ?? true ? () => async (template) => {
 				const signer = this.#signer;
 				if (!signer) throw new NoSignerError("no signer configured for AUTH");
 				const pk = await signer.getPublicKey();
@@ -641,9 +440,29 @@ var Client = class Client {
 			index: this.index,
 			ingest: (event, relayUrl) => this.#ingest(event, relayUrl)
 		});
-	}
-	static builder() {
-		return new ClientBuilder((opts) => new Client(opts));
+		this.#dmDeps = {
+			pool: this.pool,
+			gossip: this.gossip,
+			hydrateGossip: async (pubkeys) => this.hydrateGossip(pubkeys),
+			ingest: (event, relayUrl) => this.#ingest(event, relayUrl),
+			markSeen: (id, relayUrl) => {
+				this.index.markSeen(id, relayUrl);
+			},
+			assertAlive: () => this.#assertAlive(),
+			requireNip59Crypto: () => this.#requireNip59Crypto(),
+			publish: async (eventOrBuilder, opts) => this.publish(eventOrBuilder, opts)
+		};
+		this.#syncDeps = {
+			pool: this.pool,
+			storage: this.storage,
+			persistEvents: this.#persistEvents,
+			assertAlive: () => this.#assertAlive(),
+			ingest: (event, relayUrl, opts) => this.#ingest(event, relayUrl, opts),
+			markSeen: (id, relayUrl) => {
+				this.index.markSeen(id, relayUrl);
+			},
+			defaultRelays: (urls) => this.#defaultRelays(urls)
+		};
 	}
 	get signer() {
 		return this.#signer;
@@ -669,7 +488,7 @@ var Client = class Client {
 		const normalized = normalizeURL(url);
 		this.#relays = this.#relays.filter((r) => r !== normalized);
 		this.loaders.removeRelay(normalized);
-		this.pool.close([normalized]);
+		this.pool.closeRelays([normalized]);
 	}
 	/** Connect all configured relays (best-effort; failures are ignored). */
 	async connect(opts) {
@@ -681,6 +500,14 @@ var Client = class Client {
 		while (this.#flushing !== void 0) await this.#flushing;
 		this.pool.close();
 	}
+	/**
+	* Listen for a client event. Multiple listeners per type are allowed and fire in registration
+	* order; a throwing listener is reported and does not break the dispatch. Returns an unsubscribe
+	* function.
+	*/
+	on(type, listener) {
+		return this.#events.on(type, listener);
+	}
 	#assertAlive() {
 		if (this.#shutdown) throw new ClientError("client is shut down");
 	}
@@ -689,9 +516,6 @@ var Client = class Client {
 		if (list.length === 0) throw new ClientError("no relays configured");
 		return list;
 	}
-	#wantObserve(flag) {
-		return flag !== false;
-	}
 	/** Ingest one inbound event: index (with relay URL) → meta → persistence. */
 	observe(event, relayUrl) {
 		this.#ingest(event, relayUrl);
@@ -713,18 +537,11 @@ var Client = class Client {
 	*/
 	#ingest(event, relayUrl, opts) {
 		this.index.add(event, relayUrl);
-		if (opts?.meta !== false) this.#ingestMeta(event);
+		if (opts?.meta !== false) this.gossip.ingest(event);
 		if (opts?.persist === false || !this.#persistEvents) return;
 		this.#persistQueue.push(event);
 		this.#armFlush();
 	}
-	/** Record a relay sighting for an id already in the index. */
-	#markSeen(id, relayUrl) {
-		this.index.markSeen(id, relayUrl);
-	}
-	#ingestMeta(event) {
-		this.gossip.ingest(event);
-	}
 	#armFlush() {
 		if (this.#flushing) return;
 		this.#flushing = this.#flushLoop();
@@ -739,7 +556,7 @@ var Client = class Client {
 				try {
 					await this.storage.putMany(batch);
 				} catch (error) {
-					invokeSafely(() => this.onstorageerror?.(toStorageError(error)));
+					this.#events.emit("storageerror", toStorageError(error));
 				}
 			}
 		} finally {
@@ -772,7 +589,7 @@ var Client = class Client {
 	*/
 	outbox(opts) {
 		this.#assertAlive();
-		return createOutboxFeed({
+		return new OutboxFeed({
 			pool: this.pool,
 			gossip: this.gossip,
 			storage: this.storage,
@@ -804,22 +621,24 @@ var Client = class Client {
 			hydrate: async (pubkeys) => this.hydrateGossip(pubkeys)
 		});
 	}
+	#requireSigner() {
+		const signer = this.#signer;
+		if (!signer) throw new ClientError("no signer configured");
+		return signer;
+	}
 	async getPublicKey() {
-		if (!this.#signer) throw new ClientError("no signer configured");
-		return this.#signer.getPublicKey();
+		return this.#requireSigner().getPublicKey();
 	}
 	async signEvent(unsigned) {
-		if (!this.#signer) throw new ClientError("no signer configured");
-		return this.#signer.signEvent(unsigned);
+		return this.#requireSigner().signEvent(unsigned);
 	}
 	async signEventBuilder(builder) {
-		if (!this.#signer) throw new ClientError("no signer configured");
-		return builder.sign(this.#signer);
+		return builder.sign(this.#requireSigner());
 	}
 	async signTemplate(template) {
-		if (!this.#signer) throw new ClientError("no signer configured");
-		const pubkey = await this.#signer.getPublicKey();
-		return this.#signer.signEvent({
+		const signer = this.#requireSigner();
+		const pubkey = await signer.getPublicKey();
+		return signer.signEvent({
 			...template,
 			pubkey
 		});
@@ -856,7 +675,7 @@ var Client = class Client {
 			if (urls.length > 0) relays = urls;
 		}
 		const results = await this.pool.publish(this.#defaultRelays(relays), event, { timeoutMs: opts?.timeoutMs });
-		if (results.some((r) => r.result?.ok === true) && this.#wantObserve(opts?.observe)) this.observe(event);
+		if (results.some((r) => r.status === "ok") && opts?.observe !== false) this.observe(event);
 		return results;
 	}
 	/**
@@ -865,8 +684,8 @@ var Client = class Client {
 	*/
 	async fetchEvents(filter, opts) {
 		this.#assertAlive();
-		const filters = canonicalizeFilters(Array.isArray(filter) ? filter : [filter]);
-		const shouldObserve = this.#wantObserve(opts?.observe);
+		const filters = toFilterList(filter);
+		const shouldObserve = opts?.observe !== false;
 		const candidates = [];
 		if (opts?.localFirst === true) try {
 			const local = await this.storage.query(filters);
@@ -878,7 +697,7 @@ var Client = class Client {
 				});
 			}
 		} catch (error) {
-			invokeSafely(() => this.onstorageerror?.(toStorageError(error)));
+			this.#events.emit("storageerror", toStorageError(error));
 		}
 		const onevent = (event, relayUrl) => {
 			if (shouldObserve) this.#ingest(event, relayUrl, {
@@ -914,12 +733,12 @@ var Client = class Client {
 	*/
 	async fetchEach(filter, opts) {
 		this.#assertAlive();
-		const filters = canonicalizeFilters(Array.isArray(filter) ? filter : [filter]);
+		const filters = toFilterList(filter);
 		const results = await this.pool.fetchEach(this.#defaultRelays(opts?.relays), filters, {
 			timeoutMs: opts?.timeoutMs,
 			signal: opts?.signal
 		});
-		if (this.#wantObserve(opts?.observe)) {
+		if (opts?.observe !== false) {
 			const unique = [];
 			const seen = /* @__PURE__ */ new Set();
 			for (const result of results) for (const event of result.events) {
@@ -939,19 +758,19 @@ var Client = class Client {
 	/** Query local storage only (no network). */
 	async queryLocal(filter) {
 		this.#assertAlive();
-		const filters = canonicalizeFilters(Array.isArray(filter) ? filter : [filter]);
+		const filters = toFilterList(filter);
 		return this.storage.query(filters);
 	}
 	subscribe(filter, opts) {
 		this.#assertAlive();
-		const filters = canonicalizeFilters(Array.isArray(filter) ? filter : [filter]);
-		const shouldObserve = this.#wantObserve(opts?.observe);
+		const filters = toFilterList(filter);
+		const shouldObserve = opts?.observe !== false;
 		const wrapEvent = (event, relayUrl) => {
 			if (shouldObserve) this.observe(event, relayUrl);
 			opts?.onevent?.(event, relayUrl);
 		};
 		const wrapReceived = (id, relayUrl) => {
-			if (shouldObserve) this.#markSeen(id, relayUrl);
+			if (shouldObserve) this.index.markSeen(id, relayUrl);
 			opts?.receivedEvent?.(id, relayUrl);
 		};
 		if (opts?.gossip !== true || opts.relays !== void 0) return this.pool.subscribe(this.#defaultRelays(opts?.relays), filters, {
@@ -973,51 +792,20 @@ var Client = class Client {
 		});
 	}
 	#requireNip59Crypto() {
-		if (!this.#signer) throw new ClientError("no signer configured");
-		return requireNip59Crypto(this.#signer);
-	}
-	#throwIfAborted(signal) {
-		throwIfAborted(signal);
-	}
-	#dmDeps() {
-		return {
-			pool: this.pool,
-			gossip: this.gossip,
-			hydrateGossip: async (pubkeys) => this.hydrateGossip(pubkeys),
-			ingest: (event, relayUrl) => this.#ingest(event, relayUrl),
-			markSeen: (id, relayUrl) => this.#markSeen(id, relayUrl),
-			assertAlive: () => this.#assertAlive(),
-			requireNip59Crypto: () => this.#requireNip59Crypto(),
-			throwIfAborted: (signal) => this.#throwIfAborted(signal),
-			wantObserve: (flag) => this.#wantObserve(flag),
-			publish: async (eventOrBuilder, opts) => this.publish(eventOrBuilder, opts)
-		};
-	}
-	#syncDeps() {
-		return {
-			pool: this.pool,
-			storage: this.storage,
-			persistEvents: this.#persistEvents,
-			assertAlive: () => this.#assertAlive(),
-			throwIfAborted: (signal) => this.#throwIfAborted(signal),
-			wantObserve: (flag) => this.#wantObserve(flag),
-			ingest: (event, relayUrl, opts) => this.#ingest(event, relayUrl, opts),
-			markSeen: (id, relayUrl) => this.#markSeen(id, relayUrl),
-			defaultRelays: (urls) => this.#defaultRelays(urls)
-		};
+		return requireNip59Crypto(this.#requireSigner());
 	}
 	/** Publish a kind:10050 NIP-17 DM relay list (`relay` tags). Not kind 10002. */
 	async setDmRelays(relays, opts) {
-		return setDmRelays(this.#dmDeps(), relays, opts);
+		return setDmRelays(this.#dmDeps, relays, opts);
 	}
 	async sendPrivateMessage(recipients, content, opts) {
-		return sendPrivateMessage(this.#dmDeps(), recipients, content, opts);
+		return sendPrivateMessage(this.#dmDeps, recipients, content, opts);
 	}
 	async fetchPrivateMessages(opts) {
-		return fetchPrivateMessages(this.#dmDeps(), opts);
+		return fetchPrivateMessages(this.#dmDeps, opts);
 	}
 	async subscribePrivateMessages(opts) {
-		return subscribePrivateMessages(this.#dmDeps(), opts);
+		return subscribePrivateMessages(this.#dmDeps, opts);
 	}
 	/**
 	* NIP-77 sync against one relay: reconcile, then optionally upload local-only events and/or
@@ -1025,7 +813,7 @@ var Client = class Client {
 	* listed. `persistEvents: false` skips putMany, still ingests when observe is on.
 	*/
 	async syncToRelay(url, filter, opts) {
-		return syncToRelay(this.#syncDeps(), url, filter, opts);
+		return syncToRelay(this.#syncDeps, url, filter, opts);
 	}
 	/**
 	* NIP-77 sync against the given relays (or Client default relays). Independent sessions run in
@@ -1033,10 +821,10 @@ var Client = class Client {
 	* URL order.
 	*/
 	async sync(filter, opts) {
-		return sync(this.#syncDeps(), filter, opts);
+		return sync(this.#syncDeps, filter, opts);
 	}
 };
 //#endregion
-export { ClientBuilder as i, ClientError as n, SyncDirection as r, Client as t };
+export { ClientError as n, SyncDirection as r, Client as t };
 
-//# sourceMappingURL=client-CadO5fAX.mjs.map
+//# sourceMappingURL=client-Cj2lUaVh.mjs.map