@bobfrankston/mailx 1.0.187 → 1.0.189

package/client/app.js

@@ -5,7 +5,7 @@
 import { initFolderTree, refreshFolderTree, updateFolderCounts } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, getSelectedMessages } from "./components/message-list.js";
 import { showMessage, getCurrentMessage, initViewer } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, rebuildServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
@@ -259,9 +259,9 @@ document.getElementById("btn-rebuild")?.addEventListener("click", async () => {
     if (statusSync)
         statusSync.textContent = "Rebuilding...";
     try {
-        await rebuildServer();
+        await restartServer();
     }
-    catch { /* server is shutting down */ }
+    catch { /* restarting */ }
 });
 document.getElementById("btn-factory-reset")?.addEventListener("click", async () => {
     if (restartDropdown)
@@ -341,10 +341,39 @@ async function openCompose(mode) {
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // Open compose — always as popup via window.open().
-    // In IPC mode, msger's new_window_req_handler allows msger.localhost popups.
-    // DO NOT use window.location.href — msger exits on navigation.
-    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+    // Inline compose: load compose.html in an overlay iframe (same origin, same IPC)
+    // Popup windows don't work in IPC mode (custom protocol doesn't propagate to child windows)
+    showComposeOverlay();
+}
+function showComposeOverlay() {
+    // Remove existing overlay if any
+    document.getElementById("compose-overlay")?.remove();
+    const overlay = document.createElement("div");
+    overlay.id = "compose-overlay";
+    overlay.style.cssText = "position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;background:rgba(0,0,0,0.3);display:flex;align-items:center;justify-content:center;";
+    const frame = document.createElement("iframe");
+    frame.src = "compose/compose.html";
+    frame.style.cssText = "width:min(900px,90vw);height:min(700px,85vh);border:none;border-radius:8px;box-shadow:0 8px 32px rgba(0,0,0,0.4);background:#fff;";
+    // Close overlay when compose calls window.close()
+    frame.addEventListener("load", () => {
+        try {
+            const win = frame.contentWindow;
+            if (win) {
+                // Override window.close() in the iframe to remove the overlay instead
+                win.close = () => overlay.remove();
+            }
+        }
+        catch { /* cross-origin safety */ }
+    });
+    // Click backdrop to close (with confirmation)
+    overlay.addEventListener("click", (e) => {
+        if (e.target === overlay) {
+            if (confirm("Discard this message?"))
+                overlay.remove();
+        }
+    });
+    overlay.appendChild(frame);
+    document.body.appendChild(overlay);
 }
 function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();
@@ -432,7 +461,13 @@ document.getElementById("btn-reply-all")?.addEventListener("click", () => openCo
 document.getElementById("btn-forward")?.addEventListener("click", () => openCompose("forward"));
 // Context menu events from message-list right-click
 document.addEventListener("mailx-compose", ((e) => {
-    openCompose(e.detail.mode);
+    if (e.detail.mode === "draft" && sessionStorage.getItem("composeInit")) {
+        // Draft already stored by viewer — just show overlay
+        showComposeOverlay();
+    }
+    else {
+        openCompose(e.detail.mode);
+    }
 }));
 document.addEventListener("mailx-delete", () => deleteSelectedMessages());
 // ── Search ──
@@ -783,7 +818,7 @@ document.addEventListener("keydown", (e) => {
         document.getElementById("btn-sync")?.click();
     }
     // R = Toggle read/unread
-    if (e.key === "r" && !e.ctrlKey && !e.metaKey && !e.altKey) {
+    if (e.key.toLowerCase() === "r" && !e.ctrlKey && !e.metaKey && !e.altKey) {
         const active = document.activeElement;
         if (active && (active.tagName === "INPUT" || active.tagName === "TEXTAREA" || active.tagName === "SELECT"))
             return;

package/client/components/folder-tree.js

@@ -378,12 +378,16 @@ async function loadFolderTree(container) {
                 mvHeader.style.display = "none";
             const mainBody = document.getElementById("mv-body");
             if (mainBody) {
+                const isAndroid = window.mailxapi?.platform === "android";
+                const formDisplay = isAndroid ? "display:none;" : "";
+                const introText = isAndroid ? "" : "Add your email account to get started.";
+                const checkingHtml = isAndroid ? '<div style="padding:0.5rem;color:var(--color-text-muted)">Checking for accounts...</div>' : "";
                 mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:500px">
                     <h2 style="margin-bottom:1rem">Welcome to mailx</h2>
-                    <div id="setup-device-accounts"></div>
+                    <div id="setup-device-accounts">${checkingHtml}</div>
                     <div id="setup-cloud-status"></div>
-                    <p id="setup-form-intro">Add your email account to get started.</p>
-                    <form id="setup-form" style="margin-top:1rem">
+                    <p id="setup-form-intro">${introText}</p>
+                    <form id="setup-form" style="margin-top:1rem;${formDisplay}">
                         <label style="display:block;margin-bottom:0.5rem">
                             Your name
                             <input id="setup-name" type="text" placeholder="Your Name" style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
@@ -486,31 +490,56 @@ async function loadFolderTree(container) {
                         </div>`;
                     }
                 }).catch(() => { });
-                // On Android, check for device Google accounts and show picker
+                // On Android, check for device Google accounts
                 getDeviceAccounts().then(async (deviceAccounts) => {
                     const pickerEl = document.getElementById("setup-device-accounts");
-                    if (!pickerEl || deviceAccounts.length === 0)
+                    if (!pickerEl)
                         return;
+                    if (deviceAccounts.length === 0) {
+                        // No device accounts — show the form
+                        pickerEl.innerHTML = "";
+                        const f = document.getElementById("setup-form");
+                        const i = document.getElementById("setup-form-intro");
+                        if (f)
+                            f.style.display = "block";
+                        if (i)
+                            i.textContent = "Add your email account to get started.";
+                        return;
+                    }
                     const formEl = document.getElementById("setup-form");
                     const introEl = document.getElementById("setup-form-intro");
+                    // Auto-setup helper
+                    async function autoSetup(email, name) {
+                        if (introEl)
+                            introEl.textContent = "";
+                        if (formEl)
+                            formEl.style.display = "none";
+                        pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-text-muted)">Setting up ${email}...</div>`;
+                        const result = await setupAccount(name, email, "");
+                        if (result?.ok) {
+                            pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-accent)">${result.message || "Account added!"}</div>`;
+                            setTimeout(() => location.reload(), 2000);
+                        }
+                        else {
+                            pickerEl.innerHTML = `<div style="padding:0.5rem;color:#f55">${result?.error || "Setup failed"}</div>`;
+                            if (formEl)
+                                formEl.style.display = "block";
+                        }
+                    }
+                    // One account — auto-select it
+                    if (deviceAccounts.length === 1) {
+                        await autoSetup(deviceAccounts[0].email, deviceAccounts[0].name);
+                        return;
+                    }
+                    // Multiple accounts — show picker
                     if (introEl)
                         introEl.textContent = "Select an account:";
                     if (formEl)
                         formEl.style.display = "none";
-                    pickerEl.innerHTML = deviceAccounts.map((a) => `<button class="device-account-btn" data-email="${a.email}" data-name="${a.name}" style="display:block;width:100%;padding:0.75rem 1rem;margin-bottom:0.5rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:6px;cursor:pointer;font-size:1rem;text-align:left">${a.email}</button>`).join("") + `<button id="setup-show-form" style="margin-top:0.5rem;padding:0.5rem 1rem;background:none;color:var(--color-text-muted);border:none;cursor:pointer;font-size:0.9rem">Use a different account...</button>`;
+                    pickerEl.innerHTML = deviceAccounts.map((a) => `<button class="device-account-btn" data-email="${a.email}" data-name="${a.name}" style="display:block;width:100%;padding:0.75rem 1rem;margin-bottom:0.5rem;background:var(--color-accent);color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:1rem;text-align:left">Use ${a.email}</button>`).join("") + `<button id="setup-show-form" style="margin-top:0.5rem;padding:0.5rem 1rem;background:none;color:var(--color-text-muted);border:none;cursor:pointer;font-size:0.9rem">Use a different account...</button>`;
                     pickerEl.querySelectorAll(".device-account-btn").forEach((btn) => {
                         btn.addEventListener("click", async () => {
-                            const email = btn.dataset.email || "";
-                            const name = btn.dataset.name || "";
-                            pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-text-muted)">Setting up ${email}...</div>`;
-                            const result = await setupAccount(name, email, "");
-                            if (result?.ok) {
-                                pickerEl.innerHTML = `<div style="padding:0.5rem;color:var(--color-accent)">${result.message || "Account added!"}</div>`;
-                                setTimeout(() => location.reload(), 2000);
-                            }
-                            else {
-                                pickerEl.innerHTML = `<div style="padding:0.5rem;color:#f55">${result?.error || "Setup failed"}</div>`;
-                            }
+                            await autoSetup(btn.dataset.email || "", btn.dataset.name || "");
                         });
                     });
                     document.getElementById("setup-show-form")?.addEventListener("click", () => {
@@ -520,7 +549,18 @@ async function loadFolderTree(container) {
                         if (introEl)
                             introEl.textContent = "Add your email account to get started.";
                     });
-                }).catch(() => { });
+                }).catch(() => {
+                    // Bridge failed — show the form
+                    const p = document.getElementById("setup-device-accounts");
+                    if (p)
+                        p.innerHTML = "";
+                    const f = document.getElementById("setup-form");
+                    const i = document.getElementById("setup-form-intro");
+                    if (f)
+                        f.style.display = "block";
+                    if (i)
+                        i.textContent = "Add your email account to get started.";
+                });
             }
             // Dismiss startup overlay
             const overlay = document.getElementById("startup-overlay");

package/client/components/message-viewer.js

@@ -144,7 +144,8 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                         draftFolderId: msg.folderId,
                     };
                     sessionStorage.setItem("composeInit", JSON.stringify(init));
-                    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+                    // Trigger compose overlay via custom event (app.ts handles it)
+                    document.dispatchEvent(new CustomEvent("mailx-compose", { detail: { mode: "draft" } }));
                 };
             }
             else {

package/client/lib/api-client.js

@@ -1,24 +1,24 @@
 /**
- * API client — auto-detects IPC (WebView) vs HTTP (browser).
- * When mailxapi is available (injected by launcher), calls go directly via IPC.
- * Otherwise falls back to REST/WebSocket.
- *
- * All server operations MUST go through these centralized methods.
- * Never use fetch("/api/...") directly in components.
+ * API client — all operations go through the IPC bridge (mailxapi).
+ * mailxapi is injected by the launcher (msger on desktop, MAUI on Android).
  */
-// Lazy IPC detection — checked on each call, not at module load time.
-// Handles: desktop (initScript before page load), Android (bootstrap before app import),
-// and popup windows (opener's bridge).
 function getIpc() {
     if (typeof mailxapi !== "undefined" && mailxapi?.isApp)
         return mailxapi;
     if (window.opener?.mailxapi?.isApp)
         return window.opener.mailxapi;
+    // Compose iframe — check parent
+    if (window.parent?.mailxapi?.isApp)
+        return window.parent.mailxapi;
     return null;
 }
-function hasIPC() { return getIpc() !== null; }
-// ── HTTP fallback ──
-// Abort controller for message-list requests — cancel stale fetches when folder changes
+function ipc() {
+    const bridge = getIpc();
+    if (!bridge)
+        throw new Error("IPC bridge not available");
+    return bridge;
+}
+// ── Abort controller for message-list requests ──
 let messageListAbort = null;
 export function abortMessageListRequests() {
     if (messageListAbort) {
@@ -26,309 +26,134 @@ export function abortMessageListRequests() {
         messageListAbort = null;
     }
 }
-function newMessageListSignal() {
-    abortMessageListRequests();
-    messageListAbort = new AbortController();
-    return messageListAbort.signal;
-}
-async function api(path, options) {
-    let res;
-    try {
-        res = await fetch(`/api${path}`, {
-            headers: { "Content-Type": "application/json" },
-            ...options
-        });
-    }
-    catch (e) {
-        // Network error — server is down
-        if (e.name === "AbortError")
-            throw e;
-        throw new Error("Server offline — run: mailx -server");
-    }
-    if (!res.ok) {
-        const err = await res.json().catch(() => ({ error: res.statusText }));
-        throw new Error(err.error || res.statusText);
-    }
-    return res.json();
-}
-// ── API Methods (IPC or HTTP) ──
+// ── API Methods ──
 export function getAccounts() {
-    if (hasIPC())
-        return getIpc().getAccounts();
-    return api("/accounts");
+    return ipc().getAccounts();
 }
 export function getFolders(accountId) {
-    if (hasIPC())
-        return getIpc().getFolders(accountId);
-    return api(`/folders/${accountId}`);
+    return ipc().getFolders(accountId);
 }
 export function getMessages(accountId, folderId, page = 1, pageSize = 50) {
-    if (hasIPC())
-        return getIpc().getMessages(accountId, folderId, page, pageSize);
-    const signal = newMessageListSignal();
-    return api(`/messages/${accountId}/${folderId}?page=${page}&pageSize=${pageSize}`, { signal });
+    abortMessageListRequests();
+    return ipc().getMessages(accountId, folderId, page, pageSize);
 }
 export function getUnifiedInbox(page = 1, pageSize = 50) {
-    if (hasIPC())
-        return getIpc().getUnifiedInbox(page, pageSize);
-    const signal = newMessageListSignal();
-    return api(`/messages/unified/inbox?page=${page}&pageSize=${pageSize}`, { signal });
+    abortMessageListRequests();
+    return ipc().getUnifiedInbox(page, pageSize);
 }
 export function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0) {
-    if (hasIPC())
-        return getIpc().searchMessages(query, page, pageSize);
-    const params = new URLSearchParams({ q: query, page: String(page), pageSize: String(pageSize), scope });
-    if (scope === "current" && accountId) {
-        params.set("accountId", accountId);
-        params.set("folderId", String(folderId));
-    }
-    if (scope === "server" && accountId) {
-        params.set("accountId", accountId);
-        params.set("folderId", String(folderId));
-    }
-    return api(`/search?${params}`);
+    return ipc().searchMessages(query, page, pageSize);
 }
 export function getMessage(accountId, uid, allowRemote = false, folderId) {
-    if (hasIPC())
-        return getIpc().getMessage(accountId, uid, allowRemote, folderId);
-    const params = new URLSearchParams();
-    if (allowRemote)
-        params.set("allowRemote", "true");
-    if (folderId != null)
-        params.set("folderId", String(folderId));
-    const q = params.toString() ? `?${params}` : "";
-    return api(`/message/${accountId}/${uid}${q}`);
+    return ipc().getMessage(accountId, uid, allowRemote, folderId);
 }
 export function updateFlags(accountId, uid, flags) {
-    if (hasIPC())
-        return getIpc().updateFlags(accountId, uid, flags);
-    return api(`/message/${accountId}/${uid}/flags`, {
-        method: "PATCH",
-        body: JSON.stringify({ flags })
-    });
+    return ipc().updateFlags(accountId, uid, flags);
 }
 export function triggerSync() {
-    if (hasIPC())
-        return getIpc().syncAll();
-    return api("/sync", { method: "POST" });
+    return ipc().syncAll();
 }
 export function syncAccount(accountId) {
-    if (hasIPC())
-        return getIpc().syncAccount(accountId);
-    return api(`/sync/${accountId}`, { method: "POST" });
+    return ipc().syncAccount(accountId);
 }
 export function reauthenticate(accountId) {
-    if (hasIPC())
-        return getIpc().reauthenticate(accountId);
-    return api(`/reauth/${accountId}`, { method: "POST" });
+    return ipc().reauthenticate(accountId);
 }
 export function getSyncPending() {
-    if (hasIPC())
-        return getIpc().getSyncPending();
-    return api("/sync/pending");
+    return ipc().getSyncPending();
 }
 export function searchContacts(query) {
-    if (hasIPC())
-        return getIpc().searchContacts(query);
-    return api(`/contacts?q=${encodeURIComponent(query)}`);
+    return ipc().searchContacts(query);
 }
 export function allowRemoteContent(type, value) {
-    if (hasIPC())
-        return getIpc().allowRemoteContent(type, value);
-    return api("/settings/allow-remote", {
-        method: "POST",
-        body: JSON.stringify({ type, value })
-    });
+    return ipc().allowRemoteContent(type, value);
 }
 export function deleteMessage(accountId, uid) {
-    if (hasIPC())
-        return getIpc().deleteMessage?.(accountId, uid);
-    return api(`/message/${accountId}/${uid}`, { method: "DELETE" });
+    return ipc().deleteMessage?.(accountId, uid);
 }
 export function deleteMessages(accountId, uids) {
     if (uids.length === 1)
         return deleteMessage(accountId, uids[0]);
-    if (hasIPC())
-        return getIpc().deleteMessages?.(accountId, uids);
-    return api("/messages/delete", {
-        method: "POST", body: JSON.stringify({ accountId, uids })
-    });
+    return ipc().deleteMessages?.(accountId, uids);
 }
 export function moveMessages(accountId, uids, targetFolderId, targetAccountId) {
     if (uids.length === 1)
         return moveMessage(accountId, uids[0], targetFolderId, targetAccountId);
-    if (hasIPC())
-        return getIpc().moveMessages?.(accountId, uids, targetFolderId, targetAccountId);
-    const body = { accountId, uids, targetFolderId };
-    if (targetAccountId)
-        body.targetAccountId = targetAccountId;
-    return api("/messages/move", {
-        method: "POST", body: JSON.stringify(body)
-    });
+    return ipc().moveMessages?.(accountId, uids, targetFolderId, targetAccountId);
 }
 export function undeleteMessage(accountId, uid, folderId) {
-    if (hasIPC())
-        return getIpc().undeleteMessage?.(accountId, uid, folderId);
-    return api(`/message/${accountId}/${uid}/undelete`, {
-        method: "POST",
-        body: JSON.stringify({ folderId })
-    });
+    return ipc().undeleteMessage?.(accountId, uid, folderId);
 }
 export function moveMessage(accountId, uid, targetFolderId, targetAccountId) {
-    if (hasIPC())
-        return getIpc().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)
-    });
+    return ipc().moveMessage?.(accountId, uid, targetFolderId, targetAccountId);
 }
 export function restartServer() {
-    if (hasIPC())
-        return getIpc().restart?.();
-    return api("/restart", { method: "POST" }).catch(() => { });
-}
-export function rebuildServer() {
-    return api("/rebuild", { method: "POST" }).catch(() => { });
+    return ipc().restart?.();
 }
 export function markFolderRead(accountId, folderId) {
-    if (hasIPC())
-        return getIpc().markFolderRead?.(accountId, folderId);
-    return api(`/folder/${accountId}/${folderId}/mark-read`, { method: "POST" });
+    return ipc().markFolderRead?.(accountId, folderId);
 }
 export function createFolder(accountId, parentPath, name) {
-    if (hasIPC())
-        return getIpc().createFolder?.(accountId, parentPath, name);
-    return api(`/folder/${accountId}`, {
-        method: "POST",
-        body: JSON.stringify({ parentPath, name })
-    });
+    return ipc().createFolder?.(accountId, parentPath, name);
 }
 export function renameFolder(accountId, folderId, newName) {
-    if (hasIPC())
-        return getIpc().renameFolder?.(accountId, folderId, newName);
-    return api(`/folder/${accountId}/${folderId}/rename`, {
-        method: "POST",
-        body: JSON.stringify({ newName })
-    });
+    return ipc().renameFolder?.(accountId, folderId, newName);
 }
 export function deleteFolder(accountId, folderId) {
-    if (hasIPC())
-        return getIpc().deleteFolder?.(accountId, folderId);
-    return api(`/folder/${accountId}/${folderId}`, { method: "DELETE" });
+    return ipc().deleteFolder?.(accountId, folderId);
 }
 export function emptyFolder(accountId, folderId) {
-    if (hasIPC())
-        return getIpc().emptyFolder?.(accountId, folderId);
-    return api(`/folder/${accountId}/${folderId}/empty`, { method: "POST" });
+    return ipc().emptyFolder?.(accountId, folderId);
 }
 export function sendMessage(body) {
-    if (hasIPC())
-        return getIpc().sendMessage?.(body);
-    return api("/send", { method: "POST", body: JSON.stringify(body) });
+    return ipc().sendMessage?.(body);
 }
 export function saveDraft(body) {
-    if (hasIPC())
-        return getIpc().saveDraft?.(body);
-    return api("/draft", { method: "POST", body: JSON.stringify(body) });
+    return ipc().saveDraft?.(body);
 }
 const eventHandlers = [];
 export function onEvent(handler) {
     eventHandlers.push(handler);
 }
 export function connectEvents() {
-    if (hasIPC()) {
-        // IPC events come via mailxapi.onEvent
-        getIpc().onEvent((event) => {
-            for (const h of eventHandlers)
-                h(event);
-        });
-    }
-    else {
-        // WebSocket for HTTP mode
-        const protocol = location.protocol === "https:" ? "wss:" : "ws:";
-        const ws = new WebSocket(`${protocol}//${location.host}`);
-        ws.onmessage = (ev) => {
-            try {
-                const event = JSON.parse(ev.data);
-                for (const h of eventHandlers)
-                    h(event);
-            }
-            catch { /* ignore */ }
-        };
-        ws.onclose = () => {
-            setTimeout(connectEvents, 3000);
-        };
-    }
+    ipc().onEvent((event) => {
+        for (const h of eventHandlers)
+            h(event);
+    });
 }
 // ── Autocomplete ──
 export function autocomplete(body, signal) {
-    if (hasIPC())
-        return getIpc().autocomplete?.(body);
-    return api("/autocomplete", { method: "POST", body: JSON.stringify(body), signal });
+    return ipc().autocomplete?.(body);
 }
 export function getAutocompleteSettings() {
-    if (hasIPC())
-        return getIpc().getAutocompleteSettings?.();
-    return api("/autocomplete/settings");
+    return ipc().getAutocompleteSettings?.();
 }
 export function saveAutocompleteSettings(settings) {
-    if (hasIPC())
-        return getIpc().saveAutocompleteSettings?.(settings);
-    return api("/autocomplete/settings", { method: "POST", body: JSON.stringify(settings) });
+    return ipc().saveAutocompleteSettings?.(settings);
 }
 export function getVersion() {
-    if (hasIPC())
-        return getIpc().getVersion();
-    return api("/version");
+    return ipc().getVersion();
 }
 export function getSettings() {
-    if (hasIPC())
-        return getIpc().getSettings();
-    return api("/settings");
+    return ipc().getSettings();
 }
 export function saveSettings(settings) {
-    if (hasIPC())
-        return getIpc().saveSettingsData?.(settings);
-    return api("/settings", { method: "PUT", body: JSON.stringify(settings) });
-}
-export async function getAttachment(accountId, uid, attachmentId, folderId) {
-    if (hasIPC())
-        return getIpc().getAttachment(accountId, uid, attachmentId, folderId);
-    // HTTP mode: fetch as blob
-    const params = folderId != null ? `?folderId=${folderId}` : "";
-    const res = await fetch(`/api/message/${accountId}/${uid}/attachment/${attachmentId}${params}`);
-    if (!res.ok)
-        throw new Error("Attachment not found");
-    const blob = await res.blob();
-    const buf = await blob.arrayBuffer();
-    return {
-        content: btoa(String.fromCharCode(...new Uint8Array(buf))),
-        contentType: res.headers.get("content-type") || "application/octet-stream",
-        filename: `attachment-${attachmentId}`,
-    };
+    return ipc().saveSettingsData?.(settings);
 }
 export function repairAccounts() {
-    if (hasIPC())
-        return getIpc().repairAccounts?.();
-    return api("/repair-accounts", { method: "POST" });
+    return ipc().repairAccounts?.();
 }
 export function deleteDraft(accountId, draftUid) {
-    if (hasIPC())
-        return getIpc().deleteDraft?.(accountId, draftUid);
-    return api("/draft", { method: "DELETE", body: JSON.stringify({ accountId, draftUid }) });
+    return ipc().deleteDraft?.(accountId, draftUid);
 }
 export function setupAccount(name, email, password) {
-    if (hasIPC())
-        return getIpc().setupAccount?.(name, email, password);
-    return api("/setup", { method: "POST", body: JSON.stringify({ name, email, password }) });
+    return ipc().setupAccount?.(name, email, password);
+}
+export async function getAttachment(accountId, uid, attachmentId, folderId) {
+    return ipc().getAttachment(accountId, uid, attachmentId, folderId);
 }
 export async function getDeviceAccounts() {
-    if (hasIPC())
-        return getIpc().getDeviceAccounts?.() ?? [];
-    return [];
+    return ipc().getDeviceAccounts?.() ?? [];
 }
 // Legacy exports for backward compatibility
 export const connectWebSocket = connectEvents;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.187",
