@voltro/plugin-webhooks 0.26.0 → 0.27.0

package/dist/index.js

@@ -1,13 +1,13 @@
 import { a as e, c as t, i as n, l as r, n as i, o as a, r as o, s, t as c } from "./signing-DUG4JWwk.js";
 import { WebhookDeliveryNotFound as l, WebhookPayloadInvalid as u, WebhookPayloadUnrepresentable as d, WebhookPayloadVersionInvalid as f, WebhookSubscribeInvalid as p } from "./errors.js";
-import { _voltroWebhookDeliveriesTable as m, _voltroWebhookRateWindowsTable as h, _voltroWebhookTargetsTable as ee, webhookTables as g } from "./mixin.js";
-import { randomBytes as _, randomUUID as v } from "node:crypto";
-import { Context as te, Effect as y, Either as ne, Schema as b } from "effect";
-import { and as x, eq as S } from "@voltro/database";
-import { assertPublicUrl as C } from "@voltro/integration-http";
-import { publishServerError as re } from "@voltro/protocol";
-import { createLogger as w } from "@voltro/logger";
-import { Activity as T, DurableClock as E, Workflow as ie } from "@effect/workflow";
+import { _voltroWebhookDeliveriesTable as m, _voltroWebhookRateWindowsTable as h, _voltroWebhookTargetsTable as g, webhookTables as _ } from "./mixin.js";
+import { randomBytes as v, randomUUID as y } from "node:crypto";
+import { Context as ee, Effect as b, Either as te, Schema as x } from "effect";
+import { and as S, eq as C } from "@voltro/database";
+import { assertPublicUrl as w } from "@voltro/integration-http";
+import { publishServerError as ne } from "@voltro/protocol";
+import { createLogger as T } from "@voltro/logger";
+import { Activity as E, DurableClock as re, Workflow as ie } from "@effect/workflow";
 //#region src/eventAudience.ts
 var ae = (e) => e.webhook !== void 0, D = (e) => {
 	let t = e.webhook;
@@ -39,7 +39,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	502,
 	503,
 	504
-], A = (e, t, n) => {
+], se = (e, t, n) => {
 	if (t >= e.maxAttempts || n?.status !== void 0 && !(e.retryOn ?? k).includes(n.status)) return null;
 	if (e.honourRetryAfter !== !1 && n?.retryAfterSeconds !== void 0) {
 		let t = n.retryAfterSeconds * 1e3, r = O(e.maxDelay), i = Math.min(t, r);
@@ -66,7 +66,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		delayMs: Math.max(1, Math.floor(o)),
 		baseDelayMs: a
 	};
-}, j = () => ({
+}, A = () => ({
 	strategy: "exponential",
 	maxAttempts: 8,
 	initialDelay: "5s",
@@ -74,7 +74,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	retryOn: k,
 	honourRetryAfter: !0,
 	jitter: "full"
-}), se = () => ({
+}), ce = () => ({
 	strategy: "fixed",
 	maxAttempts: 120,
 	initialDelay: "30s",
@@ -82,7 +82,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	retryOn: k,
 	honourRetryAfter: !0,
 	jitter: "full"
-}), M = class extends te.Tag("@voltro/webhooks/WebhooksService")() {}, ce = 32, N = 32, P = () => _(ce).toString("hex"), F = (e) => {
+}), j = class extends ee.Tag("@voltro/webhooks/WebhooksService")() {}, le = 32, M = 32, N = () => v(le).toString("hex"), P = (e) => e.events ?? (e.event === void 0 ? [] : [e.event]), F = (e) => {
 	let t;
 	try {
 		t = new URL(e.url);
@@ -97,20 +97,33 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		reason: `url protocol must be http or https, got ${t.protocol}`
 	});
 	if (process.env.NODE_ENV === "production") try {
-		C(e.url);
+		w(e.url);
 	} catch (e) {
 		throw new p({
 			field: "url",
 			reason: e.message
 		});
 	}
