@vercel/board 0.29.0 → 0.30.0

package/dist/{a2-HUbQJ0RD.mjs → a2-D_28Pdip.mjs}

@@ -1,31 +1,31 @@
 import { r as IMPORT_BYTES_MAX, t as ATTACHMENT_BYTES_MAX } from "./files-SniSmeEr.mjs";
 import { _ as RemoteWatcherId, b as actorKind, x as platformAvatar } from "./schemas-DBmUO6pr.mjs";
 import "./external-D3p5T57R.mjs";
-import { a as METHODS, d as VERSION, f as SYNC, n as compileWatcher, r as hasCriteria, t as canonicalWatchers } from "./watchers-hash-BDhLVkV5.mjs";
-import { r as duration, t as BoardError } from "./client-D0Px7KzF.mjs";
+import { a as METHODS, d as VERSION, f as SYNC, n as compileWatcher, r as hasCriteria, t as canonicalWatchers } from "./watchers-hash-B_5b0-ZG.mjs";
+import { a as forbidden, c as toErrorResponse, f as duration, i as duplicateId, r as badRequest, s as notFound, t as HttpError, u as BoardError } from "./errors-C_5rB8Iz.mjs";
 import { i as isKeyIdOf, r as derivedId, t as waitUntil } from "./wait-until-Dw4XrIDQ.mjs";
-import { a as forbidden, c as toErrorResponse, i as duplicateId, r as badRequest, s as notFound, t as HttpError } from "./errors-CusN4x2l.mjs";
 import { t as own } from "./own-OwgPWdmh.mjs";
 import { n as replaceMentions } from "./mentions-CB6ShY4R.mjs";
-import { _ as FULL_ACCESS, i as authenticates, v as authorize } from "./auth-JO22iIwr.mjs";
-import { a as resolveMentions, n as actorSeen } from "./actors-DcJhFbwJ.mjs";
-import { n as MIDDLEWARE_ACTOR, t as DroppedError } from "./middleware-CXjEeef4.mjs";
+import { n as authorize, t as FULL_ACCESS } from "./access-CQ39gqEV.mjs";
+import { a as resolveMentions, n as actorSeen } from "./actors-xPiamLWk.mjs";
+import { i as authenticates } from "./auth-BPinwfN0.mjs";
+import { n as MIDDLEWARE_ACTOR, t as DroppedError } from "./middleware-DlJQYiwV.mjs";
 import { n as syncTarget, r as withEmailMentions } from "./targets-Cgjs29T0.mjs";
-import { t as A2Error } from "./session-clear-wHd5GCpZ-BnKSxReK.mjs";
-import { a as reducer } from "./reducer-CjmvZSAb-D_OSISmj.mjs";
-import { _ as BOARD_SESSION, a as IDENTITY_SESSION, c as SCHEDULES_SESSION, d as inboxContract, f as inboxSession, g as watchSession, h as watchContract, l as boardContract, m as schedulesContract, n as channelsReducer, o as INBOXES_SESSION, p as registryContract, r as identityCodesReducer, s as REGISTRY_SESSION, t as actorsReducer, u as identityContract } from "./reducers-DJzVpXwM.mjs";
-import { n as createServer, t as consumer } from "./server-DtFrWxi3-Boa6gdWO.mjs";
-import { a as linkedTo, i as iso, n as foldMessages, o as personOf, t as foldActors } from "./folds-BDMSxBUf.mjs";
-import { c as readUpload, i as finishUpload, l as startUpload, n as attachmentNotFound, t as attachmentBody, u as writeUpload } from "./blob-DdbpJqN1.mjs";
-import { t as concernedMessageId } from "./project-CBXlLftU.mjs";
-import { t as TABLES_CONSUMER } from "./sql-D4Z_efJX.mjs";
+import { t as A2Error } from "./session-clear-XJYpmUpg-2q8l_FJR.mjs";
+import { a as reducer } from "./reducer-Bswr11ar-P324o9vn.mjs";
+import { _ as BOARD_SESSION, a as IDENTITY_SESSION, c as SCHEDULES_SESSION, d as inboxContract, f as inboxSession, g as watchSession, h as watchContract, l as boardContract, m as schedulesContract, n as channelsReducer, o as INBOXES_SESSION, p as registryContract, r as identityCodesReducer, s as REGISTRY_SESSION, t as actorsReducer, u as identityContract } from "./reducers-8jqLewgw.mjs";
+import { n as createServer, t as consumer } from "./server-DX7mM6nm-D7N_7bug.mjs";
+import { a as linkedTo, i as iso, n as foldMessages, o as personOf, t as foldActors } from "./folds-DGYkMW19.mjs";
+import { c as readUpload, i as finishUpload, l as startUpload, n as attachmentNotFound, t as attachmentBody, u as writeUpload } from "./blob-DQK5prXT.mjs";
+import { t as concernedMessageId } from "./project-C_2xs57L.mjs";
+import { t as TABLES_CONSUMER } from "./sql-Bj0fk6dn.mjs";
 import { t as afterRetry } from "./attempts-HXcskN1w.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { lookup } from "node:dns";
 import { request } from "node:https";
 import { BlockList, isIP } from "node:net";