+  "version": "1.0.189",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.21",
-    "@bobfrankston/msger": "^0.1.237",
+    "@bobfrankston/msger": "^0.1.239",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -238,12 +238,14 @@ class AndroidSyncManager {
     async syncAllContacts() { }
 }
 // ── OAuth credentials (same "installed" client as desktop) ──
+// Same credentials as desktop mailx (iflow-credentials.json from @bobfrankston/iflow-direct)
 const OAUTH_CLIENT = {
-    clientId: "1067464114116-ndd19nqat8lucb0mbb0mvl7i3tbhnc43.apps.googleusercontent.com",
-    clientSecret: "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",
+    clientId: "884213380682-hcso64dcqmk4p98vsc7br2e6gvn7iv2u.apps.googleusercontent.com",
+    clientSecret: "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",
     authUri: "https://accounts.google.com/o/oauth2/auth",
     tokenUri: "https://oauth2.googleapis.com/token",
-    redirectUri: "http://localhost",
+    // Reverse client ID scheme — auto-allowed for Google "installed" apps
+    redirectUri: "com.googleusercontent.apps.884213380682-hcso64dcqmk4p98vsc7br2e6gvn7iv2u:/oauth2callback",
 };
 const OAUTH_SCOPES = "https://mail.google.com/ https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/drive.file";
 // ── Token cache (IndexedDB) ──
@@ -362,8 +364,29 @@ function createNativeTokenProvider(email) {
     };
 }
 // ── Initialization ──
+async function waitForNativeBridge(timeoutMs = 5000) {
+    if (window._nativeBridge)
+        return;
+    return new Promise((resolve) => {
+        const start = Date.now();
+        const check = () => {
+            if (window._nativeBridge || Date.now() - start > timeoutMs) {
+                resolve();
+            }
+            else {
+                setTimeout(check, 50);
+            }
+        };
+        // Also listen for the event C# dispatches after bridge injection
+        window.addEventListener("nativebridgeready", () => resolve(), { once: true });
+        check();
+    });
+}
 export async function initAndroid() {
     console.log("[android] Initializing mailx...");
+    // Wait for C# to inject the native bridge (TCP/FS/HTTP + OAuth)
+    await waitForNativeBridge();
+    console.log(`[android] Native bridge: ${window._nativeBridge ? "ready" : "timeout"}`);
     db = new WebMailxDB("mailx");
     await db.waitReady();
     bodyStore = new WebMessageStore();