@bobfrankston/mailx 1.0.393 → 1.0.394

package/client/components/message-list.js

@@ -24,6 +24,16 @@ let touchWasScroll = false;
 // (text columns default asc, date defaults desc).
 let currentSort = "date";
 let currentSortDir = "desc";
+/** Atomic focus: update shared state + notify viewer in one call.
+ *  First slice of S56 (row-objects-own-preview) — consolidates the two
+ *  parallel selection paths (state.select + onMessageSelect) so the eventual
+ *  Row-class migration touches exactly one call site. The viewer's `gen`
+ *  token still cancels stale fetches; this just makes the transition
+ *  indivisible at the caller level. */
+function focusMessage(accountId, msg) {
+    state.select(msg);
+    onMessageSelect(accountId, msg.uid, msg.folderId);
+}
 /** Flip the "not-downloaded" indicator off for rows whose bodies just cached.
  *  Called from the bodyCached service event — covers both background prefetch
  *  and on-demand fetch. No-op for rows not currently rendered. */
@@ -473,8 +483,7 @@ export async function showThreadPopup(pillEl, headMsg) {
         item.appendChild(date);
         item.appendChild(subject);
         item.addEventListener("click", async () => {
-            state.select({ accountId: msg.accountId, uid: msg.uid, folderId: msg.folderId, subject: msg.subject, from: msg.from, to: msg.to, cc: msg.cc, date: msg.date, flags: msg.flags, size: msg.size, preview: msg.preview, hasAttachments: msg.hasAttachments });
-            onMessageSelect(msg.accountId, msg.uid, msg.folderId);
+            focusMessage(msg.accountId, { accountId: msg.accountId, uid: msg.uid, folderId: msg.folderId, subject: msg.subject, from: msg.from, to: msg.to, cc: msg.cc, date: msg.date, flags: msg.flags, size: msg.size, preview: msg.preview, hasAttachments: msg.hasAttachments });
             popup.remove();
         });
         popup.appendChild(item);
@@ -640,9 +649,7 @@ function appendMessages(body, accountId, items) {
             }
             lastClickedRow = row;
             row.classList.remove("unread");
-            // Update shared state + notify viewer
-            state.select(msg);
-            onMessageSelect(msgAccountId, msg.uid, msg.folderId);
+            focusMessage(msgAccountId, msg);
         });
         // Q64: double-click → pop out the message in a floating overlay so
         // the user can read it without losing the selected list context.
@@ -718,8 +725,7 @@ function appendMessages(body, accountId, items) {
                 clearSelection();
                 row.classList.add("selected");
                 lastClickedRow = row;
-                state.select(msg);
-                onMessageSelect(msgAccountId, msg.uid, msg.folderId);
+                focusMessage(msgAccountId, msg);
             }
             const isSeen = msg.flags.includes("\\Seen");
             const isFlagged = msg.flags.includes("\\Flagged");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.393",
+  "version": "1.0.394",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/packages/mailx-store-web/android-bootstrap.js

