@bobfrankston/mailx 1.0.218 → 1.0.219

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":243,"y":28}
+{"height":1344,"width":2151,"x":194,"y":22}

package/client/app.js

@@ -371,30 +371,49 @@ function showComposeOverlay() {
     closeBtn.addEventListener("mouseenter", () => closeBtn.style.color = "#c00");
     closeBtn.addEventListener("mouseleave", () => closeBtn.style.color = "#666");
     closeBtn.addEventListener("click", () => {
+        // compose.ts handles the prompt (Save/Discard/Cancel) and then calls
+        // window.close() which is redirected to wrapper.remove() at line below.
+        // If the user cancels the prompt, closeCompose() is never called and
+        // the wrapper stays. Don't force-remove on a timer — that defeats Cancel.
         try {
             const win = frame.contentWindow;
             if (win)
                 win.dispatchEvent(new Event("compose-save-and-close"));
         }
         catch { /* */ }
-        setTimeout(() => wrapper.remove(), 500);
     });
     titleBar.appendChild(closeBtn);
-    // Drag to move
+    // Drag to move. While dragging we set pointer-events:none on the iframe
+    // so mouse events don't get swallowed by the inner document the moment
+    // the cursor crosses into the iframe region. Without that, drag only
+    // worked if you stayed on the title bar pixels, which is why it felt
+    // broken except at the lower-right (resize grip) corner.
     let dragX = 0, dragY = 0;
     titleBar.addEventListener("mousedown", (e) => {
         if (e.target === closeBtn)
             return;
         e.preventDefault();
-        dragX = e.clientX - wrapper.offsetLeft;
-        dragY = e.clientY - wrapper.offsetTop;
-        const onMove = (e) => {
-            wrapper.style.left = `${e.clientX - dragX}px`;
-            wrapper.style.top = `${e.clientY - dragY}px`;
+        const rect = wrapper.getBoundingClientRect();
+        dragX = e.clientX - rect.left;
+        dragY = e.clientY - rect.top;
+        // Clamp movement to the viewport so the title bar stays grabbable.
+        const clamp = (val, min, max) => Math.max(min, Math.min(max, val));
+        frame.style.pointerEvents = "none";
+        document.body.style.userSelect = "none";
+        const onMove = (ev) => {
+            ev.preventDefault();
+            const w = wrapper.offsetWidth;
+            const h = wrapper.offsetHeight;
+            const left = clamp(ev.clientX - dragX, 0, window.innerWidth - 40);
+            const top = clamp(ev.clientY - dragY, 0, window.innerHeight - 40);
+            wrapper.style.left = `${left}px`;
+            wrapper.style.top = `${top}px`;
             wrapper.style.bottom = "auto";
             wrapper.style.right = "auto";
         };
         const onUp = () => {
+            frame.style.pointerEvents = "";
+            document.body.style.userSelect = "";
             document.removeEventListener("mousemove", onMove);
             document.removeEventListener("mouseup", onUp);
         };

package/client/compose/compose.js

@@ -439,18 +439,65 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
         alert(`Send failed: ${e.message}`);
     }
 });
-// ── Discard ──
-document.getElementById("btn-discard")?.addEventListener("click", () => {
-    if (editor.getText().trim() || toInput.value) {
-        if (!confirm("Discard this message?"))
-            return;
+// ── Close handling ──
+/** True if the compose has anything worth asking about. */
+function composeHasContent() {
+    return !!(editor.getText().trim() || toInput.value.trim() || ccInput.value.trim() || bccInput.value.trim() || subjectInput.value.trim());
+}
+/** Ask Save/Discard/Cancel. Returns "save" | "discard" | "cancel". */
+function promptSaveOrDiscard() {
+    // Three-way prompt built from two native dialogs: OK(save) / Cancel → then
+    // for Cancel, ask "Really discard?" which becomes Discard / Cancel.
+    const saveIt = confirm("Save this message as a draft?\n\nOK = Save as draft\nCancel = continue...");
+    if (saveIt)
+        return "save";
+    const discard = confirm("Discard the message without saving?\n\nOK = Discard\nCancel = Keep editing");
+    if (discard)
+        return "discard";
+    return "cancel";
+}
+/** Handle any "close the compose" action (Discard button, Escape, X, window close). */
+async function handleCloseRequest() {
+    if (!composeHasContent()) {
+        closeCompose();
+        return true;
     }
-    window.close();
+    const choice = promptSaveOrDiscard();
+    if (choice === "cancel")
+        return false;
+    // Stop auto-save so it can't race with our explicit save/discard.
+    if (draftDebounceTimer) {
+        clearTimeout(draftDebounceTimer);
+        draftDebounceTimer = null;
+    }
+    if (draftTimer) {
+        clearInterval(draftTimer);
+        draftTimer = null;
+    }
+    if (choice === "save") {
+        try {
+            await saveDraft();
+        }
+        catch { /* already logged */ }
+    }
+    else {
+        // Discard: if we have a tracked draft, delete it so the orphan doesn't stick around.
+        if (draftUid || draftId) {
+            try {
+                await deleteDraft(getFromAccountId(), draftUid || 0, draftId || "");
+            }
+            catch { /* ignore */ }
+        }
+    }
+    closeCompose();
+    return true;
+}
+document.getElementById("btn-discard")?.addEventListener("click", () => {
+    handleCloseRequest();
 });
 // ── Save and close (X button from parent) ──
-window.addEventListener("compose-save-and-close", async () => {
-    await saveDraft();
-    closeCompose();
+window.addEventListener("compose-save-and-close", () => {
+    handleCloseRequest();
 });
 // ── Keyboard shortcuts ──
 document.addEventListener("keydown", (e) => {
@@ -458,17 +505,20 @@ document.addEventListener("keydown", (e) => {
         document.getElementById("btn-send")?.click();
     }
     if (e.key === "Escape") {
-        document.getElementById("btn-discard")?.click();
-    }
-    // Ctrl+K = trigger address completion
-    if (e.ctrlKey && e.key === "k") {
         e.preventDefault();
+        handleCloseRequest();
+    }
+    // Ctrl+K in an address field = trigger address completion.
+    // NOTE: Ctrl+K is ALSO the editor's "insert link" shortcut. Scope this handler
+    // strictly to the to/cc/bcc inputs so it doesn't shadow the editor binding when
+    // focus is in the body.
+    if (e.ctrlKey && (e.key === "k" || e.key === "K")) {
         const active = document.activeElement;
         const addressFields = [toInput, ccInput, bccInput];
-        const target = addressFields.includes(active) ? active : toInput;
-        target.focus();
-        // Force trigger autocomplete by dispatching input event
-        target.dispatchEvent(new Event("input"));
+        if (addressFields.includes(active)) {
+            e.preventDefault();
+            active.dispatchEvent(new Event("input"));
+        }
     }
 });
 //# sourceMappingURL=compose.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.218",
+  "version": "1.0.219",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.7",
+    "@bobfrankston/iflow-direct": "^0.1.8",
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.280",
+    "@bobfrankston/msger": "^0.1.282",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -74,11 +74,11 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.7",
+      "@bobfrankston/iflow-direct": "^0.1.8",
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.280",
+      "@bobfrankston/msger": "^0.1.282",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -1250,8 +1250,15 @@ export class ImapManager extends EventEmitter {
     /** Fetch a single message body on demand, caching in the store.
      *  Uses its own fresh connection — never blocked by background prefetch. */
     async fetchMessageBody(accountId, folderId, uid) {
-        // Already cached?
+        // Already cached? If the file is on disk but body_path wasn't written to
+        // the DB (e.g. from an interrupted earlier run), the prefetch loop would
+        // otherwise keep returning the same missing rows forever — once saw
+        // "gmail: 17266796 bodies cached" in the logs, which is the counter
+        // spinning on the same 100 rows.
         if (await this.bodyStore.hasMessage(accountId, folderId, uid)) {
+            const existingPath = this.bodyStore.getMessagePath?.(accountId, folderId, uid);
+            if (existingPath)
+                this.db.updateBodyPath(accountId, uid, existingPath);
             return this.bodyStore.getMessage(accountId, folderId, uid);
         }
         if (!this.configs.has(accountId))
@@ -1359,6 +1366,14 @@ export class ImapManager extends EventEmitter {
                 this.db.queueSyncAction(accountId, "delete", msg.uid, msg.folderId);
             }
         }
+        // Recalc folder counts so the tree badge updates immediately instead
+        // of showing stale numbers until the next full sync.
+        const sourceFolderIds = new Set(messages.map(m => m.folderId));
+        for (const fid of sourceFolderIds)
+            this.db.recalcFolderCounts(fid);
+        if (trash)
+            this.db.recalcFolderCounts(trash.id);
+        this.emit("folderCountsChanged", accountId, {});
         // Process all queued actions in one IMAP session
         this.debounceSyncActions(accountId);
     }
@@ -1375,6 +1390,13 @@ export class ImapManager extends EventEmitter {
         for (const msg of messages) {
             this.db.queueSyncAction(accountId, "move", msg.uid, msg.folderId, { targetFolderId });
         }
+        // Recalc folder counts (source folders + destination) so the tree
+        // badge updates immediately.
+        const sourceFolderIds = new Set(messages.map(m => m.folderId));
+        for (const fid of sourceFolderIds)
+            this.db.recalcFolderCounts(fid);
+        this.db.recalcFolderCounts(targetFolderId);
+        this.emit("folderCountsChanged", accountId, {});
         // Process all queued actions in one IMAP session
         this.debounceSyncActions(accountId);
     }

package/packages/mailx-store/file-store.d.ts

@@ -8,6 +8,8 @@ export declare class FileMessageStore implements MessageStore {
     private basePath;
     constructor(basePath: string);
     private messagePath;
+    /** Public lookup of the on-disk path without touching the file. */
+    getMessagePath(accountId: string, folderId: number, uid: number): string;
     putMessage(accountId: string, folderId: number, uid: number, raw: Buffer): Promise<string>;
     getMessage(accountId: string, folderId: number, uid: number): Promise<Buffer>;
     deleteMessage(accountId: string, folderId: number, uid: number): Promise<void>;

package/packages/mailx-store/file-store.js

@@ -14,6 +14,10 @@ export class FileMessageStore {
     messagePath(accountId, folderId, uid) {
         return path.join(this.basePath, accountId, String(folderId), `${uid}.eml`);
     }
+    /** Public lookup of the on-disk path without touching the file. */
+    getMessagePath(accountId, folderId, uid) {
+        return this.messagePath(accountId, folderId, uid);
+    }
     async putMessage(accountId, folderId, uid, raw) {
         const filePath = this.messagePath(accountId, folderId, uid);
         fs.mkdirSync(path.dirname(filePath), { recursive: true });