@qntx/nostr 0.1.0 → 0.2.0

package/dist/{loaders-BNQszDAn.mjs → loaders-o6YXB_Ri.mjs}

@@ -1,60 +1,26 @@
-import { a as isHex32, s as normalizeURL } from "./util-6tfLQ9JF.mjs";
-import { a as NostrError } from "./error-DZEs5OuZ.mjs";
-import { r as isAddressableKind, t as Kind } from "./kind-BLl4cLOc.mjs";
-import { _ as getDTag, d as sortedEvents, i as isReplaceableWinner } from "./event-CzoQEFMF.mjs";
+import { g as NostrError, l as normalizeURL, o as isHex32 } from "./util-LfQirgDk.mjs";
+import { r as isAddressableKind, t as Kind } from "./kind-Cxwhhkx8.mjs";
+import { _ as formatEventAddress, f as sortedEvents } from "./event-D8Nfoh4K.mjs";
+import { t as invokeSafely } from "./report-CHld4uWj.mjs";
 import { Nip19Error, decode, npubEncode } from "./nips/nip19.mjs";
 import { parseRelayList } from "./nips/nip65.mjs";
+import { r as throwIfAborted } from "./abort-Ba8tDrOI.mjs";
 import { parseDmRelayList } from "./nips/nip17.mjs";
-import { n as toStorageError } from "./error-CwBxle6N.mjs";
-//#region src/loaders/cache.ts
-function keyOf(spec) {
-	return `${spec.kind}:${spec.pubkey.toLowerCase()}:${spec.dTag ?? ""}`;
-}
-/** In-memory replaceable-event cache used by loaders (no DOM / localStorage). */
-var ReplaceableCache = class {
-	#events = /* @__PURE__ */ new Map();
-	get(spec) {
-		return this.#events.get(keyOf(spec));
-	}
-	set(spec, event, fetchedAt = Math.floor(Date.now() / 1e3)) {
-		this.#events.set(keyOf(spec), {
-			event,
-			fetchedAt
-		});
-	}
-	/** Keep newer event by created_at. */
-	putIfNewer(event, dTag) {
-		const spec = {
-			kind: event.kind,
-			pubkey: event.pubkey,
-			dTag
-		};
-		const prev = this.get(spec);
-		if (!prev?.event || isReplaceableWinner(event, prev.event)) this.set(spec, event);
-	}
-	clear(spec) {
-		if (spec) this.#events.delete(keyOf(spec));
-		else this.#events.clear();
-	}
-	get size() {
-		return this.#events.size;
-	}
-};
-//#endregion
+import { n as toStorageError } from "./error-DrEIM7FO.mjs";
 //#region src/loaders/context.ts
