@voltro/plugin-webhooks 0.86.0 → 0.88.0

package/dist/service.js

@@ -7,13 +7,13 @@ import { Context as u, Effect as d, Result as f, Schema as p } from "effect";
 import { randomBytes as m, randomUUID as h } from "node:crypto";
 import { and as g, eq as _ } from "@voltro/database";
 import { assertPublicUrl as v } from "@voltro/integration-http";
-//#region src/service.ts
-var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32, x = 32, S = () => m(b).toString("hex"), C = (e) => e.events ?? (e.event === void 0 ? [] : [e.event]), w = (e, t) => {
+// src/service.ts
+var y = 2592e3, b = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, x = 32, S = 32, C = () => m(x).toString("hex"), w = (e) => e.events ?? (e.event === void 0 ? [] : [e.event]), T = (e, t) => {
 	if (e !== void 0 && t?._tag === "standardWebhooks" && !n(e)) throw new c({
 		field: "secret",
 		reason: "a standard-webhooks target needs the spec's secret serialization (\"whsec_\" + base64 of 24..64 random bytes) — mint one with generateStandardWebhooksSecret(), or omit `secret` and let subscribe mint it. If the incompatible key is inherited, rotate the endpoint secret and update the receiver before adding the event"
 	});
-}, T = (e) => {
+}, E = (e) => {
 	let t;
 	try {
 		t = new URL(e.url);
@@ -35,7 +35,7 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 			reason: e.message
 		});
 	}
-	let n = C(e);
+	let n = w(e);
 	if (n.length === 0) throw new c({
 		field: "event",
 		reason: "event id required"
@@ -52,11 +52,11 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 		field: "events",
 		reason: "duplicate event — one row per event, so a repeat would deliver twice"
 	});
