domma-cms 0.112.0 → 0.112.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.112.0",
+  "version": "0.112.1",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/plugins/_lib/admin/mail/reader-view.js

@@ -277,6 +277,9 @@ return {
         // State
         // ---------------------------------------------------------------
         let mailboxes = [];
+        let refreshTimer = null;
+        let refreshing = false;
+        let observedThreadPage = null;
         let currentAccountId = null;
         let folders = [];
         let currentFolder = 'INBOX';
@@ -554,6 +557,8 @@ return {
             openPanels.clear();
             window.removeEventListener('beforeunload', onBeforeUnload);
             cancelMarkRead();
+            clearInterval(refreshTimer);
+            refreshTimer = null;
             clearTimeout(undoTimer);
             if (keyboardHandler) document.removeEventListener('keydown', keyboardHandler);
             keyboardHandler = null;
@@ -1349,13 +1354,40 @@ return {
         // ---------------------------------------------------------------
 
         /**
-         * Fetch and draw the current page.
+         * Check for arrivals before reloading, including in conversation mode.
          *
          * @returns {Promise<void>}
          */
-        async function loadMessages() {
+        async function refreshMailbox() {
+            if (refreshing || !currentAccountId) return;
+            refreshing = true;
+            const account = currentAccountId;
+            try {
+                if (features.search) {
+                    try {
+                        const result = await api(`${BASE}/sync/run?${new URLSearchParams({account})}`, 'POST');
+                        const failure = result.folders?.[currentFolder]?.mode === 'error'
+                            ? result.folders[currentFolder] : null;
+                        if (failure) throw new Error(failure.reason);
+                    } catch (err) {
+                        // Reduced mode still reads live from IMAP.
+                        if (err.status !== 503) throw err;
+                    }
+                }
+                if (!here() || currentAccountId !== account) return;
+                page = 1;
+                await loadMessages({fresh: true});
+            } catch (err) {
+                handleError(err);
+            } finally {
+                refreshing = false;
+            }
+        }
+
+        /** Fetch and draw the current page. */
+        async function loadMessages({fresh = false} = {}) {
             if (searchQuery) return runSearch();
-            if (threadsOn) return loadThreads();
+            if (threadsOn) return loadThreads({fresh});
 
             const loader = E.loader(listEl, {type: 'dots'});
             try {
@@ -1364,6 +1396,7 @@ return {
                     folder: currentFolder,
                     page: String(page)
                 });
+                if (fresh) params.set('fresh', '1');
                 const result = await api(`${BASE}/messages?${params}`);
                 lastListSource = result.source ?? 'imap';
                 messages = result.messages;
@@ -1389,7 +1422,7 @@ return {
          *
          * @returns {Promise<void>}
          */
-        async function loadThreads() {
+        async function loadThreads({fresh = false} = {}) {
             const loader = E.loader(listEl, {type: 'dots'});
             try {
                 const params = new URLSearchParams({
@@ -1405,6 +1438,7 @@ return {
                     // next folder may well be mirrored, and silently
                     // forgetting the setting because one folder was not is
                     // worse than one line of explanation.
+                    if (fresh) params.set('fresh', '1');
                     const flat = await api(`${BASE}/messages?${params}`);
                     lastListSource = flat.source ?? 'imap';
                     messages = flat.messages;
@@ -4656,7 +4690,7 @@ return {
                 id: `${pluginName}-refresh`,
                 icon: 'refresh-cw',
                 title: 'Refresh',
-                onClick: () => loadMessages()
+                onClick: () => refreshMailbox()
             });
             if (refreshPlaced) $container.find('#mail-refresh-btn').get(0)?.remove();
             const placed = chrome.addBannerAction?.($container, {
@@ -4668,7 +4702,7 @@ return {
             if (placed) $container.find('#mail-settings-btn').get(0)?.remove();
         } catch { /* no banner: the pane buttons stay */ }
         if (!here()) return;
-        $container.find('#mail-refresh-btn').on('click', () => loadMessages());
+        $container.find('#mail-refresh-btn').on('click', () => refreshMailbox());
 
         // Folder management was right-click only, which is the same as not
         // existing for anyone who does not already know it is there.
@@ -4760,6 +4794,31 @@ return {
 
         await start();
         if (!here()) return;
+        // The sidebar updates independently; keep an open inbox in step with
+        // the mirror without interrupting selection, search or older pages.
+        refreshTimer = setInterval(async () => {
+            if (!here() || document.hidden || refreshing || !currentAccountId ||
+                page !== 1 || searchQuery || selected.size) return;
+            const account = currentAccountId;
+            const folder = currentFolder;
+            refreshing = true;
+            try {
+                const params = new URLSearchParams({account, folder, page: '1'});
+                const result = await api(`${BASE}/messages?${params}`);
+                if (!here() || currentAccountId !== account || currentFolder !== folder ||
+                    page !== 1 || searchQuery || selected.size) return;
+                const signature = rows => JSON.stringify(rows.map(m => [m.uid, m.flags]));
+                const snapshot = JSON.stringify([account, folder, result.total, signature(result.messages)]);
+                const changed = threadsOn
+                    ? snapshot !== observedThreadPage
+                    : result.total !== total || signature(result.messages) !== signature(messages);
+                observedThreadPage = snapshot;
+                if (changed) {
+                    await loadMessages();
+                }
+            } catch { /* A temporary failure must not replace the open reader. */ }
+            finally { refreshing = false; }
+        }, 30_000);
         Domma.icons.scan($container.get(0));
 
         // Domma's router does not call this; the lifetime does the work. Kept so a

package/plugins/_lib/mail/readRoutes.js

@@ -385,7 +385,7 @@ export function registerReadRoutes(fastify, {auth, hooks, config, pool, pluginNa
         // answered from the store - instant, and no connection needed. It
         // returns null for anything not mirrored, which falls through to the
         // wire exactly as the free edition always does.
-        if (cachedList) {
+        if (cachedList && request.query.fresh !== '1') {
             try {
                 const cached = await cachedList({
                     account: ctx.account, userId: ctx.uid, folder, page, limit