@bobfrankston/msger 0.1.353 → 0.1.355

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/msger",
-  "version": "0.1.353",
+  "version": "0.1.355",
   "description": "Fast, lightweight, cross-platform message box - Rust-powered alternative to msgview",
   "type": "module",
   "main": "./index.js",
@@ -51,8 +51,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/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
@@ -134,56 +133,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 +155,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 +195,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 +207,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 +215,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 {