@remit/imap-worker 0.0.84 → 0.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/handlers/imported-folder.test.ts

@@ -0,0 +1,63 @@
+import assert from "node:assert";
+import { describe, it } from "node:test";
+import type { MailboxItem } from "@remit/data-ports";
+import type { CreateMailboxQueueInput } from "@remit/mailbox-service";
+import { createImportedFolder } from "./imported-folder.js";
+
+const inbox = {
+	mailboxId: "mbx-inbox",
+	accountId: "acc-1",
+	fullPath: "INBOX",
+	namespaceType: "personal",
+	namespacePrefix: "INBOX.",
+	hierarchyDelimiter: ".",
+} as MailboxItem;
+
+describe("createImportedFolder (#1103)", () => {
+	it("creates the folder through the pending folder-create path, in the INBOX namespace", async () => {
+		const calls: [CreateMailboxQueueInput, string, boolean | undefined][] = [];
+		const create = createImportedFolder(
+			{ findByPath: async () => inbox },
+			{
+				createMailbox: async (input, accountId, subscribe) => {
+					calls.push([input, accountId, subscribe]);
+					return {
+						outcome: "Created" as const,
+						mailbox: {
+							...inbox,
+							mailboxId: "mbx-new",
+							fullPath: input.fullPath,
+						},
+					};
+				},
+			},
+		);
+
+		const created = await create("acc-1", "INBOX.Facturen");
+
+		assert.equal(
+			created.outcome === "Created" && created.mailbox.mailboxId,
+			"mbx-new",
+		);
+		assert.equal(calls.length, 1);
+		const [input, accountId, subscribe] = calls[0];
+		assert.equal(accountId, "acc-1");
+		assert.equal(subscribe, true);
+		assert.equal(input.fullPath, "INBOX.Facturen");
+		assert.equal(input.namespacePrefix, "INBOX.");
+		assert.equal(input.hierarchyDelimiter, ".");
+	});
+
+	it("refuses to guess a namespace for an account with no INBOX", async () => {
+		const create = createImportedFolder(
+			{ findByPath: async () => null },
+			{
+				createMailbox: async () => {
+					throw new Error("must not be called");
+				},
+			},
+		);
+
+		await assert.rejects(create("acc-1", "Facturen"), /no INBOX/);
+	});
+});

package/src/handlers/imported-folder.ts

@@ -0,0 +1,38 @@
+import type { CreateImportedFolder } from "@remit/config-transfer";
+import type { IMailboxRepository } from "@remit/data-ports";
+import type { MailboxQueueService } from "@remit/mailbox-service";
+
+export const createImportedFolder =
+	(
+		mailbox: Pick<IMailboxRepository, "findByPath">,
+		queue: Pick<MailboxQueueService, "createMailbox">,
+	): CreateImportedFolder =>
+	async (accountId, folderPath) => {
+		const inbox = await mailbox.findByPath(accountId, "INBOX");
+		if (!inbox) {
+			throw new Error(
+				`Account ${accountId} has no INBOX to take a namespace from, so "${folderPath}" cannot be created`,
+			);
+		}
+		return queue.createMailbox(
+			{
+				accountId,
+				namespaceType: inbox.namespaceType,
+				namespacePrefix: inbox.namespacePrefix,
+				hierarchyDelimiter: inbox.hierarchyDelimiter,
+				fullPath: folderPath,
+				uidValidity: 0,
+				uidNext: 1,
+				highestModseq: "0",
+				messageCount: 0,
+				unseenCount: 0,
+				deletedCount: 0,
+				totalSize: 0,
+				lastSyncUid: 0,
+				highWaterMarkUid: 0,
+				lastMessageSyncAt: 0,
+			},
+			accountId,
+			true,
+		);
+	};

package/src/handlers/sync-mailboxes.ts

@@ -3,6 +3,7 @@ import { writeFolderRoleAppointment } from "@remit/backend/folder-role-appointme
 import {
 	bindImportedFolders,
 	type ConfigBinderDeps,
+	disableFiltersMissingFolders,
 } from "@remit/config-transfer";
 import type {
 	AccountItem,
@@ -16,10 +17,12 @@ import type { Logger } from "@remit/logger-lambda";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
 import {
 	createConnectionWithCredentials,
+	MailboxQueueService,
 	MailboxSyncService,
 	MailConnectionError,
 	type MailCredentials,
 } from "@remit/mailbox-service";
+import { env } from "expect-env";
 import pMap from "p-map";
 import {
 	isAccountDeleted,
@@ -30,6 +33,7 @@ import { emitEvent } from "../emit.js";
 import type { SyncMailboxesEvent, SyncMessagesEvent } from "../events.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
+import { createImportedFolder } from "./imported-folder.js";
 import { orderMailboxesForSync } from "./mailbox-sync-order.js";
 
 const EVENT_EMIT_CONCURRENCY = 20;
@@ -110,6 +114,14 @@ export const syncMailboxes = async (
 				mailboxId,
 				lastKnownPath,
 			),
+		createFolder: createImportedFolder(
+			mailboxService,
+			new MailboxQueueService({
+				mailboxService,
+				sqsQueueUrl: env.SQS_QUEUE_URL_MAILBOX_MGMT,
+				logger: log,
+			}),
+		),
 	};
 
 	const { accountId } = event;
@@ -233,10 +245,21 @@ const syncMailboxesForAccount = async (
 		account.accountConfigId,
 		accountId,
 	);
-	if (bound.bound > 0 || bound.dropped > 0 || bound.stillPending > 0) {
+	if (Object.values(bound).some((count) => count > 0)) {
 		log.info({ accountId, ...bound }, "Bound imported folder references");
 	}
 
+	const disabled = await disableFiltersMissingFolders(
+		binder.repositories,
+		account.accountConfigId,
+	);
+	if (disabled > 0) {
+		log.warn(
+			{ accountId, disabled },
+			"Disabled filters whose move folder no longer exists",
+		);
+	}
+
 	const allMailboxes = await collectAllMailboxes(accountId, mailboxService);
 
 	// This fan-out is where an account's IMAP work is decided: one SEARCH per