@bobfrankston/rmfmail 1.2.87 → 1.2.96

package/client/android-bootstrap.bundle.js

@@ -5951,6 +5951,7 @@ var WebMailxService = class {
   }
   // ── Send ──
   async send(msg) {
+    console.log(`[send] from=${msg?.from} to=${(msg?.to || []).length} subject="${msg?.subject || ""}" attachments=${Array.isArray(msg?.attachments) ? msg.attachments.length : 0}`);
     const settings = await loadSettings();
     const account = settings.accounts.find((a) => a.id === msg.from);
     if (!account)
@@ -5978,10 +5979,10 @@ var WebMailxService = class {
       msg.references?.length ? `References: ${msg.references.join(" ")}` : null,
       `MIME-Version: 1.0`
     ].filter((h) => h !== null);
-    let rawMessage;
-    if (hasHtml) {
-      const altBoundary = `mailx_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
-      const body = `--${altBoundary}\r
+    const makeInner = () => {
+      if (hasHtml) {
+        const altBoundary = `mailx_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+        const body = `--${altBoundary}\r
 Content-Type: text/plain; charset=UTF-8\r
 Content-Transfer-Encoding: quoted-printable\r
 \r
@@ -5993,22 +5994,50 @@ Content-Transfer-Encoding: quoted-printable\r
 ${htmlEncoded}\r
 --${altBoundary}--\r
 `;
+        return { headers: [`Content-Type: multipart/alternative; boundary="${altBoundary}"`], body };
+      }
+      return {
+        headers: [`Content-Type: text/plain; charset=UTF-8`, `Content-Transfer-Encoding: quoted-printable`],
+        body: textEncoded
+      };
+    };
+    const atts = Array.isArray(msg.attachments) ? msg.attachments : [];
+    let rawMessage;
+    if (atts.length > 0) {
+      const wrap76 = (s) => s.match(/.{1,76}/g)?.join("\r\n") || s;
+      const mixedBoundary = `mailxmix_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+      const inner = makeInner();
+      const parts = [];
+      parts.push(`--${mixedBoundary}\r
+` + inner.headers.join("\r\n") + `\r
+\r
+` + inner.body);
+      for (const att of atts) {
+        const filename = (att.filename || "attachment").replace(/[\r\n"]/g, "_");
+        const mime = att.mimeType || "application/octet-stream";
+        const wrapped = wrap76(att.dataBase64 || "");
+        parts.push(`--${mixedBoundary}\r
+Content-Type: ${mime}; name="${filename}"\r
+Content-Disposition: attachment; filename="${filename}"\r
+Content-Transfer-Encoding: base64\r
+\r
+${wrapped}\r
+`);
+      }
       const headers = [
         ...envelope,
-        `Content-Type: multipart/alternative; boundary="${altBoundary}"`
+        `Content-Type: multipart/mixed; boundary="${mixedBoundary}"`
       ].join("\r\n");
       rawMessage = `${headers}\r
 \r
-${body}`;
+${parts.join("")}--${mixedBoundary}--\r
+`;
     } else {
-      const headers = [
-        ...envelope,
-        `Content-Type: text/plain; charset=UTF-8`,
-        `Content-Transfer-Encoding: quoted-printable`
-      ].join("\r\n");
+      const inner = makeInner();
+      const headers = [...envelope, ...inner.headers].join("\r\n");
       rawMessage = `${headers}\r
 \r
-${textEncoded}`;
+${inner.body}`;
     }
     await this.syncManager.queueOutgoingLocal(account.id, rawMessage);
     for (const addr of msg.to)
@@ -6725,11 +6754,14 @@ var GmailApiProvider = class _GmailApiProvider {
     const inReplyTo = getHeader(headers, "In-Reply-To") || "";
     const referencesRaw = getHeader(headers, "References") || "";
     const references = referencesRaw.trim() ? referencesRaw.split(/\s+/).filter((r) => r.startsWith("<") && r.endsWith(">")) : [];
+    const internalMs = msg.internalDate ? new Date(Number(msg.internalDate)) : null;
+    const headerMs = dateRaw ? new Date(dateRaw) : null;
     return {
       uid: idToUid(msg.id),
       messageId,
       providerId: msg.id,
-      date: dateRaw ? new Date(dateRaw) : msg.internalDate ? new Date(Number(msg.internalDate)) : null,
+      date: internalMs ?? headerMs,
+      sentDate: headerMs ?? internalMs ?? void 0,
       subject,
       from: parseAddressList(fromRaw),
       to: parseAddressList(toRaw),
@@ -7378,8 +7410,8 @@ function parseEnvelope(envStr) {
       result.to = parseAddressList2(tokens[5]);
       result.cc = parseAddressList2(tokens[6]);
       result.bcc = parseAddressList2(tokens[7]);
-      result.inReplyTo = unquote(tokens[8]);
-      result.messageId = unquote(tokens[9]);
+      result.inReplyTo = unquote(tokens[8]).trim();
+      result.messageId = unquote(tokens[9]).trim();
     }
   } catch {
   }
@@ -8144,6 +8176,10 @@ var NativeImapClient = class {
         return parseSearchResponse(r.text);
       }
     }
+    const tagged = responses.find((r) => r.tag === tag);
+    if (!tagged || tagged.type !== "OK") {
+      throw new Error(`SEARCH failed: ${tagged ? `${tagged.type} ${tagged.text || ""}` : "no tagged response"}`);
+    }
     return [];
   }
   /** Set flags on a message */
@@ -8831,6 +8867,7 @@ var NativeImapClient = class {
       if (envMatch) {
         const env = parseEnvelope(envMatch[1]);
         msg.date = msg.date || env.date;
+        msg.sentDate = env.date || void 0;
         msg.subject = env.subject;
         msg.messageId = env.messageId;
         msg.from = env.from;
@@ -8873,6 +8910,7 @@ var FetchedMessage = class {
   uid;
   flags;
   date;
+  sentDate;
   subject;
   messageId;
   from;
@@ -9407,6 +9445,18 @@ var ImapWebProvider = class {
   async getUids(folder) {
     return this.withRetry(() => this.client.getUids(folder), `getUids(${folder})`);
   }
+  /** APPEND a raw message to this account's Sent folder. Used by the
+   *  Android send path after a successful SMTP delivery — without it a
+   *  phone-sent message never got a Sent copy on IMAP accounts (Gmail's
+   *  API self-files; SMTP does not). Resolves the Sent path from the
+   *  special-folder map (populated by listFolders; refreshed here if the
+   *  cache is cold). Returns the appended UID when the server reports it. */
+  async appendToSent(raw) {
+    if (!this.specialFolders.sent)
+      await this.listFolders();
+    const sentPath = this.specialFolders.sent || "Sent";
+    return this.withRetry(() => this.client.appendMessage(sentPath, raw, ["\\Seen"]), `appendToSent(${sentPath})`);
+  }
   async close() {
     try {
       await this.client.logout();