@bobfrankston/rmfmail 1.1.79 → 1.1.80

package/client/app.bundle.js

@@ -71,6 +71,7 @@ __export(api_client_exports, {
   moveMessages: () => moveMessages,
   onEvent: () => onEvent,
   onWsEvent: () => onWsEvent,
+  openAttachment: () => openAttachment,
   openInTextEditor: () => openInTextEditor,
   openInWord: () => openInWord,
   openLocalPath: () => openLocalPath,
@@ -503,6 +504,10 @@ function setupAccount(name, email, password) {
 async function getAttachment(accountId, uid, attachmentId, folderId) {
   return ipc().getAttachment(accountId, uid, attachmentId, folderId);
 }
+async function openAttachment(accountId, uid, attachmentId, folderId) {
+  const fn = ipc().openAttachment;
+  return fn ? fn(accountId, uid, attachmentId, folderId) : void 0;
+}
 async function getDeviceAccounts() {
   return ipc().getDeviceAccounts?.() ?? [];
 }
@@ -1661,27 +1666,36 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
         chip.addEventListener("click", async (e) => {
           e.preventDefault();
           try {
-            const data = await getAttachment(accountId, uid, i, msg.folderId);
             const bridge = window._nativeBridge;
             if (bridge?.openAttachment) {
-              await bridge.openAttachment(att.filename, data.contentType, data.content);
-            } else {
-              const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
-              const blob = new Blob([bytes], { type: data.contentType });
-              const url = URL.createObjectURL(blob);
-              const a = document.createElement("a");
-              a.href = url;
-              a.download = att.filename || "attachment";
-              a.style.display = "none";
-              document.body.appendChild(a);
-              a.click();
-              setTimeout(() => {
-                a.remove();
-                URL.revokeObjectURL(url);
-              }, 5e3);
+              const data2 = await getAttachment(accountId, uid, i, msg.folderId);
+              await bridge.openAttachment(att.filename, data2.contentType, data2.content);
+              return;
+            }
+            try {
+              const res = await openAttachment(accountId, uid, i, msg.folderId);
+              if (res?.ok)
+                return;
+            } catch (svcErr) {
+              console.warn(`[attachment] service open failed, falling back to blob: ${svcErr?.message || svcErr}`);
             }
+            const data = await getAttachment(accountId, uid, i, msg.folderId);
+            const bytes = Uint8Array.from(atob(data.content), (c) => c.charCodeAt(0));
+            const blob = new Blob([bytes], { type: data.contentType });
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement("a");
+            a.href = url;
+            a.download = att.filename || "attachment";
+            a.style.display = "none";
+            document.body.appendChild(a);
+            a.click();
+            setTimeout(() => {
+              a.remove();
+              URL.revokeObjectURL(url);
+            }, 5e3);
           } catch (err) {
-            console.error(`Attachment download failed: ${err.message}`);
+            console.error(`Attachment open failed: ${err?.message || err}`);
+            alert(`Couldn't open "${att.filename}": ${err?.message || err}`);
           }
         });
         chip.draggable = true;