@bobfrankston/rmfmail 1.2.164 → 1.2.166

package/bin/mailx.ts

@@ -183,53 +183,13 @@ const isDaemon = hasFlag("daemon"); // internal: re-spawned detached process
     }
 }
 
-if (hasFlag("register-mailto") || hasFlag("unregister-mailto")) {
-    const unregister = hasFlag("unregister-mailto");
-    // C124: Linux registration — a .desktop entry claiming the mailto:
-    // scheme + xdg-mime default. No exe-launcher needed (unlike Windows):
-    // Linux pickers read Name= from the .desktop file directly.
-    if (process.platform === "linux") {
-        const appsDir = path.join(os.homedir(), ".local", "share", "applications");
-        const desktopPath = path.join(appsDir, "rmfmail.desktop");
-        if (unregister) {
-            try { fs.unlinkSync(desktopPath); } catch { /* not registered */ }
-            try { execSync(`update-desktop-database "${appsDir}"`); } catch { /* optional tool */ }
-            console.log("Unregistered rmfmail mailto: handler.");
-            process.exit(0);
-        }
-        const __mailtoJs = path.join(import.meta.dirname, "mailx.js");
-        const __iconPng = path.join(import.meta.dirname, "..", "client", "icon.png");
-        // Exec quoting follows the Desktop Entry spec: quoted absolute paths,
-        // bare %u field code (quoting %u breaks argument expansion).
-        const desktopEntry = [
-            "[Desktop Entry]",
-            "Type=Application",
-            "Name=rmfmail",
-            "Comment=rmfmail email client",
-            `Exec="${process.execPath}" "${__mailtoJs}" --mailto %u`,
-            `Icon=${__iconPng}`,
-            "Terminal=false",
-            "MimeType=x-scheme-handler/mailto;",
-            "Categories=Network;Email;",
-            "",
-        ].join("\n");
-        fs.mkdirSync(appsDir, { recursive: true });
-        fs.writeFileSync(desktopPath, desktopEntry);
-        try {
-            execSync("xdg-mime default rmfmail.desktop x-scheme-handler/mailto");
-        } catch (e: any) {
-            console.error(`xdg-mime failed (${e.message}) — handler installed but not set as default. Set it in your DE's default-apps settings.`);
-        }
-        try { execSync(`update-desktop-database "${appsDir}"`); } catch { /* optional tool */ }
-        console.log(`Registered rmfmail as mailto: handler (${desktopPath}).`);
-        process.exit(0);
-    }
-    if (process.platform !== "win32") {
-        // macOS needs a real .app bundle with CFBundleURLTypes — LaunchServices
-        // won't register a bare script. Tracked as the macOS half of C124.
-        console.error("--register-mailto / --unregister-mailto: macOS registration not implemented yet (needs an .app bundle — TODO C124).");
-        process.exit(1);
-    }
+/** Windows mailto: registration — registry keys via reg.exe. Shared by the
+ *  `-register-mailto` CLI flag and the Settings → "Make default email app"
+ *  menu action (injected into MailxService; the registry work stays HERE in
+ *  the platform launcher — packages/ stay cross-platform). Returns the
+ *  outcome text instead of printing so both callers can surface it. */
+function registerMailtoWindows(unregister: boolean): { ok: boolean; message: string } {
+    const lines: string[] = [];
     // Registered command points at the rmfmailto.exe launcher (per-app
     // binary at %LOCALAPPDATA%\rmfmail\bin\rmfmailto.exe). The exe has its
     // own VERSIONINFO with FileDescription="rmfmail" so the Win11 "Select
@@ -247,17 +207,16 @@ if (hasFlag("register-mailto") || hasFlag("unregister-mailto")) {
         try {
             fs.mkdirSync(__perAppBin, { recursive: true });
             fs.copyFileSync(__pkgRmfmailtoExe, __rmfmailtoExe);
-            console.log(`Installed rmfmailto.exe to ${__rmfmailtoExe}`);
+            lines.push(`Installed rmfmailto.exe to ${__rmfmailtoExe}`);
         } catch (e: any) {
-            console.error(`Failed to copy rmfmailto.exe to per-app dir: ${e.message}`);
+            lines.push(`Failed to copy rmfmailto.exe to per-app dir: ${e.message}`);
             // Fall through and try registering the in-package path so
             // mailto still works, just from inside node_modules.
         }
     }
     const __launcherExe = fs.existsSync(__rmfmailtoExe) ? __rmfmailtoExe : __pkgRmfmailtoExe;
     if (!fs.existsSync(__launcherExe)) {
-        console.error(`rmfmailto.exe not found at ${__launcherExe} — package may have been built without it. Re-run 'npm run build' on the build machine.`);
-        process.exit(1);
+        return { ok: false, message: `rmfmailto.exe not found at ${__launcherExe} — package may have been built without it. Re-run 'npm run build' on the build machine.` };
     }
     // reg.exe value for `\"path\" \"%1\"` — double-backslash escapes for
     // cmd.exe's shell layer, which strips one level before the value reaches
@@ -310,15 +269,15 @@ if (hasFlag("register-mailto") || hasFlag("unregister-mailto")) {
             try {
                 const out = execSync(`reg query "${key}" /ve`, { stdio: ["pipe", "pipe", "pipe"] }).toString();
                 if (/mailx\.js|rmfmail/i.test(out)) {
-                    try { execSync(`reg delete "${key}" /f`, { stdio: "pipe" }); console.log(`  cleaned leftover ${oldExe} mailto handler`); }
+                    try { execSync(`reg delete "${key}" /f`, { stdio: "pipe" }); lines.push(`  cleaned leftover ${oldExe} mailto handler`); }
                     catch { /* */ }
                 }
             } catch { /* not present — fine */ }
         }
-        console.log("rmfmail unregistered as a mailto: handler.");
-        console.log("Note: if rmfmail was the active default in Settings → Default apps → Email,");
-        console.log("Windows may keep the prior selection in UserChoice until you pick another app.");
-        process.exit(0);
+        lines.push("rmfmail unregistered as a mailto: handler.");
+        lines.push("Note: if rmfmail was the active default in Settings → Default apps → Email,");
+        lines.push("Windows may keep the prior selection in UserChoice until you pick another app.");
+        return { ok: true, message: lines.join("\n") };
     }
     // Prepass: same defensive cleanup as --unregister, restricted to
     // rmfmail/mailx-related leftover keys. Without this, registering on
@@ -329,31 +288,84 @@ if (hasFlag("register-mailto") || hasFlag("unregister-mailto")) {
         try {
             const out = execSync(`reg query "${key}" /ve`, { stdio: ["pipe", "pipe", "pipe"] }).toString();
             if (/mailx\.js|rmfmail/i.test(out)) {
-                try { execSync(`reg delete "${key}" /f`, { stdio: "pipe" }); console.log(`  cleaned leftover ${oldExe} mailto handler`); }
+                try { execSync(`reg delete "${key}" /f`, { stdio: "pipe" }); lines.push(`  cleaned leftover ${oldExe} mailto handler`); }
                 catch { /* */ }
             }
         } catch { /* not present — fine */ }
     }
+    let failed = 0;
     for (const [keyPath, name, data] of keys) {
         const valueArg = name ? `/v "${name}"` : "/ve";
         const dataArg = data ? `/d "${data}"` : "";
         const type = data ? "/t REG_SZ" : "/t REG_SZ /d \"\"";
         const cmdLine = `reg add "${keyPath}" ${valueArg} ${type} ${dataArg} /f`;
         try { execSync(cmdLine, { stdio: "pipe" }); }
-        catch (e: any) { console.error(`  failed: ${cmdLine}\n    ${e.message}`); }
-    }
-    console.log("rmfmail registered as a mailto: handler.");
-    console.log("");
-    console.log("To make it the default in Windows 11:");
-    console.log("  Settings → Apps → Default apps → search \"rmfmail\" → click rmfmail");
-    console.log("  → \"Set default\" for the mailto link type.");
-    console.log("");
-    console.log("Win11 enforces a hash on `HKCU\\...\\UrlAssociations\\mailto\\UserChoice`,");
-    console.log("so the only programmatic ways to flip the active default are MSIX packaging");
-    console.log("(parked under C46) or a hash-aware tool like SetUserFTA. The picker may");
-    console.log("warn \"app must be from the Store\" — click \"More options\" / \"Choose another");
-    console.log("app on this PC\" to reach rmfmail.");
-    process.exit(0);
+        catch (e: any) { failed++; lines.push(`  failed: ${cmdLine}\n    ${e.message}`); }
+    }
+    lines.push("rmfmail registered as a mailto: handler.");
+    lines.push("");
+    lines.push("To make it the default in Windows 11:");
+    lines.push("  Settings → Apps → Default apps → search \"rmfmail\" → click rmfmail");
+    lines.push("  → \"Set default\" for the mailto link type.");
+    lines.push("");
+    lines.push("Win11 enforces a hash on `HKCU\\...\\UrlAssociations\\mailto\\UserChoice`,");
+    lines.push("so the only programmatic ways to flip the active default are MSIX packaging");
+    lines.push("(parked under C46) or a hash-aware tool like SetUserFTA. The picker may");
+    lines.push("warn \"app must be from the Store\" — click \"More options\" / \"Choose another");
+    lines.push("app on this PC\" to reach rmfmail.");
+    return { ok: failed === 0, message: lines.join("\n") };
+}
+
+if (hasFlag("register-mailto") || hasFlag("unregister-mailto")) {
+    const unregister = hasFlag("unregister-mailto");
+    // C124: Linux registration — a .desktop entry claiming the mailto:
+    // scheme + xdg-mime default. No exe-launcher needed (unlike Windows):
+    // Linux pickers read Name= from the .desktop file directly.
+    if (process.platform === "linux") {
+        const appsDir = path.join(os.homedir(), ".local", "share", "applications");
+        const desktopPath = path.join(appsDir, "rmfmail.desktop");
+        if (unregister) {
+            try { fs.unlinkSync(desktopPath); } catch { /* not registered */ }
+            try { execSync(`update-desktop-database "${appsDir}"`); } catch { /* optional tool */ }
+            console.log("Unregistered rmfmail mailto: handler.");
+            process.exit(0);
+        }
+        const __mailtoJs = path.join(import.meta.dirname, "mailx.js");
+        const __iconPng = path.join(import.meta.dirname, "..", "client", "icon.png");
+        // Exec quoting follows the Desktop Entry spec: quoted absolute paths,
+        // bare %u field code (quoting %u breaks argument expansion).
+        const desktopEntry = [
+            "[Desktop Entry]",
+            "Type=Application",
+            "Name=rmfmail",
+            "Comment=rmfmail email client",
+            `Exec="${process.execPath}" "${__mailtoJs}" --mailto %u`,
+            `Icon=${__iconPng}`,
+            "Terminal=false",
+            "MimeType=x-scheme-handler/mailto;",
+            "Categories=Network;Email;",
+            "",
+        ].join("\n");
+        fs.mkdirSync(appsDir, { recursive: true });
+        fs.writeFileSync(desktopPath, desktopEntry);
+        try {
+            execSync("xdg-mime default rmfmail.desktop x-scheme-handler/mailto");
+        } catch (e: any) {
+            console.error(`xdg-mime failed (${e.message}) — handler installed but not set as default. Set it in your DE's default-apps settings.`);
+        }
+        try { execSync(`update-desktop-database "${appsDir}"`); } catch { /* optional tool */ }
+        console.log(`Registered rmfmail as mailto: handler (${desktopPath}).`);
+        process.exit(0);
+    }
+    if (process.platform !== "win32") {
+        // macOS needs a real .app bundle with CFBundleURLTypes — LaunchServices
+        // won't register a bare script. Tracked as the macOS half of C124.
+        console.error("--register-mailto / --unregister-mailto: macOS registration not implemented yet (needs an .app bundle — TODO C124).");
+        process.exit(1);
+    }
+    const r = registerMailtoWindows(unregister);
+    console.log(r.message);
+    process.exit(r.ok ? 0 : 1);
 }
 
 // Read our own version once — used for the instance file + upgrade check below.
