@bobfrankston/rmfmail 1.1.3 → 1.1.4

package/client/app.js

@@ -6,7 +6,7 @@ import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced,
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
 /** The user-visible app name. Single point of change for the rename;
@@ -2480,25 +2480,7 @@ onWsEvent((event) => {
             // "not-downloaded" indicator to the teal dot for any rows in view.
             markBodiesCached(event.items || []);
             break;
-        case "bodyAvailable":
-            // Reconciler completed an interactive-lane fetch. The viewer
-            // listens for this directly to re-render the focused message;
-            // here we just clip the row's "not-downloaded" state so the
-            // dot updates immediately for the rest of the list.
-            if (event.accountId && event.uid) {
-                markBodiesCached([{ accountId: event.accountId, uid: event.uid }]);
-            }
-            break;
-        case "messageRemoved":
-            // Reconciler discovered a message gone from the server (another
-            // device deleted it, EXPUNGE landed). Local row is already gone;
-            // pull the row out of the rendered list if present.
-            if (event.accountId && event.uid) {
-                document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
-                    detail: { accountId: event.accountId, uid: event.uid },
-                }));
-            }
-            break;
+        // bodyAvailable and messageRemoved migrated to subscribeStore below.
         case "syncStateChanged": {
             // Drives the bottom-right sync-status pill. Same surface used by
             // syncProgress / folderSynced; reconciler ticks this every few
@@ -2719,6 +2701,24 @@ onWsEvent((event) => {
         }
     }
 });
+// Store-bus consumers (post-refactor). bodyAvailable / messageRemoved
+// previously fanned out via the legacy onEvent({type:...}) channel; the
+// reconciler now publishes directly on storeBus and the wildcard catches
+// both folder:<id> and message:<uuid> topic forms.
+subscribeStore("*", (ev) => {
+    if (ev.kind === "bodyAvailable" && ev.accountId && ev.uid) {
+        // Flip the row's "not-downloaded" dot. Viewer subscribes separately
+        // (in message-viewer.ts) to re-render the focused message.
+        markBodiesCached([{ accountId: ev.accountId, uid: ev.uid }]);
+    }
+    else if (ev.kind === "messageRemoved" && ev.accountId && ev.uid) {
+        // Server-side EXPUNGE (or another device deleted) — yank the row
+        // out of the list if it's still rendered.
+        document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
+            detail: { accountId: ev.accountId, uid: ev.uid },
+        }));
+    }
+});
 /** Open a compose window pre-filled from a mailto: URL. Same plumbing as
  *  openCompose("new") but the init shape comes from the parsed URL instead
  *  of the currently-selected message. The body arrives as plain text from