-	if (e.event.length === 0) throw new p({
+	let n = P(e);
+	if (n.length === 0) throw new p({
 		field: "event",
 		reason: "event id required"
 	});
-	if (e.secret !== void 0 && e.secret.length < N) throw new p({
+	if (e.event !== void 0 && e.events !== void 0) throw new p({
+		field: "event",
+		reason: "pass `event` OR `events`, not both — the row set would be ambiguous"
+	});
+	if (n.some((e) => e.length === 0)) throw new p({
+		field: "events",
+		reason: "event id required"
+	});
+	if (new Set(n).size !== n.length) throw new p({
+		field: "events",
+		reason: "duplicate event — one row per event, so a repeat would deliver twice"
+	});
+	if (e.secret !== void 0 && e.secret.length < M) throw new p({
 		field: "secret",
-		reason: `secret must be at least ${N} chars`
+		reason: `secret must be at least ${M} chars`
 	});
 	if (e.retry !== void 0) {
 		if (e.retry.maxAttempts < 1) throw new p({
@@ -130,13 +143,13 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		field: "autoDisableAfter",
 		reason: `autoDisableAfter must be a positive integer, got ${e.autoDisableAfter}`
 	});
-}, I = (e, t) => ({
-	id: v(),
-	event: e.event,
+}, I = (e, t, n, r) => ({
+	id: y(),
+	event: n ?? e.event ?? "",
 	url: e.url,
-	secret: e.secret ?? P(),
+	secret: r ?? e.secret ?? N(),
 	signing: e.signing ?? t?.defaultSigning ?? c(),
-	retry: e.retry ?? t?.defaultRetry ?? j(),
+	retry: e.retry ?? t?.defaultRetry ?? A(),
 	filter: e.filter ?? null,
 	scope: e.scope ?? null,
 	headers: e.headers ?? null,
@@ -149,7 +162,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	autoDisableReason: null,
 	payloadVersion: e.payloadVersion ?? t?.version ?? 1,
 	description: e.description ?? null
-}), le = (e) => e instanceof Date ? e.getTime() : typeof e == "string" ? Date.parse(e) : 0, L = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : null, ue = (e) => {
+}), ue = (e) => e instanceof Date ? e.getTime() : typeof e == "string" ? Date.parse(e) : 0, L = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : null, de = (e) => {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
@@ -170,19 +183,19 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	scheduledAt: L(e.scheduledAt),
 	nextAttemptAt: L(e.nextAttemptAt),
 	createdAt: L(e.createdAt)
-}), de = (e, t) => e === t ? "current" : e < t ? "behind" : "ahead", z = (e, t) => {
+}), fe = (e, t) => e === t ? "current" : e < t ? "behind" : "ahead", z = (e, t) => {
 	if (e === null) return !0;
 	let n = { payload: t };
-	for (let [t, r] of Object.entries(e)) if (!pe(fe(n, t), r)) return !1;
+	for (let [t, r] of Object.entries(e)) if (!me(pe(n, t), r)) return !1;
 	return !0;
-}, fe = (e, t) => {
+}, pe = (e, t) => {
 	let n = t.split("."), r = e;
 	for (let e of n) {
 		if (typeof r != "object" || !r) return;
 		r = r[e];
 	}
 	return r;
-}, pe = (e, t) => {
+}, me = (e, t) => {
 	if (typeof t == "object" && t && !Array.isArray(t)) {
 		let n = t;
 		if ("eq" in n) return e === n.eq;
@@ -193,37 +206,42 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		if ("in" in n && Array.isArray(n.in)) return n.in.includes(e);
 	}
 	return e === t;
-}, me = (e, t, n = {}) => {
-	let r = new Map((n.events ?? []).map((e) => [e.id, e]));
-	return {
+}, he = (e, t, n = {}) => {
+	let r = new Map((n.events ?? []).map((e) => [e.id, e])), i = {
 		subscribe: async (t) => {
 			F(t);
-			let n = I(t, r.get(t.event));
-			return await e.store.insert("_voltro_webhook_targets", {
-				...n,
+			let n = P(t), i = t.secret ?? N(), a = n.map((e) => I(t, r.get(e), e, i));
+			for (let t of a) await e.store.insert("_voltro_webhook_targets", {
+				...t,
 				createdAt: /* @__PURE__ */ new Date(),
 				updatedAt: /* @__PURE__ */ new Date()
-			}), {
-				id: n.id,
-				event: n.event,
-				url: n.url,
-				secret: n.secret,
-				signing: n.signing,
-				retry: n.retry
+			});
+			let o = a[0];
+			return {
+				id: o.id,
+				event: o.event,
+				url: o.url,
+				secret: o.secret,
+				signing: o.signing,
+				retry: o.retry,
+				...a.length > 1 ? { targets: a.map((e) => ({
+					id: e.id,
+					event: e.event
+				})) } : {}
 			};
 		},
 		emit: async (n, i) => {
 			let a = typeof n == "object" && n.kind === "event" ? D(n) : void 0, o = typeof n == "string" ? r.get(n) : a ?? n, s = typeof n == "string" ? n : n.id ?? n.name;
 			if (o !== void 0) {
-				let e = b.decodeUnknownEither(o.payload)(i, { errors: "all" });
-				if (ne.isLeft(e)) throw new u({
+				let e = x.decodeUnknownEither(o.payload)(i, { errors: "all" });
+				if (te.isLeft(e)) throw new u({
 					event: s,
 					issues: e.left.message
 				});
 			}
-			let c = v(), l = (await e.store.query({
+			let c = y(), l = (await e.store.query({
 				table: "_voltro_webhook_targets",
-				predicate: S("event", s),
+				predicate: C("event", s),
 				order: [{
 					column: "createdAt",
 					direction: "asc"
@@ -233,7 +251,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				projection: void 0
 			})).filter((e) => z(e.filter, i)), d = [], f = JSON.stringify(i);
 			for (let n of l) {
-				let r = v();
+				let r = y();
 				n.active ? (await t({
 					deliveryId: r,
 					targetId: n.id,
@@ -271,7 +289,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		replay: async (n) => {
 			let r = (await e.store.query({
 				table: "_voltro_webhook_deliveries",
-				predicate: S("deliveryId", n),
+				predicate: C("deliveryId", n),
 				order: [{
 					column: "attempt",
 					direction: "asc"
@@ -285,54 +303,70 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				deliveryId: r.deliveryId,
 				targetId: r.targetId,
 				event: r.event,
-				eventId: r.eventId ?? v(),
+				eventId: r.eventId ?? y(),
 				payloadJson: typeof r.payload == "string" ? r.payload : JSON.stringify(r.payload),
 				attemptEpoch: Date.now()
 			});
 		},
+		resolveTargets: async (t) => {
+			if (typeof t == "string") return [t];
+			let n = (await e.store.query({
+				table: "_voltro_webhook_targets",
+				predicate: void 0,
+				order: void 0,
+				take: 1e3,
+				skip: void 0,
+				projection: void 0
+			})).filter((e) => e.scope !== null && Object.entries(t.scope).every(([t, n]) => e.scope?.[t] === n)).map((e) => e.id);
+			if (n.length === 0) throw Error(`webhooks: no target matches scope ${JSON.stringify(t.scope)} — the operation would have silently done nothing`);
+			return n;
+		},
 		pauseTarget: async (t) => {
-			await e.store.update("_voltro_webhook_targets", t, {
+			for (let n of await i.resolveTargets(t)) await e.store.update("_voltro_webhook_targets", n, {
 				active: !1,
 				updatedAt: /* @__PURE__ */ new Date()
 			});
 		},
 		resumeTarget: async (n) => {
-			await e.store.update("_voltro_webhook_targets", n, {
-				active: !0,
-				consecutiveFailures: 0,
-				autoDisabledAt: null,
-				autoDisableReason: null,
-				updatedAt: /* @__PURE__ */ new Date()
-			});
-			let r = await e.store.query({
-				table: "_voltro_webhook_deliveries",
-				predicate: x(S("targetId", n), S("status", "pending")),
-				order: [{
-					column: "createdAt",
-					direction: "asc"
-				}],
-				take: 1e4,
-				skip: void 0,
-				projection: void 0
-			}), i = Date.now();
-			for (let e of r) await t({
-				deliveryId: e.deliveryId,
-				targetId: n,
-				event: e.event,
-				eventId: e.eventId ?? v(),
-				payloadJson: typeof e.payload == "string" ? e.payload : JSON.stringify(e.payload),
-				attemptEpoch: i
-			});
+			for (let r of await i.resolveTargets(n)) {
+				await e.store.update("_voltro_webhook_targets", r, {
+					active: !0,
+					consecutiveFailures: 0,
+					autoDisabledAt: null,
+					autoDisableReason: null,
+					updatedAt: /* @__PURE__ */ new Date()
+				});
+				let n = await e.store.query({
+					table: "_voltro_webhook_deliveries",
+					predicate: S(C("targetId", r), C("status", "pending")),
+					order: [{
+						column: "createdAt",
+						direction: "asc"
+					}],
+					take: 1e4,
+					skip: void 0,
+					projection: void 0
+				}), i = Date.now();
+				for (let e of n) await t({
+					deliveryId: e.deliveryId,
+					targetId: r,
+					event: e.event,
+					eventId: e.eventId ?? y(),
+					payloadJson: typeof e.payload == "string" ? e.payload : JSON.stringify(e.payload),
+					attemptEpoch: i
+				});
+			}
 		},
 		deleteTarget: async (t) => {
-			await e.store.delete("_voltro_webhook_targets", t), await e.store.deleteMany("_voltro_webhook_deliveries", { where: x(S("targetId", t), S("status", "pending")) });
+			for (let n of await i.resolveTargets(t)) await e.store.delete("_voltro_webhook_targets", n), await e.store.deleteMany("_voltro_webhook_deliveries", { where: S(C("targetId", n), C("status", "pending")) });
 		},
 		rotateSecret: async (t) => {
-			let n = P();
-			return await e.store.update("_voltro_webhook_targets", t, {
+			let n = N();
+			for (let r of await i.resolveTargets(t)) await e.store.update("_voltro_webhook_targets", r, {
 				secret: n,
 				updatedAt: /* @__PURE__ */ new Date()
-			}), { secret: n };
+			});
+			return { secret: n };
 		},
 		updateTarget: async (t, n) => {
 			if (n.url !== void 0 && F({
@@ -350,19 +384,19 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				"autoDisableAfter",
 				"format"
 			]) n[e] !== void 0 && (r[e] = n[e]);
-			await e.store.update("_voltro_webhook_targets", t, r);
+			for (let n of await i.resolveTargets(t)) await e.store.update("_voltro_webhook_targets", n, r);
 		},
 		testTarget: async (n, r) => {
 			let i = (await e.store.query({
 				table: "_voltro_webhook_targets",
-				predicate: S("id", n),
+				predicate: C("id", n),
 				order: void 0,
 				take: 1,
 				skip: void 0,
 				projection: void 0
 			}))[0];
 			if (i === void 0) throw Error(`testTarget: no target ${n}`);
-			let a = v(), o = JSON.stringify(r ?? {
+			let a = y(), o = JSON.stringify(r ?? {
 				test: !0,
 				targetId: n,
 				at: (/* @__PURE__ */ new Date()).toISOString()
@@ -371,7 +405,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				deliveryId: a,
 				targetId: i.id,
 				event: i.event,
-				eventId: v(),
+				eventId: y(),
 				payloadJson: o
 			}) : await e.store.insert("_voltro_webhook_deliveries", {
 				id: `${a}:1`,
@@ -389,9 +423,9 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}), { deliveryId: a };
 		},
 		listDeliveries: async (t) => {
-			let n = await e.store.query({
+			let n = t?.scope === void 0 ? void 0 : new Set(await i.resolveTargets({ scope: t.scope })), r = await e.store.query({
 				table: "_voltro_webhook_deliveries",
-				predicate: t?.targetId === void 0 ? void 0 : S("targetId", t.targetId),
+				predicate: t?.targetId === void 0 ? void 0 : C("targetId", t.targetId),
 				order: [{
 					column: "createdAt",
 					direction: "desc"
@@ -399,13 +433,13 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				take: Math.min((t?.limit ?? 200) * (t?.status !== void 0 || t?.since !== void 0 ? 10 : 1), 5e3),
 				skip: void 0,
 				projection: void 0
-			}), r = t?.since?.getTime();
-			return n.filter((e) => t?.status === void 0 || e.status === t.status).filter((e) => r === void 0 || le(e.createdAt) >= r).slice(0, t?.limit ?? 200).map(R);
+			}), a = t?.since?.getTime();
+			return r.filter((e) => n === void 0 || n.has(String(e.targetId))).filter((e) => t?.status === void 0 || e.status === t.status).filter((e) => a === void 0 || ue(e.createdAt) >= a).slice(0, t?.limit ?? 200).map(R);
 		},
 		getDelivery: async (t) => {
 			let n = (await e.store.query({
 				table: "_voltro_webhook_deliveries",
-				predicate: S("id", t),
+				predicate: C("id", t),
 				order: void 0,
 				take: 1,
 				skip: void 0,
@@ -413,7 +447,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}))[0];
 			return n === void 0 ? null : {
 				...R(n),
-				payload: ue(n.payload),
+				payload: de(n.payload),
 				responseBody: n.responseBody ?? null
 			};
 		},
@@ -427,7 +461,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		listTargets: async (t, n) => {
 			let r = await e.store.query({
 				table: "_voltro_webhook_targets",
-				predicate: t === void 0 ? void 0 : S("event", t),
+				predicate: t === void 0 ? void 0 : C("event", t),
 				order: [{
 					column: "createdAt",
 					direction: "desc"
@@ -452,15 +486,16 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}));
 		}
 	};
-}, he = y.gen(function* () {
-	return yield* M;
-}), ge = (e) => {
+	return i;
+}, ge = b.gen(function* () {
+	return yield* j;
+}), _e = (e) => {
 	if (e.webhooks === void 0) throw Error("useWebhooks: `ctx.webhooks` is not set. Add @voltro/plugin-webhooks to your app.config.ts plugin list and declare at least one *.webhook.tsx file.");
 	return e.webhooks;
-}, _e = 1e4, B = class {
+}, ve = 1e4, B = class {
 	capacity;
 	cache = /* @__PURE__ */ new Map();
-	constructor(e = _e) {
+	constructor(e = ve) {
 		this.capacity = e;
 	}
 	evictExpired() {
@@ -506,9 +541,9 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	status: e,
 	contentType: "application/json; charset=utf-8",
 	body: JSON.stringify(t)
-}), ve = (e, t) => {
+}), ye = (e, t) => {
 	let n = e.provider, r = e.signature ?? n?.signature ?? null, i = e.idempotency ?? n?.idempotency ?? null, o = e.bodyType ?? n?.bodyType ?? "json", s = t.idempotencyCache ?? H(), c = W(i?.ttl), l = t.log ?? ((e) => {
-		w({ scope: `webhook:${e.webhookId}` }).debug("incoming webhook", {
+		T({ scope: `webhook:${e.webhookId}` }).debug("incoming webhook", {
 			status: e.status,
 			signatureOk: e.signatureOk,
 			idempotency: e.idempotency,
@@ -581,7 +616,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		}
 		let p;
 		try {
-			p = b.decodeUnknownSync(e.payload)(f);
+			p = x.decodeUnknownSync(e.payload)(f);
 		} catch (t) {
 			let n = G(422, {
 				error: "schema validation failed",
@@ -659,7 +694,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				idempotency: h,
 				durationMs: Date.now() - u,
 				errorMessage: t.message
-			}), re({
+			}), ne({
 				error: t,
 				source: "webhook",
 				name: e.id,
@@ -667,9 +702,9 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}), n;
 		}
 	};
-}, ye = (e) => `/webhooks/${e}`, K = "_voltro_webhook_rate_windows", q = 6e4, be = (e, t) => `${e}@${t}`, J = async (e, t, n) => (await e.query({
+}, be = (e) => `/webhooks/${e}`, K = "_voltro_webhook_rate_windows", q = 6e4, xe = (e, t) => `${e}@${t}`, J = async (e, t, n) => (await e.query({
 	table: "_voltro_webhook_rate_windows",
-	predicate: x(S("scope", t), S("bucket", n)),
+	predicate: S(C("scope", t), C("bucket", n)),
 	order: [],
 	take: 1,
 	skip: void 0,
@@ -680,7 +715,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		let i = await J(e, t.key, n);
 		if (i === null) {
 			await e.insertIgnore(K, {
-				id: be(t.key, n),
+				id: xe(t.key, n),
 				scope: t.key,
 				bucket: n,
 				count: 0,
@@ -693,7 +728,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		if (await e.updateMany("_voltro_webhook_rate_windows", {
 			count: i.count + 1,
 			updatedAt: /* @__PURE__ */ new Date()
-		}, { where: x(S("id", i.id), S("count", i.count)) }) === 1) return !0;
+		}, { where: S(C("id", i.id), C("count", i.count)) }) === 1) return !0;
 	}
 	throw Error(`webhook rate window: contention on (${t.key}, ${n}) exceeded ${Y} attempts`);
 }, Z = async (e, t, n) => {
@@ -703,10 +738,10 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		if (i === null || i.count <= 0 || await e.updateMany("_voltro_webhook_rate_windows", {
 			count: i.count - 1,
 			updatedAt: /* @__PURE__ */ new Date()
-		}, { where: x(S("id", i.id), S("count", i.count)) }) === 1) return;
+		}, { where: S(C("id", i.id), C("count", i.count)) }) === 1) return;
 	}
 	throw Error(`webhook rate window: release contention on (${t}) exceeded ${Y} attempts`);
-}, xe = async (e, t, n, r = q) => {
+}, Se = async (e, t, n, r = q) => {
 	if (t.length === 0) return {
 		acquired: !0,
 		retryInMs: 0
@@ -727,7 +762,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		acquired: !0,
 		retryInMs: 0
 	};
-}, Se = (e, t) => {
+}, Ce = (e, t) => {
 	if (e === "json") return {
 		contentType: "application/json",
 		bytes: Buffer.from(t, "utf8")
@@ -743,15 +778,15 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	}
 	return e === "form" ? {
 		contentType: "application/x-www-form-urlencoded",
-		bytes: Buffer.from(Ce(n), "utf8")
+		bytes: Buffer.from(we(n), "utf8")
 	} : {
 		contentType: "application/xml",
-		bytes: Buffer.from(Te(n), "utf8")
+		bytes: Buffer.from(Ee(n), "utf8")
 	};
-}, Ce = (e) => {
+}, we = (e) => {
 	if (typeof e != "object" || !e || Array.isArray(e)) throw new d({
 		format: "form",
-		reason: `form encoding requires a JSON object at the top level, got ${Oe(e)}`
+		reason: `form encoding requires a JSON object at the top level, got ${ke(e)}`
 	});
 	let t = new URLSearchParams();
 	for (let [n, r] of Object.entries(e)) Q(t, n, r);
@@ -770,13 +805,13 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		return;
 	}
 	e.append(t, String(n));
-}, we = /^[A-Za-z_][A-Za-z0-9_.-]*$/, Te = (e) => `<?xml version="1.0" encoding="UTF-8"?>${$("webhook", e)}`, $ = (e, t) => {
-	if (!we.test(e)) throw new d({
+}, Te = /^[A-Za-z_][A-Za-z0-9_.-]*$/, Ee = (e) => `<?xml version="1.0" encoding="UTF-8"?>${$("webhook", e)}`, $ = (e, t) => {
+	if (!Te.test(e)) throw new d({
 		format: "xml",
 		reason: `object key ${JSON.stringify(e)} is not a valid XML element name`
 	});
-	return `<${e}>${Ee(e, t)}</${e}>`;
-}, Ee = (e, t) => t == null ? "" : Array.isArray(t) ? t.map((e) => $("item", e)).join("") : typeof t == "object" ? Object.entries(t).map(([e, t]) => $(e, t)).join("") : De(String(t)), De = (e) => e.replace(/[&<>"']/g, (e) => {
+	return `<${e}>${De(e, t)}</${e}>`;
+}, De = (e, t) => t == null ? "" : Array.isArray(t) ? t.map((e) => $("item", e)).join("") : typeof t == "object" ? Object.entries(t).map(([e, t]) => $(e, t)).join("") : Oe(String(t)), Oe = (e) => e.replace(/[&<>"']/g, (e) => {
 	switch (e) {
 		case "&": return "&amp;";
 		case "<": return "&lt;";
@@ -784,17 +819,17 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		case "\"": return "&quot;";
 		default: return "&apos;";
 	}
-}), Oe = (e) => e === null ? "null" : Array.isArray(e) ? "array" : typeof e, ke = "_voltro_webhook_targets", Ae = 32, je = async (e, t) => (await e.query({
+}), ke = (e) => e === null ? "null" : Array.isArray(e) ? "array" : typeof e, Ae = "_voltro_webhook_targets", je = 32, Me = async (e, t) => (await e.query({
 	table: "_voltro_webhook_targets",
-	predicate: S("id", t),
+	predicate: C("id", t),
 	order: [],
 	take: 1,
 	skip: void 0,
 	projection: void 0
-}))[0] ?? null, Me = async (e, t, n, r, i = /* @__PURE__ */ new Date()) => {
-	for (let a = 0; a < Ae; a++) {
+}))[0] ?? null, Ne = async (e, t, n, r, i = /* @__PURE__ */ new Date()) => {
+	for (let a = 0; a < je; a++) {
 		a > 0 && await new Promise((e) => setTimeout(e, a));
-		let o = await je(e, t);
+		let o = await Me(e, t);
 		if (o === null) return {
 			consecutiveFailures: 0,
 			autoDisabled: !1
@@ -804,7 +839,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			if (s === 0 || await e.updateMany("_voltro_webhook_targets", {
 				consecutiveFailures: 0,
 				updatedAt: i
-			}, { where: x(S("id", t), S("consecutiveFailures", s)) }) === 1) return {
+			}, { where: S(C("id", t), C("consecutiveFailures", s)) }) === 1) return {
 				consecutiveFailures: 0,
 				autoDisabled: !1
 			};
@@ -814,68 +849,68 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			consecutiveFailures: c,
 			updatedAt: i
 		};
-		if (u && (d.active = !1, d.autoDisabledAt = i, d.autoDisableReason = r.slice(0, 500)), await e.updateMany("_voltro_webhook_targets", d, { where: x(S("id", t), S("consecutiveFailures", s)) }) === 1) return {
+		if (u && (d.active = !1, d.autoDisabledAt = i, d.autoDisableReason = r.slice(0, 500)), await e.updateMany("_voltro_webhook_targets", d, { where: S(C("id", t), C("consecutiveFailures", s)) }) === 1) return {
 			consecutiveFailures: c,
 			autoDisabled: u
 		};
 	}
-	throw Error(`webhook auto-disable: streak CAS contention on target ${t} exceeded ${Ae} attempts`);
-}, Ne = b.Struct({
-	status: b.Number,
-	body: b.String,
-	latencyMs: b.Number,
-	retryAfterSec: b.Union(b.Number, b.Undefined),
-	transportError: b.Union(b.String, b.Undefined),
-	encodeError: b.Union(b.String, b.Undefined)
-}), Pe = b.Struct({
-	outcome: b.Literal("succeeded", "failed", "retry"),
-	delayMs: b.Union(b.Number, b.Undefined),
-	reason: b.Union(b.String, b.Undefined),
-	autoDisabled: b.Union(b.Boolean, b.Undefined),
-	consecutiveFailures: b.Union(b.Number, b.Undefined)
-}), Fe = b.Struct({
-	acquired: b.Boolean,
-	retryInMs: b.Number
-}), Ie = ie.make({
+	throw Error(`webhook auto-disable: streak CAS contention on target ${t} exceeded ${je} attempts`);
+}, Pe = x.Struct({
+	status: x.Number,
+	body: x.String,
+	latencyMs: x.Number,
+	retryAfterSec: x.Union(x.Number, x.Undefined),
+	transportError: x.Union(x.String, x.Undefined),
+	encodeError: x.Union(x.String, x.Undefined)
+}), Fe = x.Struct({
+	outcome: x.Literal("succeeded", "failed", "retry"),
+	delayMs: x.Union(x.Number, x.Undefined),
+	reason: x.Union(x.String, x.Undefined),
+	autoDisabled: x.Union(x.Boolean, x.Undefined),
+	consecutiveFailures: x.Union(x.Number, x.Undefined)
+}), Ie = x.Struct({
+	acquired: x.Boolean,
+	retryInMs: x.Number
+}), Le = ie.make({
 	name: "voltro.deliverWebhook",
 	payload: {
-		deliveryId: b.String,
-		targetId: b.String,
-		event: b.String,
-		eventId: b.String,
-		payloadJson: b.String,
-		attemptEpoch: b.optionalWith(b.Number, { default: () => 0 })
+		deliveryId: x.String,
+		targetId: x.String,
+		event: x.String,
+		eventId: x.String,
+		payloadJson: x.String,
+		attemptEpoch: x.optionalWith(x.Number, { default: () => 0 })
 	},
-	success: b.Struct({
-		finalStatus: b.Literal("succeeded", "failed", "deferred"),
-		attempts: b.Number
+	success: x.Struct({
+		finalStatus: x.Literal("succeeded", "failed", "deferred"),
+		attempts: x.Number
 	}),
 	idempotencyKey: ({ deliveryId: e, attemptEpoch: t }) => `voltro.deliverWebhook:${e}:${t ?? 0}`
-}), Le = (e, t = {}) => (n, r) => {
-	let { deliveryId: i, targetId: a, event: s, eventId: c, payloadJson: l } = n, u = w({ scope: `webhook:${i}` });
-	return y.gen(function* () {
-		let n = yield* T.make({
+}), Re = (e, t = {}) => (n, r) => {
+	let { deliveryId: i, targetId: a, event: s, eventId: c, payloadJson: l } = n, u = T({ scope: `webhook:${i}` });
+	return b.gen(function* () {
+		let n = yield* E.make({
 			name: "fetch-target",
-			success: b.Union(b.Null, b.Struct({
-				id: b.String,
-				event: b.String,
-				url: b.String,
-				secret: b.String,
-				signing: b.Any,
-				retry: b.Any,
-				headers: b.Union(b.Record({
-					key: b.String,
-					value: b.String
-				}), b.Null),
-				rateLimitPerMinute: b.Union(b.Number, b.Null),
-				active: b.Boolean,
-				format: b.Literal("json", "form", "xml"),
-				tenantId: b.Union(b.String, b.Null)
+			success: x.Union(x.Null, x.Struct({
+				id: x.String,
+				event: x.String,
+				url: x.String,
+				secret: x.String,
+				signing: x.Any,
+				retry: x.Any,
+				headers: x.Union(x.Record({
+					key: x.String,
+					value: x.String
+				}), x.Null),
+				rateLimitPerMinute: x.Union(x.Number, x.Null),
+				active: x.Boolean,
+				format: x.Literal("json", "form", "xml"),
+				tenantId: x.Union(x.String, x.Null)
 			})),
-			execute: y.tryPromise({
+			execute: b.tryPromise({
 				try: async () => (await e.store.query({
 					table: "_voltro_webhook_targets",
-					predicate: S("id", a),
+					predicate: C("id", a),
 					order: [{
 						column: "createdAt",
 						direction: "asc"
@@ -889,7 +924,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					event: s,
 					cause: String(e)
 				}), /* @__PURE__ */ Error(`fetch-target failed: ${e.message}`))
-			}).pipe(y.orDie)
+			}).pipe(b.orDie)
 		});
 		if (n === null) return {
 			finalStatus: "failed",
@@ -914,75 +949,75 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				...o
 			});
 		};
-		if (n.active !== !0) return yield* T.make({
+		if (n.active !== !0) return yield* E.make({
 			name: "record-paused-pending",
-			success: b.Void,
-			execute: y.tryPromise({
+			success: x.Void,
+			execute: b.tryPromise({
 				try: () => r(`${i}:1`, 1, { status: "pending" }),
 				catch: (e) => /* @__PURE__ */ Error(`record-paused-pending failed: ${e.message}`)
-			}).pipe(y.orDie)
+			}).pipe(b.orDie)
 		}), {
 			finalStatus: "deferred",
 			attempts: 0
 		};
-		let f = (e) => typeof e == "string" ? JSON.parse(e) : e, p = f(n.retry), m = f(n.signing), h = n.headers === null ? null : f(n.headers), ee = t.rateWindowMs ?? 6e4, g = t.events?.find((e) => e.id === s)?.globalRateLimit, _ = [...typeof n.rateLimitPerMinute == "number" && n.rateLimitPerMinute > 0 ? [{
+		let f = (e) => typeof e == "string" ? JSON.parse(e) : e, p = f(n.retry), m = f(n.signing), h = n.headers === null ? null : f(n.headers), g = t.rateWindowMs ?? 6e4, _ = t.events?.find((e) => e.id === s)?.globalRateLimit, v = [...typeof n.rateLimitPerMinute == "number" && n.rateLimitPerMinute > 0 ? [{
 			key: `target:${n.id}`,
 			limit: n.rateLimitPerMinute
-		}] : [], ...g !== void 0 && g.perMinute > 0 ? [{
+		}] : [], ..._ !== void 0 && _.perMinute > 0 ? [{
 			key: `event:${s}`,
-			limit: g.perMinute
+			limit: _.perMinute
 		}] : []];
 		for (let t = 1; t <= p.maxAttempts; t++) {
 			let f = `${i}:${t}`;
-			if (_.length > 0) for (let n = 0;; n++) {
-				let i = yield* T.make({
+			if (v.length > 0) for (let n = 0;; n++) {
+				let i = yield* E.make({
 					name: `rate-acquire-${t}-${n}`,
-					success: Fe,
-					execute: y.tryPromise({
-						try: () => xe(e.store, _, Date.now(), ee),
+					success: Ie,
+					execute: b.tryPromise({
+						try: () => Se(e.store, v, Date.now(), g),
 						catch: (e) => (u.debug("rate-acquire raw error", {
 							targetId: a,
 							event: s,
 							attempt: t,
 							cause: String(e)
 						}), /* @__PURE__ */ Error(`rate-acquire failed: ${e.message}`))
-					}).pipe(y.orDie)
+					}).pipe(b.orDie)
 				});
 				if (i.acquired) break;
-				yield* T.make({
+				yield* E.make({
 					name: `record-rate-deferral-${t}-${n}`,
-					success: b.Void,
-					execute: y.tryPromise({
+					success: x.Void,
+					execute: b.tryPromise({
 						try: () => r(f, t, {
 							status: "pending",
 							nextAttemptAt: new Date(Date.now() + i.retryInMs)
 						}),
 						catch: (e) => /* @__PURE__ */ Error(`record-rate-deferral failed: ${e.message}`)
-					}).pipe(y.orDie)
-				}), yield* E.sleep({
+					}).pipe(b.orDie)
+				}), yield* re.sleep({
 					name: `rate-window-sleep-${t}-${n}`,
 					duration: `${i.retryInMs} millis`
 				});
 			}
-			yield* T.make({
+			yield* E.make({
 				name: `record-attempt-start-${t}`,
-				success: b.Void,
-				execute: y.tryPromise({
+				success: x.Void,
+				execute: b.tryPromise({
 					try: () => r(f, t, {
 						status: "inFlight",
 						nextAttemptAt: null,
 						scheduledAt: /* @__PURE__ */ new Date()
 					}),
 					catch: (e) => /* @__PURE__ */ Error(`record-attempt-start failed: ${e.message}`)
-				}).pipe(y.orDie)
+				}).pipe(b.orDie)
 			});
-			let g = yield* T.make({
+			let _ = yield* E.make({
 				name: `sign-and-post-${t}`,
-				success: Ne,
-				execute: y.promise(async () => {
+				success: Pe,
+				execute: b.promise(async () => {
 					let e = Date.now(), r;
 					try {
-						r = Se(n.format, l);
+						r = Ce(n.format, l);
 					} catch (t) {
 						if (t instanceof d) return {
 							status: 0,
@@ -995,7 +1030,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						throw t;
 					}
 					let a = Buffer.from(r.bytes), { headerName: u, headerValue: f } = o(m, a, n.secret);
-					process.env.NODE_ENV === "production" && C(n.url);
+					process.env.NODE_ENV === "production" && w(n.url);
 					try {
 						let o = await fetch(n.url, {
 							method: "POST",
@@ -1030,18 +1065,18 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						};
 					}
 				})
-			}), v = yield* T.make({
+			}), y = yield* E.make({
 				name: `classify-and-record-${t}`,
-				success: Pe,
-				execute: y.tryPromise({
+				success: Fe,
+				execute: b.tryPromise({
 					try: async () => {
-						let r = g.status >= 200 && g.status < 300, i = g.transportError !== void 0, o = g.encodeError !== void 0, s = (t, n) => Me(e.store, a, t, n);
+						let r = _.status >= 200 && _.status < 300, i = _.transportError !== void 0, o = _.encodeError !== void 0, s = (t, n) => Ne(e.store, a, t, n);
 						if (r) {
 							await e.store.update("_voltro_webhook_deliveries", f, {
 								status: "succeeded",
-								responseStatus: g.status,
-								responseBody: g.body,
-								latencyMs: g.latencyMs,
+								responseStatus: _.status,
+								responseBody: _.body,
+								latencyMs: _.latencyMs,
 								updatedAt: /* @__PURE__ */ new Date()
 							});
 							let t = await s(!0, "");
@@ -1053,18 +1088,18 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 								consecutiveFailures: t.consecutiveFailures
 							};
 						}
-						let c = o ? null : A(p, t, {
-							...i ? {} : { status: g.status },
-							...g.retryAfterSec === void 0 ? {} : { retryAfterSeconds: g.retryAfterSec }
+						let c = o ? null : se(p, t, {
+							...i ? {} : { status: _.status },
+							..._.retryAfterSec === void 0 ? {} : { retryAfterSeconds: _.retryAfterSec }
 						});
 						if (c === null) {
-							let t = o ? `encode (${n.format}): ${g.encodeError}` : i ? `transport: ${g.transportError}` : `http ${g.status}: ${g.body.slice(0, 200)}`;
+							let t = o ? `encode (${n.format}): ${_.encodeError}` : i ? `transport: ${_.transportError}` : `http ${_.status}: ${_.body.slice(0, 200)}`;
 							await e.store.update("_voltro_webhook_deliveries", f, {
 								status: "failed",
-								responseStatus: i || o ? null : g.status,
-								responseBody: i || o ? null : g.body,
-								errorMessage: o ? t : g.transportError ?? null,
-								latencyMs: g.latencyMs,
+								responseStatus: i || o ? null : _.status,
+								responseBody: i || o ? null : _.body,
+								errorMessage: o ? t : _.transportError ?? null,
+								latencyMs: _.latencyMs,
 								updatedAt: /* @__PURE__ */ new Date()
 							});
 							let r = await s(!1, t);
@@ -1078,10 +1113,10 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						}
 						return await e.store.update("_voltro_webhook_deliveries", f, {
 							status: "retryScheduled",
-							responseStatus: i ? null : g.status,
-							responseBody: i ? null : g.body,
-							errorMessage: g.transportError ?? null,
-							latencyMs: g.latencyMs,
+							responseStatus: i ? null : _.status,
+							responseBody: i ? null : _.body,
+							errorMessage: _.transportError ?? null,
+							latencyMs: _.latencyMs,
 							nextAttemptAt: new Date(Date.now() + c.delayMs),
 							updatedAt: /* @__PURE__ */ new Date()
 						}), {
@@ -1098,24 +1133,24 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						attempt: t,
 						cause: String(e)
 					}), /* @__PURE__ */ Error(`classify-and-record failed: ${e.message}`))
-				}).pipe(y.orDie)
+				}).pipe(b.orDie)
 			});
-			if (v.autoDisabled === !0 && u.warn("target auto-disabled after consecutive failures", {
+			if (y.autoDisabled === !0 && u.warn("target auto-disabled after consecutive failures", {
 				targetId: a,
 				event: s,
-				consecutiveFailures: v.consecutiveFailures ?? null,
-				reason: v.reason ?? null
-			}), v.outcome === "succeeded") return {
+				consecutiveFailures: y.consecutiveFailures ?? null,
+				reason: y.reason ?? null
+			}), y.outcome === "succeeded") return {
 				finalStatus: "succeeded",
 				attempts: t
 			};
-			if (v.outcome === "failed") return {
+			if (y.outcome === "failed") return {
 				finalStatus: "failed",
 				attempts: t
 			};
-			v.delayMs !== void 0 && (yield* E.sleep({
+			y.delayMs !== void 0 && (yield* re.sleep({
 				name: `retry-sleep-${t}`,
-				duration: `${v.delayMs} millis`
+				duration: `${y.delayMs} millis`
 			}));
 		}
 		return {
@@ -1125,4 +1160,4 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	});
 };
 //#endregion
-export { B as IdempotencyCache, q as RATE_WINDOW_MS, K as RATE_WINDOW_TABLE, ke as TARGETS_TABLE, l as WebhookDeliveryNotFound, u as WebhookPayloadInvalid, d as WebhookPayloadUnrepresentable, f as WebhookPayloadVersionInvalid, p as WebhookSubscribeInvalid, M as WebhooksService, m as _voltroWebhookDeliveriesTable, h as _voltroWebhookRateWindowsTable, ee as _voltroWebhookTargetsTable, xe as acquireRateSlots, D as asOutgoingEvent, Le as buildDeliverWebhookExecute, me as buildWebhooksService, de as compareVersions, X as consumeRateSlot, ye as defaultIncomingPath, c as defaultOutgoingSignature, j as defaultRetryPolicy, s as defineIncomingWebhook, t as defineWebhookProvider, Ie as deliverWebhookWorkflow, Se as encodePayload, se as fastRetryPolicy, P as generateSecret, H as getIdempotencyCache, i as githubSignature, ae as hasWebhookAudience, r as isWebhookDescriptor, z as matchesFilter, ve as mountIncomingWebhook, A as nextRetry, O as parseDuration, W as parseTtl, Me as recordDeliveryOutcome, Z as releaseRateSlot, I as resolveSubscribe, o as signPayload, n as slackSignature, e as stripeSignature, ge as useWebhooks, he as useWebhooksEffect, F as validateSubscribe, a as verifySignature, g as webhookTables };
+export { B as IdempotencyCache, q as RATE_WINDOW_MS, K as RATE_WINDOW_TABLE, Ae as TARGETS_TABLE, l as WebhookDeliveryNotFound, u as WebhookPayloadInvalid, d as WebhookPayloadUnrepresentable, f as WebhookPayloadVersionInvalid, p as WebhookSubscribeInvalid, j as WebhooksService, m as _voltroWebhookDeliveriesTable, h as _voltroWebhookRateWindowsTable, g as _voltroWebhookTargetsTable, Se as acquireRateSlots, D as asOutgoingEvent, Re as buildDeliverWebhookExecute, he as buildWebhooksService, fe as compareVersions, X as consumeRateSlot, be as defaultIncomingPath, c as defaultOutgoingSignature, A as defaultRetryPolicy, s as defineIncomingWebhook, t as defineWebhookProvider, Le as deliverWebhookWorkflow, Ce as encodePayload, P as eventsOf, ce as fastRetryPolicy, N as generateSecret, H as getIdempotencyCache, i as githubSignature, ae as hasWebhookAudience, r as isWebhookDescriptor, z as matchesFilter, ye as mountIncomingWebhook, se as nextRetry, O as parseDuration, W as parseTtl, Ne as recordDeliveryOutcome, Z as releaseRateSlot, I as resolveSubscribe, o as signPayload, n as slackSignature, e as stripeSignature, _e as useWebhooks, ge as useWebhooksEffect, F as validateSubscribe, a as verifySignature, _ as webhookTables };