@@ -2048,6 +2060,12 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     // shell can SIGTERM it without name-based sweeps (cross-platform —
     // see memory: feedback_cross_platform_strong_rule). Remove on
     // resolution so the file doesn't accumulate stale PIDs.
+    // Settings → "Make rmfmail the default email app" runs the same
+    // registration the -register-mailto CLI flag does. Windows-only —
+    // Linux/mac users still go through the CLI (xdg / TODO C124).
+    if (process.platform === "win32") {
+        svc.setMailtoRegisterFn(async () => registerMailtoWindows(false));
+    }
     svc.setPopupFn(async (opts: any) => {
         // Own WebView2 profile so a reminder popup can never share (and
         // crash) the main window's browser process — see S67 note on the

package/client/android-bootstrap.bundle.js

@@ -10593,10 +10593,12 @@ var AndroidSyncManager = class {
       auth = { method: "XOAUTH2", user: smtpUser, token };
     }
     const parseAddrs = (s) => s.match(/[\w.+-]+@[\w.-]+/g) || [];
-    const toMatch = raw.match(/^To:\s*(.+)$/mi);
-    const ccMatch = raw.match(/^Cc:\s*(.+)$/mi);
-    const bccMatch = raw.match(/^Bcc:\s*(.+)$/mi);
-    const fromMatch = raw.match(/^From:\s*(.+)$/mi);
+    const headerEnd = raw.search(/\r?\n\r?\n/);
+    const headerSec = (headerEnd === -1 ? raw : raw.slice(0, headerEnd)).replace(/\r?\n[ \t]+/g, " ");
+    const toMatch = headerSec.match(/^To:\s*(.+)$/mi);
+    const ccMatch = headerSec.match(/^Cc:\s*(.+)$/mi);
+    const bccMatch = headerSec.match(/^Bcc:\s*(.+)$/mi);
+    const fromMatch = headerSec.match(/^From:\s*(.+)$/mi);
     const recipients = [
       ...toMatch ? parseAddrs(toMatch[1]) : [],
       ...ccMatch ? parseAddrs(ccMatch[1]) : [],
@@ -10604,7 +10606,8 @@ var AndroidSyncManager = class {
     ];
     const sender = fromMatch ? parseAddrs(fromMatch[1])[0] || account.email : account.email;
     if (recipients.length === 0) throw new Error("No recipients");
-    const rawToSend = raw.replace(/^Bcc:.*\r?\n/mi, "");
+    const stripBcc = (h) => h.replace(/^Bcc:[^\n]*(\r?\n[ \t][^\n]*)*(\r?\n|$)/mi, "").replace(/\r?\n$/, "");
+    const rawToSend = headerEnd === -1 ? stripBcc(raw) : stripBcc(raw.slice(0, headerEnd)) + raw.slice(headerEnd);
     const client = new SmtpClient({
       host: smtpHost,
       port: smtpPort,