@@ -365,9 +365,13 @@ class AndroidSyncManager {
         }
     }
     async fetchMessageBody(accountId, folderId, uid) {
+        const t0 = Date.now();
         if (await this.bodyStore.hasMessage(accountId, folderId, uid)) {
-            return this.bodyStore.getMessage(accountId, folderId, uid);
+            const cached = await this.bodyStore.getMessage(accountId, folderId, uid);
+            console.log(`[fetchBody] cache hit ${accountId}/${folderId}/${uid} (${Date.now() - t0}ms)`);
+            return cached;
         }
+        console.log(`[fetchBody] cache miss ${accountId}/${folderId}/${uid} — fetching`);
         const provider = this.getProvider(accountId);
         if (!provider) {
             console.warn(`[fetchBody] No provider for ${accountId}`);
@@ -376,27 +380,41 @@ class AndroidSyncManager {
         // Look up the Gmail providerId stored in body_path during sync
         const envelope = this.db.getMessageByUid(accountId, uid, folderId);
         const bp = envelope?.bodyPath || "";
-        let msg = null;
-        if (bp.startsWith("gmail:") && provider.fetchById) {
-            const providerId = bp.substring(6);
-            msg = await provider.fetchById(providerId, { source: true });
-        }
-        else {
-            // Fallback: list-and-find by UID (slow, fragile)
+        // 60 s wall-clock cap — infinite hang was the user-reported symptom
+        // ("fetch message body on android is infinite"). A dead BridgeTransport
+        // socket won't recover by waiting. Legit fetches finish in seconds.
+        const FETCH_TIMEOUT_MS = 60_000;
+        const fetchPromise = (async () => {
+            if (bp.startsWith("gmail:") && provider.fetchById) {
+                const providerId = bp.substring(6);
+                return provider.fetchById(providerId, { source: true });
+            }
             const folders = this.db.getFolders(accountId);
             const folder = folders.find(f => f.id === folderId);
             if (!folder)
                 return null;
-            msg = await provider.fetchOne(folder.path, uid, { source: true });
+            return provider.fetchOne(folder.path, uid, { source: true });
+        })();
+        let msg = null;
+        try {
+            msg = await Promise.race([
+                fetchPromise,
+                new Promise((_, reject) => setTimeout(() => reject(new Error(`body-fetch timeout ${FETCH_TIMEOUT_MS / 1000}s (${accountId}/${folderId}/${uid})`)), FETCH_TIMEOUT_MS)),
+            ]);
+        }
+        catch (e) {
+            console.error(`[fetchBody] failed ${accountId}/${folderId}/${uid} after ${Date.now() - t0}ms: ${e?.message || e}`);
+            throw e;
         }
         if (!msg?.source) {
-            console.warn(`[fetchBody] No source returned for ${accountId}/${folderId}/${uid} (bp=${bp})`);
+            console.warn(`[fetchBody] No source returned for ${accountId}/${folderId}/${uid} (bp=${bp}, ${Date.now() - t0}ms)`);
             return null;
         }
         // Encode the UTF-8 string back to bytes for storage
         const raw = new TextEncoder().encode(msg.source);
         await this.bodyStore.putMessage(accountId, folderId, uid, raw);
         this.db.updateBodyPath(accountId, uid, `idb:${accountId}/${folderId}/${uid}`);
+        console.log(`[fetchBody] fetched + cached ${accountId}/${folderId}/${uid} (${raw.byteLength} bytes, ${Date.now() - t0}ms)`);
         return raw;
     }
     async updateFlagsLocal(accountId, uid, folderId, flags) {

package/packages/mailx-store-web/sync-manager.js

@@ -241,33 +241,62 @@ export class SyncManager {
         }
     }
     async fetchMessageBody(accountId, folderId, uid) {
+        const t0 = Date.now();
+        // Cache first — IndexedDB lookup is O(1) and should always win on a
+        // previously-fetched body. If this path misses on something the user
+        // clearly fetched before, the cache is broken (wrong key shape, wiped
+        // IndexedDB, account-id change) and needs investigation — log so it's
+        // visible.
         if (await this.bodyStore.hasMessage(accountId, folderId, uid)) {
-            return this.bodyStore.getMessage(accountId, folderId, uid);
+            const cached = await this.bodyStore.getMessage(accountId, folderId, uid);
+            console.log(`[fetchBody] cache hit ${accountId}/${folderId}/${uid} (${Date.now() - t0}ms)`);
+            return cached;
         }
+        console.log(`[fetchBody] cache miss ${accountId}/${folderId}/${uid} — fetching from provider`);
         const provider = this.getProvider(accountId);
-        if (!provider)
+        if (!provider) {
+            console.warn(`[fetchBody] no provider for ${accountId}`);
             return null;
+        }
         const envelope = this.db.getMessageByUid(accountId, uid, folderId);
         const bp = envelope?.bodyPath || "";
-        let msg = null;
-        if (bp.startsWith("gmail:") && provider.fetchById) {
-            const providerId = bp.substring(6);
-            msg = await provider.fetchById(providerId, { source: true });
-        }
-        else {
+        // Wall-clock timeout — without this, an IMAP provider that dangles
+        // (Dovecot silently dropped the socket, BridgeTransport stalled) hung
+        // the viewer forever. 60 s is generous for a single-message BODY[]
+        // fetch on a phone connection; legit large bodies finish in seconds,
+        // and anything longer means the socket is dead and retrying on a fresh
+        // one is faster than waiting.
+        const FETCH_TIMEOUT_MS = 60_000;
+        const fetchPromise = (async () => {
+            if (bp.startsWith("gmail:") && provider.fetchById) {
+                const providerId = bp.substring(6);
+                return provider.fetchById(providerId, { source: true });
+            }
             const folders = this.db.getFolders(accountId);
             const folder = folders.find((f) => f.id === folderId);
             if (!folder)
                 return null;
-            msg = await provider.fetchOne(folder.path, uid, { source: true });
+            return provider.fetchOne(folder.path, uid, { source: true });
+        })();
+        let msg = null;
+        try {
+            msg = await Promise.race([
+                fetchPromise,
+                new Promise((_, reject) => setTimeout(() => reject(new Error(`body-fetch timeout ${FETCH_TIMEOUT_MS / 1000}s (${accountId}/${folderId}/${uid})`)), FETCH_TIMEOUT_MS)),
+            ]);
+        }
+        catch (e) {
+            console.error(`[fetchBody] failed ${accountId}/${folderId}/${uid} after ${Date.now() - t0}ms: ${e?.message || e}`);
+            throw e;
         }
         if (!msg?.source) {
-            console.warn(`[fetchBody] No source returned for ${accountId}/${folderId}/${uid} (bp=${bp})`);
+            console.warn(`[fetchBody] No source returned for ${accountId}/${folderId}/${uid} (bp=${bp}, ${Date.now() - t0}ms)`);
             return null;
         }
         const raw = new TextEncoder().encode(msg.source);
         await this.bodyStore.putMessage(accountId, folderId, uid, raw);
         this.db.updateBodyPath(accountId, uid, `idb:${accountId}/${folderId}/${uid}`);
+        console.log(`[fetchBody] fetched + cached ${accountId}/${folderId}/${uid} (${raw.byteLength} bytes, ${Date.now() - t0}ms)`);
         return raw;
     }
     async updateFlagsLocal(accountId, uid, folderId, flags) {

package/rebuild.cmd

@@ -0,0 +1,23 @@
+@echo off
+REM ─────────────────────────────────────────────────────────────────────────
+REM  rebuild.cmd — one-shot release: npmglobalize + APK.
+REM  Runs the desktop release workflow (npmglobalize commits, tags, bumps,
+REM  publishes the npm package) and, only if that succeeds, rebuilds the
+REM  Android MAUI APK + copies it into download/apks/ + updates versions.json.
+REM  Anything non-zero from npmglobalize aborts before the APK stage — no
+REM  point building an APK against a failed publish.
+REM ─────────────────────────────────────────────────────────────────────────
+
+cls
+setlocal
+cd /d %~dp0
+
+call npmglobalize
+if errorlevel 1 (
+    echo [rebuild] npmglobalize failed with errorlevel %ERRORLEVEL% — skipping build-apk
+    endlocal
+    exit /b %ERRORLEVEL%
+)
+
+call "%~dp0build-apk.cmd"
+endlocal

package/unbash.cmd

@@ -0,0 +1,55 @@
+@echo off
+REM ─────────────────────────────────────────────────────────────────────────
+REM  unbash.cmd — surgically remove a stuck session-env subdir so Claude
+REM  Code's Bash tool can recreate it. One subdir per concurrent Claude
+REM  session; only nuke the stuck one, not all of them.
+REM
+REM  Usage:
+REM    unbash.cmd                  List existing session-env subdirs.
+REM    unbash.cmd <uuid>           Remove that specific subdir.
+REM    unbash.cmd stale            Remove subdirs with no writes in >60 min
+REM                                (abandoned from crashed sessions).
+REM    unbash.cmd all              Remove every subdir (nuclear — kills
+REM                                state of live concurrent sessions too).
+REM ─────────────────────────────────────────────────────────────────────────
+
+setlocal ENABLEEXTENSIONS
+set BASE=%USERPROFILE%\.claude\session-env
+
+if not exist "%BASE%" (
+    echo [unbash] No session-env directory at %BASE% — nothing to do.
+    endlocal
+    exit /b 0
+)
+
+if "%~1"=="" (
+    echo [unbash] Subdirs under %BASE%:
+    dir /b /ad "%BASE%" 2>nul
+    echo.
+    echo [unbash] Pass a UUID to remove just one, 'stale' to remove old ones,
+    echo          or 'all' to nuke everything ^(kills live sessions too^).
+    endlocal
+    exit /b 0
+)
+
+if /I "%~1"=="all" (
+    rmdir /s /q "%BASE%"
+    echo [unbash] Removed all session-env subdirs.
+    endlocal
+    exit /b 0
+)
+
+if /I "%~1"=="stale" (
+    powershell -NoProfile -Command "Get-ChildItem -Directory '%BASE%' | Where-Object { $_.LastWriteTime -lt (Get-Date).AddMinutes(-60) } | ForEach-Object { Write-Host ('[unbash] removing stale ' + $_.Name); Remove-Item -Recurse -Force $_.FullName }"
+    endlocal
+    exit /b 0
+)
+
+if not exist "%BASE%\%~1" (
+    echo [unbash] No subdir %~1 under %BASE%.
+    endlocal
+    exit /b 1
+)
+rmdir /s /q "%BASE%\%~1"
+echo [unbash] Removed %BASE%\%~1
+endlocal