@remit/mailbox-service 0.0.120 → 0.0.122

package/dist/body-sync.js

@@ -6,7 +6,7 @@ import { deriveAddressId, deriveBodyPartId } from "@remit/data-ports/id";
 import { isEncapsulatedMessage } from "@remit/data-ports/message-parts";
 import { isBulkSender } from "@remit/data-ports/wellknown";
 import { FilterState, MessageClassificationState, PlacementAction, PlacementConfidence, QuarantineFailureStage, SenderTrust, SyncWarningStage, } from "@remit/domain-enums";
-import { isStorageNotFoundError, } from "@remit/storage-service";
+import { isStorageNotFoundError, MATERIALIZED_SENTINEL_PART_PATH, MATERIALIZED_SENTINEL_V2_PART_PATH, } from "@remit/storage-service";
 import { Semaphore } from "async-mutex";
 import { simpleParser } from "mailparser";
 import pMap from "p-map";
@@ -42,24 +42,6 @@ export const isBodyPartDeferralEnabled = () => {
     const normalized = raw.trim().toLowerCase();
     return normalized !== "false" && normalized !== "0" && normalized !== "off";
 };
-/**
- * Sentinel object written under a message's parts prefix once lazy
- * materialization has stored EVERY leaf. The read path checks it first with a
- * single HEAD and early-returns, skipping the body.eml GET, the MIME re-parse,
- * and the per-leaf HEADs on every warm re-open.
- *
- * Deliberately an S3-only marker (no Message-row flag). A leading dot keeps it
- * out of any real IMAP section path (those are dot-separated digits).
- */
-const MATERIALIZED_SENTINEL_PART_PATH = ".materialized";
-/**
- * The sentinel for a message carrying a forwarded message. Those parts were
- * once stored under a layout in which the forwarded message's root overwrote
- * its own row, so a `.materialized` written then vouches for objects at the
- * wrong paths. Its own name makes every such message materialize once more,
- * overwriting what is there; no other message is touched.
- */
-const MATERIALIZED_SENTINEL_V2_PART_PATH = ".materialized.2";
 /**
  * A mid-stream socket drop during the ranged body fetch surfaces as a typed
  * `MailConnectionError` (the connection layer classifies imapflow's

package/dist/message-move.d.ts

@@ -249,10 +249,6 @@ export declare class MessageMoveService {
      * batch's total wait is one row's ceiling rather than the sum across it.
      */
     private settledPlacements;
