@protobase/server 0.14.5 → 0.14.6

package/dist/changes/event-code-error.js

@@ -0,0 +1,14 @@
+//#region src/changes/event-code-error.ts
+/**
+* An error the app's code threw while a change was dispatched: an event's `match` or filter, a subscription's `when`, or
+* an access rule of the roles it delivers as. Dispatch keeps the change as failed and moves on; any other error, such
+* as the database's, fails the whole dispatch, which is retried.
+*/
+var EventCodeError = class extends Error {
+	name = "EventCodeError";
+	constructor(what, error) {
+		super(`${what} threw: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+	}
+};
+//#endregion
+export { EventCodeError };

package/dist/changes/match-events.js

@@ -1,3 +1,4 @@
+import { EventCodeError } from "./event-code-error.js";
 import { evaluateFilter } from "@protobase/schema";
 import { checkEventFilter } from "@protobase/schema/internal";
 //#region src/changes/match-events.ts
@@ -39,7 +40,13 @@ const eventTest = (model, event, match) => {
 		if (!match) throw new Error(`Resource "${model.name}": event "${event.name}" has no match function`);
 		tests.push((change) => match(contextOf(change)));
 	}
-	return (change) => tests.every((test) => test(change));
+	return (change) => {
+		try {
+			return tests.every((test) => test(change));
+		} catch (error) {
+			throw new EventCodeError(`Event ${event.name} on ${change.resource} ${change.key}`, error);
+		}
+	};
 };
 /**
 * The names of the resource's events a change raises, in declaration order. The filters are checked once, here; `matches`

package/dist/webhooks/route-events.js

@@ -1,3 +1,4 @@
+import { EventCodeError } from "../changes/event-code-error.js";
 import { eventPatternMatches } from "./subscription.js";
 import { evaluateFilter } from "@protobase/schema";
 import { checkEventFilter } from "@protobase/schema/internal";
@@ -48,7 +49,12 @@ const subscriptionRouter = (subscriptions, models) => {
 		if (options.enabled === false) return false;
 		if (options.tenant !== void 0 && String(options.tenant) !== String(change.tenant)) return false;
 		const filter = filters.get(`${subscription.name}\0${change.resource}`);
-		return !filter || evaluateFilter(filter, change.after ?? change.before) === true;
+		if (!filter) return true;
+		try {
+			return evaluateFilter(filter, change.after ?? change.before) === true;
+		} catch (error) {
+			throw new EventCodeError(`The when of subscription "${subscription.name}" on ${change.resource} ${change.key}`, error);
+		}
 	};
 	return (change, events) => subscriptions.flatMap((subscription) => {
 		if (!passes(subscription, change)) return [];

package/dist/webhooks/subscriber-view.js

@@ -1,4 +1,5 @@
 import { requestAccess } from "../request-access.js";
+import { EventCodeError } from "../changes/event-code-error.js";
 import { checkRecord, evaluateFilter } from "@protobase/schema";
 //#region src/webhooks/subscriber-view.ts
 /**
@@ -64,8 +65,14 @@ const subscriberEvents = (deps) => {
 		if (!entry) throw new Error(`Not implemented: a change of "${change.resource}", which is no resource of the app`);
 		const cacheKey = `${subscription.name}\0${change.resource}`;
 		if (!accesses.has(cacheKey)) accesses.set(cacheKey, requestAccess(deps, entry, session));
-		const access = await accesses.get(cacheKey);
-		if (!await mayRead(access, change.after ?? change.before)) return void 0;
+		const readable = async () => {
+			const access = await accesses.get(cacheKey);
+			return await mayRead(access, change.after ?? change.before) ? access : void 0;
+		};
+		const access = await readable().catch((error) => {
+			throw new EventCodeError(`The access check of subscription "${subscription.name}" on ${change.resource} ${change.key}`, error);
+		});
+		if (!access) return void 0;
 		return subscriptionEvent(change, event, {
 			fields: Object.keys(access.readable.fields),
 			thin

package/dist/webhooks/webhooks.js

@@ -1,5 +1,6 @@
 import { dispatchJobName } from "../changes/capture-sql.js";
 import { coalesce } from "../changes/coalesce.js";
+import { EventCodeError } from "../changes/event-code-error.js";
 import { eventMatcher } from "../changes/match-events.js";
 import { deleteOutbox, readOutbox } from "../changes/outbox.js";
 import { resourceChange } from "../changes/resource-change.js";
@@ -41,6 +42,9 @@ const deliveryGroup = ({ subscription, change }) => `${subscription.name}:${chan
 *   time: it turns the committed outbox rows into events, makes the first try of every unordered delivery itself,
 *   queues the failures and the ordered deliveries, and deletes the rows in that same transaction. A process that dies
 *   before that commits leaves the rows, and the job's retry delivers them again, under the same `webhook-id`.
+* - `webhooks.dispatch-change`, one change whose app code threw in dispatch: an event's `match` or filter, a
+*   subscription's `when`, or an access rule of its roles. Kept as failed, so dispatch moves on to later changes; a
+*   retry after the fix queues the change's deliveries. Any other error fails the whole dispatch, which is retried.
 * - `webhooks.deliver`, one try of an unordered delivery; a failure queues the next try on the Standard Webhooks
 *   schedule, or Retry-After, and the last one is kept as failed.
 * - `webhooks.deliver-ordered`, the ordered deliveries of one dispatch for one subscription and record, retried with
@@ -138,20 +142,54 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 			}
 		}
 	});
