@voltro/plugin-webhooks 0.26.0 → 0.28.0

package/dist/index.js

@@ -6,10 +6,10 @@ 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 { createLogger as ie } from "@voltro/logger";
+import { Activity as w, DurableClock as T, Workflow as ae } from "@effect/workflow";
 //#region src/eventAudience.ts
-var ae = (e) => e.webhook !== void 0, D = (e) => {
+var oe = (e) => e.webhook !== void 0, E = (e) => {
 	let t = e.webhook;
 	if (t !== void 0) return {
 		_tag: "outgoingEvent",
@@ -19,8 +19,8 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		...t.version === void 0 ? {} : { version: t.version },
 		...t.rateLimit === void 0 ? {} : { globalRateLimit: t.rateLimit }
 	};
-}, oe = /^(\d+(?:\.\d+)?)\s*(ms|s|m|h|d)?$/, O = (e) => {
-	let t = oe.exec(e);
+}, se = /^(\d+(?:\.\d+)?)\s*(ms|s|m|h|d)?$/, D = (e) => {
+	let t = se.exec(e);
 	if (!t) throw Error(`invalid duration literal: ${e}`);
 	let n = Number(t[1]), r = t[2] ?? "s";
 	switch (r) {
@@ -31,7 +31,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		case "d": return n * 864e5;
 		default: throw Error(`unreachable unit: ${r}`);
 	}
-}, k = [
+}, O = [
 	408,
 	425,
 	429,
@@ -39,16 +39,16 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	502,
 	503,
 	504
-], A = (e, t, n) => {
-	if (t >= e.maxAttempts || n?.status !== void 0 && !(e.retryOn ?? k).includes(n.status)) return null;
+], k = (e, t, n) => {
+	if (t >= e.maxAttempts || n?.status !== void 0 && !(e.retryOn ?? O).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);
+		let t = n.retryAfterSeconds * 1e3, r = D(e.maxDelay), i = Math.min(t, r);
 		return {
 			delayMs: i,
 			baseDelayMs: i
 		};
 	}
-	let r = O(e.initialDelay), i = O(e.maxDelay), a;
+	let r = D(e.initialDelay), i = D(e.maxDelay), a;
 	switch (e.strategy) {
 		case "fixed":
 			a = r;
@@ -66,23 +66,23 @@ 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",
 	maxDelay: "1h",
-	retryOn: k,
+	retryOn: O,
 	honourRetryAfter: !0,
 	jitter: "full"
-}), se = () => ({
+}), ce = () => ({
 	strategy: "fixed",
 	maxAttempts: 120,
 	initialDelay: "30s",
 	maxDelay: "30s",
-	retryOn: k,
+	retryOn: O,
 	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 te.Tag("@voltro/webhooks/WebhooksService")() {}, le = 32, ue = 32, M = () => _(le).toString("hex"), N = (e) => e.events ?? (e.event === void 0 ? [] : [e.event]), P = (e) => {
 	let t;
 	try {
 		t = new URL(e.url);
@@ -104,13 +104,26 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			reason: e.message
 		});
 	}
-	if (e.event.length === 0) throw new p({
+	let n = N(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 < ue) throw new p({
 		field: "secret",
-		reason: `secret must be at least ${N} chars`
+		reason: `secret must be at least ${ue} 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) => ({
+}, F = (e, t, n, r) => ({
 	id: v(),
-	event: e.event,
+	event: n ?? e.event ?? "",
 	url: e.url,
-	secret: e.secret ?? P(),
+	secret: r ?? e.secret ?? M(),
 	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,14 +162,14 @@ 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) => {
+}), de = (e) => e instanceof Date ? e.getTime() : typeof e == "string" ? Date.parse(e) : 0, I = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : null, fe = (e) => {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
 	} catch {
 		return e;
 	}
-}, R = (e) => ({
+}, L = (e) => ({
 	id: String(e.id),
 	deliveryId: String(e.deliveryId),
 	targetId: String(e.targetId),
@@ -167,22 +180,22 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	responseStatus: e.responseStatus ?? null,
 	errorMessage: e.errorMessage ?? null,
 	latencyMs: e.latencyMs ?? null,
-	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) => {
+	scheduledAt: I(e.scheduledAt),
+	nextAttemptAt: I(e.nextAttemptAt),
+	createdAt: I(e.createdAt)
+}), pe = (e, t) => e === t ? "current" : e < t ? "behind" : "ahead", R = (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 (!he(me(n, t), r)) return !1;
 	return !0;
-}, fe = (e, t) => {
+}, me = (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) => {
+}, he = (e, t) => {
 	if (typeof t == "object" && t && !Array.isArray(t)) {
 		let n = t;
 		if ("eq" in n) return e === n.eq;
@@ -193,37 +206,58 @@ 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 {
+}, z = (e, t) => e !== null && Object.entries(t).every(([t, n]) => e[t] === n), ge = async (e, t) => {
+	let n = (await e.store.query({
+		table: "_voltro_webhook_targets",
+		predicate: void 0,
+		order: [{
+			column: "createdAt",
+			direction: "asc"
+		}],
+		take: 1e3,
+		skip: void 0,
+		projection: void 0
+	})).filter((e) => z(e.scope, t));
+	if (n.length === 0) return;
+	let r = new Set(n.map((e) => e.secret));
+	if (r.size > 1) throw Error(`webhooks.subscribe: the scope ${JSON.stringify(t)} matches ${n.length} targets with ${r.size} different secrets, so it is not one endpoint. Pass \`secret\` explicitly, or narrow the scope.`);
+	return [...r][0];
+}, _e = (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,
+			P(t);
+			let n = N(t), i = t.secret === void 0 && t.scope !== void 0 ? await ge(e, t.scope) : void 0, a = t.secret ?? i ?? M(), o = n.map((e) => F(t, r.get(e), e, a));
+			for (let t of o) 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 s = o[0];
+			return {
+				id: s.id,
+				event: s.event,
+				url: s.url,
+				secret: s.secret,
+				signing: s.signing,
+				retry: s.retry,
+				...o.length > 1 ? { targets: o.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" });
+		emit: async (n, i, a) => {
+			let o = typeof n == "object" && n.kind === "event" ? E(n) : void 0, s = typeof n == "string" ? r.get(n) : o ?? n, c = typeof n == "string" ? n : n.id ?? n.name;
+			if (s !== void 0) {
+				let e = b.decodeUnknownEither(s.payload)(i, { errors: "all" });
 				if (ne.isLeft(e)) throw new u({
-					event: s,
+					event: c,
 					issues: e.left.message
 				});
 			}
-			let c = v(), l = (await e.store.query({
+			let l = v(), d = a?.tenantId, f = (await e.store.query({
 				table: "_voltro_webhook_targets",
-				predicate: S("event", s),
+				predicate: d == null ? S("event", c) : x(S("event", c), S("tenantId", d)),
 				order: [{
 					column: "createdAt",
 					direction: "asc"
@@ -231,16 +265,16 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				take: 1e3,
 				skip: void 0,
 				projection: void 0
-			})).filter((e) => z(e.filter, i)), d = [], f = JSON.stringify(i);
-			for (let n of l) {
+			})).filter((e) => R(e.filter, i)), p = [], m = JSON.stringify(i);
+			for (let n of f) {
 				let r = v();
 				n.active ? (await t({
 					deliveryId: r,
 					targetId: n.id,
-					event: s,
-					eventId: c,
-					payloadJson: f
-				}), d.push({
+					event: c,
+					eventId: l,
+					payloadJson: m
+				}), p.push({
 					targetId: n.id,
 					deliveryId: r,
 					status: "dispatched"
@@ -249,23 +283,23 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					deliveryId: r,
 					targetId: n.id,
 					tenantId: n.tenantId ?? null,
-					event: s,
-					eventId: c,
+					event: c,
+					eventId: l,
 					attempt: 1,
 					status: "pending",
-					payload: f,
+					payload: m,
 					scheduledAt: /* @__PURE__ */ new Date(),
 					createdAt: /* @__PURE__ */ new Date(),
 					updatedAt: /* @__PURE__ */ new Date()
-				}), d.push({
+				}), p.push({
 					targetId: n.id,
 					deliveryId: r,
 					status: "queued"
 				}));
 			}
 			return {
-				eventId: c,
-				deliveries: d
+				eventId: l,
+				deliveries: p
 			};
 		},
 		replay: async (n) => {
@@ -290,52 +324,68 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				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) => z(e.scope, t.scope)).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: x(S("targetId", r), S("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 ?? v(),
+					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: x(S("targetId", n), S("status", "pending")) });
 		},
 		rotateSecret: async (t) => {
-			let n = P();
-			return await e.store.update("_voltro_webhook_targets", t, {
+			let n = M();
+			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({
+			if (n.url !== void 0 && P({
 				event: "x",
 				url: n.url
 			}), n.rateLimitPerMinute !== void 0 && n.rateLimitPerMinute !== null && (!Number.isInteger(n.rateLimitPerMinute) || n.rateLimitPerMinute < 1)) throw Error("updateTarget: rateLimitPerMinute must be a positive integer or null");
@@ -350,7 +400,7 @@ 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({
@@ -389,7 +439,7 @@ 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),
 				order: [{
@@ -399,8 +449,8 @@ 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 || de(e.createdAt) >= a).slice(0, t?.limit ?? 200).map(L);
 		},
 		getDelivery: async (t) => {
 			let n = (await e.store.query({
@@ -412,8 +462,8 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				projection: void 0
 			}))[0];
 			return n === void 0 ? null : {
-				...R(n),
-				payload: ue(n.payload),
+				...L(n),
+				payload: fe(n.payload),
 				responseBody: n.responseBody ?? null
 			};
 		},
@@ -452,15 +502,16 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}));
 		}
 	};
-}, he = y.gen(function* () {
-	return yield* M;
-}), ge = (e) => {
+	return i;
+}, ve = y.gen(function* () {
+	return yield* j;
+}), ye = (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 {
+}, be = 1e4, B = class {
 	capacity;
 	cache = /* @__PURE__ */ new Map();
-	constructor(e = _e) {
+	constructor(e = be) {
 		this.capacity = e;
 	}
 	evictExpired() {
@@ -506,9 +557,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) => {
+}), xe = (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", {
+		ie({ scope: `webhook:${e.webhookId}` }).debug("incoming webhook", {
 			status: e.status,
 			signatureOk: e.signatureOk,
 			idempotency: e.idempotency,
@@ -667,7 +718,7 @@ 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({
+}, Se = (e) => `/webhooks/${e}`, K = "_voltro_webhook_rate_windows", q = 6e4, Ce = (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)),
 	order: [],
@@ -680,7 +731,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: Ce(t.key, n),
 				scope: t.key,
 				bucket: n,
 				count: 0,
@@ -696,7 +747,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		}, { where: x(S("id", i.id), S("count", i.count)) }) === 1) return !0;
 	}
 	throw Error(`webhook rate window: contention on (${t.key}, ${n}) exceeded ${Y} attempts`);
-}, Z = async (e, t, n) => {
+}, we = async (e, t, n) => {
 	for (let r = 0; r < Y; r++) {
 		r > 0 && await new Promise((e) => setTimeout(e, r));
 		let i = await J(e, t, n);
@@ -706,7 +757,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		}, { where: x(S("id", i.id), S("count", i.count)) }) === 1) return;
 	}
 	throw Error(`webhook rate window: release contention on (${t}) exceeded ${Y} attempts`);
-}, xe = async (e, t, n, r = q) => {
+}, Te = async (e, t, n, r = q) => {
 	if (t.length === 0) return {
 		acquired: !0,
 		retryInMs: 0
@@ -717,7 +768,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			a.push(o);
 			continue;
 		}
-		for (let t of a) await Z(e, t.key, i);
+		for (let t of a) await we(e, t.key, i);
 		return {
 			acquired: !1,
 			retryInMs: (i + 1) * r - n
@@ -727,7 +778,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		acquired: !0,
 		retryInMs: 0
 	};
-}, Se = (e, t) => {
+}, Ee = (e, t) => {
 	if (e === "json") return {
 		contentType: "application/json",
 		bytes: Buffer.from(t, "utf8")
@@ -743,40 +794,40 @@ 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(De(n), "utf8")
 	} : {
 		contentType: "application/xml",
-		bytes: Buffer.from(Te(n), "utf8")
+		bytes: Buffer.from(ke(n), "utf8")
 	};
-}, Ce = (e) => {
+}, De = (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 ${Me(e)}`
 	});
 	let t = new URLSearchParams();
-	for (let [n, r] of Object.entries(e)) Q(t, n, r);
+	for (let [n, r] of Object.entries(e)) Z(t, n, r);
 	return t.toString();
-}, Q = (e, t, n) => {
+}, Z = (e, t, n) => {
 	if (n === null) {
 		e.append(t, "");
 		return;
 	}
 	if (Array.isArray(n)) {
-		n.forEach((n, r) => Q(e, `${t}[${r}]`, n));
+		n.forEach((n, r) => Z(e, `${t}[${r}]`, n));
 		return;
 	}
 	if (typeof n == "object") {
-		for (let [r, i] of Object.entries(n)) Q(e, `${t}[${r}]`, i);
+		for (let [r, i] of Object.entries(n)) Z(e, `${t}[${r}]`, i);
 		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({
+}, Oe = /^[A-Za-z_][A-Za-z0-9_.-]*$/, ke = (e) => `<?xml version="1.0" encoding="UTF-8"?>${Q("webhook", e)}`, Q = (e, t) => {
+	if (!Oe.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}>${Ae(e, t)}</${e}>`;
+}, Ae = (e, t) => t == null ? "" : Array.isArray(t) ? t.map((e) => Q("item", e)).join("") : typeof t == "object" ? Object.entries(t).map(([e, t]) => Q(e, t)).join("") : je(String(t)), je = (e) => e.replace(/[&<>"']/g, (e) => {
 	switch (e) {
 		case "&": return "&amp;";
 		case "<": return "&lt;";
@@ -784,17 +835,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({
+}), Me = (e) => e === null ? "null" : Array.isArray(e) ? "array" : typeof e, Ne = "_voltro_webhook_targets", Pe = 32, Fe = async (e, t) => (await e.query({
 	table: "_voltro_webhook_targets",
 	predicate: S("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, $ = async (e, t, n, r, i = /* @__PURE__ */ new Date()) => {
+	for (let a = 0; a < Pe; a++) {
 		a > 0 && await new Promise((e) => setTimeout(e, a));
-		let o = await je(e, t);
+		let o = await Fe(e, t);
 		if (o === null) return {
 			consecutiveFailures: 0,
 			autoDisabled: !1
@@ -819,24 +870,24 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			autoDisabled: u
 		};
 	}
-	throw Error(`webhook auto-disable: streak CAS contention on target ${t} exceeded ${Ae} attempts`);
-}, Ne = b.Struct({
+	throw Error(`webhook auto-disable: streak CAS contention on target ${t} exceeded ${Pe} attempts`);
+}, Ie = 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({
+}), Le = 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({
+}), Re = b.Struct({
 	acquired: b.Boolean,
 	retryInMs: b.Number
-}), Ie = ie.make({
+}), ze = ae.make({
 	name: "voltro.deliverWebhook",
 	payload: {
 		deliveryId: b.String,
@@ -851,10 +902,10 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		attempts: b.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}` });
+}), Be = (e, t = {}) => (n, r) => {
+	let { deliveryId: i, targetId: a, event: s, eventId: c, payloadJson: l } = n, u = ie({ scope: `webhook:${i}` });
 	return y.gen(function* () {
-		let n = yield* T.make({
+		let n = yield* w.make({
 			name: "fetch-target",
 			success: b.Union(b.Null, b.Struct({
 				id: b.String,
@@ -914,7 +965,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				...o
 			});
 		};
-		if (n.active !== !0) return yield* T.make({
+		if (n.active !== !0) return yield* w.make({
 			name: "record-paused-pending",
 			success: b.Void,
 			execute: y.tryPromise({
@@ -935,11 +986,11 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		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({
+				let i = yield* w.make({
 					name: `rate-acquire-${t}-${n}`,
-					success: Fe,
+					success: Re,
 					execute: y.tryPromise({
-						try: () => xe(e.store, _, Date.now(), ee),
+						try: () => Te(e.store, _, Date.now(), ee),
 						catch: (e) => (u.debug("rate-acquire raw error", {
 							targetId: a,
 							event: s,
@@ -949,7 +1000,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					}).pipe(y.orDie)
 				});
 				if (i.acquired) break;
-				yield* T.make({
+				yield* w.make({
 					name: `record-rate-deferral-${t}-${n}`,
 					success: b.Void,
 					execute: y.tryPromise({
@@ -959,12 +1010,12 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						}),
 						catch: (e) => /* @__PURE__ */ Error(`record-rate-deferral failed: ${e.message}`)
 					}).pipe(y.orDie)
-				}), yield* E.sleep({
+				}), yield* T.sleep({
 					name: `rate-window-sleep-${t}-${n}`,
 					duration: `${i.retryInMs} millis`
 				});
 			}
-			yield* T.make({
+			yield* w.make({
 				name: `record-attempt-start-${t}`,
 				success: b.Void,
 				execute: y.tryPromise({
@@ -976,13 +1027,13 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					catch: (e) => /* @__PURE__ */ Error(`record-attempt-start failed: ${e.message}`)
 				}).pipe(y.orDie)
 			});
-			let g = yield* T.make({
+			let g = yield* w.make({
 				name: `sign-and-post-${t}`,
-				success: Ne,
+				success: Ie,
 				execute: y.promise(async () => {
 					let e = Date.now(), r;
 					try {
-						r = Se(n.format, l);
+						r = Ee(n.format, l);
 					} catch (t) {
 						if (t instanceof d) return {
 							status: 0,
@@ -1030,12 +1081,12 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						};
 					}
 				})
-			}), v = yield* T.make({
+			}), v = yield* w.make({
 				name: `classify-and-record-${t}`,
-				success: Pe,
+				success: Le,
 				execute: y.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 = g.status >= 200 && g.status < 300, i = g.transportError !== void 0, o = g.encodeError !== void 0, s = (t, n) => $(e.store, a, t, n);
 						if (r) {
 							await e.store.update("_voltro_webhook_deliveries", f, {
 								status: "succeeded",
@@ -1053,7 +1104,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 								consecutiveFailures: t.consecutiveFailures
 							};
 						}
-						let c = o ? null : A(p, t, {
+						let c = o ? null : k(p, t, {
 							...i ? {} : { status: g.status },
 							...g.retryAfterSec === void 0 ? {} : { retryAfterSeconds: g.retryAfterSec }
 						});
@@ -1113,7 +1164,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				finalStatus: "failed",
 				attempts: t
 			};
-			v.delayMs !== void 0 && (yield* E.sleep({
+			v.delayMs !== void 0 && (yield* T.sleep({
 				name: `retry-sleep-${t}`,
 				duration: `${v.delayMs} millis`
 			}));
@@ -1125,4 +1176,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, Ne 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, ee as _voltroWebhookTargetsTable, Te as acquireRateSlots, E as asOutgoingEvent, Be as buildDeliverWebhookExecute, _e as buildWebhooksService, pe as compareVersions, X as consumeRateSlot, Se as defaultIncomingPath, c as defaultOutgoingSignature, A as defaultRetryPolicy, s as defineIncomingWebhook, t as defineWebhookProvider, ze as deliverWebhookWorkflow, Ee as encodePayload, N as eventsOf, ce as fastRetryPolicy, M as generateSecret, H as getIdempotencyCache, i as githubSignature, oe as hasWebhookAudience, r as isWebhookDescriptor, R as matchesFilter, xe as mountIncomingWebhook, k as nextRetry, D as parseDuration, W as parseTtl, $ as recordDeliveryOutcome, we as releaseRateSlot, F as resolveSubscribe, o as signPayload, n as slackSignature, e as stripeSignature, ye as useWebhooks, ve as useWebhooksEffect, P as validateSubscribe, a as verifySignature, g as webhookTables };