-    /**
-     * Update ThreadMessage for move operations.
-     * Updates mailboxId and optionally isDeleted.
-     */
     private updateThreadMessageForMove;
     /**
      * Delete every ThreadMessage row that points at this messageId.

package/dist/message-move.js

@@ -261,7 +261,7 @@ export class MessageMoveService {
                     continue;
                 }
                 // Update ThreadMessage
-                await this.updateThreadMessageForMove(accountConfigId, messageId, trashMailbox.mailboxId, true);
+                await this.updateThreadMessageForMove(accountConfigId, messageId, trashMailbox.mailboxId);
                 await this.addressService.reconcileJunkOnlyForMessage(messageId, configJunkRoles);
                 events.push({
                     event: {
@@ -380,10 +380,6 @@ export class MessageMoveService {
         }
         const sourceMailbox = await this.mailboxService.get(accountId, message.mailboxId);
         const destinationMailbox = await this.mailboxService.get(accountId, destinationMailboxId);
-        // Check if moving to/from Trash
-        const trashMailbox = await this.mailboxSpecialUseService.findTrashMailbox(accountId);
-        const isMovingToTrash = Boolean(trashMailbox && destinationMailboxId === trashMailbox.mailboxId);
-        const isMovingFromTrash = Boolean(trashMailbox && message.mailboxId === trashMailbox.mailboxId);
         // The optimistic write is a transition off the row this call read
         // (imap-mutations R3). Three mailbox lookups stand between the read and
         // here, and PLACEMENT_MOVE_PUSH runs on a queue this account's FIFO group
@@ -408,12 +404,8 @@ export class MessageMoveService {
             throw new MessagePlacementUnsettledError(`Message ${messageId} was not moved: something else changed where it is while this move was being prepared`, accountId, messageId, "in_flight");
         }
         // Update ThreadMessage
-        await this.updateThreadMessageForMove(accountConfigId, messageId, destinationMailboxId, isMovingToTrash);
+        await this.updateThreadMessageForMove(accountConfigId, messageId, destinationMailboxId);
         await this.addressService.reconcileJunkOnlyForMessage(messageId, await this.mailboxSpecialUseService.resolveJunkRolesForConfig(accountConfigId));
-        // If moving FROM Trash, clear isDeleted
-        if (isMovingFromTrash) {
-            await this.updateThreadMessageDeleted(accountConfigId, messageId, false);
-        }
         this.log.info({
             messageId,
             from: sourceMailbox.fullPath,
@@ -478,15 +470,13 @@ export class MessageMoveService {
         // the copy at uid=0 with an undelivered event; upsert no-ops on the row
         // and lets the event be re-enqueued below, keeping the operation
         // idempotent and the copy re-drivable (issue #75).
-        const copyRow = await this.messageService.upsertWithStatus({
+        const copyRow = await this.messageService.copyMessage(messageId, {
             messageId: newMessageId,
             mailboxId: destinationMailboxId,
             uid: 0, // Will be updated by worker after IMAP COPY
             sequenceNumber: 0, // Will be updated by worker
             rfc822Size: sourceMessage.rfc822Size,
             internalDate: sourceMessage.internalDate,
-            envelopeId: sourceMessage.envelopeId, // Share envelope with source
-            rootBodyPartId: sourceMessage.rootBodyPartId, // Share body parts with source
             status: MessageStatus.moving,
             syncStatus: MessageSyncStatus.pending,
             bodyStorageKey: sourceMessage.bodyStorageKey,
@@ -502,7 +492,6 @@ export class MessageMoveService {
             classificationState: sourceMessage.classificationState,
             hasListUnsubscribe: sourceMessage.hasListUnsubscribe,
         });
-        await this.messageService.copySearchText(messageId, newMessageId);
         // Copy ThreadMessage entry
         const sourceThreadMessage = await this.threadMessageService.getByMessageId(accountConfigId, messageId);
         const copyListing = await this.threadMessageService.create({
@@ -719,11 +708,7 @@ export class MessageMoveService {
      * batch's total wait is one row's ceiling rather than the sum across it.
      */
     settledPlacements = async (messages, accountId) => Promise.all(messages.map((message) => this.settledPlacement(message, accountId)));
