@bobfrankston/mailx-imap 0.1.35 → 0.1.37

package/index.js

@@ -2181,15 +2181,43 @@ export class ImapManager extends EventEmitter {
                 // it can't share the ops queue. Counts against the per-host
                 // semaphore (one slot for the IDLE socket).
                 const watchClient = await this.createClient(accountId, "idle");
+                // RFC 5465 NOTIFY: when the server supports it (Dovecot does;
+                // gmail-IMAP and Outlook IMAP typically don't), engage
+                // cross-mailbox push so changes in Sent/Drafts/subfolders
+                // surface in real time instead of waiting for the next
+                // periodic sync. SELECTED group keeps INBOX events flowing
+                // through the existing IDLE/EXISTS path; PERSONAL group
+                // pushes STATUS for every other mailbox the user owns.
+                const caps = typeof watchClient.getCapabilities === "function"
+                    ? watchClient.getCapabilities()
+                    : new Set();
+                const useNotify = caps.has("NOTIFY");
+                const notifySpec = useNotify
+                    ? "(SELECTED (MessageNew MessageExpunge FlagChange)) (PERSONAL (MessageNew MessageExpunge FlagChange MailboxName))"
+                    : undefined;
+                const onMailboxStatus = useNotify
+                    ? (mailboxPath, _data) => {
+                        // Find the local folder row by IMAP path and sync it.
+                        // STATUS pushes are lightweight count hints — the real
+                        // change set is fetched by syncFolder.
+                        const folder = this.db.getFolders(accountId).find(f => f.path === mailboxPath);
+                        if (!folder) {
+                            console.log(`  [notify] ${accountId}: STATUS for unknown mailbox "${mailboxPath}" — skipping`);
+                            return;
+                        }
+                        console.log(`  [notify] ${accountId}: ${mailboxPath} changed → syncFolder`);
+                        this.syncFolder(accountId, folder.id).catch(e => console.error(`  [notify] sync ${mailboxPath} failed: ${e.message}`));
+                    }
+                    : undefined;
                 const stop = await watchClient.watchMailbox("INBOX", (newCount) => {
                     console.log(`  [idle] ${accountId}: ${newCount} new message(s)`);
                     this.syncInboxNewOnly(accountId).catch(e => console.error(`  [idle] sync error: ${e.message}`));
-                });
+                }, { notifySpec, onMailboxStatus });
                 this.watchers.set(accountId, async () => {
                     await stop();
                     await watchClient.logout();
                 });
-                console.log(`  [idle] Watching INBOX for ${accountId}`);
+                console.log(`  [idle] Watching INBOX for ${accountId}${useNotify ? " (+NOTIFY personal mailboxes)" : ""}`);
             }
             catch (e) {
                 console.error(`  [idle] Failed to watch ${accountId}: ${e.message}`);
@@ -3124,6 +3152,34 @@ export class ImapManager extends EventEmitter {
             return;
         if (!draftUid && !draftId)
             return;
+        // Local-first: drop the draft from the local DB FIRST so the user's
+        // Drafts view reflects the Send click instantly. The IMAP delete is
+        // queued for the background reconciler. Without this, the draft
+        // stayed visible in Drafts until the IMAP round-trip completed (or
+        // forever if it failed) — Bob 2026-05-12: "when I send a letter you
+        // seem to still leave it in draft so I don't know if it has been
+        // sent or not. Once you hand it off it must leave draft."
+        let localDeletedUid = 0;
+        if (draftUid) {
+            const existing = this.db.getMessageByUid(accountId, draftUid, drafts.id);
+            if (existing) {
+                this.unlinkBodyFile(accountId, draftUid, drafts.id).catch(() => { });
+                this.db.deleteMessage(accountId, draftUid, "user sent the message (draft cleanup)", "mailx-imap deleteDraft (local)");
+                localDeletedUid = draftUid;
+            }
+        }
+        if (draftId && !localDeletedUid) {
+            // Look up any local draft rows by X-Mailx-Draft-ID. The DB
+            // doesn't index that header directly, but locally-saved drafts
+            // share a stable header set; rely on the UID path 99% of the
+            // time. This branch covers the "draft was saved on another
+            // device, came in via sync, no UID known yet" edge case — for
+            // now the IMAP path below handles it.
+        }
+        if (localDeletedUid > 0) {
+            this.db.recalcFolderCounts(drafts.id);
+            this.emit("folderCountsChanged", accountId, {});
+        }
         let succeeded = false;
         try {
             await this.withConnection(accountId, async (client) => {
@@ -3162,12 +3218,9 @@ export class ImapManager extends EventEmitter {
             console.error(`  [drafts] withConnection failed for ${accountId}: ${e?.message || e}`);
         }
         // Reliable cleanup: if the inline attempt didn't actually delete the
-        // draft, queue a sync_action so the regular processSyncActions loop
-        // retries it later. Without this, transient IMAP failures left stale
-        // drafts in the folder ("draft droppings" that pile up after sends).
-        // Only the UID path can be queued — searchByHeader retries on every
-        // future call anyway, and queuing a header-lookup isn't a real
-        // sync_action shape.
+        // draft on the server, queue a sync_action so the regular
+        // processSyncActions loop retries it later. The local row is already
+        // gone (above), so the user doesn't see stale UI either way.
         if (!succeeded && draftUid) {
             console.log(`  [drafts] Queueing sync_action for retry: delete UID ${draftUid} in ${drafts.path}`);
             this.db.queueSyncAction(accountId, "delete", draftUid, drafts.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,10 +9,10 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.10",
+    "@bobfrankston/mailx-types": "^0.1.11",
     "@bobfrankston/mailx-settings": "^0.1.14",
-    "@bobfrankston/mailx-store": "^0.1.17",
-    "@bobfrankston/iflow-direct": "^0.1.39",
+    "@bobfrankston/mailx-store": "^0.1.18",
+    "@bobfrankston/iflow-direct": "^0.1.41",
     "@bobfrankston/tcp-transport": "^0.1.6",
     "@bobfrankston/smtp-direct": "^0.1.8",
     "@bobfrankston/mailx-sync": "^0.1.16",
@@ -37,10 +37,10 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.10",
+      "@bobfrankston/mailx-types": "^0.1.11",
       "@bobfrankston/mailx-settings": "^0.1.14",
-      "@bobfrankston/mailx-store": "^0.1.17",
-      "@bobfrankston/iflow-direct": "^0.1.39",
+      "@bobfrankston/mailx-store": "^0.1.18",
+      "@bobfrankston/iflow-direct": "^0.1.41",
       "@bobfrankston/tcp-transport": "^0.1.6",
       "@bobfrankston/smtp-direct": "^0.1.8",
       "@bobfrankston/mailx-sync": "^0.1.16",