@bobfrankston/rmfmail 1.2.177 → 1.2.179

package/client/android-bootstrap.bundle.js

@@ -2328,10 +2328,91 @@ var init_groups = __esm({
   }
 });
 
+// packages/mailx-types/reminder-state.js
+function normalizeReminderState(raw, now) {
+  const out = { dismissed: {}, snoozed: {} };
+  if (raw && typeof raw === "object") {
+    for (const [k, v] of Object.entries(raw.dismissed || {})) {
+      if (v === true)
+        out.dismissed[k] = now;
+      else if (Number.isFinite(v) && v > 0)
+        out.dismissed[k] = v;
+    }
+    for (const [k, v] of Object.entries(raw.snoozed || {})) {
+      if (Number.isFinite(v) && v > 0)
+        out.snoozed[k] = v;
+    }
+  }
+  return out;
+}
+function mergeReminderStates(a, b, now) {
+  const out = { dismissed: {}, snoozed: {} };
+  const dismissedCutoff = now - DISMISSED_RETENTION_MS;
+  const snoozedCutoff = now - SNOOZED_RETENTION_MS;
+  for (const src of [a.dismissed, b.dismissed]) {
+    for (const [k, v] of Object.entries(src)) {
+      if (v < dismissedCutoff)
+        continue;
+      if (!(k in out.dismissed) || v > out.dismissed[k])
+        out.dismissed[k] = v;
+    }
+  }
+  for (const src of [a.snoozed, b.snoozed]) {
+    for (const [k, v] of Object.entries(src)) {
+      if (v < snoozedCutoff)
+        continue;
+      if (!(k in out.snoozed) || v > out.snoozed[k])
+        out.snoozed[k] = v;
+    }
+  }
+  return out;
+}
+function reminderStatesEqual(a, b) {
+  const mapsEqual = (x, y) => {
+    const xk = Object.keys(x);
+    if (xk.length !== Object.keys(y).length)
+      return false;
+    return xk.every((k) => y[k] === x[k]);
+  };
+  return mapsEqual(a.dismissed, b.dismissed) && mapsEqual(a.snoozed, b.snoozed);
+}
+var REMINDER_STATE_FILE, DISMISSED_RETENTION_MS, SNOOZED_RETENTION_MS;
+var init_reminder_state = __esm({
+  "packages/mailx-types/reminder-state.js"() {
+    "use strict";
+    REMINDER_STATE_FILE = "reminders.jsonc";
+    DISMISSED_RETENTION_MS = 30 * 864e5;
+    SNOOZED_RETENTION_MS = 7 * 864e5;
+  }
+});
+
+// packages/mailx-types/mime-inline-images.js
+function extractInlineImages(html, idDomain) {
+  const images = [];
+  const byDataUri = /* @__PURE__ */ new Map();
+  const stamp = `${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
+  const out = html.replace(/(<img\b[^>]*?\ssrc=)(["'])(data:(image\/[\w.+-]+);base64,([A-Za-z0-9+/=\s]+))\2/gi, (_m, prefix, quote, dataUri, mime, b64) => {
+    let cid = byDataUri.get(dataUri);
+    if (!cid) {
+      cid = `img${images.length + 1}.${stamp}@${idDomain}`;
+      byDataUri.set(dataUri, cid);
+      images.push({ contentId: cid, mime, base64: b64.replace(/\s+/g, "") });
+    }
+    return `${prefix}${quote}cid:${cid}${quote}`;
+  });
+  return { html: out, images };
+}
+var init_mime_inline_images = __esm({
+  "packages/mailx-types/mime-inline-images.js"() {
+    "use strict";
+  }
+});
+
 // packages/mailx-types/index.js
 var mailx_types_exports = {};
 __export(mailx_types_exports, {
   CONTACT_RULES: () => CONTACT_RULES,
+  REMINDER_STATE_FILE: () => REMINDER_STATE_FILE,
   addContactsDenylistEntry: () => addContactsDenylistEntry,
   addContactsPreferredEntry: () => addContactsPreferredEntry,
   answeredOf: () => answeredOf,
@@ -2340,10 +2421,14 @@ __export(mailx_types_exports, {
   encodeQuotedPrintable: () => encodeQuotedPrintable,
   expandRecipients: () => expandRecipients,
   extractAddress: () => extractAddress,
+  extractInlineImages: () => extractInlineImages,
   flaggedOf: () => flaggedOf,
   htmlToPlainText: () => htmlToPlainText,
   isAddressToken: () => isAddressToken,
+  mergeReminderStates: () => mergeReminderStates,
+  normalizeReminderState: () => normalizeReminderState,
   parseSearchQuery: () => parseSearchQuery,
+  reminderStatesEqual: () => reminderStatesEqual,
   sanitizeHtml: () => sanitizeHtml,
   seenOf: () => seenOf,
   setAnswered: () => setAnswered,
@@ -2544,6 +2629,8 @@ var init_mailx_types = __esm({
     init_contact_rules();
     init_contacts_config();
     init_groups();
+    init_reminder_state();
+    init_mime_inline_images();
     _SEEN = "\\Seen";
     _FLAGGED = "\\Flagged";
     _ANSWERED = "\\Answered";
@@ -6107,12 +6194,14 @@ var WebMailxService = class _WebMailxService {
     const cc = msg.cc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
     const bcc = msg.bcc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
     const hasHtml = !!msg.bodyHtml;
-    const htmlBody = msg.bodyHtml || "";
+    const domain = account.email.split("@")[1] || "mailx.local";
+    const messageId = `<${Date.now()}.${Math.random().toString(36).slice(2)}@${domain}>`;
+    const extracted = hasHtml ? extractInlineImages(msg.bodyHtml, domain) : { html: "", images: [] };
+    const htmlBody = extracted.html;
+    const inlineImages = extracted.images;
     const textBody = msg.bodyText || (hasHtml ? htmlToPlainText(htmlBody) : "");
     const htmlEncoded = hasHtml ? encodeQuotedPrintable(htmlBody) : "";
     const textEncoded = encodeQuotedPrintable(textBody);
-    const domain = account.email.split("@")[1] || "mailx.local";
-    const messageId = `<${Date.now()}.${Math.random().toString(36).slice(2)}@${domain}>`;
     const envelope = [
       `From: ${fromHeader}`,
       `To: ${to}`,
@@ -6125,9 +6214,11 @@ var WebMailxService = class _WebMailxService {
       msg.references?.length ? `References: ${msg.references.join(" ")}` : null,
       `MIME-Version: 1.0`
     ].filter((h) => h !== null);
+    const newBoundary = () => `mailx_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+    const wrap76 = (s) => s.match(/.{1,76}/g)?.join("\r\n") || s;
     const makeInner = () => {
       if (hasHtml) {
-        const altBoundary = `mailx_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
+        const altBoundary = newBoundary();
         const body = `--${altBoundary}\r
 Content-Type: text/plain; charset=UTF-8\r
 Content-Transfer-Encoding: quoted-printable\r
@@ -6140,7 +6231,29 @@ Content-Transfer-Encoding: quoted-printable\r
 ${htmlEncoded}\r
 --${altBoundary}--\r
 `;
-        return { headers: [`Content-Type: multipart/alternative; boundary="${altBoundary}"`], body };
+        const alt = { headers: [`Content-Type: multipart/alternative; boundary="${altBoundary}"`], body };
+        if (inlineImages.length === 0)
+          return alt;
+        const relBoundary = newBoundary();
+        const relParts = [
+          `--${relBoundary}\r
+` + alt.headers.join("\r\n") + `\r
+\r
+` + alt.body,
+          ...inlineImages.map((im) => `--${relBoundary}\r
+Content-Type: ${im.mime}\r
+Content-ID: <${im.contentId}>\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: base64\r
+\r
+${wrap76(im.base64)}\r
+`)
+        ];
+        return {
+          headers: [`Content-Type: multipart/related; boundary="${relBoundary}"; type="multipart/alternative"`],
+          body: relParts.join("") + `--${relBoundary}--\r
+`
+        };
       }
       return {
         headers: [`Content-Type: text/plain; charset=UTF-8`, `Content-Transfer-Encoding: quoted-printable`],
@@ -6150,7 +6263,6 @@ ${htmlEncoded}\r
     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 = [];
@@ -6640,6 +6752,51 @@ ${bodyEncoded}`;
   async deleteTask(_uuid) {
     return this.notImpl("deleteTask");
   }
+  // Reminder dismissed/snoozed state — same reminders.jsonc on the shared
+  // Drive folder the desktop uses, same mailx-types merge. Alarms don't
+  // fire on Android today (getCalendarEvents/getTasks return []), but the
+  // API is live so this device still contributes its state and adopts the
+  // desktops' — the moment calendar lands here, sync just works.
+  reminderStateCache = null;
+  async getReminderState() {
+    if (this.reminderStateCache && Date.now() - this.reminderStateCache.at < 6e4) {
+      return this.reminderStateCache.state;
+    }
+    const now = Date.now();
+    let state = { dismissed: {}, snoozed: {} };
+    try {
+      const json = await cloudRead(REMINDER_STATE_FILE);
+      if (json != null)
+        state = normalizeReminderState(JSON.parse(json), now);
+    } catch {
+    }
+    this.reminderStateCache = { state, at: Date.now() };
+    return state;
+  }
+  async mergeReminderState(patch) {
+    const now = Date.now();
+    const local = normalizeReminderState(patch, now);
+    let cloud = { dismissed: {}, snoozed: {} };
+    let hadCloud = false;
+    try {
+      const json = await cloudRead(REMINDER_STATE_FILE);
+      if (json != null) {
+        cloud = normalizeReminderState(JSON.parse(json), now);
+        hadCloud = true;
+      }
+    } catch {
+    }
+    const merged = mergeReminderStates(cloud, local, now);
+    if (!(hadCloud && reminderStatesEqual(merged, cloud))) {
+      try {
+        await cloudWrite(REMINDER_STATE_FILE, JSON.stringify(merged, null, 2) + "\n");
+      } catch (e) {
+        console.error(`[reminders] cloud write failed: ${e?.message || e}`);
+      }
+    }
+    this.reminderStateCache = { state: merged, at: Date.now() };
+    return merged;
+  }
   // User dictionary (cloud-mirrored) — Android can implement these via
   // the same userdict.csv cloud round-trip the desktop uses; until that
   // wire-up lands, return safe defaults so spellcheck.ts catch() paths
@@ -11346,6 +11503,10 @@ function installBridge() {
       return { ok: true };
     },
     loadContactsConfig: () => service.loadContactsConfig(),
+    // Cross-device reminder dismissed/snoozed state (reminders.jsonc on
+    // Drive) — alarm poller pushes/pulls through these.
+    getReminderState: () => service.getReminderState(),
+    mergeReminderState: (patch) => service.mergeReminderState(patch),
     syncAll: async () => {
       await service.syncAll();
       return { ok: true };