@voltro/plugin-webhooks 0.25.0 → 0.27.0

package/dist/index.js

@@ -6,8 +6,8 @@ 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 re } from "@voltro/logger";
-import { Activity as T, DurableClock as E, Workflow as ie } from "@effect/workflow";
+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 ee.Tag("@voltro/webhooks/WebhooksService")() {}, ce = 32, N = 32, P = () => v(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);
@@ -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 = 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,14 +143,15 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		field: "autoDisableAfter",
 		reason: `autoDisableAfter must be a positive integer, got ${e.autoDisableAfter}`
 	});
-}, I = (e, t) => ({
+}, I = (e, t, n, r) => ({
 	id: y(),
-	event: e.event,
+	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,
 	rateLimitPerMinute: e.rateLimitPerMinute ?? null,
 	active: !0,
@@ -148,19 +162,40 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	autoDisableReason: null,
 	payloadVersion: e.payloadVersion ?? t?.version ?? 1,
 	description: e.description ?? null
-}), le = (e, t) => e === t ? "current" : e < t ? "behind" : "ahead", L = (e, t) => {
+}), 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);
+	} catch {
+		return e;
+	}
+}, R = (e) => ({
+	id: String(e.id),
+	deliveryId: String(e.deliveryId),
+	targetId: String(e.targetId),
+	event: String(e.event),
+	eventId: e.eventId ?? null,
+	attempt: Number(e.attempt ?? 0),
+	status: e.status,
+	responseStatus: e.responseStatus ?? null,
+	errorMessage: e.errorMessage ?? null,
+	latencyMs: e.latencyMs ?? null,
+	scheduledAt: L(e.scheduledAt),
+	nextAttemptAt: L(e.nextAttemptAt),
+	createdAt: L(e.createdAt)
+}), 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 (!de(ue(n, t), r)) return !1;
+	for (let [t, r] of Object.entries(e)) if (!me(pe(n, t), r)) return !1;
 	return !0;
