@bobfrankston/mailx-store 0.1.37 → 0.1.39

package/db.d.ts

@@ -294,7 +294,14 @@ export declare class MailxDB {
      *  is stable. Use this as the identity in any long-lived reference
      *  (compose in-reply-to, dally, undo stacks). */
     getMessageByUuid(uuid: string): MessageEnvelope;
-    getMessageBodyPath(accountId: string, uid: number): string;
+    /** Look up a message's body_path. folderId is REQUIRED when available
+     *  because (account, uid) is not a unique key — the same numeric UID
+     *  refers to different messages in INBOX vs Outbox vs Sent etc. Passing
+     *  no folderId returns the first matching row, which may be the wrong
+     *  message's body — same class of bug as the parsedCache UID collision.
+     *  Existing callers without folderId are tolerated (legacy) but should
+     *  be migrated. */
+    getMessageBodyPath(accountId: string, uid: number, folderId?: number): string;
     updateMessageFlags(accountId: string, uid: number, flags: string[]): void;
     updateMessageFolder(accountId: string, uid: number, targetFolderId: number): void;
     /** Local-first move of a message between folders. Updates BOTH the

package/db.js

@@ -1802,8 +1802,17 @@ export class MailxDB {
             return null;
         return this.rowToEnvelope(r);
     }
-    getMessageBodyPath(accountId, uid) {
-        const r = this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
+    /** Look up a message's body_path. folderId is REQUIRED when available
+     *  because (account, uid) is not a unique key — the same numeric UID
+     *  refers to different messages in INBOX vs Outbox vs Sent etc. Passing
+     *  no folderId returns the first matching row, which may be the wrong
+     *  message's body — same class of bug as the parsedCache UID collision.
+     *  Existing callers without folderId are tolerated (legacy) but should
+     *  be migrated. */
+    getMessageBodyPath(accountId, uid, folderId) {
+        const r = folderId != null
+            ? this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(accountId, folderId, uid)
+            : this.db.prepare("SELECT body_path FROM messages WHERE account_id = ? AND uid = ?").get(accountId, uid);
         return r?.body_path || "";
     }
     updateMessageFlags(accountId, uid, flags) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.18",
-    "@bobfrankston/mailx-settings": "^0.1.22",
+    "@bobfrankston/mailx-settings": "^0.1.25",
     "@bobfrankston/mailx-bus": "^0.1.2",
     "mailparser": "^3.7.2"
   },
@@ -30,7 +30,7 @@
   ".transformedSnapshot": {
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.18",
-      "@bobfrankston/mailx-settings": "^0.1.22",
+      "@bobfrankston/mailx-settings": "^0.1.25",
       "@bobfrankston/mailx-bus": "^0.1.2",
       "mailparser": "^3.7.2"
     }

package/store.d.ts

@@ -58,6 +58,11 @@ export interface StoreMessage extends MessageEnvelope {
     listUnsubscribeOneClick: boolean;
     emlPath: string;
     isFlagged: boolean;
+    /** X-Mailx-Draft-ID header value (empty for non-draft messages). When
+     *  the user re-opens a draft for edit, the compose layer threads this
+     *  back into saveDraft so the server-side dedup keeps replacing the
+     *  same draft instead of stacking up a new one every save. */
+    mailxDraftId: string;
 }
 export declare class Store {
     /** SQLite metadata index. Exposed as a public field — sync clients

package/store.js

@@ -224,7 +224,7 @@ export class Store {
         // the historical lookup. Either may be empty (body never fetched).
         let storedPath = envelope.bodyPath || "";
         if (!storedPath)
-            storedPath = this.db.getMessageBodyPath(accountId, uid) || "";
+            storedPath = this.db.getMessageBodyPath(accountId, uid, folderId) || "";
         const empty = {
             ...envelope,
             bodyHtml: "", bodyText: "",
@@ -400,6 +400,7 @@ export class Store {
             return String(v);
         };
         const returnPath = hdr("return-path").replace(/[<>]/g, "");
+        const mailxDraftId = hdr("x-mailx-draft-id").trim();
         const { listUnsubscribeMail, listUnsubscribeHttp, listUnsubscribeOneClick } = parseListUnsubscribe(parsed.headers);
         const listUnsubscribe = listUnsubscribeHttp || listUnsubscribeMail;
         const result = {
@@ -416,6 +417,7 @@ export class Store {
             // basePath every time.
             emlPath: this.bodyStore.absolutePath(storedPath),
             isFlagged,
+            mailxDraftId,
         };
         // Memoize for instant re-view of the same message. cacheKey is
         // path+mtime so a re-fetch (mtime changes) invalidates naturally.