@remit/drizzle-service 0.0.62 → 0.0.64

package/package.json

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

package/src/repos/i4-message-flag-push.ts

@@ -1,32 +1,16 @@
+import type {
+	MessageFlagPushItem,
+	PutMessageFlagPushInput,
+} from "@remit/data-ports";
 import { and, eq } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { messageFlagPushTable } from "../schema/i4-message-flag-push.js";
 
 type DB = Db<Record<string, unknown>>;
 
-export type FlagPushOperation = "add" | "remove";
-export type MessageFlagPushState =
-	| "pending"
-	| "queued"
-	| "processing"
-	| "processed";
-
-export interface MessageFlagPushItem {
-	messageId: string;
-	flagName: string;
-	accountId: string;
-	accountConfigId: string;
-	mailboxId: string;
-	operation: FlagPushOperation;
-	state: MessageFlagPushState;
-	createdAt: number;
-	updatedAt: number;
-}
-
-export type PutMessageFlagPushInput = Omit<
-	MessageFlagPushItem,
-	"state" | "createdAt" | "updatedAt"
->;
+export type { MessageFlagPushItem, PutMessageFlagPushInput };
+export type FlagPushOperation = MessageFlagPushItem["operation"];
+export type MessageFlagPushState = MessageFlagPushItem["state"];
 
 const DEFAULT_STATE: MessageFlagPushState = "pending";
 

package/src/repos/i4-message-placement-move.ts

@@ -1,30 +1,15 @@
+import type {
+	MessagePlacementMoveItem,
+	PutMessagePlacementMoveInput,
+} from "@remit/data-ports";
 import { eq } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { messagePlacementMoveTable } from "../schema/i4-message-placement-move.js";
 
 type DB = Db<Record<string, unknown>>;
 
-export type MessagePlacementMoveState =
-	| "pending"
-	| "queued"
-	| "processing"
-	| "processed";
-
-export interface MessagePlacementMoveItem {
-	messageId: string;
-	accountId: string;
-	accountConfigId: string;
-	sourceMailboxId: string;
-	destinationMailboxId: string;
-	state: MessagePlacementMoveState;
-	createdAt: number;
-	updatedAt: number;
-}
-
-export type PutMessagePlacementMoveInput = Omit<
-	MessagePlacementMoveItem,
-	"state" | "createdAt" | "updatedAt"
->;
+export type { MessagePlacementMoveItem, PutMessagePlacementMoveInput };
+export type MessagePlacementMoveState = MessagePlacementMoveItem["state"];
 
 const DEFAULT_STATE: MessagePlacementMoveState = "pending";
 

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(

package/src/repos/thread-message.ts

@@ -19,26 +19,17 @@ import {
 	type SQL,
 	sql,
 } from "drizzle-orm";
-import shortUuid from "short-uuid";
-import { v5 as uuidv5 } from "uuid";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
+import { deterministicBase36Id } from "../id.js";
 import { decodeToken } from "../pagination.js";
 import { threadMessageTable } from "../schema/thread-message.js";
 import { fromMatch, subjectMatch } from "./thread-search-predicates.js";
 
-// ─── ID generation (mirrors remit-electrodb-service/src/id.ts) ───────────────
-
-const REMIT_NAMESPACE = "9e89694d-214b-4d9b-99f5-214b4d9b99f5";
-const translator = shortUuid.createTranslator(shortUuid.constants.uuid25Base36);
-
-const base36uuidv5 = (name: string): string =>
-	translator.fromUUID(uuidv5(name, REMIT_NAMESPACE));
-
 export const deriveThreadMessageId = (
 	threadId: string,
 	messageId: string,
-): string => base36uuidv5(`threadmsg:${threadId}:${messageId}`);
+): string => deterministicBase36Id(`threadmsg:${threadId}:${messageId}`);
 
 // ─── Constants ────────────────────────────────────────────────────────────────