@voltro/plugin-notifications 0.26.0 → 0.28.0

package/dist/index.js

@@ -1,18 +1,18 @@
-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 ee, unreadCountDescriptor as d, unsubscribeDescriptor as te } from "./rpc.js";
-import { Context as f, Effect as p, Layer as m, Schema as h } from "effect";
-import { and as g, boolean as _, eq as v, generateId as y, id as b, integer as x, isNotNull as ne, isNull as S, json as C, lte as w, registerRetention as T, retentionTtlMsFromEnv as E, table as D, text as O, timestamp as k } from "@voltro/database";
-import { definePlugin as A } from "@voltro/protocol";
-import { randomUUID as j } from "node:crypto";
+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 ee, unreadCountDescriptor as te, unsubscribeDescriptor as ne } from "./rpc.js";
+import { Context as d, Effect as f, Layer as p, Schema as m } from "effect";
+import { and as h, boolean as g, eq as _, generateId as v, id as y, integer as b, isNotNull as re, isNull as x, json as S, lte as C, registerRetention as w, retentionTtlMsFromEnv as T, table as E, text as D, timestamp as O } from "@voltro/database";
+import { definePlugin as k } from "@voltro/protocol";
+import { randomUUID as A } from "node:crypto";
 //#region src/errors.ts
