@remit/drizzle-service 0.0.63 → 0.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/i4-outbox-message.test.ts

@@ -105,6 +105,52 @@ describe("OutboxMessageRepo", () => {
 		await repo.delete(accountConfigId, msg.outboxMessageId);
 	});
 
+	test("updateIfStatus writes on the expected status and refuses any other", async () => {
+		const accountConfigId = randomId();
+		const msg = await repo.create(makeOutboxInput(randomId(), accountConfigId));
+
+		const written = await repo.updateIfStatus(
+			accountConfigId,
+			msg.outboxMessageId,
+			"queued",
+			{ status: "failed", lastError: "the queue refused it" },
+		);
+		assert.equal(written?.status, "failed");
+
+		// The compare-and-set every outbox transition rests on: a caller that read
+		// `queued` and decided on it must not overwrite a row the worker has since
+		// moved. `null` says another writer got there first.
+		const refused = await repo.updateIfStatus(
+			accountConfigId,
+			msg.outboxMessageId,
+			"queued",
+			{ status: "draft" },
+		);
+		assert.equal(refused, null);
+		const still = await repo.get(accountConfigId, msg.outboxMessageId);
+		assert.equal(still.status, "failed");
+
+		await repo.delete(accountConfigId, msg.outboxMessageId);
+	});
+
+	test("cross-tenant: updateIfStatus refuses a foreign accountConfig", async () => {
+		const accountConfigId = randomId();
+		const other = randomId();
+		const msg = await repo.create(makeOutboxInput(randomId(), accountConfigId));
+
+		const refused = await repo.updateIfStatus(
+			other,
+			msg.outboxMessageId,
+			"queued",
+			{ status: "failed" },
+		);
+		assert.equal(refused, null);
+		const still = await repo.get(accountConfigId, msg.outboxMessageId);
+		assert.equal(still.status, "queued");
+
+		await repo.delete(accountConfigId, msg.outboxMessageId);
+	});
+
 	test("markSent clears lastError and lastSmtpCode", async () => {
 		const accountConfigId = randomId();
 		const msg = await repo.create({

package/src/repos/i4-outbox-message.ts

@@ -129,6 +129,40 @@ export class OutboxMessageRepo implements IOutboxMessageRepository {
 		outboxMessageId: string,
 		input: UpdateOutboxMessageInput,
 	): Promise<OutboxMessageItem> {
+		const [row] = await this.applyUpdate(
+			accountConfigId,
+			outboxMessageId,
+			input,
+		);
+		if (!row)
+			throw new NotFoundError(`OutboxMessage not found: ${outboxMessageId}`);
+		return rowToOutboxMessage(row);
+	}
+
+	async updateIfStatus(
+		accountConfigId: string,
+		outboxMessageId: string,
+		expected: OutboxMessageItem["status"],
+		input: UpdateOutboxMessageInput,
+	): Promise<OutboxMessageItem | null> {
+		const [row] = await this.applyUpdate(
+			accountConfigId,
+			outboxMessageId,
+			input,
+			expected,
+		);
+		// No row means the status moved or the row went away — both say another
+		// writer got there first, which is the caller's answer rather than an
+		// error here.
+		return row ? rowToOutboxMessage(row) : null;
+	}
+
+	private async applyUpdate(
+		accountConfigId: string,
+		outboxMessageId: string,
+		input: UpdateOutboxMessageInput,
+		expected?: OutboxMessageItem["status"],
+	): Promise<(typeof outboxMessageTable.$inferSelect)[]> {
 		const now = Date.now();
 		const updates: Partial<typeof outboxMessageTable.$inferInsert> = {
 			updatedAt: now,
@@ -154,19 +188,20 @@ export class OutboxMessageRepo implements IOutboxMessageRepository {
 		if (input.inReplyTo !== undefined) updates.inReplyTo = input.inReplyTo;
 		if (input.references !== undefined) updates.references = input.references;
 
-		const [row] = await this.db
+		const rows = await this.db
 			.update(outboxMessageTable)
 			.set(updates)
 			.where(
 				and(
 					eq(outboxMessageTable.accountConfigId, accountConfigId),
 					eq(outboxMessageTable.outboxMessageId, outboxMessageId),
+					expected === undefined
+						? undefined
+						: eq(outboxMessageTable.status, expected),
 				),
 			)
 			.returning();
-		if (!row)
-			throw new NotFoundError(`OutboxMessage not found: ${outboxMessageId}`);
-		return rowToOutboxMessage(row);
+		return rows;
 	}
 
 	async updateStatus(