@voltro/plugin-notifications 0.54.0 → 0.55.0

package/dist/index.js

@@ -1,8 +1,8 @@
-import { archiveDescriptor as e, clearQuietHoursDescriptor as t, inboxDescriptor as n, markAllReadDescriptor as r, markReadDescriptor as i, markUnreadDescriptor as a, notificationsRpcClientImports as o, preferencesDescriptor as s, setPreferenceDescriptor as c, setQuietHoursDescriptor as l, subscribeDescriptor as u, unarchiveDescriptor as d, unreadCountDescriptor as f, unsubscribeDescriptor as p, webPushPublicKeyDescriptor as m, webPushRpcClientImports as ee, webPushStatusDescriptor as te, webPushSubscribeDescriptor as ne, webPushUnsubscribeDescriptor as re } from "./rpc.js";
-import { Context as h, Effect as g, Layer as ie, Schema as _ } from "effect";
-import { and as v, boolean as y, eq as b, generateId as x, id as S, integer as C, isNotNull as ae, isNull as w, json as T, lte as E, registerRetention as D, retentionTtlMsFromEnv as O, table as k, text as A, timestamp as j } from "@voltro/database";
-import { definePlugin as oe, pluginInstanceName as se } from "@voltro/protocol";
-import { createCipheriv as M, createDecipheriv as ce, createECDH as N, createHash as le, createHmac as ue, createPrivateKey as de, randomBytes as fe, randomUUID as P, sign as pe, timingSafeEqual as me } from "node:crypto";
+import { BASE_NAME as e, archiveDescriptor as t, clearQuietHoursDescriptor as n, inboxDescriptor as r, markAllReadDescriptor as i, markReadDescriptor as a, markUnreadDescriptor as o, notificationsRpcClientImports as s, preferencesDescriptor as c, setPreferenceDescriptor as l, setQuietHoursDescriptor as u, subscribeDescriptor as d, unarchiveDescriptor as f, unreadCountDescriptor as p, unsubscribeDescriptor as m, webPushPublicKeyDescriptor as ee, webPushRpcClientImports as te, webPushStatusDescriptor as ne, webPushSubscribeDescriptor as re, webPushUnsubscribeDescriptor as ie } from "./rpc.js";
+import { Context as h, Effect as g, Layer as ae, Schema as _ } from "effect";
+import { and as v, boolean as y, eq as b, generateId as x, id as S, integer as C, isNotNull as oe, isNull as w, json as T, lte as E, registerRetention as D, retentionTtlMsFromEnv as O, table as k, text as A, timestamp as j } from "@voltro/database";
+import { definePlugin as se, pluginInstanceName as ce } from "@voltro/protocol";
+import { createCipheriv as le, createDecipheriv as M, createECDH as N, createHash as ue, createHmac as de, createPrivateKey as fe, randomBytes as pe, randomUUID as P, sign as me, timingSafeEqual as he } from "node:crypto";
 //#region src/errors.ts
 var F = class extends _.TaggedError()("PushTokenRejected", {
 	token: _.String,
@@ -12,7 +12,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	deliver: async (e) => {
 		process.stdout.write(`[notify:${e.category}] → ${e.to}: ${e.title} — ${e.body}\n`);
 	}
-}), he = (e) => ({
+}), ge = (e) => ({
 	id: e.id ?? "slack",
 	deliver: async (t) => {
 		let n = e.format ? e.format(t) : { text: `*${t.title}*\n${t.body}` }, r = await fetch(e.url, {
@@ -25,7 +25,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		});
 		if (!r.ok) throw Error(`webhook ${e.id ?? "slack"} POST ${r.status}`);
 	}
-}), ge = (e) => ({
+}), _e = (e) => ({
 	id: "email",
 	deliver: (t) => e({
 		to: t.to,
@@ -33,13 +33,13 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		html: `<p>${t.body}</p>`,
 		text: t.body
 	})
-}), _e = (e) => ({
+}), ve = (e) => ({
 	id: "sms",
 	deliver: (t) => e(t.to, `${t.title}: ${t.body}`)
-}), ve = (e, t) => ({
+}), ye = (e, t) => ({
 	id: e,
 	deliver: t
-}), ye = (e) => {
+}), be = (e) => {
 	let t = async (t, n, r) => {
 		let i = {
 			token: n,
@@ -172,7 +172,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 			for (let e = a.length - 1; e >= 0; e--) t.has(a[e].id) && a.splice(e, 1);
 		}
 	};
-}, z = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : "", be = (e) => {
+}, z = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : "", xe = (e) => {
 	let t = async (t, n, r, i) => await e.query({
 		table: t,
 		predicate: n,
@@ -369,7 +369,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 			for (let n of t) await e.delete("_voltro_notification_held", n);
 		}
 	};
-}, xe = (e) => ({
+}, Se = (e) => ({
 	id: "inApp",
 	deliver: async (t) => {
 		await e.addInbox({
@@ -395,14 +395,14 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	} catch {
 		return e.getUTCHours() * 60 + e.getUTCMinutes();
 	}
-}, Se = (e, t) => {
+}, Ce = (e, t) => {
 	if (e.startMinute === e.endMinute) return !1;
 	let n = B(t, e.tz ?? "UTC");
 	return e.startMinute < e.endMinute ? n >= e.startMinute && n < e.endMinute : n >= e.startMinute || n < e.endMinute;
-}, Ce = (e, t) => {
+}, we = (e, t) => {
 	let n = B(t, e.tz ?? "UTC"), r = e.endMinute - n;
 	return r <= 0 && (r += 1440), new Date(t.getTime() + r * 6e4);
-}, we = (e) => {
+}, Te = (e) => {
 	let t = new Map(e.channels.map((e) => [e.id, e])), n = e.channels.map((e) => e.id), r = e.now ?? (() => (/* @__PURE__ */ new Date()).toISOString()), i = e.digestWindowMs ?? 0, a = async (i) => {
 		let a = await e.store.getPreferences(i.to), o = L(n, i.category, i.channels, a, i.to), s = n.filter((e) => !o.includes(e)), c = [], l = [], u = {
 			to: i.to,
@@ -482,7 +482,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		};
 	}, o = async (t) => {
 		let n = await e.store.getQuietHours(t.to), o = new Date(r());
-		if (n && Se(n, o)) return (n.policy ?? "hold") === "drop" ? {
+		if (n && Ce(n, o)) return (n.policy ?? "hold") === "drop" ? {
 			delivered: [],
 			failed: [],
 			skipped: [],
@@ -492,7 +492,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 			kind: "quiet",
 			subjectId: t.to,
 			send: t,
-			flushAt: Ce(n, o).toISOString()
+			flushAt: we(n, o).toISOString()
 		}), {
 			delivered: [],
 			failed: [],
@@ -556,11 +556,11 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 				let t = i.get(e.subjectId) ?? [];
 				t.push(e), i.set(e.subjectId, t);
 			}
-			for (let [e, t] of i) await a(Te(e, t));
+			for (let [e, t] of i) await a(Ee(e, t));
 			return await e.store.clearHeld(n.map((e) => e.id)), n.length;
 		}
 	};
-}, Te = (e, t) => {
+}, Ee = (e, t) => {
 	if (t.length === 1) return t[0].send;
 	let n = t.map((e) => ({
 		category: e.send.category,
@@ -575,7 +575,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		data: { items: n },
 		tenantId: t[0].send.tenantId ?? null
 	};
-}, V = (e) => e.toString("base64url"), H = (e) => Buffer.from(e, "base64url"), U = (e, t) => ue("sha256", e).update(t).digest(), W = (e, t, n) => U(e, Buffer.concat([t, Buffer.from([1])])).subarray(0, n), Ee = () => {
+}, V = (e) => e.toString("base64url"), H = (e) => Buffer.from(e, "base64url"), U = (e, t) => de("sha256", e).update(t).digest(), W = (e, t, n) => U(e, Buffer.concat([t, Buffer.from([1])])).subarray(0, n), De = () => {
 	let e = N("prime256v1");
 	return e.generateKeys(), V(e.getPrivateKey());
 }, G = (e) => {
@@ -583,11 +583,11 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	if (t.length !== 32) throw Error(`VOLTRO_VAPID_PRIVATE_KEY must be a base64url 32-byte P-256 scalar (got ${t.length} bytes)`);
 	let n = N("prime256v1");
 	return n.setPrivateKey(t), V(n.getPublicKey());
-}, De = (e) => {
+}, Oe = (e) => {
 	let t = H(e), n = N("prime256v1");
 	n.setPrivateKey(t);
 	let r = n.getPublicKey();
-	return de({
+	return fe({
 		key: {
 			kty: "EC",
 			crv: "P-256",
@@ -597,7 +597,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		},
 		format: "jwk"
 	});
-}, K = (e, t, n, r = Date.now()) => {
+}, ke = (e, t, n, r = Date.now()) => {
 	let i = new URL(e), a = {
 		aud: `${i.protocol}//${i.host}`,
 		exp: Math.floor(r / 1e3) + 43200,
@@ -606,45 +606,45 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		typ: "JWT",
 		alg: "ES256"
 	})))}.${V(Buffer.from(JSON.stringify(a)))}`;
-	return `vapid t=${o}.${V(pe("sha256", Buffer.from(o), {
-		key: De(t),
+	return `vapid t=${o}.${V(me("sha256", Buffer.from(o), {
+		key: Oe(t),
 		dsaEncoding: "ieee-p1363"
 	}))}, k=${G(t)}`;
-}, Oe = Buffer.from("WebPush: info\0"), ke = Buffer.from("Content-Encoding: aes128gcm\0"), Ae = Buffer.from("Content-Encoding: nonce\0"), je = 4096, Me = (e, t, n = {}) => {
+}, K = Buffer.from("WebPush: info\0"), Ae = Buffer.from("Content-Encoding: aes128gcm\0"), je = Buffer.from("Content-Encoding: nonce\0"), Me = 4096, Ne = (e, t, n = {}) => {
 	let r = H(e.p256dh), i = H(e.auth);
 	if (r.length !== 65 || r[0] !== 4) throw Error("push subscription p256dh must be a 65-byte uncompressed P-256 point");
 	if (i.length !== 16) throw Error("push subscription auth must be 16 bytes");
 	let a = N("prime256v1");
 	n.asPrivate ? a.setPrivateKey(n.asPrivate) : a.generateKeys();
 	let o = a.getPublicKey(), s = W(U(i, a.computeSecret(r)), Buffer.concat([
-		Oe,
+		K,
 		r,
 		o
-	]), 32), c = n.salt ?? fe(16), l = U(c, s), u = W(l, ke, 16), d = W(l, Ae, 12), f = M("aes-128-gcm", u, d), p = Buffer.concat([
+	]), 32), c = n.salt ?? pe(16), l = U(c, s), u = W(l, Ae, 16), d = W(l, je, 12), f = le("aes-128-gcm", u, d), p = Buffer.concat([
 		f.update(Buffer.concat([t, Buffer.from([2])])),
 		f.final(),
 		f.getAuthTag()
 	]), m = Buffer.alloc(21);
-	return c.copy(m, 0), m.writeUInt32BE(je, 16), m.writeUInt8(o.length, 20), Buffer.concat([
+	return c.copy(m, 0), m.writeUInt32BE(Me, 16), m.writeUInt8(o.length, 20), Buffer.concat([
 		m,
 		o,
 		p
 	]);
-}, Ne = (e, t) => {
+}, Pe = (e, t) => {
 	let n = e.subarray(0, 16), r = e.readUInt8(20), i = e.subarray(21, 21 + r), a = e.subarray(21 + r), o = N("prime256v1");
 	o.setPrivateKey(t.uaPrivate);
 	let s = o.getPublicKey(), c = o.computeSecret(i), l = U(n, W(U(t.authSecret, c), Buffer.concat([
-		Oe,
+		K,
 		s,
 		i
-	]), 32)), u = W(l, ke, 16), d = W(l, Ae, 12), f = ce("aes-128-gcm", u, d);
+	]), 32)), u = W(l, Ae, 16), d = W(l, je, 12), f = M("aes-128-gcm", u, d);
 	f.setAuthTag(a.subarray(a.length - 16));
 	let p = Buffer.concat([f.update(a.subarray(0, a.length - 16)), f.final()]), m = p.length - 1;
 	for (; m >= 0 && p[m] === 0;) m--;
 	if (p[m] !== 2) throw Error("web-push record missing the last-record delimiter");
 	return p.subarray(0, m);
-}, Pe = async (e, t, n) => {
-	let r = Me(e.keys, t), i = n.fetchImpl ?? fetch, a;
+}, Fe = async (e, t, n) => {
+	let r = Ne(e.keys, t), i = n.fetchImpl ?? fetch, a;
 	try {
 		a = await i(e.endpoint, {
 			method: "POST",
@@ -653,7 +653,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 				"content-type": "application/octet-stream",
 				ttl: String(n.ttl ?? 86400),
 				urgency: "normal",
-				authorization: K(e.endpoint, n.privateKey, n.contact)
+				authorization: ke(e.endpoint, n.privateKey, n.contact)
 			},
 			body: new Uint8Array(r)
 		});
@@ -678,10 +678,10 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		status: a.status,
 		detail: o.slice(0, 200)
 	};
-}, Fe = (e, t) => {
+}, Ie = (e, t) => {
 	let n = Buffer.from(e), r = Buffer.from(t);
-	return n.length === r.length && me(n, r);
-}, Ie = k("_voltro_notification_push_subscriptions", {
+	return n.length === r.length && he(n, r);
+}, Le = k("_voltro_notification_push_subscriptions", {
 	id: S({ prefix: "notifpush" }),
 	subjectId: A(),
 	endpointHash: A(),
@@ -691,7 +691,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	ua: A().nullable(),
 	createdAt: j().default("now"),
 	tenantId: A().nullable()
-}).unique("byPushEndpointHash", ["endpointHash"]).index("byPushSubject", ["subjectId"]), q = (e) => le("sha256").update(e).digest("hex"), J = () => {
+}).unique("byPushEndpointHash", ["endpointHash"]).index("byPushSubject", ["subjectId"]), q = (e) => ue("sha256").update(e).digest("hex"), J = () => {
 	let e = /* @__PURE__ */ new Map();
 	return {
 		upsert: async (t) => {
@@ -707,7 +707,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		},
 		countForSubject: async (t) => [...e.values()].filter((e) => e.subjectId === t).length
 	};
-}, Y = "_voltro_notification_push_subscriptions", Le = (e) => {
+}, Y = "_voltro_notification_push_subscriptions", Re = (e) => {
 	let t = async (t, n) => e.query({
 		table: Y,
 		predicate: t,
@@ -761,23 +761,23 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		},
 		countForSubject: async (e) => (await t(b("subjectId", e))).length
 	};
-}, Re = Symbol.for("@voltro/plugin-notifications:web-push"), X = () => {
+}, ze = Symbol.for("@voltro/plugin-notifications:web-push"), X = () => {
 	let e = globalThis;
-	return e[Re] ??= {
+	return e[ze] ??= {
 		store: J(),
 		bound: !1
 	};
-}, ze = (e) => {
+}, Be = (e) => {
 	let t = X();
-	t.store = Le(e), t.bound = !0;
-}, Be = () => {
+	t.store = Re(e), t.bound = !0;
+}, Ve = () => {
 	let e = X();
 	e.store = J(), e.bound = !1;
 }, Z = (e) => {
 	let t = e ?? process.env.VOLTRO_VAPID_PRIVATE_KEY;
 	if (t === void 0 || t.trim() === "") throw Error("web push needs VOLTRO_VAPID_PRIVATE_KEY (a base64url P-256 scalar). `voltro dev` mints one into .env.local; for production generate one and set it in the deployment environment. There is deliberately no default.");
 	return t;
-}, Q = 3800, Ve = (e, t) => {
+}, Q = 3800, He = (e, t) => {
 	let n = typeof e.data?.url == "string" ? e.data.url : void 0, r = {
 		title: e.title,
 		body: e.body,
@@ -794,31 +794,31 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		...o,
 		body: `${l}…`
 	}));
-}, He = (e = {}) => (X().channelOptions = e, We(e)), Ue = () => {
+}, Ue = (e = {}) => (X().channelOptions = e, Ge(e)), We = () => {
 	let e = X().channelOptions;
 	G(Z(e?.privateKey));
-}, We = (e) => ({
+}, Ge = (e) => ({
 	id: e.id ?? "webPush",
 	deliver: async (t) => {
-		let n = await Ge(t, e), r = n.filter((e) => e.status === "failed");
+		let n = await Ke(t, e), r = n.filter((e) => e.status === "failed");
 		if (n.length > 0 && r.length === n.length) throw Error(`web push failed for all ${r.length} endpoint(s): ${r[0].error ?? "unknown"}`);
 	},
-	deliverDetailed: (t) => Ge(t, e)
-}), Ge = async (e, t) => {
+	deliverDetailed: (t) => Ke(t, e)
+}), Ke = async (e, t) => {
 	let n = Z(t.privateKey), r = await X().store.listForSubject(e.to), i = [];
 	for (let a of r) {
-		let r = fe(16).toString("base64url"), o = {
+		let r = pe(16).toString("base64url"), o = {
 			privateKey: n,
 			...t.contact === void 0 ? {} : { contact: t.contact },
 			...t.ttl === void 0 ? {} : { ttl: t.ttl },
 			...t.fetchImpl === void 0 ? {} : { fetchImpl: t.fetchImpl }
-		}, s = await Pe({
+		}, s = await Fe({
 			endpoint: a.endpoint,
 			keys: {
 				p256dh: a.p256dh,
 				auth: a.auth
 			}
-		}, Ve(e, r), o);
+		}, He(e, r), o);
 		s.kind === "delivered" ? i.push({
 			endpoint: a.endpoint,
 			status: "sent",
@@ -835,7 +835,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		});
 	}
 	return i;
-}, Ke = (e) => G(Z(e)), qe = k("_voltro_notification_inbox", {
+}, qe = (e) => G(Z(e)), Je = k("_voltro_notification_inbox", {
 	id: S({ prefix: "notif" }),
 	subjectId: A(),
 	category: A(),
@@ -846,7 +846,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	archivedAt: j().nullable(),
 	createdAt: j().default("now"),
 	tenantId: A().nullable()
-}).renamedFrom("notification_inbox").index("byInboxSubject", ["subjectId"]).index("byInboxSubjectCreatedAt", ["subjectId", "createdAt"]).index("byInboxSubjectUnread", ["subjectId"], { where: "\"readAt\" IS NULL" }), Je = k("_voltro_notification_preferences", {
+}).renamedFrom("notification_inbox").index("byInboxSubject", ["subjectId"]).index("byInboxSubjectCreatedAt", ["subjectId", "createdAt"]).index("byInboxSubjectUnread", ["subjectId"], { where: "\"readAt\" IS NULL" }), Ye = k("_voltro_notification_preferences", {
 	id: S({ prefix: "notifpref" }),
 	subjectId: A(),
 	category: A(),
@@ -856,7 +856,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	"subjectId",
 	"category",
 	"channel"
-]), Ye = k("_voltro_notification_deliveries", {
+]), Xe = k("_voltro_notification_deliveries", {
 	id: S({ prefix: "notifdlv" }),
 	recipient: A(),
 	category: A(),
@@ -867,35 +867,35 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 	endpoint: A().nullable(),
 	clickToken: A().nullable(),
 	clickedAt: j().nullable()
-}).renamedFrom("notification_deliveries").index("byDeliveriesAt", ["at"]).index("byDeliveriesClickToken", ["clickToken"]), Xe = k("_voltro_notification_topic_subscriptions", {
+}).renamedFrom("notification_deliveries").index("byDeliveriesAt", ["at"]).index("byDeliveriesClickToken", ["clickToken"]), Ze = k("_voltro_notification_topic_subscriptions", {
 	id: S({ prefix: "notiftsub" }),
 	topic: A(),
 	subjectId: A(),
 	tenantId: A().nullable()
-}).renamedFrom("notification_topic_subscriptions").unique("byTopicSubject", ["topic", "subjectId"]).index("byTopic", ["topic"]), $ = k("_voltro_notification_quiet_hours", {
+}).renamedFrom("notification_topic_subscriptions").unique("byTopicSubject", ["topic", "subjectId"]).index("byTopic", ["topic"]), Qe = k("_voltro_notification_quiet_hours", {
 	id: S({ prefix: "notifqh" }),
 	subjectId: A(),
 	startMinute: C(),
 	endMinute: C(),
 	tz: A().default("UTC"),
 	policy: A().default("hold")
-}).renamedFrom("notification_quiet_hours").unique("byQuietHoursSubject", ["subjectId"]), Ze = k("_voltro_notification_held", {
+}).renamedFrom("notification_quiet_hours").unique("byQuietHoursSubject", ["subjectId"]), $e = k("_voltro_notification_held", {
 	id: S({ prefix: "notifheld" }),
 	kind: A(),
 	subjectId: A(),
 	send: T(),
 	flushAt: j()
-}).renamedFrom("notification_held").index("byHeldFlushAt", ["flushAt"]).index("byHeldSubjectKind", ["subjectId", "kind"]), Qe = class extends h.Tag("@voltro/plugin-notifications/NotificationService")() {}, $e = (e) => async (t) => {
+}).renamedFrom("notification_held").index("byHeldFlushAt", ["flushAt"]).index("byHeldSubjectKind", ["subjectId", "kind"]), et = class extends h.Tag("@voltro/plugin-notifications/NotificationService")() {}, tt = (e) => async (t) => {
 	if (e !== void 0) try {
 		let n = await e(t);
 		if (typeof n == "string" && n !== "") return n;
 	} catch {}
 	return t.request.subject.id ?? "anonymous";
-}, et = (e) => e.request.subject.tenantId ?? null, tt = "@voltro/plugin-notifications", nt = (h = {}) => {
-	let _ = $e(h.resolveSubjectId), v = se({
-		base: tt,
-		alias: h.alias,
-		instance: h.name
+}, nt = (e) => e.request.subject.tenantId ?? null, $ = e, rt = (e = {}) => {
+	let h = tt(e.resolveSubjectId), _ = ce({
+		base: $,
+		alias: e.alias,
+		instance: e.name
 	});
 	D({
 		source: "plugin",
@@ -909,7 +909,7 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		timeColumn: "createdAt",
 		ttlMs: O(process.env.VOLTRO_NOTIFICATION_INBOX_READ_TTL_HOURS, 4320),
 		envVar: "VOLTRO_NOTIFICATION_INBOX_READ_TTL_HOURS",
-		where: ae("readAt")
+		where: oe("readAt")
 	}), D({
 		source: "plugin",
 		table: "_voltro_notification_held",
@@ -917,81 +917,81 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		ttlMs: O(process.env.VOLTRO_NOTIFICATION_HELD_TTL_HOURS, 168),
 		envVar: "VOLTRO_NOTIFICATION_HELD_TTL_HOURS"
 	});
-	let y = h.store === void 0, b = { current: h.store ?? R() }, x = {
-		addInbox: (e) => b.current.addInbox(e),
-		listInbox: (e, t) => b.current.listInbox(e, t),
-		markRead: (e, t) => b.current.markRead(e, t),
-		markUnread: (e, t) => b.current.markUnread(e, t),
-		markAllRead: (e) => b.current.markAllRead(e),
-		setArchived: (e, t, n) => b.current.setArchived(e, t, n),
-		unreadCount: (e) => b.current.unreadCount(e),
-		getPreferences: (e) => b.current.getPreferences(e),
-		setPreference: (e) => b.current.setPreference(e),
-		recordDelivery: (e) => b.current.recordDelivery(e),
-		listDeliveries: (e) => b.current.listDeliveries(e),
-		markClicked: (e) => b.current.markClicked(e),
-		subscribeTopic: (e) => b.current.subscribeTopic(e),
-		unsubscribeTopic: (e, t) => b.current.unsubscribeTopic(e, t),
-		listTopicSubscribers: (e) => b.current.listTopicSubscribers(e),
-		getQuietHours: (e) => b.current.getQuietHours(e),
-		setQuietHours: (e) => b.current.setQuietHours(e),
-		clearQuietHours: (e) => b.current.clearQuietHours(e),
-		enqueueHeld: (e) => b.current.enqueueHeld(e),
-		pendingDigest: (e) => b.current.pendingDigest(e),
-		dueHeld: (e) => b.current.dueHeld(e),
-		clearHeld: (e) => b.current.clearHeld(e)
-	}, S = h.channels ?? [I()], C = S.some((e) => e.id === "inApp") ? S : [...S, xe(x)], w = h.digestWindowMs ?? 0, T = C.some((e) => e.id === "webPush"), E = we({
-		channels: C,
-		store: x,
-		digestWindowMs: w
-	}), k, A = [
+	let v = e.store === void 0, y = { current: e.store ?? R() }, b = {
+		addInbox: (e) => y.current.addInbox(e),
+		listInbox: (e, t) => y.current.listInbox(e, t),
+		markRead: (e, t) => y.current.markRead(e, t),
+		markUnread: (e, t) => y.current.markUnread(e, t),
+		markAllRead: (e) => y.current.markAllRead(e),
+		setArchived: (e, t, n) => y.current.setArchived(e, t, n),
+		unreadCount: (e) => y.current.unreadCount(e),
+		getPreferences: (e) => y.current.getPreferences(e),
+		setPreference: (e) => y.current.setPreference(e),
+		recordDelivery: (e) => y.current.recordDelivery(e),
+		listDeliveries: (e) => y.current.listDeliveries(e),
+		markClicked: (e) => y.current.markClicked(e),
+		subscribeTopic: (e) => y.current.subscribeTopic(e),
+		unsubscribeTopic: (e, t) => y.current.unsubscribeTopic(e, t),
+		listTopicSubscribers: (e) => y.current.listTopicSubscribers(e),
+		getQuietHours: (e) => y.current.getQuietHours(e),
+		setQuietHours: (e) => y.current.setQuietHours(e),
+		clearQuietHours: (e) => y.current.clearQuietHours(e),
+		enqueueHeld: (e) => y.current.enqueueHeld(e),
+		pendingDigest: (e) => y.current.pendingDigest(e),
+		dueHeld: (e) => y.current.dueHeld(e),
+		clearHeld: (e) => y.current.clearHeld(e)
+	}, x = e.channels ?? [I()], S = x.some((e) => e.id === "inApp") ? x : [...x, Se(b)], C = e.digestWindowMs ?? 0, w = S.some((e) => e.id === "webPush"), T = Te({
+		channels: S,
+		store: b,
+		digestWindowMs: C
+	}), E, k = [
 		{
-			...n,
+			...r,
 			description: "The caller's in-app inbox items.",
-			execute: (e, t) => g.promise(async () => E.inbox(await _(t), e))
+			execute: (e, t) => g.promise(async () => T.inbox(await h(t), e))
 		},
 		{
-			...f,
+			...p,
 			description: "The caller's unread count.",
-			execute: (e, t) => g.promise(async () => ({ count: await E.unreadCount(await _(t)) }))
+			execute: (e, t) => g.promise(async () => ({ count: await T.unreadCount(await h(t)) }))
 		},
 		{
-			...i,
+			...a,
 			description: "Mark an inbox item read.",
-			execute: (e, t) => g.promise(async () => ({ ok: await E.markRead(e.id, await _(t)) }))
+			execute: (e, t) => g.promise(async () => ({ ok: await T.markRead(e.id, await h(t)) }))
 		},
 		{
-			...a,
+			...o,
 			description: "Mark an inbox item unread again.",
-			execute: (e, t) => g.promise(async () => ({ ok: await E.markUnread(e.id, await _(t)) }))
+			execute: (e, t) => g.promise(async () => ({ ok: await T.markUnread(e.id, await h(t)) }))
 		},
 		{
-			...r,
+			...i,
 			description: "Mark every unread item in the caller's inbox read.",
-			execute: (e, t) => g.promise(async () => ({ count: await E.markAllRead(await _(t)) }))
+			execute: (e, t) => g.promise(async () => ({ count: await T.markAllRead(await h(t)) }))
 		},
 		{
-			...e,
+			...t,
 			description: "Archive an inbox item — a different state from read; this is what empties the inbox.",
-			execute: (e, t) => g.promise(async () => ({ ok: await E.setArchived(e.id, await _(t), !0) }))
+			execute: (e, t) => g.promise(async () => ({ ok: await T.setArchived(e.id, await h(t), !0) }))
 		},
 		{
-			...d,
+			...f,
 			description: "Return an archived item to the inbox.",
-			execute: (e, t) => g.promise(async () => ({ ok: await E.setArchived(e.id, await _(t), !1) }))
+			execute: (e, t) => g.promise(async () => ({ ok: await T.setArchived(e.id, await h(t), !1) }))
 		},
 		{
-			...s,
+			...c,
 			description: "The caller's channel preferences.",
-			execute: (e, t) => g.promise(async () => E.getPreferences(await _(t)))
+			execute: (e, t) => g.promise(async () => T.getPreferences(await h(t)))
 		},
 		{
-			...c,
+			...l,
 			description: "Toggle a channel on/off for a category.",
 			execute: (e, t) => g.promise(async () => {
 				let { category: n, channel: r, enabled: i } = e;
-				return await E.setPreference({
-					subjectId: await _(t),
+				return await T.setPreference({
+					subjectId: await h(t),
 					category: n,
 					channel: r,
 					enabled: i
@@ -999,22 +999,22 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 			})
 		},
 		{
-			...u,
+			...d,
 			description: "Subscribe the caller to a broadcast topic.",
-			execute: (e, t) => g.promise(async () => (await E.subscribe(e.topic, await _(t), et(t)), { ok: !0 }))
+			execute: (e, t) => g.promise(async () => (await T.subscribe(e.topic, await h(t), nt(t)), { ok: !0 }))
 		},
 		{
-			...p,
+			...m,
 			description: "Unsubscribe the caller from a broadcast topic.",
-			execute: (e, t) => g.promise(async () => (await E.unsubscribe(e.topic, await _(t)), { ok: !0 }))
+			execute: (e, t) => g.promise(async () => (await T.unsubscribe(e.topic, await h(t)), { ok: !0 }))
 		},
 		{
-			...l,
+			...u,
 			description: "Set the caller's quiet-hours (DND) window.",
 			execute: (e, t) => g.promise(async () => {
 				let n = e;
-				return await E.setQuietHours({
-					subjectId: await _(t),
+				return await T.setQuietHours({
+					subjectId: await h(t),
 					startMinute: n.startMinute,
 					endMinute: n.endMinute,
 					...n.tz ? { tz: n.tz } : {},
@@ -1023,60 +1023,60 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 			})
 		},
 		{
-			...t,
+			...n,
 			description: "Clear the caller's quiet-hours window.",
-			execute: (e, t) => g.promise(async () => (await E.clearQuietHours(await _(t)), { ok: !0 }))
+			execute: (e, t) => g.promise(async () => (await T.clearQuietHours(await h(t)), { ok: !0 }))
 		}
-	], j = T ? [
+	], A = w ? [
 		{
-			...m,
+			...ee,
 			description: "The VAPID application-server key a subscribing browser needs.",
-			execute: () => g.sync(() => ({ key: Ke(X().channelOptions?.privateKey) }))
+			execute: () => g.sync(() => ({ key: qe(X().channelOptions?.privateKey) }))
 		},
 		{
-			...ne,
+			...re,
 			description: "Register the calling subject's browser push subscription (one row per endpoint).",
 			execute: (e, t) => g.promise(async () => {
 				let n = e;
 				return await X().store.upsert({
-					subjectId: await _(t),
+					subjectId: await h(t),
 					endpoint: n.endpoint,
 					endpointHash: q(n.endpoint),
 					p256dh: n.p256dh,
 					auth: n.auth,
 					ua: n.ua ?? null,
-					tenantId: et(t)
+					tenantId: nt(t)
 				}), { ok: !0 };
 			})
 		},
 		{
-			...re,
+			...ie,
 			description: "Remove one of the calling subject's own subscriptions.",
-			execute: (e, t) => g.promise(async () => ({ ok: await X().store.removeForSubject(q(e.endpoint), await _(t)) }))
+			execute: (e, t) => g.promise(async () => ({ ok: await X().store.removeForSubject(q(e.endpoint), await h(t)) }))
 		},
 		{
-			...te,
+			...ne,
 			description: "How many push endpoints the calling subject has registered.",
-			execute: (e, t) => g.promise(async () => ({ endpoints: await X().store.countForSubject(await _(t)) }))
+			execute: (e, t) => g.promise(async () => ({ endpoints: await X().store.countForSubject(await h(t)) }))
 		}
-	] : [], M = (e) => ({
+	] : [], j = (e) => ({
 		kind: "json",
 		data: e
-	}), ce = (e, t) => ({
+	}), le = (e, t) => ({
 		kind: "json",
 		status: e,
 		data: { error: t }
-	}), N = (e, t) => new URLSearchParams(new URL(e, "http://x").search).get(t), le = [{
+	}), M = (e, t) => new URLSearchParams(new URL(e, "http://x").search).get(t), N = [{
 		method: "GET",
 		path: "/deliveries",
 		description: "Recent delivery records (newest first) + per-channel + per-status counts.",
 		handler: () => g.promise(async () => {
-			let e = await x.listDeliveries({ limit: 200 }), t = {}, n = 0, r = 0;
+			let e = await b.listDeliveries({ limit: 200 }), t = {}, n = 0, r = 0;
 			for (let i of e) t[i.channel] = (t[i.channel] ?? 0) + 1, i.status === "sent" ? n++ : r++;
 			let i = e.slice(0, 100).map(({ clickToken: e, ...t }) => t);
-			return M({
+			return j({
 				deliveries: i,
-				channels: C.map((e) => e.id),
+				channels: S.map((e) => e.id),
 				stats: {
 					sent: n,
 					failed: r,
@@ -1089,28 +1089,28 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 		path: "/inbox",
 		description: "In-app inbox for a subject (?subjectId=…).",
 		handler: (e) => {
-			let t = N(e.url, "subjectId");
-			return t ? g.promise(async () => M({
-				items: await x.listInbox(t, { limit: 100 }),
-				unread: await x.unreadCount(t)
-			})) : g.succeed(ce(400, "subjectId query param required"));
+			let t = M(e.url, "subjectId");
+			return t ? g.promise(async () => j({
+				items: await b.listInbox(t, { limit: 100 }),
+				unread: await b.unreadCount(t)
+			})) : g.succeed(le(400, "subjectId query param required"));
 		}
 	}];
-	return oe({
-		name: v,
-		baseName: tt,
+	return se({
+		name: _,
+		baseName: $,
 		description: "Unified notifications — email/slack/sms/push/in-app with preference routing, inbox + delivery log.",
 		permissions: ["inspect:read", "store:write"],
-		...h.tables === !1 ? {} : { extendSchema: { tables: [
-			qe,
+		...e.tables === !1 ? {} : { extendSchema: { tables: [
 			Je,
 			Ye,
 			Xe,
-			$,
 			Ze,
-			Ie
+			Qe,
+			$e,
+			Le
 		] } },
-		...T ? {
+		...w ? {
 			declaredEnv: [{
 				name: "VOLTRO_VAPID_PRIVATE_KEY",
 				required: !0,
@@ -1126,12 +1126,12 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 					try {
 						t = JSON.parse(Buffer.from(e.rawBody).toString("utf8")).token;
 					} catch {}
-					if (typeof t != "string" || t === "" || !Fe(t, t)) return {
+					if (typeof t != "string" || t === "" || !Ie(t, t)) return {
 						status: 400,
 						body: JSON.stringify({ error: "token required" }),
 						contentType: "application/json"
 					};
-					let n = await x.markClicked(t);
+					let n = await b.markClicked(t);
 					return {
 						status: n ? 200 : 404,
 						body: JSON.stringify({ ok: n }),
@@ -1141,27 +1141,27 @@ var F = class extends _.TaggedError()("PushTokenRejected", {
 				maxBodyBytes: 4096
 			}]
 		} : {},
-		services: ie.succeed(Qe, E),
-		routes: [...A, ...j],
-		rpcClientDescriptors: T ? [...o, ...ee] : o,
-		inspectEndpoints: le,
-		bindDataStore: (e) => {
-			y && (b.current = be(e)), ze(e);
-			let t = h.flushIntervalMs ?? 3e4;
-			k = setInterval(() => {
-				E.flushDue().catch(() => {});
-			}, t), typeof k.unref == "function" && k.unref();
+		services: ae.succeed(et, T),
+		routes: [...k, ...A],
+		rpcClientDescriptors: w ? [...s, ...te] : s,
+		inspectEndpoints: N,
+		bindDataStore: (t) => {
+			v && (y.current = xe(t)), Be(t);
+			let n = e.flushIntervalMs ?? 3e4;
+			E = setInterval(() => {
+				T.flushDue().catch(() => {});
+			}, n), typeof E.unref == "function" && E.unref();
 		},
 		onActivate: (e) => g.sync(() => {
-			T && Ue(), e.logger.info("notifications active", {
-				channels: C.map((e) => e.id),
-				digestWindowMs: w
+			w && We(), e.logger.info("notifications active", {
+				channels: S.map((e) => e.id),
+				digestWindowMs: C
 			});
 		}),
 		onDeactivate: () => g.sync(() => {
-			k && clearInterval(k), k = void 0;
+			E && clearInterval(E), E = void 0;
 		})
 	});
 };
 //#endregion
-export { Qe as NotificationService, F as PushTokenRejected, we as buildNotificationService, I as consoleChannel, ve as customChannel, be as dataStoreNotificationStore, Le as dataStorePushSubscriptionStore, Ne as decryptWebPushPayload, Ye as deliveriesTable, ge as emailChannel, Me as encryptWebPushPayload, q as endpointHashOf, Ee as generateVapidPrivateKey, Ze as heldTable, xe as inAppChannel, Se as inQuietHours, qe as inboxTable, $e as makeSubjectId, R as memoryNotificationStore, J as memoryPushSubscriptionStore, B as minuteOfDayInZone, nt as notificationsPlugin, Je as preferencesTable, ye as pushChannel, Ie as pushSubscriptionsTable, Ce as quietHoursEnd, $ as quietHoursTable, Be as resetWebPushStoreForTest, L as resolveChannels, Pe as sendWebPush, _e as smsChannel, Xe as topicSubscriptionsTable, K as vapidAuthorization, G as vapidPublicKeyFor, He as webPushChannel, Ke as webPushPublicKey, he as webhookChannel };
+export { et as NotificationService, F as PushTokenRejected, Te as buildNotificationService, I as consoleChannel, ye as customChannel, xe as dataStoreNotificationStore, Re as dataStorePushSubscriptionStore, Pe as decryptWebPushPayload, Xe as deliveriesTable, _e as emailChannel, Ne as encryptWebPushPayload, q as endpointHashOf, De as generateVapidPrivateKey, $e as heldTable, Se as inAppChannel, Ce as inQuietHours, Je as inboxTable, tt as makeSubjectId, R as memoryNotificationStore, J as memoryPushSubscriptionStore, B as minuteOfDayInZone, rt as notificationsPlugin, Ye as preferencesTable, be as pushChannel, Le as pushSubscriptionsTable, we as quietHoursEnd, Qe as quietHoursTable, Ve as resetWebPushStoreForTest, L as resolveChannels, Fe as sendWebPush, ve as smsChannel, Ze as topicSubscriptionsTable, ke as vapidAuthorization, G as vapidPublicKeyFor, Ue as webPushChannel, qe as webPushPublicKey, ge as webhookChannel };