@bobfrankston/mailx 1.0.139 → 1.0.141

package/bin/mailx.js

@@ -3,8 +3,8 @@
  * mailx -- email client
  *
  * Usage:
- *   mailx                    Start server + open in msger (or browser fallback)
- *   mailx --server           Start server + open browser (skip msger)
+ *   mailx                    Start server + open in msger
+ *   mailx --server           Start server + open msger (same as default)
  *   mailx --no-browser       Start server only (headless)
  *   mailx --external         Bind to all interfaces
  *   mailx --verbose          Show detailed startup info
@@ -18,6 +18,7 @@ import fs from "node:fs";
 import path from "node:path";
 import net from "node:net";
 import { ports } from "@bobfrankston/miscinfo";
+import { showMessageBox } from "@bobfrankston/msger";
 const PORT = ports.mailx;
 const args = process.argv.slice(2);
 // Normalize: accept both -flag and --flag
@@ -30,7 +31,7 @@ const addMode = hasFlag("add");
 const testMode = hasFlag("test");
 const rebuildMode = hasFlag("rebuild");
 // Validate arguments
-const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test", "rebuild", "native-imap"];
+const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test", "rebuild", "native-imap", "log"];
 for (const arg of args) {
     const flag = arg.replace(/^--?/, "");
     if (arg.startsWith("-") && !knownFlags.includes(flag)) {
@@ -147,7 +148,7 @@ if (hasFlag("v") || hasFlag("version")) {
     };
     try {
         const pkg = JSON.parse(fs.readFileSync(`${root}/package.json`, "utf-8"));
-        console.log(`mailx v${pkg.version}`);
+        console.log(`\x1b[1;97;44m mailx v${pkg.version} \x1b[0m`);
     }
     catch {
         console.log("mailx (version unknown)");
@@ -169,26 +170,9 @@ function isPortInUse(port) {
         socket.once("error", () => resolve(false));
     });
 }
-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}"`);
-    });
-}
-/** Launch msger pointing at the server URL; fall back to browser if msger not found */
+/** Launch msger pointing at the server URL */
 function launchMsger(url) {
-    import("node:child_process").then(({ spawn }) => {
-        const child = spawn("msger", ["-url", url], { detached: true, stdio: "ignore" });
-        child.on("error", () => {
-            log("msger not found — opening in browser");
-            openBrowser(url);
-        });
-        child.unref();
-    });
+    showMessageBox({ url, detach: true, size: { width: 1400, height: 900 } });
 }
 async function prompt(question) {
     const readline = await import("readline");
@@ -507,19 +491,27 @@ async function main() {
     // Check if server is already running
     const inUse = await isPortInUse(PORT);
     if (inUse) {
-        console.log(`mailx server already running on port ${PORT}`);
         const url = `http://127.0.0.1:${PORT}`;
-        if (!noBrowser) {
-            if (serverMode)
-                openBrowser(url);
-            else
-                launchMsger(url);
-        }
+        if (!noBrowser)
+            launchMsger(url);
         return;
     }
+    // Redirect console to log file — keep terminal clean
+    // Server also logs, but this catches CLI startup messages
+    if (!verbose) {
+        const home = process.env.USERPROFILE || process.env.HOME || ".";
+        const logDir = path.join(home, ".mailx", "logs");
+        fs.mkdirSync(logDir, { recursive: true });
+        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;
+        console.log = (...a) => { logStream.write(a.join(" ") + "\n"); };
+        console.error = (...a) => { logStream.write("ERROR " + a.join(" ") + "\n"); };
+    }
     // Start Express server in-process
     console.log("Starting mailx server...");
-    log(`Loading server from: ${path.join(import.meta.dirname, "..", "packages", "mailx-server", "index.js")}`);
     if (hasFlag("external"))
         process.argv.push("--external");
     await import("../packages/mailx-server/index.js");
@@ -531,14 +523,7 @@ async function main() {
             if (await isPortInUse(PORT))
                 break;
         }
-        if (serverMode) {
-            openBrowser(url);
-            console.log("mailx opened (browser)");
-        }
-        else {
-            launchMsger(url);
-            console.log("mailx opened");
-        }
+        launchMsger(url);
     }
     // Keep process alive — server is running
     await new Promise(() => { });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.139",
+  "version": "1.0.141",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -17,13 +17,13 @@
     "start": "node --watch packages/mailx-server/index.js",
     "start:prod": "node packages/mailx-server/index.js",
     "release": "npmglobalize",
-    "postinstall": "node launcher/builder/postinstall.js"
+    "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
     "@bobfrankston/iflow": "^1.0.52",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
-    "@bobfrankston/rust-builder": "^0.1.3",
+    "@bobfrankston/msger": "^0.1.195",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -57,7 +57,7 @@
     "@bobfrankston/iflow": "file:../MailApps/iflow",
     "@bobfrankston/miscinfo": "file:../../projects/npm/miscinfo",
     "@bobfrankston/oauthsupport": "file:../../projects/oauth/oauthsupport",
-    "@bobfrankston/rust-builder": "file:../../utils/rust-builder",
+    "@bobfrankston/msger": "file:../../utils/msgx/msger",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

package/packages/mailx-server/index.js

@@ -9,7 +9,7 @@ import * as fs from "node:fs";
 import { MailxDB } from "@bobfrankston/mailx-store";
 import { ImapManager } from "@bobfrankston/mailx-imap";
 import { createApiRouter } from "@bobfrankston/mailx-api";
-import { loadSettings, loadAccountsAsync, getConfigDir, getStorePath, getStorageInfo, initLocalConfig } from "@bobfrankston/mailx-settings";
+import { loadSettings, loadAccountsAsync, getConfigDir, getStorePath, getStorageInfo } from "@bobfrankston/mailx-settings";
 import { ports } from "@bobfrankston/miscinfo";
 import { createServer } from "node:http";
 const PORT = ports.mailx;
@@ -45,7 +45,8 @@ console.error = (...args) => {
 const rootPkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "..", "..", "package.json"), "utf-8"));
 const SERVER_VERSION = rootPkg.version;
 // ── Initialize ──