-var M = class extends h.TaggedError()("PushTokenRejected", {
-	token: h.String,
-	reason: h.String
-}) {}, N = () => ({
+var j = class extends m.TaggedError()("PushTokenRejected", {
+	token: m.String,
+	reason: m.String
+}) {}, M = () => ({
 	id: "console",
 	deliver: async (e) => {
 		process.stdout.write(`[notify:${e.category}] → ${e.to}: ${e.title} — ${e.body}\n`);
 	}
-}), P = (e) => ({
+}), ie = (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 M = class extends h.TaggedError()("PushTokenRejected", {
 		});
 		if (!r.ok) throw Error(`webhook ${e.id ?? "slack"} POST ${r.status}`);
 	}
-}), F = (e) => ({
+}), ae = (e) => ({
 	id: "email",
 	deliver: (t) => e({
 		to: t.to,
@@ -33,13 +33,13 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		html: `<p>${t.body}</p>`,
 		text: t.body
 	})
-}), I = (e) => ({
+}), N = (e) => ({
 	id: "sms",
 	deliver: (t) => e(t.to, `${t.title}: ${t.body}`)
-}), re = (e, t) => ({
+}), P = (e, t) => ({
 	id: e,
 	deliver: t
-}), ie = (e) => ({
+}), F = (e) => ({
 	id: e.id ?? "push",
 	deliver: async (t) => {
 		let n = await e.tokensFor(t.to), r = t.data?.badge, i = typeof r == "number" ? r : void 0;
@@ -54,17 +54,17 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			try {
 				await e.transport(n);
 			} catch (e) {
-				throw e instanceof M ? e : new M({
+				throw e instanceof j ? e : new j({
 					token: r,
 					reason: e instanceof Error ? e.message : String(e)
 				});
 			}
 		}
 	}
-}), L = (e, t, n, r, i) => {
+}), I = (e, t, n, r, i) => {
 	let a = n ? e.filter((e) => n.includes(e)) : [...e], o = new Set(r.filter((e) => e.subjectId === i && e.category === t && e.enabled === !1).map((e) => e.channel));
 	return a.filter((e) => !o.has(e));
-}, R = () => {
+}, L = () => {
 	let e = [], t = /* @__PURE__ */ new Map(), n = [], r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = [], o = (e) => `${e.subjectId}|${e.category}|${e.channel}`, s = (e, t) => `${e}|${t}`;
 	return {
 		addInbox: async (t) => {
@@ -145,7 +145,7 @@ var M = class extends h.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 : "", B = (e) => {
+}, R = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : "", z = (e) => {
 	let t = async (t, n, r, i) => await e.query({
 		table: t,
 		predicate: n,
@@ -160,9 +160,9 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		title: String(e.title),
 		body: String(e.body),
 		data: e.data ?? {},
-		readAt: e.readAt == null ? null : z(e.readAt),
-		archivedAt: e.archivedAt == null ? null : z(e.archivedAt),
-		createdAt: z(e.createdAt),
+		readAt: e.readAt == null ? null : R(e.readAt),
+		archivedAt: e.archivedAt == null ? null : R(e.archivedAt),
+		createdAt: R(e.createdAt),
 		tenantId: e.tenantId ?? null
 	}), r = (e) => ({
 		subjectId: String(e.subjectId),
@@ -176,7 +176,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			category: String(e.category),
 			channel: String(e.channel),
 			status: e.status,
-			at: z(e.at)
+			at: R(e.at)
 		};
 		return e.error == null ? t : {
 			...t,
@@ -197,7 +197,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		kind: e.kind === "quiet" ? "quiet" : "digest",
 		subjectId: String(e.subjectId),
 		send: e.send ?? {},
-		flushAt: z(e.flushAt)
+		flushAt: R(e.flushAt)
 	});
 	return {
 		addInbox: async (t) => {
@@ -215,24 +215,24 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			});
 		},
 		listInbox: async (e, r) => {
-			let i = r?.unreadOnly ? g(v("subjectId", e), S("readAt")) : v("subjectId", e);
+			let i = r?.unreadOnly ? h(_("subjectId", e), x("readAt")) : _("subjectId", e);
 			return (await t("_voltro_notification_inbox", i, [{
 				column: "createdAt",
 				direction: "desc"
 			}], r?.limit)).map(n);
 		},
-		markRead: async (n, r) => (await t("_voltro_notification_inbox", g(v("id", n), v("subjectId", r)), [], 1))[0] ? (await e.update("_voltro_notification_inbox", n, { readAt: (/* @__PURE__ */ new Date()).toISOString() }), !0) : !1,
-		markUnread: async (n, r) => (await t("_voltro_notification_inbox", g(v("id", n), v("subjectId", r)), [], 1))[0] ? (await e.update("_voltro_notification_inbox", n, { readAt: null }), !0) : !1,
+		markRead: async (n, r) => (await t("_voltro_notification_inbox", h(_("id", n), _("subjectId", r)), [], 1))[0] ? (await e.update("_voltro_notification_inbox", n, { readAt: (/* @__PURE__ */ new Date()).toISOString() }), !0) : !1,
+		markUnread: async (n, r) => (await t("_voltro_notification_inbox", h(_("id", n), _("subjectId", r)), [], 1))[0] ? (await e.update("_voltro_notification_inbox", n, { readAt: null }), !0) : !1,
 		markAllRead: async (n) => {
-			let r = await t("_voltro_notification_inbox", g(v("subjectId", n), S("readAt")), [], void 0), i = (/* @__PURE__ */ new Date()).toISOString();
+			let r = await t("_voltro_notification_inbox", h(_("subjectId", n), x("readAt")), [], void 0), i = (/* @__PURE__ */ new Date()).toISOString();
 			for (let t of r) await e.update("_voltro_notification_inbox", String(t.id), { readAt: i });
 			return r.length;
 		},
-		setArchived: async (n, r, i) => (await t("_voltro_notification_inbox", g(v("id", n), v("subjectId", r)), [], 1))[0] ? (await e.update("_voltro_notification_inbox", n, { archivedAt: i ? (/* @__PURE__ */ new Date()).toISOString() : null }), !0) : !1,
-		unreadCount: async (e) => (await t("_voltro_notification_inbox", g(v("subjectId", e), S("readAt")), [], void 0)).length,
-		getPreferences: async (e) => (await t("_voltro_notification_preferences", v("subjectId", e), [], void 0)).map(r),
+		setArchived: async (n, r, i) => (await t("_voltro_notification_inbox", h(_("id", n), _("subjectId", r)), [], 1))[0] ? (await e.update("_voltro_notification_inbox", n, { archivedAt: i ? (/* @__PURE__ */ new Date()).toISOString() : null }), !0) : !1,
+		unreadCount: async (e) => (await t("_voltro_notification_inbox", h(_("subjectId", e), x("readAt")), [], void 0)).length,
+		getPreferences: async (e) => (await t("_voltro_notification_preferences", _("subjectId", e), [], void 0)).map(r),
 		setPreference: async (t) => {
-			let n = y({
+			let n = v({
 				kind: "typeid",
 				prefix: "notifpref"
 			}, "_voltro_notification_preferences");
@@ -267,7 +267,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			direction: "desc"
 		}], e?.limit)).map(i),
 		subscribeTopic: async (t) => {
-			let n = y({
+			let n = v({
 				kind: "typeid",
 				prefix: "notiftsub"
 			}, "_voltro_notification_topic_subscriptions");
@@ -282,16 +282,16 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			});
 		},
 		unsubscribeTopic: async (n, r) => {
-			let i = await t("_voltro_notification_topic_subscriptions", g(v("topic", n), v("subjectId", r)), [], 1);
+			let i = await t("_voltro_notification_topic_subscriptions", h(_("topic", n), _("subjectId", r)), [], 1);
 			i[0] && await e.delete("_voltro_notification_topic_subscriptions", String(i[0].id));
 		},
-		listTopicSubscribers: async (e) => (await t("_voltro_notification_topic_subscriptions", v("topic", e), [], void 0)).map(a),
+		listTopicSubscribers: async (e) => (await t("_voltro_notification_topic_subscriptions", _("topic", e), [], void 0)).map(a),
 		getQuietHours: async (e) => {
-			let n = await t("_voltro_notification_quiet_hours", v("subjectId", e), [], 1);
+			let n = await t("_voltro_notification_quiet_hours", _("subjectId", e), [], 1);
 			return n[0] ? o(n[0]) : null;
 		},
 		setQuietHours: async (t) => {
-			let n = y({
+			let n = v({
 				kind: "typeid",
 				prefix: "notifqh"
 			}, "_voltro_notification_quiet_hours");
@@ -313,7 +313,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			});
 		},
 		clearQuietHours: async (n) => {
-			let r = await t("_voltro_notification_quiet_hours", v("subjectId", n), [], 1);
+			let r = await t("_voltro_notification_quiet_hours", _("subjectId", n), [], 1);
 			r[0] && await e.delete("_voltro_notification_quiet_hours", String(r[0].id));
 		},
 		enqueueHeld: async (t) => {
@@ -325,11 +325,11 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 				flushAt: t.flushAt
 			});
 		},
