@bobfrankston/mailx 1.0.145 → 1.0.147

package/bin/mailx.js

@@ -529,21 +529,34 @@ async function main() {
     const imapManager = new ImapManager(db);
     imapManager.useNativeClient = true;
     const svc = new MailxService(db, imapManager);
-    // Read mailxapi.js for injection into WebView
-    const mailxapiPath = path.join(import.meta.dirname, "..", "client", "lib", "mailxapi.js");
-    const mailxapiScript = fs.readFileSync(mailxapiPath, "utf-8");
-    // Open msger in service mode — file:// URL, no HTTP
+    // Open msger in service mode — custom protocol serves files from client dir
     const clientDir = path.join(import.meta.dirname, "..", "client");
-    const indexPath = path.join(clientDir, "index.html");
+    const mailxapiPath = path.join(clientDir, "lib", "mailxapi.js");
+    const mailxapiScript = fs.readFileSync(mailxapiPath, "utf-8");
     const handle = showService({
-        url: indexPath,
+        url: "index.html",
+        contentDir: clientDir,
         initScript: mailxapiScript,
         size: { width: 1400, height: 900 },
+        escapeCloses: false,
     });
     // Handle requests from WebView → dispatch to MailxService
+    // Pass server version to dispatch so getVersion returns it
+    const rootPkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "..", "package.json"), "utf-8"));
     handle.onRequest(async (req) => {
-        const response = await dispatch(svc, req);
-        handle.send(response);
+        if (verbose)
+            console.error(`[ipc] ← ${req._action} (${req._cbid})`);
+        req._version = rootPkg.version;
+        try {
+            const response = await dispatch(svc, req);
+            if (verbose)
+                console.error(`[ipc] → ${req._action} (${req._cbid}) ok`);
+            handle.send(response);
+        }
+        catch (e) {
+            console.error(`[ipc] → ${req._action} (${req._cbid}) error: ${e.message}`);
+            handle.send({ _cbid: req._cbid, error: e.message });
+        }
     });
     // Wire IMAP events → push to WebView
     imapManager.on("syncProgress", (accountId, phase, progress) => {
@@ -558,6 +571,8 @@ async function main() {
     imapManager.on("accountError", (accountId, error, hint, isOAuth) => {
         handle.send({ _event: "accountError", type: "accountError", accountId, error, hint, isOAuth });
     });
+    // Wait for WebView2 initialization before starting IMAP (stdin writes during init crash wry)
+    await new Promise(r => setTimeout(r, 2000));
     // Add accounts and start sync
     for (const account of settings.accounts) {
         if (!account.enabled)

package/client/app.js

@@ -900,7 +900,8 @@ optAutocomplete?.addEventListener("change", () => {
     }).catch(() => { });
 });
 const isApp = typeof mailxapi !== "undefined" && mailxapi?.isApp;
-fetch("/api/version").then(r => r.json()).then(d => {
+const versionPromise = isApp ? mailxapi.getVersion() : fetch("/api/version").then(r => r.json());
+versionPromise.then((d) => {
     const el = document.getElementById("app-version");
     const storage = d.storage || {};
     const storageLabel = storage.provider && storage.provider !== "local"
@@ -947,56 +948,54 @@ fetch("/api/version").then(r => r.json()).then(d => {
     else if (storage.cloudError) {
         showAlert(`Cloud storage error: ${storage.cloudError}`, "cloud-error");
     }
-}).catch(async () => {
-    // Server not running — try to start it if we're in the app
-    const startupStatus = document.getElementById("startup-status");
-    if (isApp) {
-        if (startupStatus)
-            startupStatus.textContent = "Starting server...";
-        await mailxapi.ensureServer();
-        location.reload();
-    }
-    else {
+}).catch(() => {
+    // Version fetch failed — in IPC mode this means service isn't responding yet
+    if (!isApp) {
         const el = document.getElementById("app-version");
         if (el)
             el.textContent = "mailx [server offline]";
+        const startupStatus = document.getElementById("startup-status");
         if (startupStatus)
             startupStatus.textContent = "Server offline — start with: node packages/mailx-server/index.js";
     }
 });
-// ── Sync pending indicator + server health check ──
+// ── Sync pending indicator + server health check (HTTP mode only) ──
 let serverDown = false;
-setInterval(async () => {
-    try {
-        const res = await fetch("/api/sync/pending");
-        if (!res.ok)
-            return;
-        const data = await res.json();
-        const el = document.getElementById("status-pending");
-        if (el) {
-            el.textContent = data.pending > 0 ? `↻ ${data.pending} pending` : "";
-            el.style.color = data.pending > 0 ? "oklch(0.75 0.15 60)" : "";
-        }
-        // Server is back — reload if it was down
-        if (serverDown) {
-            serverDown = false;
-            const statusEl = document.getElementById("status-sync");
-            if (statusEl)
-                statusEl.textContent = "Server reconnected";
-            location.reload();
+if (isApp) {
+    // IPC mode: events come via push, no polling needed
+}
+else
+    setInterval(async () => {
+        try {
+            const res = await fetch("/api/sync/pending");
+            if (!res.ok)
+                return;
+            const data = await res.json();
+            const el = document.getElementById("status-pending");
+            if (el) {
+                el.textContent = data.pending > 0 ? `↻ ${data.pending} pending` : "";
+                el.style.color = data.pending > 0 ? "oklch(0.75 0.15 60)" : "";
+            }
+            // Server is back — reload if it was down
+            if (serverDown) {
+                serverDown = false;
+                const statusEl = document.getElementById("status-sync");
+                if (statusEl)
+                    statusEl.textContent = "Server reconnected";
+                location.reload();
+            }
         }
-    }
-    catch {
-        if (!serverDown) {
-            serverDown = true;
-            const statusEl = document.getElementById("status-sync");
-            if (statusEl) {
-                statusEl.textContent = "SERVER OFFLINE";
-                statusEl.style.color = "oklch(0.65 0.2 25)";
+        catch {
+            if (!serverDown) {
+                serverDown = true;
+                const statusEl = document.getElementById("status-sync");
+                if (statusEl) {
+                    statusEl.textContent = "SERVER OFFLINE";
+                    statusEl.style.color = "oklch(0.65 0.2 25)";
+                }
             }
         }
-    }
-}, 5000);
+    }, 5000);
 console.log("mailx client initialized, location:", location.href);
 updateNewMessageCount();
 // ── Midnight refresh — update date display when day changes ──
@@ -1011,7 +1010,7 @@ function scheduleMiddnightRefresh() {
 }
 scheduleMiddnightRefresh();
 // ── Apply theme from settings ──
-fetch("/api/version").then(r => r.json()).then(d => {
+(isApp ? mailxapi.getVersion() : fetch("/api/version").then(r => r.json())).then((d) => {
     if (d.theme === "dark")
         document.documentElement.classList.add("theme-dark");
     else if (d.theme === "light")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.145",
+  "version": "1.0.147",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -23,7 +23,7 @@
     "@bobfrankston/iflow": "^1.0.52",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.197",
+    "@bobfrankston/msger": "^0.1.199",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.d.ts

@@ -164,6 +164,7 @@ export declare class ImapManager extends EventEmitter {
     processOutbox(accountId: string): Promise<void>;
     /** Start background Outbox worker — runs immediately then every 10 seconds */
     private outboxBackoff;
+    private outboxBackoffDelay;
     startOutboxWorker(): void;
     /** Stop Outbox worker */
     stopOutboxWorker(): void;

package/packages/mailx-imap/index.js

@@ -1592,7 +1592,8 @@ export class ImapManager extends EventEmitter {
         }
     }
     /** Start background Outbox worker — runs immediately then every 10 seconds */
-    outboxBackoff = new Map(); // accountId → next retry time
+    outboxBackoff = new Map(); // accountId → next retry timestamp
+    outboxBackoffDelay = new Map(); // accountId → current delay ms
     startOutboxWorker() {
         if (this.outboxInterval)
             return;
@@ -1606,12 +1607,15 @@ export class ImapManager extends EventEmitter {
                 try {
                     await this.processLocalQueue(accountId);
                     await this.processOutbox(accountId);
-                    this.outboxBackoff.delete(accountId); // success — clear backoff
+                    // Success — clear backoff
+                    this.outboxBackoff.delete(accountId);
+                    this.outboxBackoffDelay.delete(accountId);
                 }
                 catch (e) {
-                    // Exponential backoff: 30s, 60s, 120s, max 5min
-                    const prev = this.outboxBackoff.get(accountId);
-                    const delay = prev ? Math.min((now - prev + 30000) * 2, 300000) : 30000;
+                    // Exponential backoff: 30s → 60s → 120s → 300s (max 5min)
+                    const prevDelay = this.outboxBackoffDelay.get(accountId) || 0;
+                    const delay = prevDelay ? Math.min(prevDelay * 2, 300000) : 30000;
+                    this.outboxBackoffDelay.set(accountId, delay);
                     this.outboxBackoff.set(accountId, now + delay);
                     console.error(`  [outbox] Error for ${accountId}: ${imapError(e)} (retry in ${Math.round(delay / 1000)}s)`);
                 }

package/packages/mailx-service/jsonrpc.js

@@ -93,8 +93,11 @@ async function dispatchAction(svc, action, p) {
         case "allowRemoteContent":
             svc.allowRemoteContent(p.type, p.value);
             return { ok: true };
-        case "getVersion":
-            return svc.getStorageInfo();
+        case "getVersion": {
+            const settings = svc.getSettings();
+            const storage = svc.getStorageInfo();
+            return { version: p._version || "dev", theme: settings.ui?.theme || "system", storage };
+        }
         // Autocomplete
         case "autocomplete":
             return svc.autocomplete(p);

package/rebuild.cmd

@@ -1,6 +1,6 @@
   setlocal
 : set MAILX_NATIVE_IMAP=1
   call npmglobalize
-  call killmail.cmd
-  launch.ps1
+:  call killmail.cmd
+:  launch.ps1
   endlocal