@remit/drizzle-service 0.0.89 → 0.0.91

package/package.json

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

package/src/mailbox-path-dedupe.sqlite.test.ts

@@ -18,6 +18,7 @@ import {
 
 const DEDUPE = "0030_mailbox_path_dedupe";
 const UNIQUE = "0031_mailbox_path_unique";
+const MAILBOX_COLUMNS_ADDED_SINCE = ["0033_mailbox_sync_failure_reason"];
 const ACCOUNT = "acct";
 const CONFIG = "cfg";
 
@@ -27,6 +28,8 @@ const atPredecessor = (): Handle => {
 	const sqlite = new Database(":memory:");
 	for (const entry of migrationJournal()) {
 		if (entry.tag === DEDUPE) {
+			for (const tag of MAILBOX_COLUMNS_ADDED_SINCE)
+				applyMigration(sqlite, tag);
 			return {
 				sqlite,
 				db: drizzle(sqlite) as unknown as Db<Record<string, unknown>>,

package/src/repair/junk-only-address.sqlite.test.ts

@@ -203,6 +203,7 @@ describe("addresses standing only on mail in Junk", () => {
 		// `mailbox` is read through the repo, which selects every column the
 		// entity declares — including the rename target added after this DDL.
 		applyMigration(sqlite, "0028_mailbox_pending_path");
+		applyMigration(sqlite, "0033_mailbox_sync_failure_reason");
 		sqlite.exec(
 			readFileSync(
 				new URL(

package/src/repos/i4-account.ts

@@ -8,7 +8,7 @@ import type {
 	UpdateAccountInput,
 } from "@remit/data-ports";
 import { AccountService, SyncPhase } from "@remit/domain-enums";
-import { and, asc, eq, gt, inArray, or, sql } from "drizzle-orm";
+import { and, asc, eq, gt, inArray, like, or, sql } from "drizzle-orm";
 import type { Db } from "../db.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
@@ -291,6 +291,21 @@ export class AccountRepo implements IAccountRepository {
 		return rows.map(rowToAccount);
 	}
 
+	async listMailSourcesByAccountConfig(
+		accountConfigId: string,
+	): Promise<AccountItem[]> {
+		const rows = await this.db
+			.select()
+			.from(accountTable)
+			.where(
+				and(
+					eq(accountTable.accountConfigId, accountConfigId),
+					like(accountTable.syncedServices, `%"${AccountService.Mail}"%`),
+				),
+			);
+		return rows.map(rowToAccount);
+	}
+
 	async describe(accountId: string): Promise<AccountDescription> {
 		const [accounts, mailboxes] = await Promise.all([
 			this.db

package/src/repos/i4-mailbox.sqlite.test.ts

@@ -154,6 +154,37 @@ describe("MailboxRepo (sqlite)", () => {
 			/UNIQUE constraint failed: mailbox\.account_id, mailbox\.full_path/,
 		);
 	});
+
+	test("syncFailureReason is written on failed and cleared by any other state", async () => {
+		const accountId = randomUUID();
+		const created = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Locked")),
+		);
+		assert.equal(created.syncFailureReason, "");
+
+		await repo.transition(accountId, created.mailboxId, {
+			from: [MailboxSyncStatus.synced],
+			to: MailboxSyncStatus.deleting,
+			set: { syncFailureReason: "ignored outside failed" },
+		});
+		assert.equal(
+			(await repo.get(accountId, created.mailboxId)).syncFailureReason,
+			"",
+		);
+
+		const failed = await repo.transition(accountId, created.mailboxId, {
+			from: [MailboxSyncStatus.deleting],
+			to: MailboxSyncStatus.failed,
+			set: { syncFailureReason: "Permission denied" },
+		});
+		assert.equal(failed?.syncFailureReason, "Permission denied");
+
+		const dismissed = await repo.transition(accountId, created.mailboxId, {
+			from: [MailboxSyncStatus.failed],
+			to: MailboxSyncStatus.synced,
+		});
+		assert.equal(dismissed?.syncFailureReason, "");
+	});
 });
 
 /**
@@ -179,6 +210,7 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 		applyMigration(sqlite, "0027_mailbox_sync_status_total");
 		applyMigration(sqlite, "0028_mailbox_pending_path");
 		applyMigration(sqlite, "0031_mailbox_path_unique");
+		applyMigration(sqlite, "0033_mailbox_sync_failure_reason");
 		const db = drizzle(sqlite, { schema: { mailbox: mailboxTable } });
 		repo = new MailboxRepo(db as never);
 		close = async () => {
@@ -254,6 +286,25 @@ describe("MailboxRepo (sqlite, shipped migrations)", () => {
 		assert.equal(cleared?.pendingPath, undefined);
 	});
 
+	test("syncFailureReason round-trips on the shipped shape", async () => {
+		const accountId = randomUUID();
+		const created = mailboxCreated(
+			await repo.create(makeMailboxInput(accountId, "Held")),
+		);
+		assert.equal(created.syncFailureReason, "");
+
+		await repo.transition(accountId, created.mailboxId, {
+			from: [MailboxSyncStatus.synced],
+			to: MailboxSyncStatus.deleting,
+		});
+		const failed = await repo.transition(accountId, created.mailboxId, {
+			from: [MailboxSyncStatus.deleting],
+			to: MailboxSyncStatus.failed,
+			set: { syncFailureReason: "Permission denied" },
+		});
+		assert.equal(failed?.syncFailureReason, "Permission denied");
+	});
+
 	test("round-trips a cursor above 2^53 with its exact digits", async () => {
 		const accountId = randomUUID();
 		const modseq = "18446744073709551615";

package/src/repos/i4-mailbox.ts

@@ -92,6 +92,7 @@ const transitionSet = (
 			? { pendingPath: write.pendingPath }
 			: {}
 		: { pendingPath: null }),
+	syncFailureReason: to === "failed" ? (write?.syncFailureReason ?? "") : "",
 	updatedAt: Date.now(),
 });
 
@@ -119,6 +120,7 @@ export function rowToMailbox(
 		parentMailboxId: row.parentMailboxId,
 		syncStatus: row.syncStatus as MailboxItem["syncStatus"],
 		...(row.pendingPath !== null ? { pendingPath: row.pendingPath } : {}),
+		syncFailureReason: row.syncFailureReason,
 		cursorState: (row.cursorState as MailboxItem["cursorState"]) ?? undefined,
 		specialUse: (row.specialUse as MailboxItem["specialUse"]) ?? undefined,
 		createdAt: row.createdAt,