-}, ue = (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;
-}, de = (e, t) => {
+}, me = (e, t) => {
 	if (typeof t == "object" && t && !Array.isArray(t)) {
 		let n = t;
 		if ("eq" in n) return e === n.eq;
@@ -171,23 +206,28 @@ 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;
-}, fe = (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) => {
@@ -209,7 +249,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				take: 1e3,
 				skip: void 0,
 				projection: void 0
-			})).filter((e) => L(e.filter, i)), d = [], f = JSON.stringify(i);
+			})).filter((e) => z(e.filter, i)), d = [], f = JSON.stringify(i);
 			for (let n of l) {
 				let r = y();
 				n.active ? (await t({
@@ -268,49 +308,148 @@ 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) => 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,
+			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) => {
+			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 = N();
+			for (let r of await i.resolveTargets(t)) await e.store.update("_voltro_webhook_targets", r, {
+				secret: n,
 				updatedAt: /* @__PURE__ */ new Date()
 			});
-			let r = await e.store.query({
+			return { secret: n };
+		},
+		updateTarget: async (t, n) => {
+			if (n.url !== void 0 && F({
+				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");
+			let r = { updatedAt: /* @__PURE__ */ new Date() };
+			for (let e of [
+				"url",
+				"description",
+				"filter",
+				"scope",
+				"headers",
+				"rateLimitPerMinute",
+				"autoDisableAfter",
+				"format"
+			]) n[e] !== void 0 && (r[e] = n[e]);
+			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: 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 = y(), o = JSON.stringify(r ?? {
+				test: !0,
+				targetId: n,
+				at: (/* @__PURE__ */ new Date()).toISOString()
+			});
+			return i.active ? await t({
+				deliveryId: a,
+				targetId: i.id,
+				event: i.event,
+				eventId: y(),
+				payloadJson: o
+			}) : await e.store.insert("_voltro_webhook_deliveries", {
+				id: `${a}:1`,
+				deliveryId: a,
+				targetId: i.id,
+				tenantId: i.tenantId ?? null,
+				event: i.event,
+				eventId: null,
+				attempt: 1,
+				status: "pending",
+				payload: o,
+				scheduledAt: /* @__PURE__ */ new Date(),
+				createdAt: /* @__PURE__ */ new Date(),
+				updatedAt: /* @__PURE__ */ new Date()
+			}), { deliveryId: a };
+		},
+		listDeliveries: async (t) => {
+			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: S(C("targetId", n), C("status", "pending")),
+				predicate: t?.targetId === void 0 ? void 0 : C("targetId", t.targetId),
 				order: [{
 					column: "createdAt",
-					direction: "asc"
+					direction: "desc"
 				}],
-				take: 1e4,
+				take: Math.min((t?.limit ?? 200) * (t?.status !== void 0 || t?.since !== void 0 ? 10 : 1), 5e3),
 				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 ?? y(),
-				payloadJson: typeof e.payload == "string" ? e.payload : JSON.stringify(e.payload),
-				attemptEpoch: i
-			});
+			}), 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);
 		},
-		deleteTarget: async (t) => {
-			await e.store.delete("_voltro_webhook_targets", t), await e.store.deleteMany("_voltro_webhook_deliveries", { where: S(C("targetId", t), C("status", "pending")) });
-		},
-		rotateSecret: async (t) => {
-			let n = P();
-			return await e.store.update("_voltro_webhook_targets", t, {
-				secret: n,
-				updatedAt: /* @__PURE__ */ new Date()
-			}), { secret: n };
+		getDelivery: async (t) => {
+			let n = (await e.store.query({
+				table: "_voltro_webhook_deliveries",
+				predicate: C("id", t),
+				order: void 0,
+				take: 1,
+				skip: void 0,
+				projection: void 0
+			}))[0];
+			return n === void 0 ? null : {
+				...R(n),
+				payload: de(n.payload),
+				responseBody: n.responseBody ?? null
+			};
 		},
 		updateTargetPayloadVersion: async (t, n) => {
 			if (n < 1 || !Number.isInteger(n)) throw new f({ version: n });
@@ -319,39 +458,44 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				updatedAt: /* @__PURE__ */ new Date()
 			});
 		},
-		listTargets: async (t) => (await e.store.query({
-			table: "_voltro_webhook_targets",
-			predicate: t === void 0 ? void 0 : C("event", t),
-			order: [{
-				column: "createdAt",
-				direction: "desc"
-			}],
-			take: 500,
-			skip: void 0,
-			projection: void 0
-		})).map((e) => ({
-			id: e.id,
-			event: e.event,
-			url: e.url,
-			active: e.active,
-			rateLimitPerMinute: e.rateLimitPerMinute,
-			description: e.description,
-			payloadVersion: e.payloadVersion,
-			autoDisableAfter: e.autoDisableAfter,
-			consecutiveFailures: e.consecutiveFailures ?? 0,
-			autoDisabledAt: e.autoDisabledAt === null || e.autoDisabledAt === void 0 ? null : e.autoDisabledAt instanceof Date ? e.autoDisabledAt.toISOString() : String(e.autoDisabledAt),
-			autoDisableReason: e.autoDisableReason
-		}))
+		listTargets: async (t, n) => {
+			let r = await e.store.query({
+				table: "_voltro_webhook_targets",
+				predicate: t === void 0 ? void 0 : C("event", t),
+				order: [{
+					column: "createdAt",
+					direction: "desc"
+				}],
+				take: 500,
+				skip: void 0,
+				projection: void 0
+			});
+			return (n === void 0 ? r : r.filter((e) => e.scope !== null && Object.entries(n).every(([t, n]) => e.scope?.[t] === n))).map((e) => ({
+				id: e.id,
+				event: e.event,
+				url: e.url,
+				active: e.active,
+				rateLimitPerMinute: e.rateLimitPerMinute,
+				description: e.description,
+				payloadVersion: e.payloadVersion,
+				autoDisableAfter: e.autoDisableAfter,
+				consecutiveFailures: e.consecutiveFailures ?? 0,
+				autoDisabledAt: e.autoDisabledAt === null || e.autoDisabledAt === void 0 ? null : e.autoDisabledAt instanceof Date ? e.autoDisabledAt.toISOString() : String(e.autoDisabledAt),
+				autoDisableReason: e.autoDisableReason,
+				scope: e.scope
+			}));
+		}
 	};
