@bobfrankston/mailx 1.0.134 → 1.0.135

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.134",
+  "version": "1.0.135",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,7 +20,7 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.50",
+    "@bobfrankston/iflow": "^1.0.51",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
     "@bobfrankston/rust-builder": "^0.1.3",

package/packages/mailx-server/index.js

@@ -234,10 +234,41 @@ async function start() {
     // Start HTTP server FIRST so UI is always reachable (even during IMAP startup)
     const externalAccess = process.argv.includes("--external");
     const hostname = externalAccess ? "0.0.0.0" : "127.0.0.1";
-    server = createServer(app);
-    wss = new WebSocketServer({ server });
-    wireWebSocket();
-    await new Promise((resolve) => server.listen(PORT, hostname, resolve));
+    // Retry listen with backoff — Windows CLOSE_WAIT zombies can hold the port for minutes after a crash
+    for (let attempt = 0; attempt < 30; attempt++) {
+        server = createServer(app);
+        // Prevent CLOSE_WAIT accumulation: short keepAlive timeout + connection close headers
+        server.keepAliveTimeout = 5000; // close idle keep-alive connections after 5s
+        server.headersTimeout = 10000; // kill connections with no headers after 10s
+        // Track connections for clean shutdown (prevents CLOSE_WAIT zombies on Windows)
+        server.on("connection", (conn) => {
+            openConnections.add(conn);
+            conn.on("close", () => openConnections.delete(conn));
+        });
+        // Suppress EADDRINUSE from bubbling to uncaughtException — we handle it here
+        server.on("error", () => { }); // will be replaced by listen handler below
+        wss = new WebSocketServer({ server });
+        wireWebSocket();
+        const listenResult = await new Promise((resolve) => {
+            server.removeAllListeners("error");
+            server.once("error", (e) => { resolve(e.code || e.message); });
+            server.listen({ port: PORT, host: hostname, exclusive: false }, () => {
+                server.removeAllListeners("error");
+                resolve("ok");
+            });
+        });
+        if (listenResult === "ok")
+            break;
+        if (listenResult === "EADDRINUSE" && attempt < 29) {
+            const wait = Math.min(2000 + attempt * 1000, 10000);
+            console.log(`  Port ${PORT} in use (CLOSE_WAIT zombies?) — retry ${attempt + 1}/30 in ${wait / 1000}s...`);
+            server.close();
+            await new Promise(r => setTimeout(r, wait));
+        }
+        else {
+            throw new Error(`Cannot bind port ${PORT}: ${listenResult}`);
+        }
+    }
     console.log(`mailx server running on http://${hostname}:${PORT}`);
     // Seed contacts (fast — skips existing)
     const seeded = db.seedContactsFromMessages();
@@ -287,6 +318,8 @@ async function start() {
     imapManager.startOutboxWorker();
 }
 // ── Graceful Shutdown ──
+/** Track all open connections so we can destroy them on shutdown (prevents CLOSE_WAIT zombies) */
+const openConnections = new Set();
 async function shutdown() {
     console.log("\nShutting down...");
     const forceExit = setTimeout(() => { console.log("Force exit"); process.exit(1); }, 3000);
@@ -296,6 +329,11 @@ async function shutdown() {
     }
     catch { /* proceed */ }
     db.close();
+    // Destroy all open connections immediately — prevents CLOSE_WAIT zombies on Windows
+    for (const conn of openConnections) {
+        conn.destroy();
+    }
+    openConnections.clear();
     server?.close();
     clearTimeout(forceExit);
     process.exit(0);
@@ -308,11 +346,6 @@ process.on("unhandledRejection", (err) => {
 process.on("uncaughtException", (err) => {
     console.error("FATAL uncaught exception:", err.message);
     console.error(err.stack);
-    // 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) => {