@bobfrankston/mailx 1.0.93 → 1.0.95

package/client/app.js

@@ -562,41 +562,70 @@ onWsEvent((event) => {
             showAlert(event.message, "ws-error");
             break;
         case "accountError": {
-            // Show in alert banner with re-auth button
-            const msg = `${event.accountId}: ${event.hint}`;
+            // Show actual error + hint in banner
+            const msg = `${event.accountId}: ${event.error}`;
             showAlert(msg, `acct-${event.accountId}`);
-            // Add re-auth button to the banner
+            // Add action button: Re-authenticate for OAuth, Retry for password accounts
             const bannerText = document.getElementById("alert-text");
             if (bannerText && bannerText.textContent === msg) {
                 const existing = bannerText.parentElement?.querySelector(".status-action");
                 if (!existing) {
                     const btn = document.createElement("button");
-                    btn.textContent = "Re-authenticate";
                     btn.className = "status-action";
-                    btn.addEventListener("click", async () => {
-                        btn.disabled = true;
-                        btn.textContent = "Authenticating...";
-                        try {
-                            const res = await fetch(`/api/reauth/${event.accountId}`, { method: "POST" });
-                            const data = await res.json();
-                            if (data.ok) {
-                                hideAlert();
-                                const acctEl = document.getElementById("status-accounts");
-                                if (acctEl) {
-                                    acctEl.textContent = `${event.accountId}: reconnected`;
-                                    acctEl.style.color = "";
+                    if (event.isOAuth) {
+                        btn.textContent = "Re-authenticate";
+                        btn.addEventListener("click", async () => {
+                            btn.disabled = true;
+                            btn.textContent = "Authenticating...";
+                            try {
+                                const res = await fetch(`/api/reauth/${event.accountId}`, { method: "POST" });
+                                const data = await res.json();
+                                if (data.ok) {
+                                    hideAlert();
+                                    const acctEl = document.getElementById("status-accounts");
+                                    if (acctEl) {
+                                        acctEl.textContent = `${event.accountId}: reconnected`;
+                                        acctEl.style.color = "";
+                                    }
+                                }
+                                else {
+                                    btn.textContent = "Re-authenticate";
+                                    btn.disabled = false;
                                 }
                             }
-                            else {
+                            catch {
                                 btn.textContent = "Re-authenticate";
                                 btn.disabled = false;
                             }
-                        }
-                        catch {
-                            btn.textContent = "Re-authenticate";
-                            btn.disabled = false;
-                        }
-                    });
+                        });
+                    }
+                    else {
+                        btn.textContent = "Retry";
+                        btn.addEventListener("click", async () => {
+                            btn.disabled = true;
+                            btn.textContent = "Syncing...";
+                            try {
+                                const res = await fetch(`/api/sync/${event.accountId}`, { method: "POST" });
+                                const data = await res.json();
+                                if (data.ok) {
+                                    hideAlert();
+                                    const acctEl = document.getElementById("status-accounts");
+                                    if (acctEl) {
+                                        acctEl.textContent = `${event.accountId}: reconnected`;
+                                        acctEl.style.color = "";
+                                    }
+                                }
+                                else {
+                                    btn.textContent = "Retry";
+                                    btn.disabled = false;
+                                }
+                            }
+                            catch {
+                                btn.textContent = "Retry";
+                                btn.disabled = false;
+                            }
+                        });
+                    }
                     bannerText.parentElement?.insertBefore(btn, document.getElementById("alert-dismiss"));
                 }
             }

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-client",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "private": true,
   "type": "module",
   "dependencies": {

package/package.json

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

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

@@ -17,6 +17,7 @@ export interface ImapManagerEvents {
         total: number;
         unread: number;
     }>) => void;
+    accountError: (accountId: string, error: string, hint: string, isOAuth: boolean) => void;
 }
 export declare class ImapManager extends EventEmitter {
     private configs;

package/packages/mailx-imap/index.js

@@ -210,7 +210,7 @@ export class ImapManager extends EventEmitter {
                 console.error(`  [auth] ${account.id}: ${imapError(e)}`);
                 if (!this.accountErrorShown.has(account.id)) {
                     this.accountErrorShown.add(account.id);
-                    this.emit("accountError", account.id, imapError(e), "Re-authenticate: click the button below or run mailx -setup");
+                    this.emit("accountError", account.id, imapError(e), "Authentication may have expired", true);
                 }
             }
         }
@@ -480,7 +480,7 @@ export class ImapManager extends EventEmitter {
                     const hint = errMsg.includes("max_userip_connections") || errMsg.includes("Too many")
                         ? "Too many connections — backing off"
                         : isOAuth ? "Authentication may have expired" : "Check server connectivity";
-                    this.emit("accountError", accountId, errMsg, hint);
+                    this.emit("accountError", accountId, errMsg, hint, isOAuth);
                 }
             }
             finally {
@@ -538,6 +538,7 @@ export class ImapManager extends EventEmitter {
                     }
                 }
             }
+            this.accountErrorShown.delete(accountId);
             this.emit("syncComplete", accountId);
         }
     }

package/packages/mailx-imap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/mailx-server/index.js

@@ -122,6 +122,11 @@ ${accountInfo.map((a) => `<tr><td>${a.name}</td><td>${a.folders}</td><td>${a.inb
 <p style="margin-top:2rem;font-size:0.8rem"><a href="/">Open mailx</a> | Auto-refreshes every 10s</p>
 </body></html>`);
 });
+// Graceful exit — close IMAP, DB, HTTP then exit
+app.all("/api/exit", (req, res) => {
+    res.json({ ok: true });
+    setTimeout(() => shutdown(), 100);
+});
 // Restart server + reload clients
 app.post("/api/restart", (req, res) => {
     res.json({ ok: true });
@@ -203,8 +208,8 @@ imapManager.on("folderCountsChanged", (accountId, counts) => {
 imapManager.on("syncError", (accountId, error) => {
     broadcast({ type: "error", message: `${accountId}: ${error}` });
 });
-imapManager.on("accountError", (accountId, error, hint) => {
-    broadcast({ type: "accountError", accountId, error, hint });
+imapManager.on("accountError", (accountId, error, hint, isOAuth) => {
+    broadcast({ type: "accountError", accountId, error, hint, isOAuth });
 });
 // ── Startup ──
 async function start() {
@@ -286,7 +291,12 @@ process.on("unhandledRejection", (err) => {
 process.on("uncaughtException", (err) => {
     console.error("FATAL uncaught exception:", err.message);
     console.error(err.stack);
-    // Don't exit — let node --watch handle restart
+    // EADDRINUSE = another instance holds the port — exit so node --watch can retry
+    if (err.code === "EADDRINUSE") {
+        console.error("Port in use — exiting so node --watch can retry");
+        process.exit(1);
+    }
+    // Other exceptions: stay alive, let node --watch handle file-change restarts
 });
 process.on("exit", (code) => {
     console.log(`Process exiting with code ${code}`);

package/packages/mailx-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-server",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

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

@@ -177,6 +177,7 @@ export type WsEvent = {
     accountId: string;
     error: string;
     hint: string;
+    isOAuth: boolean;
 };
 export interface MailxSettings {
     accounts: AccountConfig[];

package/packages/mailx-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-types",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/showports.cmd

@@ -0,0 +1 @@
+netstat -ano | findstr :9333