@protobase/server 0.35.0 → 0.36.0

package/dist/webhooks/subscriber-view.js

@@ -40,20 +40,30 @@ const subscriptionEvent = (change, event, { fields, thin = false } = {}) => ({
 		transaction: change.transaction
 	}
 });
-const withUnknownEncrypted = (model, record) => {
-	const fields = Object.values(model.fields).filter((field) => field.encrypted);
-	if (fields.length === 0) return record;
+const withUnknownFields = (model, record) => {
+	const fields = Object.values(model.fields).filter((field) => field.sensitive || !Object.hasOwn(record, field.name));
 	const unknown = { ...record };
+	const read = [];
+	const error = (name) => {
+		const field = model.fields[name];
+		return /* @__PURE__ */ new Error(`a subscription's access check cannot tell whether the ${field.sensitive ? "sensitive field" : "field"} "${name}" is set${field.sensitive ? "" : ", which the captured change does not hold"}`);
+	};
 	for (const field of fields) Object.defineProperty(unknown, field.name, {
 		enumerable: true,
 		get: () => {
-			throw new Error(`a subscription's access check cannot tell whether the encrypted field "${field.name}" is set`);
+			read.push(field.name);
+			throw error(field.name);
 		}
 	});
-	return unknown;
+	const check = () => {
+		if (read.length > 0) throw error(read[0]);
+	};
+	return {
+		record: unknown,
+		check
+	};
 };
-const mayRead = async (access, captured) => {
-	const record = withUnknownEncrypted(access.full, captured);
+const decide = async (access, record) => {
 	const { resolved, session, entry } = access;
 	if (!resolved.operations.read) return false;
 	if (resolved.rowFilter.read && evaluateFilter(resolved.rowFilter.read, record) !== true) return false;
@@ -64,6 +74,12 @@ const mayRead = async (access, captured) => {
 	};
 	return checkRecord(entry.source, context, "read", record, void 0, access.deps.accessOptions);
 };
+const mayRead = async (access, captured) => {
+	const { record, check } = withUnknownFields(access.full, captured);
+	const allowed = await decide(access, record);
+	check();
+	return allowed;
+};
 /**
 * Builds each subscriber's event, under the access rules of the session it delivers as, resolved once per subscription
 * and resource: `undefined` when it may not read the record, after the change or before a delete.

package/dist/webhooks/webhooks.js

@@ -47,7 +47,9 @@ const deliveryGroup = ({ subscription, change }) => `${subscription.name}:${chan
 *   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.
+*   retry after the fix queues the change's deliveries. An access rule's failure keeps the change for that subscription
+*   only: the others still receive it, and the retry delivers to that subscription alone. 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
@@ -148,17 +150,32 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 	const changeDeliveries = async (db) => {
 		const route = subscriptionRouter(await current(db), models);
 		const eventOf = subscriberEvents(deps);
-		return async (change) => {
+		return async (change, only) => {
+			const routes = route(change, matchers.get(change.resource)(change)).filter(({ subscription }) => only === void 0 || subscription.name === only);
 			const deliveries = [];
-			for (const { subscription, event } of route(change, matchers.get(change.resource)(change))) {
-				const shaped = await eventOf(subscription, change, event);
+			const failures = [];
+			const failed = /* @__PURE__ */ new Set();
+			for (const { subscription, event } of routes) {
+				if (failed.has(subscription.name)) continue;
+				const shaped = await eventOf(subscription, change, event).catch((error) => {
+					if (!(error instanceof EventCodeError)) throw error;
+					failed.add(subscription.name);
+					failures.push({
+						change,
+						subscription: subscription.name,
+						error
+					});
+				});
 				if (shaped) deliveries.push({
 					subscription,
 					event: shaped,
 					change
 				});
 			}
-			return deliveries;
+			return {
+				deliveries: deliveries.filter(({ subscription }) => !failed.has(subscription.name)),
+				failures
+			};
 		};
 	};
 	const queueOrdered = async (db, deliveries) => {
@@ -178,8 +195,9 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 		name: "webhooks.dispatch-change",
 		maxAttempts: 1,
 		timeout: "5 minutes",
-		run: async ({ change }, { db }) => {
-			const deliveries = await (await changeDeliveries(db))(change);
+		run: async ({ change, subscription: only }, { db }) => {
+			const { deliveries, failures } = await (await changeDeliveries(db))(change, only);
+			if (only !== void 0 && failures.length > 0) throw failures[0].error;
 			await db.transaction().execute(async (trx) => {
 				for (const { subscription, event } of deliveries.filter(({ subscription }) => !subscription.options.ordered)) {
 					const payload = {
@@ -190,6 +208,10 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 					await deliver.enqueue(trx, payload, { key: deliveryKey(payload) });
 				}
 				await queueOrdered(trx, deliveries);
+				for (const { subscription } of failures) await dispatchChange.enqueue(trx, {
+					change,
+					subscription
+				});
 			});
 		}
 	});
@@ -204,7 +226,9 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 		const deliveries = [];
 		const failures = [];
 		for (const change of changes) try {
-			deliveries.push(...await deliveriesOf(change));
+			const routed = await deliveriesOf(change);
+			deliveries.push(...routed.deliveries);
+			failures.push(...routed.failures);
 		} catch (error) {
 			if (!(error instanceof EventCodeError)) throw error;
 			failures.push({
@@ -232,7 +256,10 @@ const createWebhooks = ({ deps, subscriptions, functions, schema, log, table })
 				});
 			}
 			await queueOrdered(trx, deliveries);
-			for (const { change } of failures) await dispatchChange.enqueue(trx, { change });
+			for (const { change, subscription } of failures) await dispatchChange.enqueue(trx, {
+				change,
+				...subscription !== void 0 && { subscription }
+			});
 			await writeHistory(trx, schema, changes.filter((change) => deps.registry.find(change.resource)?.model.history));
 			await writeNotices(trx, schema, changes.filter((change) => deps.registry.find(change.resource)?.model.live));
 			await deleteOutbox(trx, schema, rows.map((row) => row.id));

package/package.json

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