-initLocalConfig();
+// No initLocalConfig() here — config is created when user adds an account (initCloudConfig).
+// On fresh install, loadSettings() returns defaults and the setup form handles configuration.
 let settings = loadSettings();
 if (settings.accounts.length === 0) {
     // Try cloud API fallback (Google Drive, OneDrive) if filesystem mount not available

package/launcher/builder/build-config.json

@@ -1,11 +0,0 @@
-{
-    "platforms": {
-        "windows": true,
-        "wsl": true,
-        "arm64": false
-    },
-    "options": {
-        "release": true,
-        "verbose": true
-    }
-}

package/launcher/builder/postinstall.js

@@ -1,73 +0,0 @@
-#!/usr/bin/env node
-/**
- * mailx postinstall:
- * 1. Link workspace packages so Node can resolve them after npm install
- * 2. Set binary permissions on Linux/Mac
- */
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const root = path.join(__dirname, "..", "..");
-
-// Link workspace packages into node_modules so imports resolve
-const nodeModules = path.join(root, "node_modules", "@bobfrankston");
-const packagesDir = path.join(root, "packages");
-if (fs.existsSync(packagesDir)) {
-    fs.mkdirSync(nodeModules, { recursive: true });
-    for (const pkg of fs.readdirSync(packagesDir)) {
-        const pkgDir = path.join(packagesDir, pkg);
-        const pkgJson = path.join(pkgDir, "package.json");
-        if (!fs.existsSync(pkgJson)) continue;
-        try {
-            const meta = JSON.parse(fs.readFileSync(pkgJson, "utf-8"));
-            const name = meta.name?.replace("@bobfrankston/", "");
-            if (!name) continue;
-            const link = path.join(nodeModules, name);
-            // Remove stale junction/symlink that may point to wrong location
-            try { fs.unlinkSync(link); } catch { try { fs.rmSync(link, { recursive: true }); } catch { /* */ } }
-            // Create junction (Windows) or symlink (Unix) to local packages dir
-            if (process.platform === "win32") {
-                fs.symlinkSync(pkgDir, link, "junction");
-            } else {
-                fs.symlinkSync(pkgDir, link, "dir");
-            }
-        } catch { /* skip */ }
-    }
-}
-
-// Set binary permissions
-try {
-    const { runPostinstall } = await import("@bobfrankston/rust-builder/postinstall");
-    const path = await import("path");
-    const { fileURLToPath } = await import("url");
-    const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-    runPostinstall({
-        binaryName: "mailx-app",
-        binDir: path.join(__dirname, "..", "bin"),
-        binaries: {
-            win32: "mailx-app.exe",
-            darwin: "mailx-app",
-            darwinArm64: "mailx-app-arm64",
-            linux: "mailx-app-linux",
-            linuxArm64: "mailx-app-linux-aarch64",
-        },
-    });
-} catch {
-    // rust-builder not available (e.g., local dev with file: deps)
-    // On Windows, nothing to do. On Linux/Mac, try chmod directly.
-    if (process.platform !== "win32") {
-        const fs = await import("fs");
-        const path = await import("path");
-        const { fileURLToPath } = await import("url");
-        const __dirname = path.dirname(fileURLToPath(import.meta.url));
-        const arch = process.arch;
-        const name = process.platform === "darwin"
-            ? (arch === "arm64" ? "mailx-app-arm64" : "mailx-app")
-            : (arch === "arm64" ? "mailx-app-linux-aarch64" : "mailx-app-linux");
-        const bin = path.join(__dirname, "..", "bin", name);
-        try { fs.chmodSync(bin, 0o755); } catch { /* binary may not exist */ }
-    }
-}