-//#region ../../node_modules/.pnpm/experimental-a2@0.22.0_@upstash+qstash@2.12.0_@vercel+queue@0.7.0_ai@7.0.130_zod@4.6.5__52060f00b21aecfab049c27fa3abd2f9/node_modules/experimental-a2/dist/idempotent-id-BRJVeylj.js
+//#region ../../node_modules/.pnpm/experimental-a2@0.24.0_@upstash+qstash@2.12.0_@vercel+queue@0.7.0_ai@7.0.130_zod@4.6.5__b1e2c243a963f2620a5d202817417c26/node_modules/experimental-a2/dist/idempotent-id-BRJVeylj.js
 async function idempotentId(...parts) {
 	const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify(parts)));
 	const bytes = new Uint8Array(digest).slice(0, 16);
@@ -125,11 +125,13 @@ function viewedBy(view, reader) {
 }
 /** A message's or a cursor's ID as clients see it. On this board it's the log index, in decimal. */
 const ref = (index) => String(index);
+/** A schedule's ID as clients see it: its index in session `schedules`, as `s12`, so it reads apart from message `12`. */
+const scheduleRef = (index) => `s${index}`;
 /** The log index a ref names on this board, or null for a string that names nothing here. */
 const indexOf = (value) => /^(0|[1-9]\d{0,15})$/.test(value) ? Number(value) : null;
 /** A message as `reader` sees it. Every view names its reader, so none shows a link's snapshot by default. */
 function view(message, actors, reader) {
-	const { blind, version, schedule, ...shown } = message;
+	const { blind, version, revision, schedule, ...shown } = message;
 	return {
 		...shown,
 		...blind ? { blind } : {},
@@ -137,8 +139,9 @@ function view(message, actors, reader) {
 		re: message.re === null ? null : ref(message.re),
 		replyTo: message.replyTo === null ? null : ref(message.replyTo),
 		version: version ?? message.id,
+		revision: revision ?? message.id,
 		...schedule ? { schedule: {
-			id: ref(schedule.id),
+			id: scheduleRef(schedule.id),
 			n: schedule.n
 		} } : {},
 		links: readableLinks(message.links, reader),
@@ -325,7 +328,7 @@ function payloadView(payload, links) {
 	]) if (typeof shown[key] === "number") shown[key] = ref(shown[key]);
 	const schedule = shown.schedule;
 	if (schedule) shown.schedule = {
-		id: ref(schedule.id),
+		id: scheduleRef(schedule.id),
 		n: schedule.n
 	};
 	if (links) shown.links = links;
@@ -750,19 +753,20 @@ async function writePost(ctx, input) {
 		if (input.sync?.length) throw badRequest("sync attaches whole threads: use `board sync <id> <target>`");
 	} else {
 		if (!channel) throw badRequest("a post needs a channel");
+		if (input.after !== void 0) throw badRequest("`after` is for replies", "invalid_after");
 		thread = id;
 	}
 	spend(input.proofs.post, "post", { channel });
 	if (hasLabels(input.labels)) spend(input.proofs.label, "label", { channel });
 	if (input.sync?.length) spend(input.proofs.sync, "sync", { channel });
-	if (input.id !== void 0) {
-		const landed = await ctx.reads.byEventId(input.id);
-		if (landed) {
-			if (landed.channel !== channel || landed.re !== re || landed.replyTo !== replyTo) throw duplicateId();
-			const shown = await landedFor(ctx, identity, landed);
-			if (!shown) throw duplicateId();
-			return shownTo(shown, identity.principal.access, sent);
-		}
+	const replayed = await replayOf(ctx, input, {
+		channel,
+		re,
+		replyTo
+	}, sent);
+	if (replayed) return replayed;
+	if (input.after !== void 0) {
+		if ((await ctx.reads.message(input.after))?.thread !== thread) throw badRequest(`after names no message in #${re}'s thread`, "invalid_after");
 	}
 	return commitPost(ctx, input, {
 		channel,
@@ -773,6 +777,16 @@ async function writePost(ctx, input) {
 		sent
 	});
 }
+/** The post a caller's own ID already landed, as its retry gets it back: null when there's none. */
+async function replayOf(ctx, input, place, sent) {
+	if (input.id === void 0) return null;
+	const landed = await ctx.reads.byEventId(input.id);
+	if (!landed) return null;
+	if (landed.channel !== place.channel || landed.re !== place.re || landed.replyTo !== place.replyTo) throw duplicateId();
+	const shown = await landedFor(ctx, input.identity, landed);
+	if (!shown) throw duplicateId();
+	return shownTo(shown, input.identity.principal.access, sent);
+}
 /**
 * A post that landed, as its author may have it back: only the same author's, and one in a
 * channel it can't read only if it posted without reading too. A caller that can't read gets back
@@ -833,28 +847,45 @@ async function commitPost(ctx, input, placed) {
 			by: identity.author
 		}
 	})));
-	const rows = await ctx.session.append(...seen ? [seen] : [], ...named, {
-		type: "message.posted",
-		...id ? { id } : {},
-		payload: {
+	const events = [
+		...seen ? [seen] : [],
+		...named,
+		{
+			type: "message.posted",
+			...id ? { id } : {},
+			payload: {
+				channel,
+				text,
+				re,
+				replyTo,
+				thread,
+				labels: input.labels ?? {},
+				noSync: input.noSync ?? false,
+				mentions,
+				by: identity.author,
+				origin: input.origin ?? null,
+				from: input.from ?? null,
+				...input.attachments?.length ? { attachments: input.attachments } : {},
+				...input.links?.length ? { links: input.links } : {},
+				...input.schedule ? { schedule: input.schedule } : {},
+				...identity.principal.access.readable(channel) ? {} : { blind: true },
+				...input.importedBy !== void 0 ? { importedBy: input.importedBy } : {}
+			}
+		},
+		...synced
+	];
+	let rows;
+	try {
+		rows = input.after === void 0 || re === null ? await ctx.session.append(...events) : await appendWhile(ctx, nothingAfter(ctx, re, input.after), events);
+	} catch (error) {
+		const replayed = error instanceof HttpError && error.code === "newer_message" ? await replayOf(ctx, input, {
 			channel,
-			text,
 			re,
-			replyTo,
-			thread,
-			labels: input.labels ?? {},
-			noSync: input.noSync ?? false,
-			mentions,
-			by: identity.author,
-			origin: input.origin ?? null,
-			from: input.from ?? null,
-			...input.attachments?.length ? { attachments: input.attachments } : {},
-			...input.links?.length ? { links: input.links } : {},
-			...input.schedule ? { schedule: input.schedule } : {},
-			...identity.principal.access.readable(channel) ? {} : { blind: true },
-			...input.importedBy !== void 0 ? { importedBy: input.importedBy } : {}
-		}
-	}, ...synced);
+			replyTo
+		}, sent) : null;
+		if (replayed) return replayed;
+		throw error;
+	}
 	const posted = rows.find((row) => row.type === "message.posted");
 	await untilApplied(ctx, rows);
 	const message = foldMessages({
@@ -923,6 +954,36 @@ async function untilApplied(ctx, rows) {
 }
 /** How long a write waits for the tables before it answers anyway. */
 const LANDED_WAIT_MS = 1e4;
+/**
+* Appends `events` only while the board, as `holds` reads it, still allows them: `holds` checks
+* the tables, throws what refuses the write, and returns the index its reads reflect. The append
+* holds only while that index is still the log's last, so anything that lands in between,
+* anywhere on the board, moves it, and it looks again from there.
+*/
+async function appendWhile(ctx, holds, events) {
+	for (let attempt = 1;; attempt++) {
+		await ctx.reads.ensure();
+		const position = await holds();
+		try {
+			return await appendIfLast(ctx.session, position, events);
+		} catch (error) {
+			if (!headMoved(error)) throw error;
+			if (attempt === CONDITIONAL_TRIES) throw new HttpError(503, "unavailable", "the board kept changing while it checked: try again");
+			await new Promise((resolve) => setTimeout(resolve, Math.random() * 5 * attempt));
+		}
+	}
+}
+/** How many times a conditional write looks again, as the board moves on, before it gives up. */
+const CONDITIONAL_TRIES = 10;
+/** A reply's `after`: nothing came after it in the thread, as of the index the read reflects. */
+const nothingAfter = (ctx, root, after) => async () => {
+	const { messages: [newer], position } = await ctx.reads.tables.messages({ re: root }, {
+		after,
+		limit: 1
+	});
+	if (newer) throw new HttpError(409, "newer_message", `#${newer.id} came after #${after}`);
+	return position;
+};
 /** The message a by-ID write targets, as the board looked it up, once its proof is spent on the message's channel. */
 function spent(authorized, permission) {
 	spend(authorized.proof, permission, authorized.message);
@@ -931,7 +992,10 @@ function spent(authorized, permission) {
 async function writeEdit(ctx, input) {
 	const message = spent(input.authorized, "post");
 	if (input.asAuthor !== false && message.by.principal !== input.identity.principal.id) throw forbidden("only the author can edit a message");
-	if (message.deleted) throw badRequest("message was deleted", "message_deleted");
+	if (message.deleted) {
+		if (input.revision !== void 0 && input.revision !== (message.revision ?? message.id)) throw new HttpError(409, "revision_conflict", `#${message.id} was deleted since revision ${input.revision}`);
+		throw badRequest("message was deleted", "message_deleted");
+	}
 	return commitEdit(ctx, input, message);
 }
 async function commitEdit(ctx, input, message) {
@@ -940,17 +1004,22 @@ async function commitEdit(ctx, input, message) {
 	const { text, found } = await withEmailMentions(input.text);
 	const named = found.map((actor) => actorSeen(actor, actors)).filter((event) => event !== null);
 	const { mentions, unknown } = resolveMentions(text, knownWith(actors, found), seen ? input.identity.actor : void 0, input.from != null, input.identity.principal.access.readsAll);
-	await untilApplied(ctx, await ctx.session.append(...seen ? [seen] : [], ...named, {
-		type: "message.edited",
-		payload: {
-			id: message.id,
-			thread: message.thread,
-			text,
-			mentions,
-			by: input.identity.author,
-			from: input.from ?? null
+	const events = [
+		...seen ? [seen] : [],
+		...named,
+		{
+			type: "message.edited",
+			payload: {
+				id: message.id,
+				thread: message.thread,
+				text,
+				mentions,
+				by: input.identity.author,
+				from: input.from ?? null
+			}
 		}
-	}));
+	];
+	await untilApplied(ctx, input.revision === void 0 ? await ctx.session.append(...events) : await appendWhile(ctx, revisionIs(ctx, message.id, input.revision), events));
 	return unknown.length && input.identity.principal.access.readable(message.channel) ? { unknownMentions: unknown } : {};
 }
 /** A message's links, replaced: a platform edit or unfurl changed what it links to. */
@@ -971,8 +1040,11 @@ async function writeLinks(ctx, input) {
 async function writeDelete(ctx, input) {
 	const message = spent(input.authorized, "post");
 	if (input.asAuthor !== false && message.by.principal !== input.identity.principal.id) throw forbidden("only the author can delete a message");
-	if (message.deleted) return;
-	await untilApplied(ctx, await ctx.session.append({
+	if (message.deleted) {
+		if (input.revision !== void 0 && input.revision !== (message.revision ?? message.id)) throw new HttpError(409, "revision_conflict", `#${message.id} was deleted since revision ${input.revision}`);
+		return;
+	}
+	const deleted = [{
 		type: "message.deleted",
 		payload: {
 			id: message.id,
@@ -980,8 +1052,17 @@ async function writeDelete(ctx, input) {
 			by: input.identity.author,
 			from: input.from ?? null
 		}
-	}));
-}
+	}];
+	await untilApplied(ctx, input.revision === void 0 ? await ctx.session.append(...deleted) : await appendWhile(ctx, revisionIs(ctx, message.id, input.revision), deleted));
+}
+/** An edit's or a delete's `revision`: no edit or delete since, as of the index the read reflects. */
+const revisionIs = (ctx, id, revision) => async () => {
+	const position = await ctx.reads.tables.position();
+	const message = (await ctx.reads.tables.messagesAt([id], position)).get(id);
+	const now = message ? message.revision ?? message.id : null;
+	if (now !== revision) throw new HttpError(409, "revision_conflict", message?.deleted ? `#${id} was deleted since revision ${revision}` : `#${id} was edited since revision ${revision}: it's at ${now}`);
+	return position;
+};
 async function writeReaction(ctx, input) {
 	const message = spent(input.authorized, "react");
 	if (message.deleted) throw badRequest("message was deleted", "message_deleted");
@@ -1003,7 +1084,7 @@ async function writeLabels(ctx, input) {
 	if (message.deleted) throw badRequest("message was deleted", "message_deleted");
 	const { state: actors } = await ctx.session.state(actorsReducer);
 	const seen = seenFor(input.identity, actors);
-	await untilApplied(ctx, await ctx.session.append(...seen ? [seen] : [], {
+	const events = [...seen ? [seen] : [], {
 		type: "labels.changed",
 		payload: {
 			id: message.id,
@@ -1012,8 +1093,21 @@ async function writeLabels(ctx, input) {
 			unset: input.unset ?? [],
 			by: input.identity.author
 		}
-	}));
-}
+	}];
+	await untilApplied(ctx, input.if !== void 0 && Object.keys(input.if).length > 0 ? await appendWhile(ctx, labelsAre(ctx, message.id, input.if), events) : await ctx.session.append(...events));
+}
+/** A label write's `if`: each label is as it says, as of the index the read reflects. */
+const labelsAre = (ctx, id, expected) => async () => {
+	const position = await ctx.reads.tables.position();
+	const labels = (await ctx.reads.tables.messagesAt([id], position)).get(id)?.labels ?? {};
+	for (const key of Object.keys(expected).sort()) {
+		const now = own(labels, key);
+		if (now === expected[key] || now === void 0 && expected[key] === null) continue;
+		const wanted = expected[key];
+		throw new HttpError(409, "label_conflict", wanted === null ? `${key} is set` : now === void 0 ? `${key} isn't set` : `${key} isn't ${wanted}`);
+	}
+	return position;
+};
 /**
 * Syncs a message's thread with a target, resolved by the sync that delivers it. Attaching twice
 * is a no-op; a platform thread another board thread is synced with is a 409.
@@ -1037,6 +1131,10 @@ async function writeAttach(ctx, input) {
 	}));
 	return { attached: true };
 }
+/** The batch, only while `index` is still the session's last: A2's conditional append. */
+const appendIfLast = (session, index, events) => session.append.ifLastIndex(index, ...events);
+/** What A2 throws when the session's last index isn't the one a conditional append named. */
+const headMoved = (error) => error?.code === "LAST_INDEX_MISMATCH";
 //#endregion
 //#region src/server/schedules.ts
 /** Vercel Queues delays at most 6 days: a send further out than this goes in hops. */
@@ -1137,7 +1235,7 @@ const createdBy = (schedule, principal) => schedule.as.principal.id === principa
 const scheduleView = (schedule, actors) => {
 	const author = actors.byId[schedule.as.actor.id] ?? schedule.as.actor;
 	return {
-		id: ref(schedule.id),
+		id: scheduleRef(schedule.id),
 		channel: schedule.channel,
 		re: schedule.re === null ? null : ref(schedule.re),
 		text: schedule.text,
@@ -2349,9 +2447,17 @@ function messageAt(value) {
 	if (index === null || index === 0) throw notFound(`message not found: #${value}`, "message_not_found");
 	return index;
 }
-/** A schedule's ID, `12` or as the CLI shows it, `s12`, as its index in session `schedules`. */
+/**
+* A reply's `after`, as the index of a message. One that isn't one is 0, which names no message:
+* the post refuses it, after a retry that landed gets its reply back.
+*/
+const afterAt = (value) => value === void 0 ? void 0 : indexOf(value) ?? 0;
+/**
+* A schedule's ID, `s12`, as its index in session `schedules`. `12` from a client that strips the
+* `s`, and `ss12` from an older CLI that adds one to what this board hands out, name it too.
+*/
 function scheduleAt(value) {
-	const bare = value.replace(/^s/, "");
+	const bare = value.replace(/^s{1,2}/, "");
 	const index = indexOf(bare);
 	if (index === null || index === 0) throw notFound(`schedule not found: s${bare}`, "schedule_not_found");
 	return index;
@@ -2722,6 +2828,7 @@ function build(options, binding) {
 			noSync: body.noSync,
 			id: body.id,
 			sync: body.sync,
+			after: afterAt(body.after),
 			...schedule && !fromRequest(caller) ? {
 				schedule,
 				lenientMentions: true
@@ -2880,25 +2987,27 @@ function build(options, binding) {
 		async post(caller, parsed) {
 			return postNow(caller, await identityOf(caller), parsed);
 		},
-		async edit(caller, { id, text }) {
+		async edit(caller, { id, text, revision }) {
 			const identity = await identityOf(caller);
 			const authorized = await authorizeOwn(writes, identity.principal, messageAt(id), "edit");
 			const { unknownMentions } = await writeEdit(writes, {
 				identity,
 				authorized,
-				text
+				text,
+				revision
 			});
 			return {
 				ok: true,
 				...unknownMentions ? { unknownMentions } : {}
 			};
 		},
-		async delete(caller, { id }) {
+		async delete(caller, { id, revision }) {
 			const identity = await identityOf(caller);
 			const authorized = await authorizeOwn(writes, identity.principal, messageAt(id), "delete");
 			await writeDelete(writes, {
 				identity,
-				authorized
+				authorized,
+				revision
 			});
 			return { ok: true };
 		},
@@ -2913,14 +3022,15 @@ function build(options, binding) {
 			});
 			return { ok: true };
 		},
-		async label(caller, { id, set, unset }) {
+		async label(caller, { id, set, unset, if: expected }) {
 			const identity = await identityOf(caller);
 			const authorized = await authorizeMessage(writes, identity.principal.access, "label", messageAt(id));
 			await writeLabels(writes, {
 				identity,
 				authorized,
 				set,
-				unset
+				unset,
+				if: expected
 			});
 			return { ok: true };
 		},
@@ -3194,6 +3304,7 @@ function build(options, binding) {
 						origin: body.origin,
 						from: body.from,
 						...body.origin && !ownSync(caller) ? { importedBy: principal.id } : {},
+						after: afterAt(body.after),
 						lenientMentions: true,
 						attachments,
 						links: await linksOf(principal, body.links)
@@ -3222,7 +3333,8 @@ function build(options, binding) {
 						authorized: proof,
 						text,
 						from: body.from,
-						asAuthor
+						asAuthor,
+						revision: body.revision
 					});
 					return ref(found.id);
 				};
@@ -3240,7 +3352,8 @@ function build(options, binding) {
 				identity: author,
 				authorized: await authorized("post"),
 				from: body.from,
-				asAuthor
+				asAuthor,
+				revision: body.revision
 			});
 			else if (body.op === "react") await writeReaction(writes, {
 				identity: author,
@@ -3253,7 +3366,8 @@ function build(options, binding) {
 				identity: author,
 				authorized: await authorized("label"),
 				set: body.set,
-				unset: body.unset
+				unset: body.unset,
+				if: body.if
 			});
 			else await writeLinks(writes, {
 				identity: author,