@bobfrankston/mailx-types 0.1.45 → 0.1.47

package/mailx-api.d.ts

@@ -78,10 +78,26 @@ export interface MailxApi {
     moveFolderToTrash(accountId: string, folderId: number): Promise<void>;
     emptyFolder(accountId: string, folderId: number): Promise<void>;
     sendMessage(msg: any): Promise<void>;
-    saveDraft(accountId: string, subject: string, bodyHtml: string, bodyText: string, to?: string, cc?: string, previousDraftUid?: number, draftId?: string, bcc?: string): Promise<{
+    /** Positional here because both service classes implement it that way;
+     *  the bridge is what turns the client's single params object into these
+     *  arguments. Keep the tail in sync with jsonrpc's `case "saveDraft"` —
+     *  this list had already fallen behind by one (`from`), and `attachments`
+     *  made it two (2026-08-11). A param missing here is a param silently
+     *  dropped on the way to the daemon. */
+    saveDraft(accountId: string, subject: string, bodyHtml: string, bodyText: string, to?: string, cc?: string, previousDraftUid?: number, draftId?: string, bcc?: string, from?: string, attachments?: {
+        filename: string;
+        mimeType: string;
+        dataBase64: string;
+    }[]): Promise<{
         draftUid: number | null;
         draftId: string;
     }>;
+    /** Open a compose-window attachment in the OS default app. Optional:
+     *  desktop-only (Android has no staging dir to launch from). */
+    openPendingAttachment?(filename: string, mimeType: string, dataBase64: string): Promise<{
+        ok: boolean;
+        path: string;
+    }>;
     deleteDraft(accountId: string, draftUid: number, draftId?: string): Promise<void>;
     getOutboxStatus(): any | Promise<any>;
     listQueuedOutgoing(): any[] | Promise<any[]>;

package/mime-build.js

@@ -64,14 +64,18 @@ export function buildMimeMessage(opts) {
         `MIME-Version: 1.0`,
     ];
     const commonHeaders = headers.filter((h) => 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 };
     }
     // Pasted images live in the editor HTML as data: URIs — fine in a WebView,
@@ -130,31 +134,32 @@ export function buildMimeMessage(opts) {
             body: textEncoded,
         };
     };
-    const attachments = opts.attachments || [];
-    let raw;
-    if (attachments.length > 0) {
-        const mixedBoundary = newBoundary();
-        const inner = makeInner();
-        const parts = [
-            `--${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`;
+    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, inner, attachments, newBoundary) {
+    if (attachments.length === 0) {
+        return [...commonHeaders, ...inner.headers].join("\r\n") + `\r\n\r\n` + inner.body;
     }
-    else {
-        const inner = makeInner();
-        raw = [...commonHeaders, ...inner.headers].join("\r\n") + `\r\n\r\n` + inner.body;
+    const mixedBoundary = newBoundary();
+    const parts = [
+        `--${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 { raw, messageId, inlineImageCount: inlineImages.length };
+    return [...commonHeaders, `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`].join("\r\n")
+        + `\r\n\r\n` + parts.join("") + `--${mixedBoundary}--\r\n`;
 }
 //# sourceMappingURL=mime-build.js.map

package/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",