@bobfrankston/mailx 1.0.1 → 1.0.3

package/bin/mailx.js

@@ -1,17 +1,21 @@
 #!/usr/bin/env node
 /**
- * mailx launcher — starts the server and opens the browser.
- * Usage: mailx [--external] [--no-browser]
+ * mailx — email client launcher
+ *
+ * Usage:
+ *   mailx                    Start unified (in-process server + open browser)
+ *   mailx --server           Start as a standalone server only (no browser)
+ *   mailx --no-browser       Start server in-process, don't open browser
+ *   mailx --external         Bind to all interfaces (default: localhost only)
  */
 
-import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import path from "node:path";
 import net from "node:net";
 
 const PORT = 9333;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const serverScript = path.join(__dirname, "..", "packages", "mailx-server", "index.js");
+const args = process.argv.slice(2);
 
 function isPortInUse(port) {
     return new Promise((resolve) => {
@@ -22,36 +26,45 @@ function isPortInUse(port) {
     });
 }
 
+function openBrowser(url) {
+    import("node:child_process").then(({ exec }) => {
+        if (process.platform === "win32") exec(`start "" "${url}"`);
+        else if (process.platform === "darwin") exec(`open "${url}"`);
+        else exec(`xdg-open "${url}"`);
+    });
+}
+
 async function main() {
-    const args = process.argv.slice(2);
-    const noBrowser = args.includes("--no-browser");
-    const inUse = await isPortInUse(PORT);
+    const serverOnly = args.includes("--server");
+    const noBrowser = args.includes("--no-browser") || serverOnly;
 
+    const inUse = await isPortInUse(PORT);
     if (inUse) {
         console.log(`mailx server already running on port ${PORT}`);
-    } else {
-        console.log(`Starting mailx server on port ${PORT}...`);
-        const serverArgs = [serverScript, ...args.filter(a => a === "--external")];
-        const child = spawn(process.execPath, serverArgs, {
-            stdio: "inherit",
-            detached: false,
-        });
-        child.unref();
-
-        // Wait for server to be ready
-        for (let i = 0; i < 60; i++) {
-            await new Promise(r => setTimeout(r, 500));
-            if (await isPortInUse(PORT)) break;
+        if (!noBrowser) {
+            openBrowser(`http://localhost:${PORT}`);
+            console.log(`Opened http://localhost:${PORT}`);
         }
+        return;
     }
 
+    // Start server in-process (unified mode)
+    console.log(`Starting mailx on port ${PORT}...`);
+
+    // Pass --external to server if requested
+    if (args.includes("--external")) process.argv.push("--external");
+
+    // Import and start the server directly — no subprocess
+    await import(path.join(__dirname, "..", "packages", "mailx-server", "index.js"));
+
     if (!noBrowser) {
-        const url = `http://localhost:${PORT}`;
-        const { exec } = await import("node:child_process");
-        if (process.platform === "win32") exec(`start "" "${url}"`);
-        else if (process.platform === "darwin") exec(`open "${url}"`);
-        else exec(`xdg-open "${url}"`);
-        console.log(`Opened ${url}`);
+        // Wait a moment for server to be ready
+        for (let i = 0; i < 30; i++) {
+            await new Promise(r => setTimeout(r, 200));
+            if (await isPortInUse(PORT)) break;
+        }
+        openBrowser(`http://localhost:${PORT}`);
+        console.log(`Opened http://localhost:${PORT}`);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -22,8 +22,14 @@
     "@bobfrankston/iflow": "^1.0.2",
     "@bobfrankston/miscinfo": "^1.0.5",
     "@bobfrankston/oauthsupport": "^1.0.10",
+    "@bobfrankston/certsupport": "^1.0.35",
+    "better-sqlite3": "^11.0.0",
+    "express": "^4.21.0",
+    "jsonc-parser": "^3.3.1",
     "mailparser": "^3.7.2",
-    "quill": "^2.0.3"
+    "nodemailer": "^7.0.0",
+    "quill": "^2.0.3",
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/mailparser": "^3.4.6"
@@ -45,7 +51,13 @@
     "@bobfrankston/iflow": "file:../MailApps/iflow",
     "@bobfrankston/miscinfo": "file:../../projects/npm/miscinfo",
     "@bobfrankston/oauthsupport": "file:../../projects/oauth/oauthsupport",
+    "@bobfrankston/certsupport": "file:../../projects/nodejs/certsupport",
+    "better-sqlite3": "^11.0.0",
+    "express": "^4.21.0",
+    "jsonc-parser": "^3.3.1",
     "mailparser": "^3.7.2",
-    "quill": "^2.0.3"
+    "nodemailer": "^7.0.0",
+    "quill": "^2.0.3",
+    "ws": "^8.18.0"
   }
 }

package/packages/mailx-server/index.js

@@ -14,8 +14,19 @@ import { ports } from "@bobfrankston/miscinfo";
 import { InitServerAsync, InitServerOptions } from "@bobfrankston/certsupport";
 const PORT = ports.mailx;
 // ── File logging ──
-const logDir = path.join(import.meta.dirname, "..", "..");
-const logPath = path.join(logDir, "mailx.log");
+const logDir = path.join(process.env.USERPROFILE || process.env.HOME || ".", ".mailx");
+fs.mkdirSync(logDir, { recursive: true });
+// Rotate: delete logs older than 7 days
+try {
+    for (const f of fs.readdirSync(logDir).filter(f => f.startsWith("mailx-") && f.endsWith(".log"))) {
+        const stat = fs.statSync(path.join(logDir, f));
+        if (Date.now() - stat.mtimeMs > 7 * 86400000)
+            fs.unlinkSync(path.join(logDir, f));
+    }
+}
+catch { /* ignore cleanup errors */ }
+const logDate = new Date().toISOString().slice(0, 10);
+const logPath = path.join(logDir, `mailx-${logDate}.log`);
 const logStream = fs.createWriteStream(logPath, { flags: "a" });
 const origLog = console.log;
 const origErr = console.error;

package/packages/mailx-server/package.json

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