@bobfrankston/rmfmail 1.2.252 → 1.2.253

package/packages/mailx-types/mime-build.ts

@@ -116,14 +116,18 @@ export function buildMimeMessage(opts: BuildMimeOptions): BuiltMime {
     ];
     const commonHeaders = headers.filter((h): h is string => h !== null);
 
-    // ── draft: a single text/html part and nothing else ──
+    // ── draft: a single text/html part, plus attachments if there are any ──
+    // "Simple" means no alternative and no inline-image extraction — it does
+    // NOT mean "drop the user's files". This branch used to `return` before
+    // ever reading opts.attachments, so a draft saved with a 65KB image was
+    // written body-only and the file was gone on reopen (Bob 2026-08-11).
     if (opts.simpleHtml) {
         const body = opts.bodyHtml || opts.bodyText || "";
-        const raw = [
-            ...commonHeaders,
-            `Content-Type: text/html; charset=UTF-8`,
-            `Content-Transfer-Encoding: quoted-printable`,
-        ].join("\r\n") + `\r\n\r\n` + encodeQuotedPrintable(body);
+        const htmlPart = {
+            headers: [`Content-Type: text/html; charset=UTF-8`, `Content-Transfer-Encoding: quoted-printable`],
+            body: encodeQuotedPrintable(body),
+        };
+        const raw = wrapWithAttachments(commonHeaders, htmlPart, opts.attachments || [], newBoundary);
         return { raw, messageId, inlineImageCount: 0 };
     }
 
@@ -186,32 +190,40 @@ export function buildMimeMessage(opts: BuildMimeOptions): BuiltMime {
         };
     };
 
-    const attachments = opts.attachments || [];
-    let raw: string;
-    if (attachments.length > 0) {
-        const mixedBoundary = newBoundary();
-        const inner = makeInner();
-        const parts: string[] = [
-            `--${mixedBoundary}\r\n` + inner.headers.join("\r\n") + `\r\n\r\n` + inner.body,
-        ];
-        for (const att of attachments) {
-            // A quote or newline in a filename would break out of the header.
-            const filename = (att.filename || "attachment").replace(/[\r\n"]/g, "_");
-            const mime = att.mimeType || "application/octet-stream";
-            parts.push(
-                `--${mixedBoundary}\r\n` +
-                `Content-Type: ${mime}; name="${filename}"\r\n` +
-                `Content-Disposition: attachment; filename="${filename}"\r\n` +
-                `Content-Transfer-Encoding: base64\r\n\r\n` +
-                `${wrap76(att.dataBase64 || "")}\r\n`
-            );
-        }
-        raw = [...commonHeaders, `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`].join("\r\n")
-            + `\r\n\r\n` + parts.join("") + `--${mixedBoundary}--\r\n`;
-    } else {
-        const inner = makeInner();
-        raw = [...commonHeaders, ...inner.headers].join("\r\n") + `\r\n\r\n` + inner.body;
-    }
+    const raw = wrapWithAttachments(commonHeaders, makeInner(), opts.attachments || [], newBoundary);
 
     return { raw, messageId, inlineImageCount: inlineImages.length };
 }
+
+/** Emit `inner` as the whole body, or — when there are attachments — as the
+ *  first part of a multipart/mixed followed by one base64 part per file.
+ *  Shared by the draft and send paths so a file can never be dropped by one
+ *  of them alone. */
+function wrapWithAttachments(
+    commonHeaders: string[],
+    inner: { headers: string[]; body: string },
+    attachments: MimeAttachment[],
+    newBoundary: () => string,
+): string {
+    if (attachments.length === 0) {
+        return [...commonHeaders, ...inner.headers].join("\r\n") + `\r\n\r\n` + inner.body;
+    }
+    const mixedBoundary = newBoundary();
+    const parts: string[] = [
+        `--${mixedBoundary}\r\n` + inner.headers.join("\r\n") + `\r\n\r\n` + inner.body,
+    ];
+    for (const att of attachments) {
+        // A quote or newline in a filename would break out of the header.
+        const filename = (att.filename || "attachment").replace(/[\r\n"]/g, "_");
+        const mime = att.mimeType || "application/octet-stream";
+        parts.push(
+            `--${mixedBoundary}\r\n` +
+            `Content-Type: ${mime}; name="${filename}"\r\n` +
+            `Content-Disposition: attachment; filename="${filename}"\r\n` +
+            `Content-Transfer-Encoding: base64\r\n\r\n` +
+            `${wrap76(att.dataBase64 || "")}\r\n`
+        );
+    }
+    return [...commonHeaders, `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`].join("\r\n")
+        + `\r\n\r\n` + parts.join("") + `--${mixedBoundary}--\r\n`;
+}

package/packages/mailx-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-types",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",