@bobfrankston/mailx 1.0.45 → 1.0.46

package/client/app.js

@@ -5,7 +5,7 @@
 import { initFolderTree, refreshFolderTree } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder } from "./components/message-list.js";
 import { showMessage, getCurrentMessage } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, getAccounts, getFolders } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, getAccounts, getFolders, deleteMessage, undeleteMessage, restartServer, getSyncPending } from "./lib/api-client.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
 let lastSeenCount = 0;
@@ -180,7 +180,7 @@ document.getElementById("btn-restart")?.addEventListener("click", async () => {
     if (statusSync)
         statusSync.textContent = "Restarting...";
     try {
-        await fetch("/api/restart", { method: "POST" });
+        await restartServer();
     }
     catch { /* server is shutting down */ }
     // Server broadcasts reload event; if missed, WebSocket reconnect will trigger page reload
@@ -247,11 +247,7 @@ async function deleteCurrentMessage() {
         return;
     const { accountId, message } = current;
     try {
-        const res = await fetch(`/api/message/${accountId}/${message.uid}`, { method: "DELETE" });
-        if (!res.ok) {
-            const err = await res.json().catch(() => ({ error: res.statusText }));
-            throw new Error(err.error || res.statusText);
-        }
+        await deleteMessage(accountId, message.uid);
         lastDeleted = { accountId, uid: message.uid, folderId: message.folderId, subject: message.subject };
         // Show undo notification in status bar
         const statusSync = document.getElementById("status-sync");
@@ -296,15 +292,7 @@ async function undoDelete() {
         return;
     const { accountId, uid, folderId } = lastDeleted;
     try {
-        const res = await fetch(`/api/message/${accountId}/${uid}/undelete`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ folderId }),
-        });
-        if (!res.ok) {
-            const err = await res.json().catch(() => ({ error: res.statusText }));
-            throw new Error(err.error || res.statusText);
-        }
+        await undeleteMessage(accountId, uid, folderId);
         const statusSync = document.getElementById("status-sync");
         if (statusSync)
             statusSync.textContent = "Message restored";
@@ -638,10 +626,7 @@ fetch("/api/version").then(r => r.json()).then(d => {
 let serverDown = false;
 setInterval(async () => {
     try {
-        const res = await fetch("/api/sync/pending");
-        if (!res.ok)
-            return;
-        const data = await res.json();
+        const data = await getSyncPending();
         const el = document.getElementById("status-pending");
         if (el) {
             el.textContent = data.pending > 0 ? `↻ ${data.pending} pending` : "";

package/client/components/folder-tree.js

@@ -2,7 +2,7 @@
  * Folder tree component -- renders account folders with hierarchy,
  * expand/collapse, and optional unified inbox.
  */
-import { getAccounts, getFolders } from "../lib/api-client.js";
+import { getAccounts, getFolders, moveMessage, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 let onFolderSelect;
 let onUnifiedInbox = null;
@@ -166,7 +166,7 @@ function renderNode(node, container, depth) {
         const items = [
             { label: "Mark all read", action: async () => {
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}/mark-read`, { method: "POST" });
+                        await markFolderRead(node.accountId, node.id);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -179,11 +179,7 @@ function renderNode(node, container, depth) {
                     if (!name)
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}`, {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: JSON.stringify({ parentPath: node.path, name }),
-                        });
+                        await createFolder(node.accountId, node.path, name);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -197,11 +193,7 @@ function renderNode(node, container, depth) {
                     if (!newName || newName === node.name)
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}/rename`, {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: JSON.stringify({ newName }),
-                        });
+                        await renameFolder(node.accountId, node.id, newName);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -214,7 +206,7 @@ function renderNode(node, container, depth) {
                     if (!confirm(`Delete folder "${node.name}"? Messages will be moved to Trash.`))
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}`, { method: "DELETE" });
+                        await deleteFolder(node.accountId, node.id);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -230,7 +222,7 @@ function renderNode(node, container, depth) {
                     if (!confirm(`Permanently delete all messages in "${node.name}"?`))
                         return;
                     try {
-                        await fetch(`/api/folder/${node.accountId}/${node.id}/empty`, { method: "POST" });
+                        await emptyFolder(node.accountId, node.id);
                         const treeContainer = document.getElementById("folder-tree");
                         if (treeContainer)
                             loadFolderTree(treeContainer);
@@ -267,18 +259,8 @@ function renderNode(node, container, depth) {
             try {
                 let moved = 0;
                 for (const msg of toMove) {
-                    const body = { targetFolderId: node.id };
-                    if (msg.accountId !== node.accountId)
-                        body.targetAccountId = node.accountId;
-                    const res = await fetch(`/api/message/${msg.accountId}/${msg.uid}/move`, {
-                        method: "POST",
-                        headers: { "Content-Type": "application/json" },
-                        body: JSON.stringify(body),
-                    });
-                    if (!res.ok) {
-                        const err = await res.json().catch(() => ({ error: res.statusText }));
-                        throw new Error(err.error);
-                    }
+                    const targetAccountId = msg.accountId !== node.accountId ? node.accountId : undefined;
+                    await moveMessage(msg.accountId, msg.uid, node.id, targetAccountId);
                     moved++;
                 }
                 if (statusEl)

package/client/components/message-list.js

@@ -2,7 +2,7 @@
  * Message list component -- renders paginated message rows.
  * Loads more messages on scroll.
  */
-import { getMessages, getUnifiedInbox, searchMessages } from "../lib/api-client.js";
+import { getMessages, getUnifiedInbox, searchMessages, updateFlags } from "../lib/api-client.js";
 /** Clear the message viewer when no message is selected */
 function clearViewer() {
     const bodyEl = document.getElementById("mv-body");
@@ -302,11 +302,7 @@ function appendMessages(body, accountId, items) {
                 ? currentFlags.filter((f) => f !== "\\Flagged")
                 : [...currentFlags, "\\Flagged"];
             try {
-                await fetch(`/api/message/${msgAccountId}/${msg.uid}/flags`, {
-                    method: "PATCH",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ flags: newFlags }),
-                });
+                await updateFlags(msgAccountId, msg.uid, newFlags);
                 msg.flags = newFlags;
                 row.classList.toggle("flagged");
                 flag.textContent = row.classList.contains("flagged") ? "\u2605" : "\u2606";

package/client/components/message-viewer.js

@@ -1,7 +1,7 @@
 /**
  * Message viewer component -- displays full message in sandboxed iframe.
  */
-import { getMessage, updateFlags } from "../lib/api-client.js";
+import { getMessage, updateFlags, allowRemoteContent } from "../lib/api-client.js";
 /** Currently displayed message (for reply/forward) */
 let currentMessage = null;
 let currentAccountId = "";
@@ -189,30 +189,18 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
             };
             banner.querySelector("#btn-load-remote").addEventListener("click", loadRemote);
             banner.querySelector("#btn-allow-sender")?.addEventListener("click", async () => {
-                await fetch("/api/settings/allow-remote", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ type: "sender", value: senderAddr }),
-                });
+                await allowRemoteContent("sender", senderAddr);
                 loadRemote();
             });
             banner.querySelector("#btn-allow-domain")?.addEventListener("click", async () => {
-                await fetch("/api/settings/allow-remote", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ type: "domain", value: senderDomain }),
-                });
+                await allowRemoteContent("domain", senderDomain);
                 loadRemote();
             });
             banner.querySelector("#btn-allow-to")?.addEventListener("click", async () => {
                 const addr = deliveredTo || toAddr;
                 if (!addr)
                     return;
-                await fetch("/api/settings/allow-remote", {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ type: "recipient", value: addr }),
-                });
+                await allowRemoteContent("recipient", addr);
                 loadRemote();
             });
         }

package/client/compose/compose.js

@@ -261,7 +261,7 @@ async function saveDraft() {
         return; // empty
     lastDraftContent = content;
     try {
-        const res = await fetch("/api/draft", {
+        const data = await fetch("/api/draft", {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             body: JSON.stringify({
@@ -273,12 +273,9 @@ async function saveDraft() {
                 cc: ccInput.value,
                 previousDraftUid: draftUid,
             }),
-        });
-        if (res.ok) {
-            const data = await res.json();
-            if (data.draftUid)
-                draftUid = data.draftUid;
-        }
+        }).then(r => r.ok ? r.json() : null);
+        if (data?.draftUid)
+            draftUid = data.draftUid;
     }
     catch { /* ignore draft save errors */ }
 }

package/client/lib/api-client.js

@@ -122,6 +122,81 @@ export function allowRemoteContent(type, value) {
         body: JSON.stringify({ type, value })
     });
 }
+// ── Message actions ──
+// IMPORTANT: All server operations MUST go through these centralized methods
+// so IPC mode works. Never use fetch("/api/...") directly in components.
+export function deleteMessage(accountId, uid) {
+    if (hasIPC)
+        return mailxapi.deleteMessage(accountId, uid);
+    return api(`/message/${accountId}/${uid}`, { method: "DELETE" });
+}
+export function undeleteMessage(accountId, uid, folderId) {
+    if (hasIPC)
+        return mailxapi.undeleteMessage(accountId, uid, folderId);
+    return api(`/message/${accountId}/${uid}/undelete`, {
+        method: "POST",
+        body: JSON.stringify({ folderId })
+    });
+}
+export function moveMessage(accountId, uid, targetFolderId, targetAccountId) {
+    if (hasIPC)
+        return mailxapi.moveMessage(accountId, uid, targetFolderId, targetAccountId);
+    const body = { targetFolderId };
+    if (targetAccountId)
+        body.targetAccountId = targetAccountId;
+    return api(`/message/${accountId}/${uid}/move`, {
+        method: "POST",
+        body: JSON.stringify(body)
+    });
+}
+export function restartServer() {
+    if (hasIPC)
+        return mailxapi.restart?.();
+    return api("/restart", { method: "POST" }).catch(() => { });
+}
+// ── Folder management ──
+export function markFolderRead(accountId, folderId) {
+    if (hasIPC)
+        return mailxapi.markFolderRead?.(accountId, folderId);
+    return api(`/folder/${accountId}/${folderId}/mark-read`, { method: "POST" });
+}
+export function createFolder(accountId, parentPath, name) {
+    if (hasIPC)
+        return mailxapi.createFolder?.(accountId, parentPath, name);
+    return api(`/folder/${accountId}`, {
+        method: "POST",
+        body: JSON.stringify({ parentPath, name })
+    });
+}
+export function renameFolder(accountId, folderId, newName) {
+    if (hasIPC)
+        return mailxapi.renameFolder?.(accountId, folderId, newName);
+    return api(`/folder/${accountId}/${folderId}/rename`, {
+        method: "POST",
+        body: JSON.stringify({ newName })
+    });
+}
+export function deleteFolder(accountId, folderId) {
+    if (hasIPC)
+        return mailxapi.deleteFolder?.(accountId, folderId);
+    return api(`/folder/${accountId}/${folderId}`, { method: "DELETE" });
+}
+export function emptyFolder(accountId, folderId) {
+    if (hasIPC)
+        return mailxapi.emptyFolder?.(accountId, folderId);
+    return api(`/folder/${accountId}/${folderId}/empty`, { method: "POST" });
+}
+// ── Compose ──
+export function sendMessage(body) {
+    if (hasIPC)
+        return mailxapi.sendMessage?.(body);
+    return api("/send", { method: "POST", body: JSON.stringify(body) });
+}
+export function saveDraft(body) {
+    if (hasIPC)
+        return mailxapi.saveDraft?.(body);
+    return api("/draft", { method: "POST", body: JSON.stringify(body) });
+}
 const eventHandlers = [];
 export function onEvent(handler) {
     eventHandlers.push(handler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.45",
+  "version": "1.0.46",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,7 +20,7 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.25",
+    "@bobfrankston/iflow": "^1.0.26",
     "@bobfrankston/miscinfo": "^1.0.6",
     "@bobfrankston/oauthsupport": "^1.0.11",
     "@bobfrankston/rust-builder": "^0.1.2",