-	if (e.secret !== void 0 && e.secret.length < x) throw new c({
+	if (e.secret !== void 0 && e.secret.length < S) throw new c({
 		field: "secret",
-		reason: `secret must be at least ${x} chars`
+		reason: `secret must be at least ${S} chars`
 	});
-	if (w(e.secret, e.signing), e.retry !== void 0) {
+	if (T(e.secret, e.signing), e.retry !== void 0) {
 		if (e.retry.maxAttempts < 1) throw new c({
 			field: "retry",
 			reason: "retry.maxAttempts must be ≥ 1"
@@ -74,9 +74,9 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 		field: "autoDisableAfter",
 		reason: `autoDisableAfter must be a positive integer, got ${e.autoDisableAfter}`
 	});
-}, E = (e, n, a, o) => {
-	let s = e.signing ?? n?.defaultSigning ?? r(), c = s._tag === "standardWebhooks" ? t : S, l = o ?? e.secret ?? c();
-	return w(l, s), {
+}, D = (e, n, a, o) => {
+	let s = e.signing ?? n?.defaultSigning ?? r(), c = s._tag === "standardWebhooks" ? t : C, l = o ?? e.secret ?? c();
+	return T(l, s), {
 		id: h(),
 		tenantId: e.tenantId ?? null,
 		event: a ?? e.event ?? "",
@@ -97,14 +97,14 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 		payloadVersion: e.payloadVersion ?? n?.version ?? 1,
 		description: e.description ?? null
 	};
-}, D = (e) => e instanceof Date ? e.getTime() : typeof e == "string" ? Date.parse(e) : 0, O = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : null, k = (e) => {
+}, O = (e) => e instanceof Date ? e.getTime() : typeof e == "string" ? Date.parse(e) : 0, k = (e) => e instanceof Date ? e.toISOString() : typeof e == "string" ? e : null, A = (e) => {
 	if (typeof e != "string") return e;
 	try {
 		return JSON.parse(e);
 	} catch {
 		return e;
 	}
-}, A = (e) => ({
+}, j = (e) => ({
 	id: String(e.id),
 	deliveryId: String(e.deliveryId),
 	targetId: String(e.targetId),
@@ -115,28 +115,28 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 	responseStatus: e.responseStatus ?? null,
 	errorMessage: e.errorMessage ?? null,
 	latencyMs: e.latencyMs ?? null,
-	scheduledAt: O(e.scheduledAt),
-	nextAttemptAt: O(e.nextAttemptAt),
-	createdAt: O(e.createdAt)
-}), j = (e, t) => e === t ? "current" : e < t ? "behind" : "ahead", M = (e, t) => {
+	scheduledAt: k(e.scheduledAt),
+	nextAttemptAt: k(e.nextAttemptAt),
+	createdAt: k(e.createdAt)
+}), M = (e, t) => e === t ? "current" : e < t ? "behind" : "ahead", N = (e, t) => {
 	if (e === null) return !0;
 	let n = { payload: t };
-	for (let [t, r] of Object.entries(e)) if (!F(N(n, t), r)) return !1;
+	for (let [t, r] of Object.entries(e)) if (!I(P(n, t), r)) return !1;
 	return !0;
-}, N = (e, t) => {
+}, P = (e, t) => {
 	let n = t.split("."), r = e;
 	for (let e of n) {
 		if (typeof r != "object" || !r) return;
 		r = r[e];
 	}
 	return r;
-}, P = (e, t) => {
+}, F = (e, t) => {
 	if (typeof e == "number" && typeof t == "number") return e - t;
 	if (typeof e == "string" && typeof t == "string") return e < t ? -1 : +(e > t);
-}, F = (e, t) => {
+}, I = (e, t) => {
 	if (typeof t == "object" && t && !Array.isArray(t)) {
 		let n = t;
-		return "eq" in n && e !== n.eq || "in" in n && (!Array.isArray(n.in) || !n.in.includes(e)) || "gt" in n && !((P(e, n.gt) ?? 0) > 0) || "gte" in n && !((P(e, n.gte) ?? -1) >= 0) || "lt" in n && !((P(e, n.lt) ?? 0) < 0) || "lte" in n && !((P(e, n.lte) ?? 1) <= 0) ? !1 : [
+		return "eq" in n && e !== n.eq || "in" in n && (!Array.isArray(n.in) || !n.in.includes(e)) || "gt" in n && !((F(e, n.gt) ?? 0) > 0) || "gte" in n && !((F(e, n.gte) ?? -1) >= 0) || "lt" in n && !((F(e, n.lt) ?? 0) < 0) || "lte" in n && !((F(e, n.lte) ?? 1) <= 0) ? !1 : [
 			"eq",
 			"in",
 			"gt",
@@ -146,9 +146,9 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 		].some((e) => e in n);
 	}
 	return e === t;
-}, I = (e, t) => e !== null && Object.entries(t).every(([t, n]) => e[t] === n), L = 500, R = 200, z = async (e, t) => {
+}, L = (e, t) => e !== null && Object.entries(t).every(([t, n]) => e[t] === n), R = 500, z = 200, B = async (e, t) => {
 	let n = [];
-	for (let r = 0; r < R; r += 1) {
+	for (let r = 0; r < z; r += 1) {
 		let i = await e.store.query({
 			table: "_voltro_webhook_targets",
 			predicate: t,
@@ -156,20 +156,20 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 				column: "id",
 				direction: "asc"
 			}],
-			take: L,
-			skip: r === 0 ? void 0 : r * L,
+			take: R,
+			skip: r === 0 ? void 0 : r * R,
 			projection: void 0
 		});
-		if (n.push(...i), i.length < L) return n;
+		if (n.push(...i), i.length < R) return n;
 	}
-	throw Error(`webhooks: more than ${R * L} rows in \`_voltro_webhook_targets\` — refusing to answer a scope lookup from a partial scan. A truncated scan mints a fresh secret for a live endpoint (breaking its signatures) or reports that a real scope matches nothing.`);
-}, B = async (e, t) => {
-	let n = (await z(e)).filter((e) => I(e.scope, t));
+	throw Error(`webhooks: more than ${z * R} rows in \`_voltro_webhook_targets\` — refusing to answer a scope lookup from a partial scan. A truncated scan mints a fresh secret for a live endpoint (breaking its signatures) or reports that a real scope matches nothing.`);
+}, V = async (e, t) => {
+	let n = (await B(e)).filter((e) => L(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];
-}, V = async (e, t) => {
+}, H = async (e, t) => {
 	try {
 		let n = await e.store.query({
 			table: "_voltro_webhook_event_stats",
@@ -195,11 +195,11 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 			updatedAt: r
 		});
 	} catch {}
-}, H = (n, r, i = {}) => {
+}, U = (n, r, i = {}) => {
 	let c = new Map((i.events ?? []).map((e) => [e.id, e])), u = {
 		subscribe: async (e) => {
-			T(e);
-			let r = C(e), i = e.secret === void 0 && e.scope !== void 0 ? await B(n, e.scope) : void 0, a = e.secret ?? i ?? t(), o = r.map((t) => E(e, c.get(t), t, a));
+			E(e);
+			let r = w(e), i = e.secret === void 0 && e.scope !== void 0 ? await V(n, e.scope) : void 0, a = e.secret ?? i ?? t(), o = r.map((t) => D(e, c.get(t), t, a));
 			for (let e of o) await n.store.insert("_voltro_webhook_targets", {
 				...e,
 				createdAt: /* @__PURE__ */ new Date(),
@@ -228,9 +228,9 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 					issues: e.failure.message
 				});
 			}
-			let d = a?.eventId ?? h(), m = a?.tenantId, v = await z(n, m == null ? _("event", u) : g(_("event", u), _("tenantId", m)));
-			await V(n, u);
-			let y = v.filter((e) => M(e.filter, i)), b = [], x = JSON.stringify(i), S = async (e, t) => {
+			let d = a?.eventId ?? h(), m = a?.tenantId, v = await B(n, m == null ? _("event", u) : g(_("event", u), _("tenantId", m)));
+			await H(n, u);
+			let y = v.filter((e) => N(e.filter, i)), b = [], x = JSON.stringify(i), S = async (e, t) => {
 				let i = h();
 				e.active ? (await r({
 					deliveryId: i,
@@ -310,7 +310,7 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 				})).length === 0) throw new l({ targetId: e });
 				return [e];
 			}
-			let t = (await z(n)).filter((t) => I(t.scope, e.scope)).map((e) => e.id);
+			let t = (await B(n)).filter((t) => L(t.scope, e.scope)).map((e) => e.id);
 			if (t.length === 0) throw Error(`webhooks: no target matches scope ${JSON.stringify(e.scope)} — the operation would have silently done nothing`);
 			return t;
 		},
@@ -353,16 +353,52 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 		deleteTarget: async (e) => {
 			for (let t of await u.resolveTargets(e)) await n.store.delete("_voltro_webhook_targets", t), await n.store.deleteMany("_voltro_webhook_deliveries", { where: g(_("targetId", t), _("status", "pending")) });
 		},
-		rotateSecret: async (e) => {
-			let r = t();
-			for (let t of await u.resolveTargets(e)) await n.store.update("_voltro_webhook_targets", t, {
-				secret: r,
-				updatedAt: /* @__PURE__ */ new Date()
-			});
-			return { secret: r };
+		rotateSecret: async (e, r = {}) => {
+			let i = r.overlapSeconds ?? 2592e3;
+			if (!Number.isInteger(i) || i < 0 || i > 2592e3) throw Error(`rotateSecret: overlapSeconds must be an integer between 0 and ${y} (30 days), got ${String(i)}`);
+			let a = t(), o = i > 0 ? /* @__PURE__ */ new Date(Math.floor(Date.now() / 1e3) * 1e3 + i * 1e3) : null, s = o !== null;
+			for (let t of await u.resolveTargets(e)) {
+				let [e] = await n.store.query({
+					table: "_voltro_webhook_targets",
+					predicate: _("id", t),
+					order: [],
+					take: 1,
+					skip: void 0,
+					projection: void 0
+				}), r = typeof e?.signing == "string" ? JSON.parse(e.signing) : e?.signing, i = o !== null && e !== void 0 && r?._tag === "standardWebhooks";
+				i || (s = !1), await n.store.update("_voltro_webhook_targets", t, {
+					secret: a,
+					previousSecret: i ? e.secret : null,
+					previousSecretUntil: i ? o : null,
+					updatedAt: /* @__PURE__ */ new Date()
+				});
+			}
+			return {
+				secret: a,
+				previousSignedUntil: s ? o : null
+			};
+		},
+		endSecretOverlap: async (e) => {
+			let t = 0;
+			for (let r of await u.resolveTargets(e)) {
+				let [e] = await n.store.query({
+					table: "_voltro_webhook_targets",
+					predicate: _("id", r),
+					order: [],
+					take: 1,
+					skip: void 0,
+					projection: void 0
+				});
+				e?.previousSecret != null && (await n.store.update("_voltro_webhook_targets", r, {
+					previousSecret: null,
+					previousSecretUntil: null,
+					updatedAt: /* @__PURE__ */ new Date()
+				}), t += 1);
+			}
+			return { ended: t };
 		},
 		updateTarget: async (e, t) => {
-			if (t.url !== void 0 && T({
+			if (t.url !== void 0 && E({
 				event: "x",
 				url: t.url
 			}), t.rateLimitPerMinute !== void 0 && t.rateLimitPerMinute !== null && (!Number.isInteger(t.rateLimitPerMinute) || t.rateLimitPerMinute < 1)) throw Error("updateTarget: rateLimitPerMinute must be a positive integer or null");
@@ -427,7 +463,7 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 				skip: void 0,
 				projection: void 0
 			}), i = e?.since?.getTime();
-			return r.filter((e) => t === void 0 || t.has(String(e.targetId))).filter((t) => e?.status === void 0 || t.status === e.status).filter((e) => i === void 0 || D(e.createdAt) >= i).slice(0, e?.limit ?? 200).map(A);
+			return r.filter((e) => t === void 0 || t.has(String(e.targetId))).filter((t) => e?.status === void 0 || t.status === e.status).filter((e) => i === void 0 || O(e.createdAt) >= i).slice(0, e?.limit ?? 200).map(j);
 		},
 		getDelivery: async (e) => {
 			let t = (await n.store.query({
@@ -439,8 +475,8 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 				projection: void 0
 			}))[0];
 			return t === void 0 ? null : {
-				...A(t),
-				payload: k(t.payload),
+				...j(t),
+				payload: A(t.payload),
 				responseBody: t.responseBody ?? null
 			};
 		},
@@ -481,11 +517,10 @@ var y = class extends u.Service()("@voltro/webhooks/WebhooksService") {}, b = 32
 		}
 	};
 	return u;
-}, U = d.gen(function* () {
-	return yield* y;
-}), W = (e) => {
+}, W = d.gen(function* () {
+	return yield* b;
+}), G = (e) => {
 	if (e.webhooks === void 0) throw Error("useWebhooks: `ctx.webhooks` is not set. Declare an outgoing event with a `webhook:` block in a *.event.ts file, or an incoming endpoint in a *.webhook.tsx file — the service is wired the moment the app has either.");
 	return e.webhooks;
 };
-//#endregion
-export { y as WebhooksService, H as buildWebhooksService, j as compareVersions, C as eventsOf, S as generateSecret, M as matchesFilter, E as resolveSubscribe, W as useWebhooks, U as useWebhooksEffect, T as validateSubscribe };
+export { y as MAX_SECRET_OVERLAP_SECONDS, b as WebhooksService, U as buildWebhooksService, M as compareVersions, w as eventsOf, C as generateSecret, N as matchesFilter, D as resolveSubscribe, G as useWebhooks, W as useWebhooksEffect, E as validateSubscribe };

package/dist/signing.js

@@ -1,6 +1,6 @@
 import { standardWebhooksHeaders as e, verifyStandardWebhooks as t } from "./standardWebhooks.js";
 import { createHmac as n, timingSafeEqual as r } from "node:crypto";
-//#region src/signing.ts
+// src/signing.ts
 var i = (e) => e === "hmacSha256" ? "sha256" : "sha1", a = (e, t, r, a = "hex") => {
 	let o = n(i(e), t);
 	return o.update(r), o.digest(a);
@@ -141,5 +141,4 @@ var s = (t, n) => {
 	encoding: "hex",
 	versionPrefix: "v1="
 });
-//#endregion
 export { m as defaultOutgoingSignature, h as genericHmacSignature, d as githubSignature, s as signRequest, f as slackSignature, p as standardWebhooksSignature, u as stripeSignature, c as verifyRequest };

package/dist/standardWebhooks.js

@@ -1,5 +1,5 @@
 import { createHmac as e, randomBytes as t, timingSafeEqual as n } from "node:crypto";
-//#region src/standardWebhooks.ts
+// src/standardWebhooks.ts
 var r = "webhook-id", i = "webhook-timestamp", a = "webhook-signature", o = "v1", s = "whsec_", c = 24, l = 64, u = 300, d = () => `${s}${t(32).toString("base64")}`, f = (e) => {
 	if (!e.startsWith("whsec_")) throw Error(`standard-webhooks: the signing secret must be the spec's serialization — "${s}" + base64(24..64 random bytes). Mint one with generateStandardWebhooksSecret(). (A hex secret is also valid base64, so accepting it would sign with the wrong key bytes and every conformant consumer would reject the delivery.)`);
 	let t = Buffer.from(e.slice(6), "base64");
@@ -84,5 +84,4 @@ var r = "webhook-id", i = "webhook-timestamp", a = "webhook-signature", o = "v1"
 		reason: "signature mismatch"
 	};
 };
-//#endregion
 export { u as STANDARD_WEBHOOKS_DEFAULT_TOLERANCE_SECONDS, r as STANDARD_WEBHOOKS_ID_HEADER, l as STANDARD_WEBHOOKS_MAX_KEY_BYTES, c as STANDARD_WEBHOOKS_MIN_KEY_BYTES, s as STANDARD_WEBHOOKS_SECRET_PREFIX, a as STANDARD_WEBHOOKS_SIGNATURE_HEADER, i as STANDARD_WEBHOOKS_TIMESTAMP_HEADER, o as STANDARD_WEBHOOKS_VERSION, d as generateStandardWebhooksSecret, p as isStandardWebhooksSecret, _ as standardWebhooksHeaders, f as standardWebhooksKey, g as standardWebhooksSignatureToken, h as standardWebhooksSignedContent, y as verifyStandardWebhooks };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-webhooks",
-  "version": "0.86.0",
+  "version": "0.88.0",
   "description": "Webhooks plugin — first-class outgoing (multi-target, durable-workflow delivery, HMAC signing, retry policies, rate limits) + incoming (signature verification, idempotency, provider templates for Stripe / GitHub / Slack / generic).",
   "keywords": [
     "voltro",
@@ -48,15 +48,15 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/database": "0.86.0",
-    "@voltro/integration-http": "0.86.0",
-    "@voltro/logger": "0.86.0",
-    "@voltro/plugin-multitenancy": "0.86.0",
-    "@voltro/protocol": "0.86.0",
-    "@voltro/runtime": "0.86.0"
+    "@voltro/database": "0.88.0",
+    "@voltro/integration-http": "0.88.0",
+    "@voltro/logger": "0.88.0",
+    "@voltro/plugin-multitenancy": "0.88.0",
+    "@voltro/protocol": "0.88.0",
+    "@voltro/runtime": "0.88.0"
   },
   "peerDependencies": {
-    "effect": "4.0.1"
+    "effect": "4.1.0"
   },
   "publishConfig": {
     "access": "public"