@remit/imap-worker 0.0.43 → 0.0.45

package/package.json

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

package/src/handlers/flag-push-placement-race.test.ts

@@ -16,6 +16,7 @@ import { afterEach, beforeEach, describe, it, mock } from "node:test";
 import { SQSClient } from "@aws-sdk/client-sqs";
 import { getClient, type RemitClient, setClient } from "@remit/backend/client";
 import type {
+	IAddressRepository,
 	IMessageFlagPushRepository,
 	IMessageFlagRepository,
 	IMessagePlacementMoveRepository,
@@ -177,6 +178,9 @@ const buildHarness = (): Harness => {
 		messageService,
 		threadMessageService,
 		markerService: placementMarkerService,
+		addressService: {
+			reconcileJunkOnlyForMessage: async () => {},
+		} as unknown as IAddressRepository,
 		sqsQueueUrl: "https://sqs.eu-west-1.amazonaws.com/000/message-mgmt",
 	});
 

package/src/handlers/sync-message-body.ts

@@ -178,6 +178,7 @@ export const syncMessageBody = async (
 				messageService,
 				threadMessageService,
 				markerService,
+				addressService,
 				sqsQueueUrl: placementMoveQueueUrl,
 			})
 		: undefined;

package/src/sent-mailbox.ts

@@ -1,38 +1,12 @@
 import type { MailboxItem } from "@remit/data-ports";
+import { resolveMailboxByLeafName } from "@remit/data-ports/mailbox-name";
 
 export type SentMailboxCandidate = Pick<
 	MailboxItem,
 	"mailboxId" | "fullPath" | "hierarchyDelimiter"
 >;
 
-const SENT_FOLDER_NAMES = [
-	"sent",
-	"sent items",
-	"sent messages",
-	"sent mail",
-] as const;
-
-// A flat mailbox namespace reports no delimiter at all — ImapFlow gives `""`
-// for a NIL LIST delimiter — and splitting on "" returns single characters, so
-// the path is its own leaf.
-const segments = (mailbox: SentMailboxCandidate): string[] =>
-	mailbox.hierarchyDelimiter.length === 0
-		? [mailbox.fullPath]
-		: mailbox.fullPath.split(mailbox.hierarchyDelimiter);
-
-const rank = (mailbox: SentMailboxCandidate): number | null => {
-	const parts = segments(mailbox);
-	const leaf = parts[parts.length - 1] ?? mailbox.fullPath;
-	const nameIndex = SENT_FOLDER_NAMES.indexOf(
-		leaf.toLowerCase() as (typeof SENT_FOLDER_NAMES)[number],
-	);
-	if (nameIndex < 0) {
-		return null;
-	}
-	// Depth outranks the name: a "Sent" buried under Trash or an archive must
-	// never beat the account's real "Sent Items" one level up.
-	return parts.length * SENT_FOLDER_NAMES.length + nameIndex;
-};
+const SENT_FOLDER_NAMES = ["sent", "sent items", "sent messages", "sent mail"];
 
 /**
  * The Sent folder by conventional name, for servers that advertise no `\Sent`
@@ -42,19 +16,5 @@ const rank = (mailbox: SentMailboxCandidate): number | null => {
  */
 export const resolveSentMailboxByName = (
 	mailboxes: SentMailboxCandidate[],
-): SentMailboxCandidate | null => {
-	let best: { mailbox: SentMailboxCandidate; rank: number } | null = null;
-	for (const mailbox of mailboxes) {
-		const candidate = rank(mailbox);
-		if (candidate === null) continue;
-		if (
-			!best ||
-			candidate < best.rank ||
-			(candidate === best.rank &&
-				mailbox.fullPath.localeCompare(best.mailbox.fullPath) < 0)
-		) {
-			best = { mailbox, rank: candidate };
-		}
-	}
-	return best?.mailbox ?? null;
-};
+): SentMailboxCandidate | null =>
+	resolveMailboxByLeafName(mailboxes, SENT_FOLDER_NAMES);