@bobfrankston/mailx-imap 0.1.33 → 0.1.35

package/index.js

@@ -943,6 +943,9 @@ export class ImapManager extends EventEmitter {
         const parsed = await simpleParser(source);
         // Coerce mailparser AddressObject(s) into the flat `{name, address}[]`
         // shape storeMessages's downstream toEmailAddresses expects.
+        // RFC 2047 encoded-word decoding (incl. inside quoted-strings) is
+        // handled uniformly in db.upsertMessage, not per-callsite — see
+        // `decodeHeaderWords` there.
         const flat = (a) => {
             if (!a)
                 return [];
@@ -3121,33 +3124,54 @@ export class ImapManager extends EventEmitter {
             return;
         if (!draftUid && !draftId)
             return;
-        await this.withConnection(accountId, async (client) => {
-            if (draftUid) {
-                try {
-                    await client.deleteMessageByUid(drafts.path, draftUid);
-                    console.log(`  [drafts] Deleted draft UID ${draftUid}`);
-                }
-                catch (e) {
-                    console.error(`  [drafts] Delete by UID ${draftUid} failed: ${e.message}`);
+        let succeeded = false;
+        try {
+            await this.withConnection(accountId, async (client) => {
+                if (draftUid) {
+                    try {
+                        await client.deleteMessageByUid(drafts.path, draftUid);
+                        console.log(`  [drafts] Deleted draft UID ${draftUid}`);
+                        succeeded = true;
+                    }
+                    catch (e) {
+                        console.error(`  [drafts] Delete by UID ${draftUid} failed: ${e.message}`);
+                    }
                 }
-            }
-            if (draftId) {
-                try {
-                    const uids = await client.searchByHeader(drafts.path, "X-Mailx-Draft-ID", draftId);
-                    for (const uid of uids) {
-                        try {
-                            await client.deleteMessageByUid(drafts.path, uid);
+                if (draftId) {
+                    try {
+                        const uids = await client.searchByHeader(drafts.path, "X-Mailx-Draft-ID", draftId);
+                        for (const uid of uids) {
+                            try {
+                                await client.deleteMessageByUid(drafts.path, uid);
+                                succeeded = true;
+                            }
+                            catch { /* next */ }
                         }
-                        catch { /* next */ }
+                        if (uids.length > 0)
+                            console.log(`  [drafts] Deleted ${uids.length} draft(s) by ID ${draftId}`);
+                    }
+                    catch (e) {
+                        console.error(`  [drafts] searchByHeader for ${draftId} failed: ${e.message}`);
                     }
-                    if (uids.length > 0)
-                        console.log(`  [drafts] Deleted ${uids.length} draft(s) by ID ${draftId}`);
-                }
-                catch (e) {
-                    console.error(`  [drafts] searchByHeader for ${draftId} failed: ${e.message}`);
                 }
-            }
-        });
+            });
+        }
+        catch (e) {
+            // withConnection itself failed (no socket, auth refresh wedged) —
+            // fall through to queue a retry if we have a UID to anchor on.
+            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.
+        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);
+        }
     }
     /** Queue outgoing message locally — never fails, worker handles IMAP+SMTP.
      *  Single path: write `~/.mailx/outbox/<acct>/*.ltr` synchronously, then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.10",
     "@bobfrankston/mailx-settings": "^0.1.14",
-    "@bobfrankston/mailx-store": "^0.1.15",
+    "@bobfrankston/mailx-store": "^0.1.17",
     "@bobfrankston/iflow-direct": "^0.1.39",
     "@bobfrankston/tcp-transport": "^0.1.6",
     "@bobfrankston/smtp-direct": "^0.1.8",
@@ -39,7 +39,7 @@
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.10",
       "@bobfrankston/mailx-settings": "^0.1.14",
-      "@bobfrankston/mailx-store": "^0.1.15",
+      "@bobfrankston/mailx-store": "^0.1.17",
       "@bobfrankston/iflow-direct": "^0.1.39",
       "@bobfrankston/tcp-transport": "^0.1.6",
       "@bobfrankston/smtp-direct": "^0.1.8",