-	const deliveriesOf = async (changes, db) => {
+	const changeDeliveries = async (db) => {
 		const route = subscriptionRouter(await current(db), models);
 		const eventOf = subscriberEvents(deps);
-		const deliveries = [];
-		for (const change of changes) for (const { subscription, event } of route(change, matchers.get(change.resource)(change))) {
-			const shaped = await eventOf(subscription, change, event);
-			if (shaped) deliveries.push({
-				subscription,
-				event: shaped,
-				change
-			});
+		return async (change) => {
+			const deliveries = [];
+			for (const { subscription, event } of route(change, matchers.get(change.resource)(change))) {
+				const shaped = await eventOf(subscription, change, event);
+				if (shaped) deliveries.push({
+					subscription,
+					event: shaped,
+					change
+				});
+			}
+			return deliveries;
+		};
+	};
+	const queueOrdered = async (db, deliveries) => {
+		const groups = /* @__PURE__ */ new Map();
+		for (const delivery of deliveries.filter(({ subscription }) => subscription.options.ordered)) {
+			const group = deliveryGroup(delivery);
+			const payload = groups.get(group) ?? {
+				subscription: delivery.subscription.name,
+				events: []
+			};
+			payload.events.push(delivery.event);
+			groups.set(group, payload);
 		}
-		return deliveries;
+		for (const [group, payload] of groups) await deliverOrdered.enqueue(db, payload, { group });
 	};
+	const dispatchChange = defineJob({
+		name: "webhooks.dispatch-change",
+		maxAttempts: 1,
+		timeout: "5 minutes",
+		run: async ({ change }, { db }) => {
+			const deliveries = await (await changeDeliveries(db))(change);
+			await db.transaction().execute(async (trx) => {
+				for (const { subscription, event } of deliveries.filter(({ subscription }) => !subscription.options.ordered)) {
+					const payload = {
+						subscription: subscription.name,
+						event,
+						attempt: 1
+					};
+					await deliver.enqueue(trx, payload, { key: deliveryKey(payload) });
+				}
+				await queueOrdered(trx, deliveries);
+			});
+		}
+	});
 	const dispatchBatch = async (db, signal) => {
 		const rows = await readOutbox(db, schema, models, batchSize);
 		if (rows.length === 0) return 0;
@@ -159,7 +197,18 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 			const entry = deps.registry.find(change.resource);
 			return entry ? [resourceChange(entry.model, change)] : [];
 		});
-		const deliveries = await deliveriesOf(changes, db);
+		const deliveriesOf = await changeDeliveries(db);
+		const deliveries = [];
+		const failures = [];
+		for (const change of changes) try {
+			deliveries.push(...await deliveriesOf(change));
+		} catch (error) {
+			if (!(error instanceof EventCodeError)) throw error;
+			failures.push({
+				change,
+				error
+			});
+		}
 		const now = deliveries.filter(({ subscription }) => !subscription.options.ordered);
 		const results = await mapLimit(now, parallelAttempts, ({ subscription, event }) => attempt(subscription, event, db, 1, signal));
 		await db.transaction().execute(async (trx) => {
@@ -179,20 +228,12 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 					delay
 				});
 			}
-			const groups = /* @__PURE__ */ new Map();
-			for (const delivery of deliveries.filter(({ subscription }) => subscription.options.ordered)) {
-				const group = deliveryGroup(delivery);
-				const payload = groups.get(group) ?? {
-					subscription: delivery.subscription.name,
-					events: []
-				};
-				payload.events.push(delivery.event);
-				groups.set(group, payload);
-			}
-			for (const [group, payload] of groups) await deliverOrdered.enqueue(trx, payload, { group });
+			await queueOrdered(trx, deliveries);
+			for (const { change } of failures) await dispatchChange.enqueue(trx, { change });
 			await deleteOutbox(trx, schema, rows.map((row) => row.id));
 		});
 		for (const [index, { subscription, event }] of now.entries()) report(subscription.name, event, 1, results[index]);
+		for (const { error } of failures) log(`events kept as failed (webhooks.dispatch-change): ${error.message}`);
 		return rows.length;
 	};
 	const dispatch = defineJob({
@@ -223,6 +264,7 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 	});
 	return { jobs: [
 		dispatch,
+		dispatchChange,
 		deliver,
 		deliverOrdered,
 		...table ? [sendTest] : [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@better-auth/passkey": "^1.7.7",
-    "@protobase/layout": "0.14.5",
-    "@protobase/query": "0.14.5",
-    "@protobase/schema": "0.14.5",
+    "@protobase/layout": "0.14.6",
+    "@protobase/query": "0.14.6",
+    "@protobase/schema": "0.14.6",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",