-/**
-* Explicit dependency bag for loaders — never a module-level singleton.
-*/
+/** Internal dependency bag for loaders — never a module-level singleton. */
 var LoaderContext = class {
 	pool;
-	cache;
+	index;
+	ingest;
 	staleAfterSec;
 	fetchTimeoutMs;
 	#relays;
 	constructor(opts) {
 		this.pool = opts.pool;
 		this.#relays = [...opts.relays];
-		this.cache = opts.cache ?? new ReplaceableCache();
+		this.index = opts.index;
+		this.ingest = opts.ingest ?? ((event, relayUrl) => this.index.add(event, relayUrl));
 		this.staleAfterSec = opts.staleAfterSec ?? 172800;
 		this.fetchTimeoutMs = opts.fetchTimeoutMs ?? 4400;
 	}
@@ -81,42 +47,60 @@ function dFilter(kind, identifier) {
 	if (isAddressableKind(kind)) return { "#d": [identifier] };
 	return {};
 }
+function addressRef(kind, pubkey, identifier) {
+	return formatEventAddress(kind, pubkey.toLowerCase(), identifier);
+}
 function parseRef(ref) {
 	if (typeof ref === "string") {
-		if (isHex32(ref)) return {
-			filter: { ids: [ref.toLowerCase()] },
-			hints: [],
-			cacheKey: `id:${ref.toLowerCase()}`
-		};
+		if (isHex32(ref.toLowerCase())) {
+			const id = ref.toLowerCase();
+			return {
+				filter: { ids: [id] },
+				hints: [],
+				lookup: (ctx) => ctx.index.get(id),
+				cacheKey: `id:${id}`
+			};
+		}
 		const decoded = decode(ref);
 		switch (decoded.type) {
 			case "note": return {
 				filter: { ids: [decoded.data] },
 				hints: [],
+				lookup: (ctx) => ctx.index.get(decoded.data),
 				cacheKey: `id:${decoded.data}`
 			};
 			case "nevent": return {
 				filter: { ids: [decoded.data.id] },
 				hints: decoded.data.relays ?? [],
+				lookup: (ctx) => ctx.index.get(decoded.data.id),
 				cacheKey: `id:${decoded.data.id}`
 			};
-			case "naddr": return {
-				filter: {
-					authors: [decoded.data.pubkey.toLowerCase()],
-					kinds: [decoded.data.kind],
-					...dFilter(decoded.data.kind, decoded.data.identifier)
-				},
-				hints: decoded.data.relays ?? [],
-				cacheKey: `addr:${decoded.data.kind}:${decoded.data.pubkey}:${decoded.data.identifier}`
-			};
+			case "naddr": {
+				const addr = addressRef(decoded.data.kind, decoded.data.pubkey, decoded.data.identifier);
+				return {
+					filter: {
+						authors: [decoded.data.pubkey.toLowerCase()],
+						kinds: [decoded.data.kind],
+						...dFilter(decoded.data.kind, decoded.data.identifier)
+					},
+					hints: decoded.data.relays ?? [],
+					lookup: (ctx) => ctx.index.getByAddress(addr),
+					cacheKey: `addr:${addr}`
+				};
+			}
 			default: throw new Nip19Error(`cannot load event from ${decoded.type}`);
 		}
 	}
-	if ("id" in ref) return {
-		filter: { ids: [ref.id.toLowerCase()] },
-		hints: ref.relays ?? [],
-		cacheKey: `id:${ref.id.toLowerCase()}`
-	};
+	if ("id" in ref) {
+		const id = ref.id.toLowerCase();
+		return {
+			filter: { ids: [id] },
+			hints: ref.relays ?? [],
+			lookup: (ctx) => ctx.index.get(id),
+			cacheKey: `id:${id}`
+		};
+	}
+	const addr = addressRef(ref.kind, ref.pubkey, ref.identifier);
 	return {
 		filter: {
 			authors: [ref.pubkey.toLowerCase()],
@@ -124,189 +108,39 @@ function parseRef(ref) {
 			...dFilter(ref.kind, ref.identifier)
 		},
 		hints: ref.relays ?? [],
-		cacheKey: `addr:${ref.kind}:${ref.pubkey}:${ref.identifier}`
+		lookup: (ctx) => ctx.index.getByAddress(addr),
+		cacheKey: `addr:${addr}`
 	};
 }
 function createEventLoader(ctx) {
 	const inflight = /* @__PURE__ */ new Map();
-	const cache = /* @__PURE__ */ new Map();
-	return {
-		load(ref) {
-			const parsed = parseRef(ref);
-			if (cache.has(parsed.cacheKey)) return Promise.resolve(cache.get(parsed.cacheKey));
-			const hit = inflight.get(parsed.cacheKey);
-			if (hit) return hit;
-			const p = (async () => {
+	return { load(ref) {
+		const parsed = parseRef(ref);
+		const hit = parsed.lookup(ctx);
+		if (hit !== void 0) return Promise.resolve(hit);
+		const pending = inflight.get(parsed.cacheKey);
+		if (pending !== void 0) return pending;
+		const p = (async () => {
+			try {
 				const relays = [.../* @__PURE__ */ new Set([...parsed.hints, ...ctx.relays])];
-				if (relays.length === 0) return void 0;
-				const events = await ctx.pool.fetch(relays, [parsed.filter], { timeoutMs: ctx.fetchTimeoutMs });
-				let best;
-				for (const e of events) if (!best || isReplaceableWinner(e, best)) best = e;
-				cache.set(parsed.cacheKey, best);
-				return best;
-			})().finally(() => inflight.delete(parsed.cacheKey));
-			inflight.set(parsed.cacheKey, p);
-			return p;
-		},
-		clearAll() {
-			inflight.clear();
-			cache.clear();
-		}
-	};
-}
-//#endregion
-//#region src/loaders/dataloader.ts
-var LoaderError = class extends NostrError {};
-var DataLoader = class {
-	#batchLoadFn;
-	#cacheKeyFn;
-	#maxBatchSize;
-	#useCache;
-	#cache = /* @__PURE__ */ new Map();
-	#inflight = /* @__PURE__ */ new Map();
-	#queue = [];
-	#scheduled = false;
-	constructor(batchLoadFn, options = {}) {
-		this.#batchLoadFn = batchLoadFn;
-		this.#cacheKeyFn = options.cacheKeyFn ?? ((k) => k);
-		this.#maxBatchSize = options.maxBatchSize ?? Infinity;
-		this.#useCache = options.cache !== false;
-	}
-	load(key) {
-		const cacheKey = this.#cacheKeyFn(key);
-		if (this.#useCache) {
-			const cached = this.#cache.get(cacheKey);
-			if (cached) return cached;
-		}
-		const inflight = this.#inflight.get(cacheKey);
-		if (inflight) return inflight;
-		const promise = new Promise((resolve, reject) => {
-			this.#queue.push({
-				key,
-				resolve,
-				reject
-			});
-			if (this.#queue.length >= this.#maxBatchSize) this.#dispatch();
-			else if (!this.#scheduled) {
-				this.#scheduled = true;
-				queueMicrotask(() => this.#dispatch());
-			}
-		}).finally(() => {
-			this.#inflight.delete(cacheKey);
-		});
-		this.#inflight.set(cacheKey, promise);
-		if (this.#useCache) this.#cache.set(cacheKey, promise);
-		return promise;
-	}
-	clear(key) {
-		this.#cache.delete(this.#cacheKeyFn(key));
-		this.#inflight.delete(this.#cacheKeyFn(key));
-	}
-	clearAll() {
-		this.#cache.clear();
-		this.#inflight.clear();
-	}
-	#dispatch() {
-		this.#scheduled = false;
-		const batch = this.#queue.splice(0, this.#maxBatchSize);
-		if (batch.length === 0) return;
-		const keys = batch.map((b) => b.key);
-		this.#batchLoadFn(keys).then((values) => {
-			if (values.length !== keys.length) {
-				const err = new LoaderError(`DataLoader batch function must return array of length ${keys.length}, got ${values.length}`);
-				for (const item of batch) item.reject(err);
-				return;
-			}
-			for (let i = 0; i < batch.length; i++) {
-				const value = values[i];
-				if (value instanceof Error) batch[i].reject(value);
-				else batch[i].resolve(value);
-			}
-		}).catch((err) => {
-			for (const item of batch) item.reject(err);
-		});
-		if (this.#queue.length > 0) {
-			this.#scheduled = true;
-			queueMicrotask(() => this.#dispatch());
-		}
-	}
-};
-//#endregion
-//#region src/loaders/replaceable.ts
-/**
-* Batch-fetch replaceable events (kind + authors) via the pool, with cache.
-* Durable cache is ReplaceableCache; DataLoader only coalesces in-flight requests.
-*/
-function createReplaceableLoader(ctx, kind) {
-	const loader = new DataLoader(async (keys) => {
-		const authors = [...new Set(keys.map((k) => k.pubkey))];
-		const hintRelays = [...new Set(keys.flatMap((k) => k.hints ?? []).concat(ctx.relays))];
-		const filter = {
-			kinds: [kind],
-			authors
-		};
-		const events = hintRelays.length > 0 ? await ctx.pool.fetch(hintRelays, [filter], { timeoutMs: ctx.fetchTimeoutMs }) : [];
-		const best = /* @__PURE__ */ new Map();
-		for (const event of events) {
-			if (event.kind !== kind) continue;
-			const prev = best.get(event.pubkey);
-			if (!prev || isReplaceableWinner(event, prev)) best.set(event.pubkey, event);
-		}
-		const now = Math.floor(Date.now() / 1e3);
-		return keys.map((k) => {
-			const event = best.get(k.pubkey) ?? null;
-			ctx.cache.set({
-				kind,
-				pubkey: k.pubkey,
-				dTag: event ? getDTag(event.tags) ?? void 0 : void 0
-			}, event, now);
-			return event;
-		});
-	}, {
-		cache: false,
-		cacheKeyFn: (k) => `${kind}:${k.pubkey}:${(k.hints ?? []).join(",")}`,
-		maxBatchSize: 50
-	});
-	return {
-		async load(pubkey, opts) {
-			const pk = pubkey.toLowerCase();
-			const style = opts?.style ?? "default";
-			const cached = ctx.cache.get({
-				kind,
-				pubkey: pk
-			});
-			if (style === "cache-only") return {
-				event: cached?.event ?? null,
-				fresh: false
-			};
-			if (style === "default" && cached && ctx.isFresh(cached.fetchedAt)) return {
-				event: cached.event,
-				fresh: false
-			};
-			return {
-				event: await loader.load({
-					pubkey: pk,
-					hints: opts?.hints
-				}),
-				fresh: true
-			};
-		},
-		clear(pubkey) {
-			if (pubkey) {
-				const pk = pubkey.toLowerCase();
-				loader.clear({ pubkey: pk });
-				ctx.cache.clear({
-					kind,
-					pubkey: pk
+				if (relays.length === 0) return;
+				await ctx.pool.fetch(relays, [parsed.filter], {
+					timeoutMs: ctx.fetchTimeoutMs,
+					onevent: (event, relayUrl) => ctx.ingest(event, relayUrl)
 				});
-			} else loader.clearAll();
-		}
-	};
+				return parsed.lookup(ctx);
+			} finally {
+				inflight.delete(parsed.cacheKey);
+			}
+		})();
+		inflight.set(parsed.cacheKey, p);
+		return p;
+	} };
 }
 //#endregion
 //#region src/loaders/lists.ts
 function fromTags(event, map) {
-	if (!event) return [];
+	if (event === void 0) return [];
 	const out = [];
 	for (const tag of event.tags) {
 		const item = map(tag);
@@ -314,33 +148,33 @@ function fromTags(event, map) {
 	}
 	return out;
 }
-function createListLoaders(ctx) {
-	const followsLoader = createReplaceableLoader(ctx, Kind.Contacts);
-	const muteLoader = createReplaceableLoader(ctx, Kind.MuteList);
-	const relayListLoader = createReplaceableLoader(ctx, Kind.RelayList);
-	const dmRelayListLoader = createReplaceableLoader(ctx, Kind.DirectMessageRelaysList);
+function createListLoaders(replaceable) {
+	const followsLoader = replaceable(Kind.Contacts);
+	const muteLoader = replaceable(Kind.MuteList);
+	const relayListLoader = replaceable(Kind.RelayList);
+	const dmRelayListLoader = replaceable(Kind.DirectMessageRelaysList);
 	return {
 		async follows(pubkey, opts) {
-			const { event, fresh } = await followsLoader.load(pubkey, opts);
+			const { event, fresh } = await followsLoader(pubkey, opts);
 			return {
 				event,
 				fresh,
-				items: fromTags(event, (tag) => tag[0] === "p" && tag[1] && isHex32(tag[1]) ? tag[1].toLowerCase() : void 0)
+				items: fromTags(event, (tag) => tag[0] === "p" && tag[1] !== void 0 && isHex32(tag[1].toLowerCase()) ? tag[1].toLowerCase() : void 0)
 			};
 		},
 		async muteList(pubkey, opts) {
-			const { event, fresh } = await muteLoader.load(pubkey, opts);
+			const { event, fresh } = await muteLoader(pubkey, opts);
 			return {
 				event,
 				fresh,
 				items: fromTags(event, (tag) => {
-					if (!tag[1]) return void 0;
+					if (tag[1] === void 0 || tag[1] === "") return;
 					switch (tag[0]) {
-						case "p": return isHex32(tag[1]) ? {
+						case "p": return isHex32(tag[1].toLowerCase()) ? {
 							label: "pubkey",
 							value: tag[1].toLowerCase()
 						} : void 0;
-						case "e": return isHex32(tag[1]) ? {
+						case "e": return isHex32(tag[1].toLowerCase()) ? {
 							label: "thread",
 							value: tag[1].toLowerCase()
 						} : void 0;
@@ -358,7 +192,7 @@ function createListLoaders(ctx) {
 			};
 		},
 		async relayList(pubkey, opts) {
-			const { event, fresh } = await relayListLoader.load(pubkey, opts);
+			const { event, fresh } = await relayListLoader(pubkey, opts);
 			let items = [];
 			if (event) try {
 				items = parseRelayList(event);
@@ -382,7 +216,7 @@ function createListLoaders(ctx) {
 			};
 		},
 		async dmRelayList(pubkey, opts) {
-			const { event, fresh } = await dmRelayListLoader.load(pubkey, opts);
+			const { event, fresh } = await dmRelayListLoader(pubkey, opts);
 			let items = [];
 			if (event) try {
 				items = parseDmRelayList(event);
@@ -399,6 +233,7 @@ function createListLoaders(ctx) {
 }
 //#endregion
 //#region src/loaders/profile.ts
+/** A {@link NostrUser} with no metadata — used when no kind:0 event exists. */
 function bareNostrUser(pubkey) {
 	const pk = pubkey.toLowerCase();
 	let npub;
@@ -413,33 +248,37 @@ function bareNostrUser(pubkey) {
 		shortName: npub.startsWith("npub1") ? `${npub.slice(0, 8)}…${npub.slice(-4)}` : pk.slice(0, 8),
 		metadata: {},
 		lastUpdated: 0,
-		event: null,
+		event: void 0,
 		fresh: false
 	};
 }
+function nonEmpty(value) {
+	return typeof value === "string" && value !== "" ? value : void 0;
+}
 function parseMetadata(content) {
 	try {
 		const obj = JSON.parse(content);
-		return typeof obj === "object" && obj !== null ? obj : {};
+		if (typeof obj !== "object" || obj === null) return {};
+		return obj;
 	} catch {
 		return {};
 	}
 }
-function createProfileLoader(ctx) {
-	const loader = createReplaceableLoader(ctx, Kind.Metadata);
+function createProfileLoader(replaceable) {
+	const loader = replaceable(Kind.Metadata);
 	return { async load(pubkey, opts) {
 		const base = bareNostrUser(pubkey);
-		const { event, fresh } = await loader.load(pubkey, opts);
+		const { event, fresh } = await loader(pubkey, opts);
 		if (!event) return {
 			...base,
 			fresh
 		};
 		const metadata = parseMetadata(event.content);
-		const display = metadata.display_name || metadata.name;
+		const display = nonEmpty(metadata.display_name) ?? nonEmpty(metadata.name);
 		return {
 			...base,
-			shortName: display || base.shortName,
-			image: metadata.picture,
+			shortName: display ?? base.shortName,
+			...metadata.picture === void 0 ? {} : { image: metadata.picture },
 			metadata,
 			lastUpdated: event.created_at,
 			event,
@@ -448,8 +287,177 @@ function createProfileLoader(ctx) {
 	} };
 }
 //#endregion
+//#region src/loaders/dataloader.ts
+var LoaderError = class extends NostrError {
+	name = "LoaderError";
+};
+var DataLoader = class {
+	#batchLoadFn;
+	#cacheKeyFn;
+	#maxBatchSize;
+	#useCache;
+	#cache = /* @__PURE__ */ new Map();
+	#inflight = /* @__PURE__ */ new Map();
+	#queue = [];
+	#scheduled = false;
+	constructor(batchLoadFn, options = {}) {
+		this.#batchLoadFn = batchLoadFn;
+		this.#cacheKeyFn = options.cacheKeyFn ?? ((k) => k);
+		this.#maxBatchSize = options.maxBatchSize ?? Number.POSITIVE_INFINITY;
+		this.#useCache = options.cache !== false;
+	}
+	async load(key) {
+		const cacheKey = this.#cacheKeyFn(key);
+		if (this.#useCache) {
+			const cached = this.#cache.get(cacheKey);
+			if (cached) return cached;
+		}
+		const inflight = this.#inflight.get(cacheKey);
+		if (inflight) return inflight;
+		const pending = new Promise((resolve, reject) => {
+			this.#queue.push({
+				key,
+				resolve,
+				reject
+			});
+			if (this.#queue.length >= this.#maxBatchSize) this.#dispatch();
+			else if (!this.#scheduled) {
+				this.#scheduled = true;
+				queueMicrotask(() => this.#dispatch());
+			}
+		});
+		const promise = (async () => {
+			try {
+				return await pending;
+			} finally {
+				this.#inflight.delete(cacheKey);
+			}
+		})();
+		this.#inflight.set(cacheKey, promise);
+		if (this.#useCache) this.#cache.set(cacheKey, promise);
+		return promise;
+	}
+	clear(key) {
+		this.#cache.delete(this.#cacheKeyFn(key));
+		this.#inflight.delete(this.#cacheKeyFn(key));
+	}
+	clearAll() {
+		this.#cache.clear();
+		this.#inflight.clear();
+	}
+	#dispatch() {
+		this.#scheduled = false;
+		const batch = this.#queue.splice(0, this.#maxBatchSize);
+		if (batch.length === 0) return;
+		const keys = batch.map((b) => b.key);
+		(async () => {
+			let values;
+			try {
+				values = await this.#batchLoadFn(keys);
+			} catch (error) {
+				for (const item of batch) item.reject(error);
+				return;
+			}
+			if (values.length !== keys.length) {
+				const err = new LoaderError(`DataLoader batch function must return array of length ${keys.length}, got ${values.length}`);
+				for (const item of batch) item.reject(err);
+				return;
+			}
+			for (const [i, value] of values.entries()) {
+				const item = batch[i];
+				if (item === void 0) continue;
+				if (value instanceof Error) item.reject(value);
+				else item.resolve(value);
+			}
+		})();
+		if (this.#queue.length > 0) {
+			this.#scheduled = true;
+			queueMicrotask(() => this.#dispatch());
+		}
+	}
+};
+//#endregion
+//#region src/loaders/replaceable.ts
+/** FIFO cap on per-address fetch records (misses included). */
+const MAX_FETCHED_AT = 1e4;
+/**
+* Batch-fetch replaceable events (kind + authors) via the pool. Fetched events are written into the
+* reactive index (`onevent` records `seenOn`) and the winner is read back from it; the index — not
+* the loader — owns the stored value and winner selection. The loader only tracks per-address
+* `fetchedAt` timestamps so a recent fetch (including a miss) is not repeated within
+* `staleAfterSec`.
+*/
+function createReplaceableLoader(ctx, kind) {
+	const fetchedAt = /* @__PURE__ */ new Map();
+	const markFetched = (addr, hit, now) => {
+		fetchedAt.delete(addr);
+		fetchedAt.set(addr, {
+			at: now,
+			hit
+		});
+		while (fetchedAt.size > MAX_FETCHED_AT) {
+			const oldest = fetchedAt.keys().next().value;
+			if (oldest === void 0) break;
+			fetchedAt.delete(oldest);
+		}
+	};
+	const loader = new DataLoader(async (keys) => {
+		const authors = [...new Set(keys.map((k) => k.pubkey))];
+		const relays = [.../* @__PURE__ */ new Set([...keys.flatMap((k) => k.hints ?? []), ...ctx.relays])];
+		if (relays.length > 0) {
+			const filter = {
+				kinds: [kind],
+				authors
+			};
+			await ctx.pool.fetch(relays, [filter], {
+				timeoutMs: ctx.fetchTimeoutMs,
+				onevent: (event, relayUrl) => ctx.ingest(event, relayUrl)
+			});
+		}
+		const now = Math.floor(Date.now() / 1e3);
+		return keys.map((k) => {
+			const addr = formatEventAddress(kind, k.pubkey, "");
+			const event = ctx.index.getByAddress(addr);
+			markFetched(addr, event !== void 0, now);
+			return {
+				event,
+				fresh: true
+			};
+		});
+	}, {
+		cache: false,
+		cacheKeyFn: (k) => `${kind}:${k.pubkey}:${(k.hints ?? []).join(",")}`,
+		maxBatchSize: 50
+	});
+	return async (pubkey, opts) => {
+		const pk = pubkey.toLowerCase();
+		const address = formatEventAddress(kind, pk, "");
+		const style = opts?.style ?? "default";
+		const current = () => ctx.index.getByAddress(address);
+		if (style === "cache-only") return {
+			event: current(),
+			fresh: false
+		};
+		if (style === "default") {
+			const rec = fetchedAt.get(address);
+			const event = current();
+			if (rec !== void 0 && ctx.isFresh(rec.at) && (!rec.hit || event !== void 0)) return {
+				event,
+				fresh: false
+			};
+		}
+		return loader.load({
+			pubkey: pk,
+			hints: opts?.hints
+		});
+	};
+}
+//#endregion
 //#region src/loaders/outbox.ts
-var OutboxError = class extends NostrError {};
+/** Outbox feed lifecycle error (e.g. use after close). */
+var OutboxError = class extends NostrError {
+	name = "OutboxError";
+};
 function boundKey(pubkey, kind) {
 	return `${pubkey.toLowerCase()}:${kind}`;
 }
@@ -463,10 +471,9 @@ function canonicalRelayUrls(urls) {
 	return out;
 }
 /**
-* Group authors by outbox relay (discovery fallback).
-* `prefer` reorders existing candidates only; it never appends a URL
-* that is not already in the author's outbox or discovery list.
-* Returns Map<relayUrl, authors[]>.
+* Group authors by outbox relay (discovery fallback). `prefer` reorders existing candidates only;
+* it never appends a URL that is not already in the author's outbox or discovery list. Returns
+* Map<relayUrl, authors[]>.
 */
 function groupAuthorsByOutboxRelay(authors, gossip, discoveryRelays, maxRelaysPerAuthor = 3, prefer = []) {
 	const leftover = new Set((gossip.route({ authors: authors.map((a) => a.toLowerCase()) }).remainder?.authors ?? []).map((a) => a.toLowerCase()));
@@ -480,7 +487,7 @@ function groupAuthorsByOutboxRelay(authors, gossip, discoveryRelays, maxRelaysPe
 		const rest = [];
 		for (const url of urls) if (preferSet.has(url)) preferred.push(url);
 		else rest.push(url);
-		for (const url of preferred.concat(rest).slice(0, maxRelaysPerAuthor)) {
+		for (const url of [...preferred, ...rest].slice(0, maxRelaysPerAuthor)) {
 			const list = map.get(url) ?? [];
 			if (!list.includes(pk)) list.push(pk);
 			map.set(url, list);
@@ -489,8 +496,8 @@ function groupAuthorsByOutboxRelay(authors, gossip, discoveryRelays, maxRelaysPe
 	return map;
 }
 /**
-* Outbox-model feed: history sync + live subscription for a set of authors,
-* routed via NIP-65 write relays (with discovery fallback).
+* Outbox-model feed: history sync + live subscription for a set of authors, routed via NIP-65 write
+* relays (with discovery fallback).
 */
 var OutboxFeed = class {
 	#pool;
@@ -502,6 +509,7 @@ var OutboxFeed = class {
 	#timeoutMs;
 	#onEvent;
 	#observe;
+	#seen;
 	#applySync;
 	#hydrate;
 	#bounds = /* @__PURE__ */ new Map();
@@ -519,6 +527,7 @@ var OutboxFeed = class {
 		this.#timeoutMs = opts.fetchTimeoutMs ?? 4400;
 		this.#onEvent = opts.onEvent;
 		this.#observe = opts.observe;
+		this.#seen = opts.seen;
 		this.#applySync = opts.applySync;
 		this.#hydrate = opts.hydrate;
 	}
@@ -535,9 +544,7 @@ var OutboxFeed = class {
 	getBound(pubkey, kind) {
 		return this.#bounds.get(boundKey(pubkey, kind));
 	}
-	/**
-	* Load NIP-65 relay lists for authors that have no outbox routes yet.
-	*/
+	/** Load NIP-65 relay lists for authors that have no outbox routes yet. */
 	async hydrate() {
 		this.#assertOpen();
 		if (!this.#hydrate) return;
@@ -545,47 +552,48 @@ var OutboxFeed = class {
 		if (missing.length === 0) return;
 		await this.#hydrate(missing);
 	}
-	/**
-	* One-shot history pull. Persistence is `applySync`; bounds move only for events it returns.
-	*/
+	/** One-shot history pull. Persistence is `applySync`; bounds move only for events it returns. */
 	async sync(opts) {
 		this.#assertOpen();
-		if (!opts?.skipHydrate) await this.hydrate();
+		if (opts?.skipHydrate !== true) await this.hydrate();
 		await this.#hydrateBoundsFromStore();
 		const byRelay = groupAuthorsByOutboxRelay(this.#authors, this.#gossip, this.#discovery, this.#maxRelays, this.#pool.connectedUrls());
 		if (byRelay.size === 0) return [];
 		const byId = /* @__PURE__ */ new Map();
 		await Promise.all([...byRelay.entries()].map(async ([url, authors]) => {
-			if (opts?.signal?.aborted) return;
+			throwIfAborted(opts?.signal);
 			const filters = this.#syncFilters(authors, opts);
 			try {
 				const batch = await this.#pool.fetch([url], filters, {
 					timeoutMs: this.#timeoutMs,
-					signal: opts?.signal
+					signal: opts?.signal,
+					onevent: (event, relayUrl) => invokeSafely(() => this.#seen?.(event, relayUrl))
 				});
 				for (const event of batch) byId.set(event.id, event);
-			} catch {}
+			} catch (error) {
+				if (opts?.signal?.aborted === true) throw error;
+			}
 		}));
 		const unique = [...byId.values()];
 		if (unique.length === 0) return [];
 		let applied = [];
 		if (this.#applySync) try {
 			applied = await this.#applySync(unique);
-		} catch (err) {
-			throw toStorageError(err);
+		} catch (error) {
+			throw toStorageError(error);
 		}
 		const dirty = /* @__PURE__ */ new Set();
 		for (const event of applied) {
 			this.#updateBounds(event);
 			dirty.add(boundKey(event.pubkey, event.kind));
-			this.#onEvent?.(event);
+			invokeSafely(() => this.#onEvent?.(event));
 		}
 		await this.#persistBounds(dirty);
 		return sortedEvents(unique);
 	}
 	/**
-	* Start a live subscription across outbox relays for the current authors.
-	* Closes any previous live subscription.
+	* Start a live subscription across outbox relays for the current authors. Closes any previous
+	* live subscription.
 	*/
 	startLive(opts) {
 		this.#assertOpen();
@@ -602,10 +610,11 @@ var OutboxFeed = class {
 			};
 			closers.push(this.#pool.subscribe([url], [filter], {
 				signal: opts?.signal,
-				onevent: (event) => {
+				onevent: (event, relayUrl) => {
+					invokeSafely(() => this.#seen?.(event, relayUrl));
 					if (seen.has(event.id)) return;
 					seen.add(event.id);
-					this.#noteEvent(event);
+					this.#noteEvent(event, relayUrl);
 				}
 			}));
 		}
@@ -653,7 +662,7 @@ var OutboxFeed = class {
 		const base = {
 			kinds: this.#kinds,
 			limit: opts?.limit ?? 50,
-			...opts?.until !== void 0 ? { until: opts.until } : {}
+			...opts?.until === void 0 ? {} : { until: opts.until }
 		};
 		if (opts?.since !== void 0) return [{
 			...base,
@@ -672,7 +681,7 @@ var OutboxFeed = class {
 					complete = false;
 					break;
 				}
-				if (newest === void 0 || b.newest < newest) newest = b.newest;
+				newest = Math.min(newest ?? b.newest, b.newest);
 			}
 			if (complete && newest !== void 0) {
 				bounded.push(pk);
@@ -697,15 +706,19 @@ var OutboxFeed = class {
 			authors: unbounded
 		}];
 	}
-	#noteEvent(event) {
+	#noteEvent(event, relayUrl) {
 		this.#updateBounds(event);
 		const bound = this.#bounds.get(boundKey(event.pubkey, event.kind));
-		if (bound) this.#storage.setOutboxBound(event.pubkey, event.kind, {
-			oldest: bound.oldest,
-			newest: bound.newest
-		}).catch(() => {});
-		this.#observe?.(event);
-		this.#onEvent?.(event);
+		if (bound) (async () => {
+			try {
+				await this.#storage.setOutboxBound(event.pubkey, event.kind, {
+					oldest: bound.oldest,
+					newest: bound.newest
+				});
+			} catch {}
+		})();
+		invokeSafely(() => this.#observe?.(event, relayUrl));
+		invokeSafely(() => this.#onEvent?.(event));
 	}
 	async #persistBounds(keys) {
 		const writes = [];
@@ -721,8 +734,8 @@ var OutboxFeed = class {
 		if (writes.length === 0) return;
 		try {
 			await Promise.all(writes);
-		} catch (err) {
-			throw toStorageError(err);
+		} catch (error) {
+			throw toStorageError(error);
 		}
 	}
 	#updateBounds(event) {
@@ -748,20 +761,31 @@ function createOutboxFeed(opts) {
 /** Build an instance-scoped loader suite (no module globals). */
 function createLoaders(opts) {
 	const context = new LoaderContext(opts);
-	const lists = createListLoaders(context);
-	const profile = createProfileLoader(context);
+	const byKind = /* @__PURE__ */ new Map();
+	const replaceable = (kind) => {
+		let loader = byKind.get(kind);
+		if (loader === void 0) {
+			loader = createReplaceableLoader(context, kind);
+			byKind.set(kind, loader);
+		}
+		return loader;
+	};
+	const lists = createListLoaders(replaceable);
+	const profile = createProfileLoader(replaceable);
 	const event = createEventLoader(context);
 	return {
-		context,
-		follows: (pubkey, o) => lists.follows(pubkey, o),
-		muteList: (pubkey, o) => lists.muteList(pubkey, o),
-		relayList: (pubkey, o) => lists.relayList(pubkey, o),
-		dmRelayList: (pubkey, o) => lists.dmRelayList(pubkey, o),
-		profile: (pubkey, o) => profile.load(pubkey, o),
-		event: (ref) => event.load(ref)
+		follows: async (pubkey, o) => lists.follows(pubkey, o),
+		muteList: async (pubkey, o) => lists.muteList(pubkey, o),
+		relayList: async (pubkey, o) => lists.relayList(pubkey, o),
+		dmRelayList: async (pubkey, o) => lists.dmRelayList(pubkey, o),
+		profile: async (pubkey, o) => profile.load(pubkey, o),
+		event: (ref) => event.load(ref),
+		replaceable,
+		addRelay: (url) => context.addRelay(url),
+		removeRelay: (url) => context.removeRelay(url)
 	};
 }
 //#endregion
-export { groupAuthorsByOutboxRelay as a, createListLoaders as c, LoaderError as d, createEventLoader as f, createOutboxFeed as i, createReplaceableLoader as l, ReplaceableCache as m, OutboxError as n, bareNostrUser as o, LoaderContext as p, OutboxFeed as r, createProfileLoader as s, createLoaders as t, DataLoader as u };
+export { groupAuthorsByOutboxRelay as a, createOutboxFeed as i, OutboxError as n, bareNostrUser as o, OutboxFeed as r, createLoaders as t };
 
-//# sourceMappingURL=loaders-BNQszDAn.mjs.map
+//# sourceMappingURL=loaders-o6YXB_Ri.mjs.map