@remit/mailbox-service 0.0.74 → 0.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/mailbox-service",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/filters/pipeline.test.ts

@@ -44,11 +44,11 @@ const senderFilter = (destinationMailboxId: string): FilterItem =>
 		updatedAt: 1,
 	}) as unknown as FilterItem;
 
-const buildPipeline = (filter: FilterItem) => {
+const buildPipeline = (...filters: FilterItem[]) => {
 	const state = { embedCalls: 0 };
 	const config: FilterConfig = {
 		filterService: {
-			listByAccountAndState: async () => [filter],
+			listByAccountAndState: async () => filters,
 			refreshExpiry: async (f: FilterItem) => f,
 		} as unknown as IFilterRepository,
 		filterAnchorService: {
@@ -103,6 +103,42 @@ describe("FilterPipeline — anchorless From/Or filter at index time", () => {
 	});
 });
 
+/**
+ * Arbitration survives exactly here: two standing filters colliding over the
+ * same message at the same trigger. A move is exclusive, so the pass resolves
+ * one destination — the more-recently-changed action wins (reader #497 leaves
+ * this untouched while removing arbitration from the user-initiated apply).
+ */
+describe("FilterPipeline — two standing filters colliding on one message", () => {
+	const rivalFilter = (): FilterItem =>
+		({
+			...senderFilter("mbx-projects"),
+			filterId: "flt-rival",
+			name: "github to projects",
+			actionChangedAt: 2,
+		}) as unknown as FilterItem;
+
+	it("resolves a single destination from the more-recently-changed action", async () => {
+		const older = {
+			...senderFilter("mbx-archive"),
+			actionChangedAt: 1,
+		} as unknown as FilterItem;
+		const { pipeline } = buildPipeline(older, rivalFilter());
+		const decision = await pipeline.evaluate("cfg-1", "m-3", {
+			from: "npm@github.com",
+			fromName: "npm",
+			subject: "A new version of left-pad is available",
+			text: "body",
+			listId: "",
+		});
+
+		assert.deepEqual(decision.move, {
+			destinationMailboxId: "mbx-projects",
+			filterId: "flt-rival",
+		});
+	});
+});
+
 describe("FilterPipeline — anchor lazy re-embed on model drift (reader #295)", () => {
 	const anchoredFilter = (): FilterItem =>
 		({

package/src/message-delete-junk-reconcile.test.ts

@@ -8,7 +8,7 @@ import type {
 	IThreadMessageRepository,
 } from "@remit/data-ports";
 import { type MessageMoveConfig, MessageMoveService } from "./message-move.js";
-import { trashRole } from "./test-helpers/folder-roles.js";
+import { NO_JUNK_ROLES, trashRole } from "./test-helpers/folder-roles.js";
 
 const ACCOUNT = "acc-1";
 const ACCOUNT_CONFIG = "cfg-1";
@@ -57,6 +57,7 @@ const buildWorld = (trashExists: boolean) => {
 	const mailboxSpecialUseService = {
 		findTrashMailbox: async () => trash,
 		resolveTrashRole: async () => trashRole(trash),
+		resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 	} as unknown as IMailboxSpecialUseRepository;
 
 	const addressService = {

package/src/message-delete-no-trash.test.ts

@@ -15,6 +15,7 @@ import {
 	StaleTrashAppointmentError,
 	UnconfirmedTrashMailboxError,
 } from "./message-move.js";
+import { NO_JUNK_ROLES } from "./test-helpers/folder-roles.js";
 
 const ACCOUNT = "acc-1";
 const ACCOUNT_CONFIG = "cfg-1";
@@ -80,6 +81,7 @@ const buildWorld = (
 
 	const mailboxSpecialUseService = {
 		resolveTrashRole: async () => trashResolution,
+		resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 	} as unknown as IMailboxSpecialUseRepository;
 
 	const addressService = {

package/src/message-move-copy.test.ts

@@ -15,7 +15,11 @@ import { MailboxCursorState } from "@remit/domain-enums";
 import type { ManagedConnectionFactory } from "./connection-factory.js";
 import { type MessageMoveConfig, MessageMoveService } from "./message-move.js";
 import { MessageSyncService } from "./message-sync.js";
-import { noFolderRoles, trashRole } from "./test-helpers/folder-roles.js";
+import {
+	NO_JUNK_ROLES,
+	noFolderRoles,
+	trashRole,
+} from "./test-helpers/folder-roles.js";
 import type { IImapConnection, ImapMessage } from "./types.js";
 
 const stubAddressService = (): IAddressRepository =>
@@ -176,6 +180,7 @@ const buildWorld = () => {
 	const mailboxSpecialUseService = {
 		findTrashMailbox: async () => null,
 		resolveTrashRole: async () => trashRole(null),
+		resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 	} as unknown as IMailboxSpecialUseRepository;
 
 	const config: MessageMoveConfig = {

package/src/message-move-empty-trash.test.ts

@@ -22,6 +22,7 @@ import {
 	StaleTrashAppointmentError,
 	UnconfirmedTrashMailboxError,
 } from "./message-move.js";
+import { NO_JUNK_ROLES } from "./test-helpers/folder-roles.js";
 
 const ACCOUNT = "acc-1";
 const ACCOUNT_CONFIG = "cfg-1";
@@ -100,6 +101,7 @@ const buildWorld = (
 		} as unknown as IAddressRepository,
 		mailboxSpecialUseService: {
 			resolveTrashRole: async () => trashResolution,
+			resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 		} as unknown as IMailboxSpecialUseRepository,
 		threadMessageService,
 		sqsQueueUrl: "http://localhost:9324/000000000000/remit-messages.fifo",

package/src/message-move-same-mailbox.test.ts

@@ -8,7 +8,7 @@ import type {
 	IThreadMessageRepository,
 } from "@remit/data-ports";
 import { type MessageMoveConfig, MessageMoveService } from "./message-move.js";
-import { trashRole } from "./test-helpers/folder-roles.js";
+import { NO_JUNK_ROLES, trashRole } from "./test-helpers/folder-roles.js";
 
 const stubAddressService = (): IAddressRepository =>
 	({
@@ -68,6 +68,7 @@ const buildWorld = () => {
 	const mailboxSpecialUseService = {
 		findTrashMailbox: async () => null,
 		resolveTrashRole: async () => trashRole(null),
+		resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 	} as unknown as IMailboxSpecialUseRepository;
 
 	const config: MessageMoveConfig = {

package/src/message-move.ts

@@ -395,6 +395,12 @@ export class MessageMoveService {
 
 		// Process move to trash
 		if (trashMailbox && moveToTrashMessages.length > 0) {
+			// Every message in the batch shares the config, so its Junk and Trash
+			// folders resolve once rather than once per message.
+			const configJunkRoles =
+				await this.mailboxSpecialUseService.resolveJunkRolesForConfig(
+					accountConfigId,
+				);
 			for (const { messageId, message, sourceMailbox } of moveToTrashMessages) {
 				// Update local state optimistically
 				await this.messageService.updateForMove(messageId, {
@@ -413,7 +419,10 @@ export class MessageMoveService {
 					true,
 				);
 
-				await this.addressService.reconcileJunkOnlyForMessage(messageId);
+				await this.addressService.reconcileJunkOnlyForMessage(
+					messageId,
+					configJunkRoles,
+				);
 
 				events.push({
 					type: "MESSAGE_DELETE",
@@ -548,7 +557,12 @@ export class MessageMoveService {
 			isMovingToTrash,
 		);
 
-		await this.addressService.reconcileJunkOnlyForMessage(messageId);
+		await this.addressService.reconcileJunkOnlyForMessage(
+			messageId,
+			await this.mailboxSpecialUseService.resolveJunkRolesForConfig(
+				accountConfigId,
+			),
+		);
 
 		// If moving FROM Trash, clear isDeleted
 		if (isMovingFromTrash) {

package/src/message-sync-junk-harvest.test.ts

@@ -19,7 +19,7 @@ import {
 	addressSightingIn,
 	MessageSyncService,
 } from "./message-sync.js";
-import { folderRoles } from "./test-helpers/folder-roles.js";
+import { folderRoles, NO_JUNK_ROLES } from "./test-helpers/folder-roles.js";
 import type { ImapEnvelope, ImapMessage } from "./types.js";
 
 const stub = <T>(): T => ({}) as T;
@@ -141,6 +141,7 @@ const save = async (
 	).saveMessage(mailbox, "acct-1", "cfg-1", msg, {
 		junkMailboxId: role === "Junk" ? mailbox.mailboxId : null,
 		trashMailboxId: role === "Trash" ? mailbox.mailboxId : null,
+		configJunkRoles: NO_JUNK_ROLES,
 	});
 
 	return saved;
@@ -155,6 +156,7 @@ describe("what a mailbox says about the addresses on its messages", () => {
 	const ROLES = (junk: string | null, trash: string | null) => ({
 		junkMailboxId: junk,
 		trashMailboxId: trash,
+		configJunkRoles: NO_JUNK_ROLES,
 	});
 
 	it("reads the folder the account appointed, not the folder’s name", () => {

package/src/message-sync.ts

@@ -13,6 +13,7 @@ import type {
 	ThreadMessageItem,
 } from "@remit/data-ports";
 import { storedDisplayName } from "@remit/data-ports/display-name";
+import type { JunkRoleMailboxes } from "@remit/data-ports/folder-role";
 import {
 	deriveAddressId,
 	deriveBodyPartId,
@@ -92,6 +93,14 @@ export type AddressSighting = "junk" | "discarded" | "correspondent";
 export interface AccountFolderRoles {
 	readonly junkMailboxId: string | null;
 	readonly trashMailboxId: string | null;
+	/**
+	 * The same two roles across every account under the config, for the
+	 * reconcile that follows a save into Junk. The address book is keyed by
+	 * config, so a predicate over an address weighs sightings from all of them —
+	 * resolving only this account withholds a sender on one and restores it on
+	 * the next.
+	 */
+	readonly configJunkRoles: JunkRoleMailboxes;
 }
 
 /**
@@ -462,7 +471,7 @@ export class MessageSyncService {
 		// which catches its own error and reports a `failed` outcome instead of
 		// rejecting. So one bad message can no longer abort the whole batch (the
 		// poison pill that previously froze the mailbox, #817).
-		const roles = await this.folderRolesFor(accountId);
+		const roles = await this.folderRolesFor(accountId, accountConfigId);
 		const outcomes = await pMap(
 			applicable,
 			(msg) =>
@@ -697,7 +706,7 @@ export class MessageSyncService {
 		const newMessages =
 			newUids.length > 0 ? await this.fetchMessageBatch(newUids) : [];
 		const applicable = newMessages.filter((msg) => msg.envelope !== undefined);
-		const roles = await this.folderRolesFor(accountId);
+		const roles = await this.folderRolesFor(accountId, accountConfigId);
 		const outcomes = await pMap(
 			applicable,
 			(msg) =>
@@ -925,7 +934,7 @@ export class MessageSyncService {
 			);
 		}
 
-		const roles = await this.folderRolesFor(accountId);
+		const roles = await this.folderRolesFor(accountId, accountConfigId);
 		const outcomes = await pMap(
 			applicable,
 			(msg) =>
@@ -1280,14 +1289,19 @@ export class MessageSyncService {
 	 * batch rather than per message: the lookup reads an appointment row and
 	 * the account’s mailbox list, and every message in a batch shares both.
 	 */
-	private async folderRolesFor(accountId: string): Promise<AccountFolderRoles> {
-		const [junk, trash] = await Promise.all([
+	private async folderRolesFor(
+		accountId: string,
+		accountConfigId: string,
+	): Promise<AccountFolderRoles> {
+		const [junk, trash, configJunkRoles] = await Promise.all([
 			this.mailboxSpecialUseService.findJunkMailbox(accountId),
 			this.mailboxSpecialUseService.findTrashMailbox(accountId),
+			this.mailboxSpecialUseService.resolveJunkRolesForConfig(accountConfigId),
 		]);
 		return {
 			junkMailboxId: junk?.mailboxId ?? null,
 			trashMailboxId: trash?.mailboxId ?? null,
+			configJunkRoles,
 		};
 	}
 
@@ -1432,7 +1446,10 @@ export class MessageSyncService {
 			owned = created || item.mailboxId === mailboxId;
 
 			if (sighting === "junk") {
-				await repos.address.reconcileJunkOnlyForMessage(messageId);
+				await repos.address.reconcileJunkOnlyForMessage(
+					messageId,
+					roles.configJunkRoles,
+				);
 			}
 
 			await this.createThreadForMessage(

package/src/placement-move-unsettled.test.ts

@@ -20,6 +20,7 @@ import type {
 	UpdateMessageMoveInput,
 } from "@remit/data-ports";
 import { PlacementMoveService } from "./placement-move.js";
+import { noFolderRoles } from "./test-helpers/folder-roles.js";
 
 const ACCOUNT_ID = "acc-pm";
 const ACCOUNT_CONFIG_ID = "cfg-pm";
@@ -111,6 +112,7 @@ const buildHarness = (): Harness => {
 		threadMessageService,
 		markerService,
 		addressService,
+		mailboxSpecialUseService: noFolderRoles,
 		sqsQueueUrl: "https://sqs.eu-west-1.amazonaws.com/000/message-mgmt",
 		moveSettleTimeoutMs: 200,
 		moveSettlePollMs: 10,

package/src/placement-move.ts

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
 import type {
 	IAddressRepository,
+	IMailboxSpecialUseRepository,
 	IMessagePlacementMoveRepository,
 	IMessageRepository,
 	IThreadMessageRepository,
@@ -44,6 +45,12 @@ export interface PlacementMoveConfig {
 	threadMessageService: IThreadMessageRepository;
 	markerService: IMessagePlacementMoveRepository;
 	addressService: IAddressRepository;
+	/**
+	 * Required, not optional: this mover carries automatic spam placement, and
+	 * one built without the folder-role seam would silently leave the sender of
+	 * every auto-filed spam suggestible in the compose picker.
+	 */
+	mailboxSpecialUseService: IMailboxSpecialUseRepository;
 	sqsQueueUrl: string;
 	sqsEndpoint?: string;
 	logger?: PlacementMoveLogger;
@@ -87,6 +94,7 @@ export class PlacementMoveService {
 	private threadMessageService: IThreadMessageRepository;
 	private markerService: IMessagePlacementMoveRepository;
 	private addressService: IAddressRepository;
+	private mailboxSpecialUseService: IMailboxSpecialUseRepository;
 	private sqs: SQSClient;
 	private queueUrl: string;
 	private log: PlacementMoveLogger;
@@ -98,6 +106,7 @@ export class PlacementMoveService {
 		this.threadMessageService = config.threadMessageService;
 		this.markerService = config.markerService;
 		this.addressService = config.addressService;
+		this.mailboxSpecialUseService = config.mailboxSpecialUseService;
 		this.queueUrl = config.sqsQueueUrl;
 		this.log = config.logger ?? noopLogger;
 		this.moveSettleTimeoutMs =
@@ -200,7 +209,12 @@ export class PlacementMoveService {
 			originalUid: message.uid,
 		});
 
-		await this.addressService.reconcileJunkOnlyForMessage(messageId);
+		await this.addressService.reconcileJunkOnlyForMessage(
+			messageId,
+			await this.mailboxSpecialUseService.resolveJunkRolesForConfig(
+				accountConfigId,
+			),
+		);
 
 		// The queue kick is a serious operational step, not a routine one — a
 		// failure here MUST propagate (never swallowed): the marker stays

package/src/spam-report.test.ts

@@ -19,7 +19,7 @@ import {
 	NoJunkMailboxError,
 	SpamReportService,
 } from "./spam-report.js";
-import { trashRole } from "./test-helpers/folder-roles.js";
+import { NO_JUNK_ROLES, trashRole } from "./test-helpers/folder-roles.js";
 
 const ACCOUNT = "acc-1";
 const ACCOUNT_CONFIG = "cfg-1";
@@ -235,6 +235,7 @@ const buildWorld = (
 		findJunkMailbox: async () => junkMailbox,
 		findTrashMailbox: async () => null,
 		resolveTrashRole: async () => trashRole(null),
+		resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 	} as unknown as IMailboxSpecialUseRepository;
 
 	const mailboxService = {

package/src/test-helpers/folder-roles.ts

@@ -1,5 +1,8 @@
 import type { IMailboxSpecialUseRepository } from "@remit/data-ports";
-import type { RoleResolution } from "@remit/data-ports/folder-role";
+import type {
+	JunkRoleMailboxes,
+	RoleResolution,
+} from "@remit/data-ports/folder-role";
 
 type RoleMailbox = { mailboxId: string; fullPath: string };
 
@@ -24,6 +27,7 @@ export const noFolderRoles = {
 	findJunkMailbox: async () => null,
 	findTrashMailbox: async () => null,
 	resolveTrashRole: async () => trashRole(null),
+	resolveJunkRolesForConfig: async () => NO_JUNK_ROLES,
 } as unknown as IMailboxSpecialUseRepository;
 
 /** A folder-role map naming the mailboxes that hold Junk and Trash. */
@@ -41,11 +45,22 @@ export const folderRoles = (roles: {
 				: null,
 		findTrashMailbox: async () => trash,
 		resolveTrashRole: async () => trashRole(trash),
+		resolveJunkRolesForConfig: async () => ({
+			junkMailboxIds: roles.junkMailboxId ? [roles.junkMailboxId] : [],
+			trashMailboxIds: roles.trashMailboxId ? [roles.trashMailboxId] : [],
+		}),
 	} as unknown as IMailboxSpecialUseRepository;
 };
 
+/** An account whose config resolves no Junk and no Trash anywhere. */
+export const NO_JUNK_ROLES: JunkRoleMailboxes = {
+	junkMailboxIds: [],
+	trashMailboxIds: [],
+};
+
 /** The same account, as the resolved map `saveMessage` is handed. */
 export const NO_FOLDER_ROLES = {
 	junkMailboxId: null,
 	trashMailboxId: null,
+	configJunkRoles: NO_JUNK_ROLES,
 };