-    /**
-     * Update ThreadMessage for move operations.
-     * Updates mailboxId and optionally isDeleted.
-     */
-    updateThreadMessageForMove = async (accountConfigId, messageId, newMailboxId, isDeleted) => {
+    updateThreadMessageForMove = async (accountConfigId, messageId, newMailboxId) => {
         const threadMessage = await this.threadMessageService.getByMessageId(accountConfigId, messageId);
         this.log.info({
             messageId,
@@ -731,9 +716,8 @@ export class MessageMoveService {
             threadMessageId: threadMessage.threadMessageId,
             sentDate: threadMessage.sentDate,
             newMailboxId,
-            isDeleted,
         }, "Updating ThreadMessage for move");
-        await this.threadMessageService.update(threadMessage.accountConfigId, threadMessage.threadMessageId, { mailboxId: newMailboxId, isDeleted }, {
+        await this.threadMessageService.update(threadMessage.accountConfigId, threadMessage.threadMessageId, { mailboxId: newMailboxId, isDeleted: false }, {
             // Composites contain CURRENT values for condition checking
             // ElectroDB uses these to verify the item state before updating
             composites: {
@@ -749,7 +733,6 @@ export class MessageMoveService {
             messageId,
             threadMessageId: threadMessage.threadMessageId,
             newMailboxId,
-            isDeleted,
         }, "Updated ThreadMessage for move");
     };
     /**

package/dist/message-sync.js

@@ -1,11 +1,11 @@
 import { storedDisplayName } from "@remit/data-ports/display-name";
-import { deriveAddressId, deriveBodyPartId, deriveCopyMessageId, deriveEnvelopeId, deriveMessageId, deriveMessageIdFromSource, deriveThreadId, isValidMessageId, wireMessageId, } from "@remit/data-ports/id";
+import { deriveAddressId, deriveCopyMessageId, deriveEnvelopeId, deriveMessageId, deriveMessageIdFromSource, deriveThreadId, isValidMessageId, wireMessageId, } from "@remit/data-ports/id";
 import { AddressRole, MailboxCursorState, MessageKeywordFlag, MessageSystemFlag, StarColor, SyncWarningStage, } from "@remit/domain-enums";
 import pMap from "p-map";
 import { confirmDepartures, placementKey, sightingContestsPlacement, } from "./external-move.js";
 import { guardMailboxCursor, isCursorRebuildNeeded } from "./mailbox-cursor.js";
 import { matchCursorRebuild, } from "./mailbox-cursor-rebuild.js";
-import { ROOT_PART_PATH, walkMimeStructure } from "./mime-walker.js";
+import { walkMimeStructure } from "./mime-walker.js";
 import { advanceChangeCursor, advanceUidWatermarks, dropAppliedPrefix, formatChangeCursor, hasChangeCursor, orderByModseq, parseChangeCursor, parseModseq, } from "./sync-watermarks.js";
 import { messageReferencesOf, parentOf, threadRootOf } from "./thread-root.js";
 const MESSAGE_SAVE_CONCURRENCY = 10;
@@ -495,10 +495,9 @@ export class MessageSyncService {
             }
         }, { concurrency: MESSAGE_SAVE_CONCURRENCY });
         const stale = new Set(staleMessageIds);
-        await pMap(existingRows.filter((row) => stale.has(row.messageId)), (row) => this.messageService.deleteIfPlacement(row.messageId, {
-            mailboxId,
-            uid: row.uid,
-        }), { concurrency: MESSAGE_SAVE_CONCURRENCY });
+        await this.messageService.deleteManyIfPlacement(mailboxId, existingRows
+            .filter((row) => stale.has(row.messageId))
+            .map((row) => ({ messageId: row.messageId, uid: row.uid })));
         const newMessages = newUids.length > 0 ? await this.fetchMessageBatch(newUids) : [];
         const applicable = newMessages.filter(hasEnvelope);
         const roles = await this.folderRolesFor(accountId, accountConfigId);
@@ -1033,7 +1032,6 @@ export class MessageSyncService {
         const envelope = msg.envelope;
         const messageId = messageIdForSighting(accountId, mailboxId, msg);
         const envelopeId = deriveEnvelopeId(messageId);
-        const rootBodyPartId = deriveBodyPartId(messageId, ROOT_PART_PATH);
         const internalDateMs = msg.internalDate.getTime();
         const { value: sentDate, usedFallback: dateFellBack } = parseHeaderDate(envelope.date, internalDateMs);
         if (dateFellBack) {
@@ -1095,8 +1093,6 @@ export class MessageSyncService {
             sequenceNumber: msg.seq,
             rfc822Size: msg.size ?? 0,
             internalDate: msg.internalDate.getTime(),
-            envelopeId,
-            rootBodyPartId,
         });
         // The server has just named this folder and this UID for a message the
         // database holds under another folder. `upsertWithStatus` left the row
@@ -1122,7 +1118,7 @@ export class MessageSyncService {
         // re-point names the placement it read, writes nothing when the row has
         // moved since, and the UID waits for the next round.
         const repointed = repointable &&
-            (await this.messageService.repointIfPlacement(messageId, { status: item.status, mailboxId: item.mailboxId, uid: item.uid }, { mailboxId, uid: msg.uid, isDeleted: sighting === "discarded" }));
+            (await this.messageService.repointIfPlacement(messageId, { status: item.status, mailboxId: item.mailboxId, uid: item.uid }, { mailboxId, uid: msg.uid, isDeleted: false }));
         if (repointable && !repointed)
             unresolvedSighting = true;
         owned = created || item.mailboxId === mailboxId || repointed;

package/dist/test-helpers/test-store.js

@@ -115,8 +115,6 @@ export const seedMessage = async (store, account, mailbox, uid, overrides = {})
         sequenceNumber: uid,
         rfc822Size: 100,
         internalDate: 1_700_000_000_000 + uid,
-        envelopeId: randomUUID(),
-        rootBodyPartId: randomUUID(),
         status: "active",
         syncStatus: "synced",
         ...overrides.message,

package/dist/thread-message-rows.d.ts

@@ -16,7 +16,6 @@ export declare const buildThreadMessageTrashUpdate: (threadMessage: ThreadMessag
     set: {
         uid: number;
         mailboxId: string;
-        isDeleted: boolean;
     };
     composites: {
         sentDate: number;

package/dist/thread-message-rows.js

@@ -10,7 +10,6 @@ export const buildThreadMessageTrashUpdate = (threadMessage, newUid, destination
     set: {
         uid: newUid,
         mailboxId: destinationMailboxId,
-        isDeleted: true,
     },
     composites: currentComposites(threadMessage),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/mailbox-service",
-	"version": "0.0.120",
+	"version": "0.0.122",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",