@remit/drizzle-service 0.0.15 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Drizzle ORM service parameterized by dialect (Postgres / SQLite)",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/cascade-delete.test.ts

@@ -242,7 +242,7 @@ describe("runDrizzleCascadeDelete", () => {
 			quarantinedAt: NOW,
 			attempts: 3,
 			failureStage: "BodyParse",
-			failureCode: "UnterminatedMultipartBoundary",
+			failureCode: "UnreadableBody",
 			failureMessage: "multipart boundary was never closed",
 			workerVersion: "worker 1.0.0",
 			structure: [{ depth: 0, contentType: "multipart/mixed" }],

package/src/repos/quarantine.test.ts

@@ -1,5 +1,6 @@
 import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
+import { deriveQuarantineId } from "@remit/data-ports/id";
 import { quarantineTable } from "../schema/quarantine.js";
 import { createTestDb, randomId, type TestDb } from "../test-db.js";
 import { QuarantineRepo } from "./quarantine.js";
@@ -26,7 +27,7 @@ describe("QuarantineRepo", () => {
 			quarantinedAt: now,
 			attempts: 3,
 			failureStage: "BodyParse",
-			failureCode: "UnterminatedMultipartBoundary",
+			failureCode: "UnreadableBody",
 			failureMessage: "multipart boundary was never closed",
 			workerVersion: "worker 1.0.0",
 			structure: [{ depth: 0, contentType: "multipart/mixed" }],
@@ -109,4 +110,83 @@ describe("QuarantineRepo", () => {
 		assert.equal(entry.sizeBytes, undefined);
 		assert.equal(entry.messageIdHash, undefined);
 	});
+
+	test("re-quarantining the same message rewrites one row, never adds another", async () => {
+		const accountConfigId = randomId();
+		const identity = {
+			accountConfigId,
+			accountId: randomId(),
+			mailboxId: randomId(),
+			uidValidity: 1_712_000_000,
+			uid: 40217,
+			mailboxPath: "INBOX",
+			attempts: 1,
+			failureStage: "BodyParse" as const,
+			failureCode: "UnreadableBody" as const,
+			failureMessage: "the parser said no",
+			workerVersion: "sha-abc",
+		};
+
+		await repo.upsert({ ...identity, quarantinedAt: 1_000 });
+		await repo.upsert({ ...identity, quarantinedAt: 2_000, attempts: 4 });
+
+		const entries = await repo.listByAccountConfigId(accountConfigId);
+
+		assert.equal(entries.length, 1);
+		assert.equal(entries[0].attempts, 4);
+		assert.equal(entries[0].quarantinedAt, 2_000);
+	});
+
+	test("keeps the id derived from the message, not the random column default", async () => {
+		const accountConfigId = randomId();
+		const identity = {
+			accountConfigId,
+			accountId: randomId(),
+			mailboxId: randomId(),
+			uidValidity: 1_712_000_000,
+			uid: 40217,
+			mailboxPath: "INBOX",
+			quarantinedAt: 1_000,
+			attempts: 1,
+			failureStage: "BodyParse" as const,
+			failureCode: "UnreadableBody" as const,
+			failureMessage: "the parser said no",
+			workerVersion: "sha-abc",
+		};
+
+		await repo.upsert(identity);
+		const [entry] = await repo.listByAccountConfigId(accountConfigId);
+
+		assert.equal(
+			entry.quarantineId,
+			deriveQuarantineId(
+				identity.accountId,
+				identity.mailboxId,
+				identity.uidValidity,
+				identity.uid,
+			),
+		);
+	});
+
+	test("defaults the MIME tree to empty when the message failed before its shape was read", async () => {
+		const accountConfigId = randomId();
+		await repo.upsert({
+			accountConfigId,
+			accountId: randomId(),
+			mailboxId: randomId(),
+			uidValidity: 1_712_000_000,
+			uid: 1,
+			mailboxPath: "INBOX",
+			quarantinedAt: 1_000,
+			attempts: 1,
+			failureStage: "BodyParse",
+			failureCode: "UnreadableBody",
+			failureMessage: "the parser said no",
+			workerVersion: "sha-abc",
+		});
+
+		const [entry] = await repo.listByAccountConfigId(accountConfigId);
+
+		assert.deepEqual(entry.structure, []);
+	});
 });

package/src/repos/quarantine.ts

@@ -2,7 +2,9 @@ import type {
 	IQuarantineRepository,
 	QuarantineItem,
 	QuarantineMimeNodeItem,
+	QuarantineUpsertInput,
 } from "@remit/data-ports";
+import { deriveQuarantineId } from "@remit/data-ports/id";
 import { desc, eq } from "drizzle-orm";
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { quarantineTable } from "../schema/quarantine.js";
@@ -38,8 +40,8 @@ function rowToItem(row: typeof quarantineTable.$inferSelect): QuarantineItem {
 }
 
 /**
- * Read side of the message quarantine (issue #72). The rows are written by the
- * sync worker; nothing in the API process creates or clears one.
+ * The message quarantine (issue #72). Written by the sync worker, read by the
+ * settings surface; nothing in the API process creates or clears a row.
  */
 export class QuarantineRepo implements IQuarantineRepository {
 	constructor(private db: DB) {}
@@ -54,4 +56,48 @@ export class QuarantineRepo implements IQuarantineRepository {
 			.orderBy(desc(quarantineTable.quarantinedAt));
 		return rows.map(rowToItem);
 	};
+
+	upsert = async (input: QuarantineUpsertInput): Promise<void> => {
+		const quarantineId = deriveQuarantineId(
+			input.accountId,
+			input.mailboxId,
+			input.uidValidity,
+			input.uid,
+		);
+		const now = Date.now();
+		const columns = {
+			accountConfigId: input.accountConfigId,
+			accountId: input.accountId,
+			mailboxId: input.mailboxId,
+			uidValidity: input.uidValidity,
+			uid: input.uid,
+			mailboxRole: input.mailboxRole ?? null,
+			mailboxPath: input.mailboxPath,
+			quarantinedAt: input.quarantinedAt,
+			attempts: input.attempts,
+			failureStage: input.failureStage,
+			failureCode: input.failureCode,
+			failureMessage: input.failureMessage,
+			failurePartPath: input.failurePartPath ?? null,
+			workerVersion: input.workerVersion,
+			contentType: input.contentType ?? null,
+			transferEncoding: input.transferEncoding ?? null,
+			charset: input.charset ?? null,
+			sizeBytes: input.sizeBytes ?? null,
+			structure: input.structure ?? [],
+			messageIdHash: input.messageIdHash ?? null,
+		};
+
+		// `quarantinedAt` is deliberately part of the update set: a re-quarantine
+		// is the message being set aside again, and the list is ordered by it.
+		// `createdAt` is not, so the row keeps saying when the message first
+		// failed.
+		await this.db
+			.insert(quarantineTable)
+			.values({ quarantineId, ...columns, createdAt: now, updatedAt: now })
+			.onConflictDoUpdate({
+				target: quarantineTable.quarantineId,
+				set: { ...columns, updatedAt: now },
+			});
+	};
 }