-}, pe = b.gen(function* () {
-	return yield* M;
-}), me = (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;
-}, he = 1e4, R = class {
+}, ve = 1e4, B = class {
 	capacity;
 	cache = /* @__PURE__ */ new Map();
-	constructor(e = he) {
+	constructor(e = ve) {
 		this.capacity = e;
 	}
 	evictExpired() {
@@ -386,20 +530,20 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	clear() {
 		this.cache.clear();
 	}
-}, z = null, B = () => (z === null && (z = new R()), z), V = {
+}, V = null, H = () => (V === null && (V = new B()), V), U = {
 	"5m": 5 * 6e4,
 	"1h": 60 * 6e4,
 	"6h": 360 * 6e4,
 	"1d": 1440 * 6e4,
 	"7d": 10080 * 6e4,
 	"30d": 720 * 60 * 6e4
-}, H = (e) => e === void 0 ? V["7d"] : V[e] ?? V["7d"], U = (e, t) => ({
+}, W = (e) => e === void 0 ? U["7d"] : U[e] ?? U["7d"], G = (e, t) => ({
 	status: e,
 	contentType: "application/json; charset=utf-8",
 	body: JSON.stringify(t)
-}), ge = (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 ?? B(), c = H(i?.ttl), l = t.log ?? ((e) => {
-		re({ scope: `webhook:${e.webhookId}` }).debug("incoming webhook", {
+}), 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) => {
+		T({ scope: `webhook:${e.webhookId}` }).debug("incoming webhook", {
 			status: e.status,
 			signatureOk: e.signatureOk,
 			idempotency: e.idempotency,
@@ -410,7 +554,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	return async (n) => {
 		let u = Date.now();
 		if (n.method !== "POST") {
-			let t = U(405, {
+			let t = G(405, {
 				error: "method not allowed",
 				expected: "POST"
 			});
@@ -431,7 +575,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				r._tag === "custom" && n.headers["x-slack-request-timestamp"] && (o = `${n.headers["x-slack-request-timestamp"]}|${t ?? ""}`);
 				let s = a(r, n.rawBody, i, o);
 				if (d = s.ok, !s.ok) {
-					let t = U(401, {
+					let t = G(401, {
 						error: "invalid signature",
 						reason: s.reason
 					});
@@ -457,7 +601,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				f = r;
 			} else f = n.rawBody;
 		} catch (t) {
-			let n = U(400, {
+			let n = G(400, {
 				error: "malformed body",
 				reason: t.message
 			});
@@ -474,7 +618,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		try {
 			p = x.decodeUnknownSync(e.payload)(f);
 		} catch (t) {
-			let n = U(422, {
+			let n = G(422, {
 				error: "schema validation failed",
 				reason: t.message
 			});
@@ -493,7 +637,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			if (m = typeof t == "string" ? n.headers[t.toLowerCase()] : t(n.headers, n.rawBody), m !== void 0 && m.length > 0) {
 				let t = s.claim(m, c);
 				if (h = t, t === "duplicate") {
-					let t = U(200, {
+					let t = G(200, {
 						received: !0,
 						duplicate: !0
 					});
@@ -506,7 +650,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					}), t;
 				}
 				if (t === "inflight") {
-					let t = U(409, {
+					let t = G(409, {
 						error: "request already in flight",
 						idempotencyKey: m
 					});
@@ -529,7 +673,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				idempotencyKey: m ?? "",
 				...r ? { workflows: r } : {}
 			}), m !== void 0 && s.commit(m);
-			let i = U(200, { received: !0 });
+			let i = G(200, { received: !0 });
 			return l({
 				webhookId: e.id,
 				status: 200,
@@ -539,7 +683,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}), i;
 		} catch (t) {
 			m !== void 0 && s.release(m);
-			let n = U(500, {
+			let n = G(500, {
 				error: "handler threw",
 				reason: t.message
 			});
@@ -558,20 +702,20 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			}), n;
 		}
 	};
-}, _e = (e) => `/webhooks/${e}`, W = "_voltro_webhook_rate_windows", G = 6e4, ve = (e, t) => `${e}@${t}`, K = 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: S(C("scope", t), C("bucket", n)),
 	order: [],
 	take: 1,
 	skip: void 0,
 	projection: void 0
-}))[0] ?? null, q = 32, J = async (e, t, n) => {
-	for (let r = 0; r < q; r++) {
+}))[0] ?? null, Y = 32, X = async (e, t, n) => {
+	for (let r = 0; r < Y; r++) {
 		r > 0 && await new Promise((e) => setTimeout(e, r));
-		let i = await K(e, t.key, n);
+		let i = await J(e, t.key, n);
 		if (i === null) {
-			await e.insertIgnore(W, {
-				id: ve(t.key, n),
+			await e.insertIgnore(K, {
+				id: xe(t.key, n),
 				scope: t.key,
 				bucket: n,
 				count: 0,
@@ -586,29 +730,29 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			updatedAt: /* @__PURE__ */ new Date()
 		}, { where: S(C("id", i.id), C("count", i.count)) }) === 1) return !0;
 	}
-	throw Error(`webhook rate window: contention on (${t.key}, ${n}) exceeded ${q} attempts`);
-}, Y = async (e, t, n) => {
-	for (let r = 0; r < q; r++) {
+	throw Error(`webhook rate window: contention on (${t.key}, ${n}) exceeded ${Y} attempts`);
+}, Z = async (e, t, n) => {
+	for (let r = 0; r < Y; r++) {
 		r > 0 && await new Promise((e) => setTimeout(e, r));
-		let i = await K(e, t, n);
+		let i = await J(e, t, n);
 		if (i === null || i.count <= 0 || await e.updateMany("_voltro_webhook_rate_windows", {
 			count: i.count - 1,
 			updatedAt: /* @__PURE__ */ new Date()
 		}, { where: S(C("id", i.id), C("count", i.count)) }) === 1) return;
 	}
-	throw Error(`webhook rate window: release contention on (${t}) exceeded ${q} attempts`);
-}, X = async (e, t, n, r = G) => {
+	throw Error(`webhook rate window: release contention on (${t}) exceeded ${Y} attempts`);
+}, Se = async (e, t, n, r = q) => {
 	if (t.length === 0) return {
 		acquired: !0,
 		retryInMs: 0
 	};
 	let i = Math.floor(n / r), a = [];
 	for (let o of t) {
-		if (await J(e, o, i)) {
+		if (await X(e, o, i)) {
 			a.push(o);
 			continue;
 		}
-		for (let t of a) await Y(e, t.key, i);
+		for (let t of a) await Z(e, t.key, i);
 		return {
 			acquired: !1,
 			retryInMs: (i + 1) * r - n
@@ -618,7 +762,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		acquired: !0,
 		retryInMs: 0
 	};
-}, Z = (e, t) => {
+}, Ce = (e, t) => {
 	if (e === "json") return {
 		contentType: "application/json",
 		bytes: Buffer.from(t, "utf8")
@@ -634,15 +778,15 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	}
 	return e === "form" ? {
 		contentType: "application/x-www-form-urlencoded",
-		bytes: Buffer.from(ye(n), "utf8")
+		bytes: Buffer.from(we(n), "utf8")
 	} : {
 		contentType: "application/xml",
-		bytes: Buffer.from(xe(n), "utf8")
+		bytes: Buffer.from(Ee(n), "utf8")
 	};
-}, ye = (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 ${we(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);
@@ -661,13 +805,13 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		return;
 	}
 	e.append(t, String(n));
-}, be = /^[A-Za-z_][A-Za-z0-9_.-]*$/, xe = (e) => `<?xml version="1.0" encoding="UTF-8"?>${$("webhook", e)}`, $ = (e, t) => {
-	if (!be.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}>${Se(e, t)}</${e}>`;
-}, Se = (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("") : Ce(String(t)), Ce = (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;";
@@ -675,17 +819,17 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		case "\"": return "&quot;";
 		default: return "&apos;";
 	}
-}), we = (e) => e === null ? "null" : Array.isArray(e) ? "array" : typeof e, Te = "_voltro_webhook_targets", Ee = 32, De = 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: C("id", t),
 	order: [],
 	take: 1,
 	skip: void 0,
 	projection: void 0
-}))[0] ?? null, Oe = async (e, t, n, r, i = /* @__PURE__ */ new Date()) => {
-	for (let a = 0; a < Ee; 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 De(e, t);
+		let o = await Me(e, t);
 		if (o === null) return {
 			consecutiveFailures: 0,
 			autoDisabled: !1
@@ -710,24 +854,24 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 			autoDisabled: u
 		};
 	}
-	throw Error(`webhook auto-disable: streak CAS contention on target ${t} exceeded ${Ee} attempts`);
-}, ke = x.Struct({
+	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)
-}), Ae = x.Struct({
+}), 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)
-}), je = x.Struct({
+}), Ie = x.Struct({
 	acquired: x.Boolean,
 	retryInMs: x.Number
-}), Me = ie.make({
+}), Le = ie.make({
 	name: "voltro.deliverWebhook",
 	payload: {
 		deliveryId: x.String,
@@ -742,10 +886,10 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		attempts: x.Number
 	}),
 	idempotencyKey: ({ deliveryId: e, attemptEpoch: t }) => `voltro.deliverWebhook:${e}:${t ?? 0}`
-}), Ne = (e, t = {}) => (n, r) => {
-	let { deliveryId: i, targetId: a, event: s, eventId: c, payloadJson: l } = n, u = re({ scope: `webhook:${i}` });
+}), 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* T.make({
+		let n = yield* E.make({
 			name: "fetch-target",
 			success: x.Union(x.Null, x.Struct({
 				id: x.String,
@@ -805,7 +949,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* E.make({
 			name: "record-paused-pending",
 			success: x.Void,
 			execute: b.tryPromise({
@@ -826,11 +970,11 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 		for (let t = 1; t <= p.maxAttempts; t++) {
 			let f = `${i}:${t}`;
 			if (v.length > 0) for (let n = 0;; n++) {
-				let i = yield* T.make({
+				let i = yield* E.make({
 					name: `rate-acquire-${t}-${n}`,
-					success: je,
+					success: Ie,
 					execute: b.tryPromise({
-						try: () => X(e.store, v, Date.now(), g),
+						try: () => Se(e.store, v, Date.now(), g),
 						catch: (e) => (u.debug("rate-acquire raw error", {
 							targetId: a,
 							event: s,
@@ -840,7 +984,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					}).pipe(b.orDie)
 				});
 				if (i.acquired) break;
-				yield* T.make({
+				yield* E.make({
 					name: `record-rate-deferral-${t}-${n}`,
 					success: x.Void,
 					execute: b.tryPromise({
@@ -850,12 +994,12 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						}),
 						catch: (e) => /* @__PURE__ */ Error(`record-rate-deferral failed: ${e.message}`)
 					}).pipe(b.orDie)
-				}), yield* E.sleep({
+				}), 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: x.Void,
 				execute: b.tryPromise({
@@ -867,13 +1011,13 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 					catch: (e) => /* @__PURE__ */ Error(`record-attempt-start failed: ${e.message}`)
 				}).pipe(b.orDie)
 			});
-			let _ = yield* T.make({
+			let _ = yield* E.make({
 				name: `sign-and-post-${t}`,
-				success: ke,
+				success: Pe,
 				execute: b.promise(async () => {
 					let e = Date.now(), r;
 					try {
-						r = Z(n.format, l);
+						r = Ce(n.format, l);
 					} catch (t) {
 						if (t instanceof d) return {
 							status: 0,
@@ -921,12 +1065,12 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 						};
 					}
 				})
-			}), y = yield* T.make({
+			}), y = yield* E.make({
 				name: `classify-and-record-${t}`,
-				success: Ae,
+				success: Fe,
 				execute: b.tryPromise({
 					try: async () => {
-						let r = _.status >= 200 && _.status < 300, i = _.transportError !== void 0, o = _.encodeError !== void 0, s = (t, n) => Oe(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",
@@ -944,7 +1088,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 								consecutiveFailures: t.consecutiveFailures
 							};
 						}
-						let c = o ? null : A(p, t, {
+						let c = o ? null : se(p, t, {
 							...i ? {} : { status: _.status },
 							..._.retryAfterSec === void 0 ? {} : { retryAfterSeconds: _.retryAfterSec }
 						});
@@ -1004,7 +1148,7 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 				finalStatus: "failed",
 				attempts: t
 			};
-			y.delayMs !== void 0 && (yield* E.sleep({
+			y.delayMs !== void 0 && (yield* re.sleep({
 				name: `retry-sleep-${t}`,
 				duration: `${y.delayMs} millis`
 			}));
@@ -1016,4 +1160,4 @@ var ae = (e) => e.webhook !== void 0, D = (e) => {
 	});
 };
 //#endregion
-export { R as IdempotencyCache, G as RATE_WINDOW_MS, W as RATE_WINDOW_TABLE, Te 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, g as _voltroWebhookTargetsTable, X as acquireRateSlots, D as asOutgoingEvent, Ne as buildDeliverWebhookExecute, fe as buildWebhooksService, le as compareVersions, J as consumeRateSlot, _e as defaultIncomingPath, c as defaultOutgoingSignature, j as defaultRetryPolicy, s as defineIncomingWebhook, t as defineWebhookProvider, Me as deliverWebhookWorkflow, Z as encodePayload, se as fastRetryPolicy, P as generateSecret, B as getIdempotencyCache, i as githubSignature, ae as hasWebhookAudience, r as isWebhookDescriptor, L as matchesFilter, ge as mountIncomingWebhook, A as nextRetry, O as parseDuration, H as parseTtl, Oe as recordDeliveryOutcome, Y as releaseRateSlot, I as resolveSubscribe, o as signPayload, n as slackSignature, e as stripeSignature, me as useWebhooks, pe as useWebhooksEffect, F as validateSubscribe, a as verifySignature, _ 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 };