@bobfrankston/mailx 1.0.173 → 1.0.174

package/bin/mailx.js

@@ -740,10 +740,13 @@ async function main() {
         console.log(`${reason} — shutting down`);
         imapManager.stopPeriodicSync();
         imapManager.stopOutboxWorker();
+        // 3s hard timeout — don't hang on broken IMAP connections
+        const forceExit = setTimeout(() => { console.log("Forced exit"); process.exit(0); }, 3000);
         try {
             await imapManager.shutdown();
         }
         catch { /* proceed */ }
+        clearTimeout(forceExit);
         db.close();
         process.exit(0);
     }

package/client/app.js

@@ -286,8 +286,14 @@ async function openCompose(mode) {
     }
     // Store init data for compose window to pick up
     sessionStorage.setItem("composeInit", JSON.stringify(init));
-    // Use relative URL so it works with both HTTP and custom protocol (msger://)
-    window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+    // IPC mode: navigate in same window (popups don't have custom protocol)
+    // HTTP mode: open as popup window
+    if (typeof mailxapi !== "undefined") {
+        window.location.href = "compose/compose.html";
+    }
+    else {
+        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+    }
 }
 function quoteBody(msg) {
     const date = new Date(msg.date).toLocaleString();

package/client/components/message-viewer.js

@@ -135,7 +135,12 @@ 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");
+                    if (typeof window.mailxapi !== "undefined") {
+                        window.location.href = "compose/compose.html";
+                    }
+                    else {
+                        window.open("compose/compose.html", "_blank", "width=800,height=600,menubar=no,toolbar=no,status=no");
+                    }
                 };
             }
             else {

package/client/compose/compose.js

@@ -5,6 +5,15 @@
  */
 import { createEditor } from "./editor.js";
 import { getVersion, getSettings, getAccounts, searchContacts, sendMessage, saveDraft as apiSaveDraft, deleteDraft } from "../lib/api-client.js";
+/** Close compose — navigate back in IPC mode, window.close() in HTTP mode */
+function closeCompose() {
+    if (typeof window.mailxapi !== "undefined") {
+        window.location.href = "../index.html";
+    }
+    else {
+        closeCompose();
+    }
+}
 // ── Load editor scripts dynamically ──
 function loadScript(src) {
     return new Promise((resolve, reject) => {
@@ -349,7 +358,7 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
         if (draftUid) {
             deleteDraft(getFromAccountId(), draftUid).catch(() => { });
         }
-        window.close();
+        closeCompose();
     }
     catch (e) {
         btn.disabled = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.173",
+  "version": "1.0.174",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,11 +20,11 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.4",
+    "@bobfrankston/iflow-direct": "^0.1.5",
     "@bobfrankston/iflow-node": "^0.1.1",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/msger": "^0.1.222",
+    "@bobfrankston/msger": "^0.1.223",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -291,8 +291,15 @@ export class ImapManager extends EventEmitter {
         const client = this.opsClients.get(accountId);
         this.opsClients.delete(accountId);
         if (client) {
+            // Force-close: don't wait for LOGOUT on a possibly dead socket
             try {
-                await (client._realLogout || client.logout)();
+                const timeout = new Promise(r => setTimeout(r, 2000));
+                await Promise.race([(client._realLogout || client.logout)(), timeout]);
+            }
+            catch { /* */ }
+            // Destroy underlying socket if still open
+            try {
+                client.destroy?.();
             }
             catch { /* */ }
             console.log(`  [conn] ${accountId}: disconnected`);