-		pendingDigest: async (e) => (await t("_voltro_notification_held", g(v("kind", "digest"), v("subjectId", e)), [{
+		pendingDigest: async (e) => (await t("_voltro_notification_held", h(_("kind", "digest"), _("subjectId", e)), [{
 			column: "flushAt",
 			direction: "asc"
 		}], void 0)).map(s),
-		dueHeld: async (e) => (await t("_voltro_notification_held", w("flushAt", e), [{
+		dueHeld: async (e) => (await t("_voltro_notification_held", C("flushAt", e), [{
 			column: "flushAt",
 			direction: "asc"
 		}], void 0)).map(s),
@@ -337,11 +337,11 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			for (let n of t) await e.delete("_voltro_notification_held", n);
 		}
 	};
-}, V = (e) => ({
+}, B = (e) => ({
 	id: "inApp",
 	deliver: async (t) => {
 		await e.addInbox({
-			id: j(),
+			id: A(),
 			subjectId: t.to,
 			category: t.category,
 			title: t.title,
@@ -351,7 +351,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			createdAt: (/* @__PURE__ */ new Date()).toISOString()
 		});
 	}
-}), H = (e, t) => {
+}), V = (e, t) => {
 	try {
 		let n = new Intl.DateTimeFormat("en-US", {
 			timeZone: t,
@@ -363,16 +363,16 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 	} catch {
 		return e.getUTCHours() * 60 + e.getUTCMinutes();
 	}
-}, U = (e, t) => {
+}, H = (e, t) => {
 	if (e.startMinute === e.endMinute) return !1;
-	let n = H(t, e.tz ?? "UTC");
+	let n = V(t, e.tz ?? "UTC");
 	return e.startMinute < e.endMinute ? n >= e.startMinute && n < e.endMinute : n >= e.startMinute || n < e.endMinute;
-}, W = (e, t) => {
-	let n = H(t, e.tz ?? "UTC"), r = e.endMinute - n;
+}, U = (e, t) => {
+	let n = V(t, e.tz ?? "UTC"), r = e.endMinute - n;
 	return r <= 0 && (r += 1440), new Date(t.getTime() + r * 6e4);
-}, G = (e) => {
+}, W = (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 = {
+		let a = await e.store.getPreferences(i.to), o = I(n, i.category, i.channels, a, i.to), s = n.filter((e) => !o.includes(e)), c = [], l = [], u = {
 			to: i.to,
 			category: i.category,
 			title: i.title,
@@ -384,7 +384,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			let a = t.get(n);
 			if (!a) continue;
 			let o = {
-				id: j(),
+				id: A(),
 				to: i.to,
 				category: i.category,
 				channel: n,
@@ -414,17 +414,17 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		};
 	}, o = async (t) => {
 		let n = await e.store.getQuietHours(t.to), o = new Date(r());
-		if (n && U(n, o)) return (n.policy ?? "hold") === "drop" ? {
+		if (n && H(n, o)) return (n.policy ?? "hold") === "drop" ? {
 			delivered: [],
 			failed: [],
 			skipped: [],
 			held: "quiet-drop"
 		} : (await e.store.enqueueHeld({
-			id: j(),
+			id: A(),
 			kind: "quiet",
 			subjectId: t.to,
 			send: t,
-			flushAt: W(n, o).toISOString()
+			flushAt: U(n, o).toISOString()
 		}), {
 			delivered: [],
 			failed: [],
@@ -434,7 +434,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		if (i > 0 && !t.channels) {
 			let n = (await e.store.pendingDigest(t.to))[0]?.flushAt ?? new Date(o.getTime() + i).toISOString();
 			return await e.store.enqueueHeld({
-				id: j(),
+				id: A(),
 				kind: "digest",
 				subjectId: t.to,
 				send: t,
@@ -488,11 +488,11 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 				let t = i.get(e.subjectId) ?? [];
 				t.push(e), i.set(e.subjectId, t);
 			}
-			for (let [e, t] of i) await a(ae(e, t));
+			for (let [e, t] of i) await a(G(e, t));
 			return await e.store.clearHeld(n.map((e) => e.id)), n.length;
 		}
 	};
-}, ae = (e, t) => {
+}, G = (e, t) => {
 	if (t.length === 1) return t[0].send;
 	let n = t.map((e) => ({
 		category: e.send.category,
@@ -507,70 +507,76 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		data: { items: n },
 		tenantId: t[0].send.tenantId ?? null
 	};
-}, K = D("_voltro_notification_inbox", {
-	id: b({ prefix: "notif" }),
-	subjectId: O(),
-	category: O(),
-	title: O(),
-	body: O(),
-	data: C(),
-	readAt: k().nullable(),
-	archivedAt: k().nullable(),
-	createdAt: k().default("now"),
-	tenantId: O().nullable()
-}).renamedFrom("notification_inbox").index("byInboxSubject", ["subjectId"]), q = D("_voltro_notification_preferences", {
-	id: b({ prefix: "notifpref" }),
-	subjectId: O(),
-	category: O(),
-	channel: O(),
-	enabled: _().default(!0)
+}, K = E("_voltro_notification_inbox", {
+	id: y({ prefix: "notif" }),
+	subjectId: D(),
+	category: D(),
+	title: D(),
+	body: D(),
+	data: S(),
+	readAt: O().nullable(),
+	archivedAt: O().nullable(),
+	createdAt: O().default("now"),
+	tenantId: D().nullable()
+}).renamedFrom("notification_inbox").index("byInboxSubject", ["subjectId"]), q = E("_voltro_notification_preferences", {
+	id: y({ prefix: "notifpref" }),
+	subjectId: D(),
+	category: D(),
+	channel: D(),
+	enabled: g().default(!0)
 }).renamedFrom("notification_preferences").unique("byPreferencesSubjectCategoryChannel", [
 	"subjectId",
 	"category",
 	"channel"
-]), J = D("_voltro_notification_deliveries", {
-	id: b({ prefix: "notifdlv" }),
-	recipient: O(),
-	category: O(),
-	channel: O(),
-	status: O(),
-	error: O().nullable(),
-	at: k().default("now")
-}).renamedFrom("notification_deliveries").index("byDeliveriesAt", ["at"]), Y = D("_voltro_notification_topic_subscriptions", {
-	id: b({ prefix: "notiftsub" }),
-	topic: O(),
-	subjectId: O(),
-	tenantId: O().nullable()
-}).renamedFrom("notification_topic_subscriptions").unique("byTopicSubject", ["topic", "subjectId"]).index("byTopic", ["topic"]), X = D("_voltro_notification_quiet_hours", {
-	id: b({ prefix: "notifqh" }),
-	subjectId: O(),
-	startMinute: x(),
-	endMinute: x(),
-	tz: O().default("UTC"),
-	policy: O().default("hold")
-}).renamedFrom("notification_quiet_hours").unique("byQuietHoursSubject", ["subjectId"]), Z = D("_voltro_notification_held", {
-	id: b({ prefix: "notifheld" }),
-	kind: O(),
-	subjectId: O(),
-	send: C(),
-	flushAt: k()
-}).renamedFrom("notification_held").index("byHeldFlushAt", ["flushAt"]).index("byHeldSubjectKind", ["subjectId", "kind"]), Q = class extends f.Tag("@voltro/plugin-notifications/NotificationService")() {}, $ = (e) => e.request.subject.id ?? "anonymous", oe = (e) => e.request.subject.tenantId ?? null, se = (f = {}) => {
-	let h = f.name ? `@voltro/plugin-notifications#${f.name}` : "@voltro/plugin-notifications";
-	T({
+]), J = E("_voltro_notification_deliveries", {
+	id: y({ prefix: "notifdlv" }),
+	recipient: D(),
+	category: D(),
+	channel: D(),
+	status: D(),
+	error: D().nullable(),
+	at: O().default("now")
+}).renamedFrom("notification_deliveries").index("byDeliveriesAt", ["at"]), Y = E("_voltro_notification_topic_subscriptions", {
+	id: y({ prefix: "notiftsub" }),
+	topic: D(),
+	subjectId: D(),
+	tenantId: D().nullable()
+}).renamedFrom("notification_topic_subscriptions").unique("byTopicSubject", ["topic", "subjectId"]).index("byTopic", ["topic"]), X = E("_voltro_notification_quiet_hours", {
+	id: y({ prefix: "notifqh" }),
+	subjectId: D(),
+	startMinute: b(),
+	endMinute: b(),
+	tz: D().default("UTC"),
+	policy: D().default("hold")
+}).renamedFrom("notification_quiet_hours").unique("byQuietHoursSubject", ["subjectId"]), Z = E("_voltro_notification_held", {
+	id: y({ prefix: "notifheld" }),
+	kind: D(),
+	subjectId: D(),
+	send: S(),
+	flushAt: O()
+}).renamedFrom("notification_held").index("byHeldFlushAt", ["flushAt"]).index("byHeldSubjectKind", ["subjectId", "kind"]), Q = class extends d.Tag("@voltro/plugin-notifications/NotificationService")() {}, $ = (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";
+}, oe = (e) => e.request.subject.tenantId ?? null, se = (d = {}) => {
+	let m = $(d.resolveSubjectId), h = d.name ? `@voltro/plugin-notifications#${d.name}` : "@voltro/plugin-notifications";
+	w({
 		table: "_voltro_notification_deliveries",
 		timeColumn: "at",
-		ttlMs: E(process.env.VOLTRO_NOTIFICATION_DELIVERIES_TTL_HOURS, 2160)
-	}), T({
+		ttlMs: T(process.env.VOLTRO_NOTIFICATION_DELIVERIES_TTL_HOURS, 2160)
+	}), w({
 		table: "_voltro_notification_inbox",
 		timeColumn: "createdAt",
-		ttlMs: E(process.env.VOLTRO_NOTIFICATION_INBOX_READ_TTL_HOURS, 4320),
-		where: ne("readAt")
-	}), T({
+		ttlMs: T(process.env.VOLTRO_NOTIFICATION_INBOX_READ_TTL_HOURS, 4320),
+		where: re("readAt")
+	}), w({
 		table: "_voltro_notification_held",
 		timeColumn: "flushAt",
-		ttlMs: E(process.env.VOLTRO_NOTIFICATION_HELD_TTL_HOURS, 168)
+		ttlMs: T(process.env.VOLTRO_NOTIFICATION_HELD_TTL_HOURS, 168)
 	});
-	let g = f.store === void 0, _ = { current: f.store ?? R() }, v = {
+	let g = d.store === void 0, _ = { current: d.store ?? L() }, v = {
 		addInbox: (e) => _.current.addInbox(e),
 		listInbox: (e, t) => _.current.listInbox(e, t),
 		markRead: (e, t) => _.current.markRead(e, t),
@@ -592,58 +598,58 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		pendingDigest: (e) => _.current.pendingDigest(e),
 		dueHeld: (e) => _.current.dueHeld(e),
 		clearHeld: (e) => _.current.clearHeld(e)
-	}, y = f.channels ?? [N()], b = y.some((e) => e.id === "inApp") ? y : [...y, V(v)], x = f.digestWindowMs ?? 0, S = G({
+	}, y = d.channels ?? [M()], b = y.some((e) => e.id === "inApp") ? y : [...y, B(v)], x = d.digestWindowMs ?? 0, S = W({
 		channels: b,
 		store: v,
 		digestWindowMs: x
-	}), C, w = [
+	}), C, E = [
 		{
 			...n,
 			description: "The caller's in-app inbox items.",
-			execute: (e, t) => p.promise(() => S.inbox($(t), e))
+			execute: (e, t) => f.promise(async () => S.inbox(await m(t), e))
 		},
 		{
-			...d,
+			...te,
 			description: "The caller's unread count.",
-			execute: (e, t) => p.promise(async () => ({ count: await S.unreadCount($(t)) }))
+			execute: (e, t) => f.promise(async () => ({ count: await S.unreadCount(await m(t)) }))
 		},
 		{
 			...i,
 			description: "Mark an inbox item read.",
-			execute: (e, t) => p.promise(async () => ({ ok: await S.markRead(e.id, $(t)) }))
+			execute: (e, t) => f.promise(async () => ({ ok: await S.markRead(e.id, await m(t)) }))
 		},
 		{
 			...a,
 			description: "Mark an inbox item unread again.",
-			execute: (e, t) => p.promise(async () => ({ ok: await S.markUnread(e.id, $(t)) }))
+			execute: (e, t) => f.promise(async () => ({ ok: await S.markUnread(e.id, await m(t)) }))
 		},
 		{
 			...r,
 			description: "Mark every unread item in the caller's inbox read.",
-			execute: (e, t) => p.promise(async () => ({ count: await S.markAllRead($(t)) }))
+			execute: (e, t) => f.promise(async () => ({ count: await S.markAllRead(await m(t)) }))
 		},
 		{
 			...e,
 			description: "Archive an inbox item — a different state from read; this is what empties the inbox.",
-			execute: (e, t) => p.promise(async () => ({ ok: await S.setArchived(e.id, $(t), !0) }))
+			execute: (e, t) => f.promise(async () => ({ ok: await S.setArchived(e.id, await m(t), !0) }))
 		},
 		{
 			...ee,
 			description: "Return an archived item to the inbox.",
-			execute: (e, t) => p.promise(async () => ({ ok: await S.setArchived(e.id, $(t), !1) }))
+			execute: (e, t) => f.promise(async () => ({ ok: await S.setArchived(e.id, await m(t), !1) }))
 		},
 		{
 			...s,
 			description: "The caller's channel preferences.",
-			execute: (e, t) => p.promise(() => S.getPreferences($(t)))
+			execute: (e, t) => f.promise(async () => S.getPreferences(await m(t)))
 		},
 		{
 			...c,
 			description: "Toggle a channel on/off for a category.",
-			execute: (e, t) => p.promise(async () => {
+			execute: (e, t) => f.promise(async () => {
 				let { category: n, channel: r, enabled: i } = e;
 				return await S.setPreference({
-					subjectId: $(t),
+					subjectId: await m(t),
 					category: n,
 					channel: r,
 					enabled: i
@@ -653,20 +659,20 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		{
 			...u,
 			description: "Subscribe the caller to a broadcast topic.",
-			execute: (e, t) => p.promise(async () => (await S.subscribe(e.topic, $(t), oe(t)), { ok: !0 }))
+			execute: (e, t) => f.promise(async () => (await S.subscribe(e.topic, await m(t), oe(t)), { ok: !0 }))
 		},
 		{
-			...te,
+			...ne,
 			description: "Unsubscribe the caller from a broadcast topic.",
-			execute: (e, t) => p.promise(async () => (await S.unsubscribe(e.topic, $(t)), { ok: !0 }))
+			execute: (e, t) => f.promise(async () => (await S.unsubscribe(e.topic, await m(t)), { ok: !0 }))
 		},
 		{
 			...l,
 			description: "Set the caller's quiet-hours (DND) window.",
-			execute: (e, t) => p.promise(async () => {
+			execute: (e, t) => f.promise(async () => {
 				let n = e;
 				return await S.setQuietHours({
-					subjectId: $(t),
+					subjectId: await m(t),
 					startMinute: n.startMinute,
 					endMinute: n.endMinute,
 					...n.tz ? { tz: n.tz } : {},
@@ -677,7 +683,7 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		{
 			...t,
 			description: "Clear the caller's quiet-hours window.",
-			execute: (e, t) => p.promise(async () => (await S.clearQuietHours($(t)), { ok: !0 }))
+			execute: (e, t) => f.promise(async () => (await S.clearQuietHours(await m(t)), { ok: !0 }))
 		}
 	], D = (e) => ({
 		kind: "json",
@@ -686,8 +692,8 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 		kind: "json",
 		status: e,
 		data: { error: t }
-	}), k = (e, t) => new URLSearchParams(new URL(e, "http://x").search).get(t);
-	return A({
+	}), A = (e, t) => new URLSearchParams(new URL(e, "http://x").search).get(t);
+	return k({
 		name: h,
 		description: "Unified notifications — email/slack/sms/push/in-app with preference routing, inbox + delivery log.",
 		permissions: ["inspect:read", "store:write"],
@@ -699,14 +705,14 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			X,
 			Z
 		] },
-		services: m.succeed(Q, S),
-		routes: w,
+		services: p.succeed(Q, S),
+		routes: E,
 		rpcClientDescriptors: o,
 		inspectEndpoints: [{
 			method: "GET",
 			path: "/deliveries",
 			description: "Recent delivery records (newest first) + per-channel + per-status counts.",
-			handler: () => p.promise(async () => {
+			handler: () => f.promise(async () => {
 				let e = await v.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++;
 				return D({
@@ -724,28 +730,28 @@ var M = class extends h.TaggedError()("PushTokenRejected", {
 			path: "/inbox",
 			description: "In-app inbox for a subject (?subjectId=…).",
 			handler: (e) => {
-				let t = k(e.url, "subjectId");
-				return t ? p.promise(async () => D({
+				let t = A(e.url, "subjectId");
+				return t ? f.promise(async () => D({
 					items: await v.listInbox(t, { limit: 100 }),
 					unread: await v.unreadCount(t)
-				})) : p.succeed(O(400, "subjectId query param required"));
+				})) : f.succeed(O(400, "subjectId query param required"));
 			}
 		}],
 		bindDataStore: (e) => {
-			g && (_.current = B(e));
-			let t = f.flushIntervalMs ?? 3e4;
+			g && (_.current = z(e));
+			let t = d.flushIntervalMs ?? 3e4;
 			C = setInterval(() => {
 				S.flushDue().catch(() => {});
 			}, t), typeof C.unref == "function" && C.unref();
 		},
-		onActivate: (e) => p.sync(() => e.logger.info("notifications active", {
+		onActivate: (e) => f.sync(() => e.logger.info("notifications active", {
 			channels: b.map((e) => e.id),
 			digestWindowMs: x
 		})),
-		onDeactivate: () => p.sync(() => {
+		onDeactivate: () => f.sync(() => {
 			C && clearInterval(C), C = void 0;
 		})
 	});
 };
 //#endregion
-export { Q as NotificationService, M as PushTokenRejected, G as buildNotificationService, N as consoleChannel, re as customChannel, B as dataStoreNotificationStore, J as deliveriesTable, F as emailChannel, Z as heldTable, V as inAppChannel, U as inQuietHours, K as inboxTable, R as memoryNotificationStore, H as minuteOfDayInZone, se as notificationsPlugin, q as preferencesTable, ie as pushChannel, W as quietHoursEnd, X as quietHoursTable, L as resolveChannels, I as smsChannel, Y as topicSubscriptionsTable, P as webhookChannel };
+export { Q as NotificationService, j as PushTokenRejected, W as buildNotificationService, M as consoleChannel, P as customChannel, z as dataStoreNotificationStore, J as deliveriesTable, ae as emailChannel, Z as heldTable, B as inAppChannel, H as inQuietHours, K as inboxTable, $ as makeSubjectId, L as memoryNotificationStore, V as minuteOfDayInZone, se as notificationsPlugin, q as preferencesTable, F as pushChannel, U as quietHoursEnd, X as quietHoursTable, I as resolveChannels, N as smsChannel, Y as topicSubscriptionsTable, ie as webhookChannel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-notifications",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "description": "One unified notification surface — email, Slack/webhook, SMS, push, in-app — with per-subject preference routing, an in-app inbox, and a delivery log. NotificationService + typed routes + useInbox/useUnreadCount hooks.",
   "keywords": [
     "voltro",
@@ -42,9 +42,9 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/client": "0.26.0",
-    "@voltro/database": "0.26.0",
-    "@voltro/protocol": "0.26.0"
+    "@voltro/client": "0.28.0",
+    "@voltro/database": "0.28.0",
+    "@voltro/protocol": "0.28.0"
   },
   "peerDependencies": {
     "effect": "^3.22.0"