@bobfrankston/msger 0.1.353 → 0.1.357

package/msger-native/builder/README.md

@@ -19,7 +19,8 @@ Edit `builder/build-config.json` to control which platforms are built:
         "windows": true,    // Build Windows x64 binary
         "wsl": false,       // Build Linux x64 binary (via WSL)
         "pi": false,        // Build Raspberry Pi ARM64 binary (remote build on Pi)
-        "arm64": false      // Build Linux ARM64 binary (cross-compile via WSL)
+        "arm64": false,     // Build Linux ARM64 binary (cross-compile via WSL)
+        "mac": false        // Sync Mac binaries from OneDrive `mac/` staging into bin/ at publish time
     },
     "options": {
         "release": true,    // Use release mode (optimized)
@@ -38,6 +39,7 @@ Edit `builder/build-config.json` to control which platforms are built:
 | `wsl` | `bin/msgernative` | Native build in WSL | WSL with Rust toolchain |
 | `pi` | `bin/msgernative-linux-aarch64` | **Remote build on Pi** (slower, guaranteed compatible) | SSH access to Raspberry Pi |
 | `arm64` | `bin/msgernative-linux-aarch64` | **Cross-compile on WSL** (faster, requires setup) | WSL with ARM64 cross-compilation toolchain |
+| `mac` | `bin/msgernative-darwin-{arm64,x64}` | Sync from `mac/` (OneDrive staging) at publish time — Mac builds happen on the Mac via `mac/build-mac.sh` | A Mac (or stale OneDrive copy) |
 
 **Pi vs ARM64:**
 - **`pi`**: Builds on the actual Raspberry Pi via SSH - slower but guaranteed to work

package/msger-native/builder/build-config.json

@@ -1,14 +1,19 @@
+// msger-native build configuration (JSONC — comments stripped before parse).
+// Each platform flag toggles whether that target is built/synced; defaults are
+// conservative so a fresh checkout only builds the local Windows binary.
 {
     "platforms": {
-        "windows": true,
-        "wsl": false,
-        "pi": false,
-        "arm64": false
+        "windows": true,    // Native build on Windows via cargo (msgernative.exe)
+        "wsl": false,       // Cross-build Linux x64 via WSL (msgernative-linux)
+        "pi": false,        // Remote SSH build on a Raspberry Pi (msgernative-linux-aarch64)
+        "arm64": false,     // Cross-compile Linux ARM64 via WSL (msgernative-linux-aarch64)
+        "mac": false        // Sync mac/msgernative-darwin-{arm64,x64} into bin/ at publish time
+                            // (Mac binaries are produced on a Mac via mac/build-mac.sh)
     },
     "options": {
-        "release": true,
-        "verbose": true,
-        "piHost": "pi4c",
-        "piProjectPath": "/home/pi/msger/msger-native"
+        "release": true,    // cargo --release (optimized) vs debug
+        "verbose": true,    // Stream cargo output instead of capturing
+        "piHost": "pi4c",   // SSH host alias for the `pi` platform
+        "piProjectPath": "/home/pi/msger/msger-native"  // Where source is staged on the Pi
     }
 }

package/msger-native/builder/build-under-wsl.ts

@@ -3,20 +3,20 @@
  * msger-native WSL builder — delegates to @bobfrankston/rust-builder
  * Run this directly inside WSL: node builder/build-under-wsl.ts
  */
-import { loadConfig, build } from "@bobfrankston/rust-builder";
+import { build, type BuildConfig } from "@bobfrankston/rust-builder";
 import path from "path";
+import fs from "fs";
 import { fileURLToPath } from "url";
+import JSON5 from "json5";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const nativeDir = path.join(__dirname, "..");
 const binDir = path.join(nativeDir, "bin");
 
-const config = loadConfig(
-    path.join(__dirname, "build-config.json"),
-    "msgernative",
-    nativeDir,
-    binDir
-);
+// build-config.json may contain comments — parse with json5 instead of using
+// rust-builder's loadConfig (which is strict JSON-only).
+const json = JSON5.parse(fs.readFileSync(path.join(__dirname, "build-config.json"), "utf-8"));
+const config: BuildConfig = { binaryName: "msgernative", cargoDir: nativeDir, binDir, ...json };
 
 // Only build WSL targets when running inside WSL
 config.platforms.windows = false;

package/msger-native/builder/builder.ts

@@ -2,20 +2,20 @@
 /**
  * msger-native builder — delegates to @bobfrankston/rust-builder
  */
-import { loadConfig, build } from "@bobfrankston/rust-builder";
+import { build, type BuildConfig } from "@bobfrankston/rust-builder";
 import path from "path";
+import fs from "fs";
 import { fileURLToPath } from "url";
+import JSON5 from "json5";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const nativeDir = path.join(__dirname, "..");
 const binDir = path.join(nativeDir, "bin");
 
-const config = loadConfig(
-    path.join(__dirname, "build-config.json"),
-    "msgernative",
-    nativeDir,
-    binDir
-);
+// build-config.json may contain comments — parse with json5 instead of using
+// rust-builder's loadConfig (which is strict JSON-only).
+const json = JSON5.parse(fs.readFileSync(path.join(__dirname, "build-config.json"), "utf-8"));
+const config: BuildConfig = { binaryName: "msgernative", cargoDir: nativeDir, binDir, ...json };
 
 // msger-specific: copy icons
 config.options = config.options || {};

package/msger-native/builder/postinstall.js

@@ -27,7 +27,11 @@ if (isWindows) {
     baseName = "msgernative";
     ext = ".exe";
 } else if (process.platform === "darwin") {
-    baseName = arch === "arm64" ? "msgernative-arm64" : "msgernative";
+    // Mac binaries use explicit darwin names so they don't collide with the
+    // Pi (`msgernative-arm64`) or generic Linux ARM (`msgernative-linux-aarch64`)
+    // binaries. Built on a Mac via build-mac.sh, synced via OneDrive's `mac/`,
+    // copied into bin/ at prepublishOnly time.
+    baseName = arch === "arm64" ? "msgernative-darwin-arm64" : "msgernative-darwin-x64";
     ext = "";
 } else {
     baseName = arch === "arm64" ? "msgernative-linux-aarch64" : "msgernative";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/msger",
-  "version": "0.1.353",
+  "version": "0.1.357",
   "description": "Fast, lightweight, cross-platform message box - Rust-powered alternative to msgview",
   "type": "module",
   "main": "./index.js",
@@ -21,7 +21,8 @@
     "clean": "node msger-native/builder/clean.ts",
     "test": "node test.js",
     "postinstall": "node msger-native/builder/postinstall.js",
-    "prepublishOnly": "npm run build:ts && npm run build:native",
+    "prep:mac": "node prep-mac-source.js",
+    "prepublishOnly": "node sync-mac-binary.js && npm run build:ts && npm run build:native",
     "prerelease:local": "git add -A && (git diff-index --quiet HEAD || git commit -m \"Pre-release commit\")",
     "preversion": "npm run build:ts && npm run build:native && git add -A",
     "release": "npm run prerelease:local && npm version patch && npm publish --quiet",
@@ -51,8 +52,7 @@
   "dependencies": {
     "@bobfrankston/msgcommon": "^0.1.23",
     "ansi-to-html": "^0.7.2",
-    "json5": "^2.2.3",
-    "rcedit": "^4.0.1"
+    "json5": "^2.2.3"
   },
   "files": [
     "*.js",

package/prep-mac-source.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/prep-mac-source.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+/**
+ * prep-mac-source.js — copy `msger-native/` Rust source into `mac/msger-native/`
+ * so the Mac (which sees `mac/` via OneDrive) has source to build from.
+ *
+ * Run from Windows whenever the Rust source changes and you want the Mac to
+ * pick it up on its next `./build-mac.sh`. Idempotent — only copies files that
+ * are missing or newer.
+ *
+ * Excludes `target/` (build output, gigabytes), `pibuild/` (Pi-specific),
+ * and the existing `bin/` (Linux/Windows binaries — Mac doesn't need them).
+ */
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const srcDir = path.join(__dirname, "msger-native");
+const dstDir = path.join(__dirname, "mac", "msger-native");
+
+const SKIP_DIRS = new Set(["target", "pibuild", "bin", "node_modules", ".git"]);
+
+if (!fs.existsSync(srcDir)) {
+    console.error(`✗ msger-native/ not found at ${srcDir}`);
+    process.exit(1);
+}
+if (!fs.existsSync(path.dirname(dstDir))) {
+    console.error(`✗ mac/ not found — make sure the OneDrive junction is in place`);
+    process.exit(1);
+}
+
+let copied = 0;
+let skipped = 0;
+
+function copyDir(src, dst) {
+    fs.mkdirSync(dst, { recursive: true });
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        const srcPath = path.join(src, entry.name);
+        const dstPath = path.join(dst, entry.name);
+        if (entry.isDirectory()) {
+            if (SKIP_DIRS.has(entry.name)) continue;
+            copyDir(srcPath, dstPath);
+        } else if (entry.isFile()) {
+            const srcMtime = fs.statSync(srcPath).mtimeMs;
+            const dstMtime = fs.existsSync(dstPath) ? fs.statSync(dstPath).mtimeMs : 0;
+            if (dstMtime >= srcMtime) {
+                skipped++;
+                continue;
+            }
+            fs.copyFileSync(srcPath, dstPath);
+            copied++;
+        }
+    }
+}
+
+copyDir(srcDir, dstDir);
+
+console.log(`  msger: prep:mac — ${copied} file(s) copied, ${skipped} unchanged`);
+console.log(`  msger: source staged at mac/msger-native/. OneDrive will sync to the Mac;`);
+console.log(`  msger: then run \`./build-mac.sh\` from the OneDrive folder on the Mac.`);

package/shower.d.ts

@@ -39,6 +39,8 @@ export interface MessageBoxOptions {
     reset?: boolean; /** Clear localStorage on startup (default: false) */
     icon?: string; /** Path to window icon. Decoded for the runtime title-bar / taskbar icon. PNG decodes most reliably; the `image` crate's ICO+PNG path is fragile. */
     relaunchIcon?: string; /** Optional path forwarded to `PKEY_AppUserModel_RelaunchIconResource` so pinned taskbar shortcuts get the app's own icon. Must be a `.ico`. Path is consumed verbatim (no decode). */
+    relaunchCommand?: string; /** Command Windows runs when the user clicks the pinned shortcut (`PKEY_AppUserModel_RelaunchCommand`). Critical for msger-hosted apps: without it, the pin captures the bare `mailx.exe` (a webview host that expects JSON stdin) and clicking it does nothing. */
+    relaunchDisplayName?: string; /** Display name for the pinned shortcut (`PKEY_AppUserModel_RelaunchDisplayNameResource`). */
     dev?: boolean; /** Open DevTools automatically on startup (default: false) */
     debug?: boolean; /** Return debug information (HTML, size) in result (default: false) */
     showVersion?: boolean; /** Show version in window title (default: false) */

package/shower.js

@@ -2,7 +2,6 @@ import { spawn, execFileSync } from 'child_process';
 import { platform } from 'os';
 import path from 'path';
 import { pathToFileURL } from 'url';
-import { createRequire } from 'module';
 import fs from 'fs';
 import AnsiToHtml from 'ansi-to-html';
 // Load package.json for version
@@ -90,11 +89,24 @@ function getUserBinDir() { return getUserBinDirFor(_appName); }
  *  bundled binary. Returns null only if msger truly isn't installed. */
 function findMsgerSource() {
     const isWindows = platform() === 'win32';
+    const isDarwin = platform() === 'darwin';
     const arch = process.arch;
     const ext = isWindows ? '.exe' : '';
-    const baseName = (!isWindows && arch === 'arm64')
-        ? 'msgernative-linux-aarch64'
-        : 'msgernative';
+    let baseName;
+    if (isWindows) {
+        baseName = 'msgernative';
+    }
+    else if (isDarwin) {
+        // Mac binaries are built infrequently on a Mac and synced via OneDrive.
+        // Names are explicit so they don't collide with the Pi/Linux ARM binaries.
+        baseName = arch === 'arm64' ? 'msgernative-darwin-arm64' : 'msgernative-darwin-x64';
+    }
+    else if (arch === 'arm64') {
+        baseName = 'msgernative-linux-aarch64';
+    }
+    else {
+        baseName = 'msgernative';
+    }
     const msgerBin = getUserBinDirFor('msger');
     const pkgBin = path.join(import.meta.dirname, 'msger-native', 'bin');
     const stable = path.join(msgerBin, `${baseName}${ext}`);
@@ -134,56 +146,21 @@ function sweepAsideSiblings(perAppExe) {
     }
     catch { /* fall through */ }
 }
-/** Locate the rcedit-<arch>.exe shipped with the `rcedit` npm package
- *  (Electron-team maintained, published unscoped). Returns null on
- *  non-Windows or if the package isn't installed. We resolve the path
- *  manually so we can call the binary with `execFileSync` and keep the
- *  caller synchronous. */
-function findRceditBinary() {
-    if (platform() !== "win32")
-        return null;
-    try {
-        // The package ships rcedit-x64.exe / rcedit-ia32.exe / rcedit-arm64.exe
-        // in its `bin/` dir. Resolve via require.resolve('rcedit') → walk up
-        // to the package root, then into bin/.
-        const pkgEntry = createRequire(import.meta.url).resolve("rcedit");
-        const pkgRoot = path.dirname(pkgEntry);
-        const archMap = {
-            x64: "rcedit-x64.exe",
-            ia32: "rcedit-ia32.exe",
-            arm64: "rcedit-arm64.exe",
-        };
-        const exeName = archMap[process.arch] || "rcedit-x64.exe";
-        const candidates = [
-            path.join(pkgRoot, "bin", exeName),
-            path.join(pkgRoot, "..", "bin", exeName),
-        ];
-        for (const c of candidates) {
-            if (fs.existsSync(c))
-                return c;
-        }
-    }
-    catch { /* not installed — caller will fall back to plain copy */ }
-    return null;
-}
 /** Inject `.ico` into `exePath` as the IDI_ICON1 / RT_GROUP_ICON resource so
  *  the per-app exe shows the app's own icon in Explorer, Task Manager, the
  *  taskbar, and pinned shortcuts — every Windows context that reads the exe
- *  resource (which `with_window_icon` doesn't reach). Sync — fires the
- *  bundled rcedit.exe via `execFileSync`. Returns true on success. Failures
- *  don't break launch — the launcher just runs without the embedded icon. */
-function injectIcon(exePath, icoPath) {
-    const rcedit = findRceditBinary();
-    if (!rcedit) {
-        console.error(`  msger: rcedit binary not found — per-app icon not injected (install \`rcedit\` npm package)`);
-        return false;
-    }
+ *  resource (which `with_window_icon` doesn't reach). Sync — invokes the
+ *  shipped `msgernative.exe --update-icon` subcommand (no external deps;
+ *  msger stays self-contained). Returns true on success. Failures don't
+ *  break launch — the launcher just runs without the embedded icon. */
+function injectIcon(msgerNative, exePath, icoPath) {
     try {
-        execFileSync(rcedit, [exePath, "--set-icon", icoPath], { stdio: "pipe" });
+        execFileSync(msgerNative, ["--update-icon", exePath, icoPath], { stdio: "pipe" });
         return true;
     }
     catch (e) {
-        console.error(`  msger: rcedit failed for ${exePath}: ${e?.message || e}`);
+        const stderr = (e?.stderr ?? "").toString().trim();
+        console.error(`  msger: --update-icon failed for ${exePath}: ${e?.message || e}${stderr ? ` (${stderr})` : ""}`);
         return false;
     }
 }
@@ -191,7 +168,7 @@ function injectIcon(exePath, icoPath) {
  *  with the per-app icon resource injected. Two modes:
  *
  *  - `_appIcon` is set (the per-app-identity case): the per-app exe is a
- *    *real copy*, not a hardlink, because `rcedit` rewrites the resource
+ *    *real copy*, not a hardlink, because `--update-icon` rewrites the resource
  *    section and we don't want that change to bleed back into the shared
  *    `msgernative.exe` (which a hardlink would). Staleness compared via
  *    mtime of source exe + mtime of source icon. Refresh uses the
@@ -231,7 +208,7 @@ function ensureFresh(perAppExe, sourceExe) {
         sweepAsideSiblings(perAppExe);
         return;
     }
-    // Copy + rcedit path. Stale when the per-app exe is missing OR the source
+    // Copy + --update-icon path. Stale when the per-app exe is missing OR the source
     // exe is newer (msger updated) OR the source icon is newer (icon changed).
     const srcMtime = fs.statSync(sourceExe).mtimeMs;
     const icoMtime = fs.statSync(_appIcon).mtimeMs;
@@ -243,7 +220,7 @@ function ensureFresh(perAppExe, sourceExe) {
     if (!stale)
         return;
     // Build the new exe out-of-band so a running instance never sees a
-    // half-rcedit'd file. Sequence: copy → rcedit tmp → rename old aside →
+    // half---update-icon'd file. Sequence: copy → --update-icon tmp → rename old aside →
     // rename tmp into place. All renames work even on locked files; only
     // delete is blocked, and we defer that to the next launch's sweep.
     const stamp = Date.now();
@@ -251,14 +228,14 @@ function ensureFresh(perAppExe, sourceExe) {
     const isIco = _appIcon.toLowerCase().endsWith(".ico");
     try {
         fs.copyFileSync(sourceExe, tmpExe);
-        let rceditOk = false;
+        let injected = false;
         if (isIco) {
-            rceditOk = injectIcon(tmpExe, _appIcon);
+            injected = injectIcon(sourceExe, tmpExe, _appIcon);
         }
-        if (!isIco || !rceditOk) {
-            // No .ico available, or rcedit couldn't inject — fall back to a
-            // plain copy. Window-icon path still gets set via Tao at launch;
-            // we just don't get the EXE-level resource.
+        if (!isIco || !injected) {
+            // No .ico available, or the resource update failed — fall back
+            // to a plain copy. Window-icon path still gets set via Tao at
+            // launch; we just don't get the EXE-level resource.
         }
         if (fs.existsSync(perAppExe)) {
             try {
@@ -312,6 +289,7 @@ function provisionAppIcon(perAppDir) {
  *    own taskbar identity. */
 function resolveBinaryPath() {
     const isWindows = platform() === 'win32';
+    const isDarwin = platform() === 'darwin';
     const arch = process.arch;
     const pkgBinDir = path.join(import.meta.dirname, 'msger-native', 'bin');
     const userBinDir = getUserBinDir();
@@ -321,6 +299,10 @@ function resolveBinaryPath() {
         baseName = 'msgernative';
         ext = '.exe';
     }
+    else if (isDarwin) {
+        baseName = arch === 'arm64' ? 'msgernative-darwin-arm64' : 'msgernative-darwin-x64';
+        ext = '';
+    }
     else if (arch === 'arm64') {
         baseName = 'msgernative-linux-aarch64';
         ext = '';

package/sync-mac-binary.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/sync-mac-binary.js

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+/**
+ * sync-mac-binary.js — copy Mac binaries from the OneDrive-synced `mac/`
+ * staging area into `msger-native/bin/` so they ship in the next npm publish.
+ *
+ * Workflow:
+ *   - On a Mac: run `build-mac.sh`. It compiles, ad-hoc codesigns, and drops
+ *     the binary into `mac/msgernative-darwin-{arm64,x64}`.
+ *   - OneDrive syncs that file back to Windows.
+ *   - This script (run by `prepublishOnly`) copies it into `msger-native/bin/`.
+ *
+ * Gated by `platforms.mac` in builder/build-config.json (parallel to `pi`).
+ * Skipped entirely when false so a publish doesn't refresh Mac binaries — useful
+ * when no Mac is available, or to avoid pulling in a stale OneDrive copy.
+ *
+ * Tolerant of a missing `mac/` or missing binaries — Mac is built rarely, and
+ * a publish without a current Mac binary is fine. Mac users on that version
+ * will get a clear "Binary not found" error and can flag it for a rebuild.
+ */
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import JSON5 from "json5";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const macDir = path.join(__dirname, "mac");
+const binDir = path.join(__dirname, "msger-native", "bin");
+const configPath = path.join(__dirname, "msger-native", "builder", "build-config.json");
+
+// build-config.json may contain comments — use json5 (already a msger dep).
+const config = JSON5.parse(fs.readFileSync(configPath, "utf-8"));
+if (!config.platforms?.mac) {
+    console.log("  msger: platforms.mac=false in build-config.json — skipping Mac binary sync");
+    process.exit(0);
+}
+
+const targets = ["msgernative-darwin-arm64", "msgernative-darwin-x64"];
+
+if (!fs.existsSync(macDir)) {
+    console.log("  msger: no mac/ staging dir — skipping Mac binary sync");
+    process.exit(0);
+}
+
+let copied = 0;
+let skipped = 0;
+for (const name of targets) {
+    const src = path.join(macDir, name);
+    const dst = path.join(binDir, name);
+    if (!fs.existsSync(src)) continue;
+
+    const srcMtime = fs.statSync(src).mtimeMs;
+    const dstMtime = fs.existsSync(dst) ? fs.statSync(dst).mtimeMs : 0;
+    if (dstMtime >= srcMtime) {
+        console.log(`  msger: ${name} already current in bin/`);
+        skipped++;
+        continue;
+    }
+
+    try {
+        fs.copyFileSync(src, dst);
+        fs.chmodSync(dst, 0o755);
+        const sizeMB = (fs.statSync(dst).size / 1024 / 1024).toFixed(1);
+        console.log(`  msger: synced ${name} (${sizeMB} MB) → bin/`);
+        copied++;
+    } catch (e) {
+        console.error(`  msger: failed to sync ${name}: ${e.message}`);
+        process.exit(1);
+    }
+}
+
+if (copied === 0 && skipped === 0) {
+    console.log("  msger: no Mac binaries in mac/ — Mac users will get \"Binary not found\" until you build one");
+}