@remit/mailbox-service 0.0.67 → 0.0.69

package/package.json

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

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

@@ -49,7 +49,9 @@ interface TrashMessage {
 
 interface EnqueuedEvent {
 	type: string;
+	schemaVersion?: number;
 	trashMailboxId?: string;
+	trashUidValidity?: number;
 }
 
 const buildWorld = (
@@ -87,7 +89,12 @@ const buildWorld = (
 
 	const config: MessageMoveConfig = {
 		messageService,
-		mailboxService: {} as unknown as IMailboxRepository,
+		mailboxService: {
+			get: async (_accountId: string, mailboxId: string) => ({
+				mailboxId,
+				uidValidity: 42,
+			}),
+		} as unknown as IMailboxRepository,
 		addressService: {
 			reconcileJunkOnlyForMessage: async () => {},
 		} as unknown as IAddressRepository,
@@ -220,4 +227,16 @@ describe("MessageMoveService.emptyTrash", () => {
 			["EMPTY_TRASH", "EMPTY_TRASH"],
 		);
 	});
+
+	it("carries the folder's identity as it stood at consent time", async () => {
+		// The worker compares this against what its own SELECT serves. Without
+		// it the expunge would be authorised by a path, and a path is reusable.
+		const { service, events } = buildWorld(appointedTrash);
+
+		await service.emptyTrash(ACCOUNT_CONFIG, ACCOUNT);
+
+		assert.equal(events[0]?.schemaVersion, 2);
+		assert.equal(events[0]?.trashMailboxId, REAL_TRASH);
+		assert.equal(events[0]?.trashUidValidity, 42);
+	});
 });

package/src/message-move.ts

@@ -22,6 +22,7 @@ import {
 	UNCONFIRMED_TRASH_FOLDER_REASON,
 } from "@remit/data-ports/folder-role";
 import { deriveCopyMessageId } from "@remit/data-ports/id";
+import { MUTATION_EVENT_SCHEMA_VERSION } from "@remit/data-ports/mutation-events";
 import {
 	CanonicalMailboxRole,
 	MessageStatus,
@@ -35,6 +36,7 @@ import { createQueueProducer } from "@remit/sqs-client/producer";
  */
 interface MessageDeleteEvent {
 	type: "MESSAGE_DELETE";
+	schemaVersion: typeof MUTATION_EVENT_SCHEMA_VERSION;
 	eventId: string;
 	timestamp: number;
 	accountId: string;
@@ -62,11 +64,14 @@ interface MessageMoveEvent {
 
 interface EmptyTrashEvent {
 	type: "EMPTY_TRASH";
+	schemaVersion: typeof MUTATION_EVENT_SCHEMA_VERSION;
 	eventId: string;
 	timestamp: number;
 	accountId: string;
 	trashMailboxId: string;
 	trashMailboxPath: string;
+	/** The folder's UIDVALIDITY at consent time; the worker re-checks it. */
+	trashUidValidity: number;
 }
 
 interface MessageCopyEvent {
@@ -382,6 +387,7 @@ export class MessageMoveService {
 
 				events.push({
 					type: "MESSAGE_DELETE",
+					schemaVersion: MUTATION_EVENT_SCHEMA_VERSION,
 					eventId: randomUUID(),
 					timestamp: Date.now(),
 					accountId,
@@ -425,6 +431,7 @@ export class MessageMoveService {
 
 			events.push({
 				type: "MESSAGE_DELETE",
+				schemaVersion: MUTATION_EVENT_SCHEMA_VERSION,
 				eventId: randomUUID(),
 				timestamp: Date.now(),
 				accountId,
@@ -764,6 +771,15 @@ export class MessageMoveService {
 			accountId,
 		);
 
+		// The identity the user consented to, carried on the event so the worker
+		// can tell this folder from a different one that has since taken over its
+		// path. Read here rather than re-read there: the value at consent time is
+		// the whole point, and the stored row is rewritten by every sync.
+		const { uidValidity: trashUidValidity } = await this.mailboxService.get(
+			accountId,
+			trashMailbox.mailboxId,
+		);
+
 		const messages = await this.messageService.listAllByMailbox(
 			trashMailbox.mailboxId,
 		);
@@ -793,11 +809,13 @@ export class MessageMoveService {
 		// Enqueue single event for worker to handle batch
 		const event: EmptyTrashEvent = {
 			type: "EMPTY_TRASH",
+			schemaVersion: MUTATION_EVENT_SCHEMA_VERSION,
 			eventId: randomUUID(),
 			timestamp: Date.now(),
 			accountId,
 			trashMailboxId: trashMailbox.mailboxId,
 			trashMailboxPath: trashMailbox.fullPath,
+			trashUidValidity,
 		};
 
 		await this.enqueueEvent(event);

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

@@ -201,6 +201,15 @@ describe("what a mailbox says about the addresses on its messages", () => {
 		assert.deepEqual(emails(saved.envelopeAddresses), BOTH);
 	});
 
+	it("leaves the identity of an envelope address to the store", async () => {
+		const saved = await save(mailboxAt("INBOX"));
+
+		assert.ok(saved.envelopeAddresses.length > 0);
+		for (const envelopeAddress of saved.envelopeAddresses) {
+			assert.ok(!("envelopeAddressId" in envelopeAddress));
+		}
+	});
+
 	it("keeps a message in Trash from deciding either way", async () => {
 		const saved = await save(mailboxAt("Trash"), "Trash");
 

package/src/message-sync.ts

@@ -16,7 +16,6 @@ import { storedDisplayName } from "@remit/data-ports/display-name";
 import {
 	deriveAddressId,
 	deriveBodyPartId,
-	deriveEnvelopeAddressId,
 	deriveEnvelopeId,
 	deriveMessageIdFromSource,
 	deriveThreadId,
@@ -1506,8 +1505,6 @@ export class MessageSyncService {
 
 			const addressId = deriveAddressId(accountConfigId, normalizedEmail);
 
-			const envelopeAddressId = deriveEnvelopeAddressId(messageId, role, order);
-
 			const addressInput = {
 				addressId,
 				accountConfigId,
@@ -1526,7 +1523,6 @@ export class MessageSyncService {
 			}
 
 			await addressService.upsertEnvelopeAddress({
-				envelopeAddressId,
 				messageId,
 				addressId,
 				displayName,