@remit/mailbox-service 0.0.120 → 0.0.121

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.js

@@ -478,15 +478,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 +500,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({

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

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/package.json

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