@mirinjs/cli 0.1.0-alpha.0 → 0.1.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirinjs/cli",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.2",
   "description": "CLI for mirin apps: dev, build, init.",
   "type": "module",
   "license": "MIT",
@@ -27,12 +27,12 @@
     "bun": ">=1.2.0"
   },
   "dependencies": {
-    "create-mirinjs": "0.1.0-alpha.0",
-    "mirinjs": "0.1.0-alpha.0"
+    "create-mirinjs": "0.1.0-alpha.2",
+    "mirinjs": "0.1.0-alpha.2"
   },
   "optionalDependencies": {
-    "@mirinjs/darwin-arm64": "0.1.0-alpha.0",
-    "@mirinjs/win32-x64": "0.1.0-alpha.0"
+    "@mirinjs/darwin-arm64": "0.1.0-alpha.2",
+    "@mirinjs/win32-x64": "0.1.0-alpha.2"
   },
   "publishConfig": {
     "access": "public"

package/src/build.ts

@@ -43,6 +43,8 @@ export interface BuildResult {
   projectDir: string;
   /** DMG config from mirin.config.ts (`true`/object/`false`); default `true`. */
   dmg: boolean | import("mirinjs").DmgConfig;
+  /** NSIS installer config (Windows) — `true`/object/`false`; default `true`. */
+  nsis: boolean | import("mirinjs").NsisConfig;
   /** Codesign identity used for the bundle, if any (MIRIN_SIGN_IDENTITY). */
   signIdentity?: string;
 }
@@ -73,6 +75,7 @@ export async function build(projectDir = process.cwd()): Promise<BuildResult> {
   const channel: string = config.release?.channel ?? "stable";
   const baseUrl: string | undefined = config.release?.baseUrl;
   const dmg: boolean | import("mirinjs").DmgConfig = config.dmg ?? true;
+  const nsis: boolean | import("mirinjs").NsisConfig = config.nsis ?? true;
 
   console.log(`[mirin build] ${appName} ${version}`);
 
@@ -146,6 +149,7 @@ export async function build(projectDir = process.cwd()): Promise<BuildResult> {
     coreDylib: artifacts.coreDylib,
     projectDir,
     dmg,
+    nsis,
     signIdentity,
   };
 }

package/src/dmg.ts

@@ -93,6 +93,34 @@ export async function notarizeAndStaple(target: string): Promise<boolean> {
   return true;
 }
 
+/**
+ * `hdiutil create` with retries. "Resource busy" is a transient CI flake — a
+ * Spotlight/antivirus/`fseventsd` process touches the staging folder (or a prior
+ * image hasn't fully detached) while hdiutil tries to read it. A short backoff
+ * clears it; only a non-busy error fails immediately.
+ */
+async function hdiutilCreate(
+  vol: string,
+  staging: string,
+  format: string,
+  dmgPath: string,
+): Promise<void> {
+  let stderr = "";
+  for (let attempt = 1; attempt <= 4; attempt++) {
+    const res =
+      await $`hdiutil create -volname ${vol} -srcfolder ${staging} -ov -format ${format} ${dmgPath}`
+        .quiet()
+        .nothrow();
+    if (res.exitCode === 0) return;
+    stderr = res.stderr.toString().trim();
+    if (!/busy/i.test(stderr)) break; // not the transient flake — fail now
+    console.warn(`[mirin release] hdiutil create busy (attempt ${attempt}/4); retrying…`);
+    rmSync(dmgPath, { force: true });
+    await Bun.sleep(3000 * attempt);
+  }
+  throw new Error(`hdiutil create failed: ${stderr}`);
+}
+
 /** Does this config ask for a styled Finder window (vs. a plain DMG)? */
 function wantsLayout(o: DmgOptions): boolean {
   return !!(o.background || o.appPosition || o.applicationsPosition || o.windowSize || o.iconSize);
@@ -131,7 +159,7 @@ export async function buildDmg(input: BuildDmgInput): Promise<string> {
       }
     }
     if (!built) {
-      await $`hdiutil create -volname ${vol} -srcfolder ${staging} -ov -format ${format} ${dmgPath}`.quiet();
+      await hdiutilCreate(vol, staging, format, dmgPath);
     }
   } finally {
     rmSync(staging, { recursive: true, force: true });

package/src/installer-win.ts

@@ -0,0 +1,166 @@
+/**
+ * Windows installer (NSIS) for `mirin release` — the Windows analogue of `dmg.ts`.
+ *
+ * Generates an NSIS script from the app folder + config and compiles it with
+ * `makensis` into a single `…-setup.exe`. The installer copies the app into
+ * Program Files (per-machine) or `%LOCALAPPDATA%\Programs` (per-user, the
+ * default — no elevation, and the in-app updater can swap the folder), creates
+ * Start Menu + Desktop shortcuts, writes an uninstaller, and registers an
+ * Add/Remove Programs entry. Customizable via {@link NsisConfig}.
+ *
+ * Requires `makensis` (NSIS 3+) on PATH; the caller checks `hasMakensis()` and
+ * falls back to the portable `.zip` when it's absent.
+ */
+
+import { $ } from "bun";
+import { existsSync, rmSync, writeFileSync } from "node:fs";
+import { join, isAbsolute } from "node:path";
+import type { NsisConfig } from "mirinjs";
+import { makeWindowsIcon } from "./icon-win.ts";
+
+export interface BuildNsisInput {
+  /** The assembled app folder (build/<App>). */
+  appDir: string;
+  appName: string;
+  /** Host exe name inside the folder (<App>.exe). */
+  exeName: string;
+  version: string;
+  /** Reverse-DNS app id → the Add/Remove Programs registry key. */
+  bundleId: string;
+  /** Output directory (build/release). */
+  outDir: string;
+  /** Output file name (e.g. stable-win32-x64-Anko-setup.exe). */
+  fileName: string;
+  options: NsisConfig;
+  /** Project root, for resolving a relative license / installerIcon. */
+  projectDir: string;
+}
+
+/** Whether `makensis` is on PATH. */
+export async function hasMakensis(): Promise<boolean> {
+  return (await $`makensis -VERSION`.quiet().nothrow()).exitCode === 0;
+}
+
+/** NSIS double-quoted string escaping (`"` and `$` are special). */
+function nsis(s: string): string {
+  return s.replace(/\$/g, "$$$$").replace(/"/g, '$\\"');
+}
+
+const resolve = (projectDir: string, p: string) => (isAbsolute(p) ? p : join(projectDir, p));
+
+/** Build the installer with `makensis`, returning the setup.exe path. */
+export async function buildNsisInstaller(input: BuildNsisInput): Promise<string> {
+  const { appDir, appName, exeName, version, bundleId, outDir, fileName, options, projectDir } = input;
+  const out = join(outDir, fileName);
+  rmSync(out, { force: true });
+
+  const perMachine = options.perMachine === true;
+  const assisted = options.oneClick !== true;
+  const desktop = options.desktopShortcut !== false;
+  const startMenu = options.startMenuShortcut !== false;
+  const runAfter = options.runAfterFinish !== false;
+  const changeDir = options.allowChangeInstallDir !== false;
+  const publisher = options.publisher ?? appName;
+  const root = perMachine ? "HKLM" : "HKCU";
+  const installDir =
+    options.installDir ?? (perMachine ? `$PROGRAMFILES64\\${appName}` : `$LOCALAPPDATA\\Programs\\${appName}`);
+
+  // Installer/uninstaller icon: an explicit .ico, else the app's bundled icon.ico.
+  let icon: string | undefined;
+  if (options.installerIcon) {
+    icon = makeWindowsIcon(resolve(projectDir, options.installerIcon), join(outDir, "_installer.ico"));
+  } else if (existsSync(join(appDir, "icon.ico"))) {
+    icon = join(appDir, "icon.ico");
+  }
+
+  const license = options.license ? resolve(projectDir, options.license) : undefined;
+  if (license && !existsSync(license)) throw new Error(`nsis: license not found: ${license}`);
+
+  const L: string[] = [];
+  L.push("Unicode True");
+  L.push("SetCompressor /SOLID lzma");
+  L.push('!include "MUI2.nsh"');
+  L.push('!include "FileFunc.nsh"');
+  L.push(`Name "${nsis(appName)}"`);
+  L.push(`OutFile "${nsis(out)}"`);
+  L.push(`InstallDir "${installDir}"`);
+  L.push(`RequestExecutionLevel ${perMachine ? "admin" : "user"}`);
+  L.push(`!define MUI_ABORTWARNING`);
+  if (icon) {
+    L.push(`!define MUI_ICON "${nsis(icon)}"`);
+    L.push(`!define MUI_UNICON "${nsis(icon)}"`);
+  }
+
+  // Pages. Assisted shows the full wizard; one-click is just the progress page.
+  if (assisted) L.push("!insertmacro MUI_PAGE_WELCOME");
+  if (license) L.push(`!insertmacro MUI_PAGE_LICENSE "${nsis(license)}"`);
+  if (assisted && changeDir) L.push("!insertmacro MUI_PAGE_DIRECTORY");
+  if (assisted && runAfter) {
+    L.push(`!define MUI_FINISHPAGE_RUN "$INSTDIR\\${nsis(exeName)}"`);
+  }
+  L.push("!insertmacro MUI_PAGE_INSTFILES");
+  if (assisted) L.push("!insertmacro MUI_PAGE_FINISH");
+  L.push("!insertmacro MUI_UNPAGE_CONFIRM");
+  L.push("!insertmacro MUI_UNPAGE_INSTFILES");
+  L.push('!insertmacro MUI_LANGUAGE "English"');
+
+  if (options.include) L.push("", "; --- user include ---", options.include, "");
+
+  const key = `Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${bundleId}`;
+  const ctx = perMachine ? "all" : "current";
+
+  // Install section.
+  L.push("Section");
+  L.push(`  SetShellVarContext ${ctx}`);
+  L.push(`  SetOutPath "$INSTDIR"`);
+  L.push(`  File /r "${nsis(appDir)}\\*"`);
+  L.push(`  WriteUninstaller "$INSTDIR\\Uninstall.exe"`);
+  if (desktop) {
+    L.push(`  CreateShortcut "$DESKTOP\\${nsis(appName)}.lnk" "$INSTDIR\\${nsis(exeName)}"`);
+  }
+  if (startMenu) {
+    L.push(`  CreateDirectory "$SMPROGRAMS\\${nsis(appName)}"`);
+    L.push(
+      `  CreateShortcut "$SMPROGRAMS\\${nsis(appName)}\\${nsis(appName)}.lnk" "$INSTDIR\\${nsis(exeName)}"`,
+    );
+  }
+  // Estimated size for Add/Remove Programs.
+  L.push(`  \${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2`);
+  L.push(`  IntFmt $0 "0x%08X" $0`);
+  const reg = (name: string, val: string) => L.push(`  WriteRegStr ${root} "${key}" "${name}" "${val}"`);
+  reg("DisplayName", nsis(appName));
+  reg("DisplayVersion", nsis(version));
+  reg("Publisher", nsis(publisher));
+  reg("DisplayIcon", `$INSTDIR\\${nsis(exeName)}`);
+  reg("InstallLocation", "$INSTDIR");
+  reg("UninstallString", '$INSTDIR\\Uninstall.exe');
+  reg("QuietUninstallString", '$INSTDIR\\Uninstall.exe /S');
+  L.push(`  WriteRegDWORD ${root} "${key}" "NoModify" 1`);
+  L.push(`  WriteRegDWORD ${root} "${key}" "NoRepair" 1`);
+  L.push(`  WriteRegDWORD ${root} "${key}" "EstimatedSize" $0`);
+  if (!assisted && runAfter) L.push(`  Exec '"$INSTDIR\\${nsis(exeName)}"'`);
+  L.push("SectionEnd");
+
+  // Uninstall section.
+  L.push("Section \"Uninstall\"");
+  L.push(`  SetShellVarContext ${ctx}`);
+  if (desktop) L.push(`  Delete "$DESKTOP\\${nsis(appName)}.lnk"`);
+  if (startMenu) {
+    L.push(`  Delete "$SMPROGRAMS\\${nsis(appName)}\\${nsis(appName)}.lnk"`);
+    L.push(`  RMDir "$SMPROGRAMS\\${nsis(appName)}"`);
+  }
+  L.push(`  RMDir /r "$INSTDIR"`);
+  L.push(`  DeleteRegKey ${root} "${key}"`);
+  L.push("SectionEnd");
+
+  const script = join(outDir, "_installer.nsi");
+  writeFileSync(script, L.join("\n") + "\n");
+  console.log(`[mirin release] compiling NSIS installer → ${fileName}`);
+  const res = await $`makensis -V2 ${script}`.nothrow();
+  rmSync(script, { force: true });
+  rmSync(join(outDir, "_installer.ico"), { force: true });
+  if (res.exitCode !== 0 || !existsSync(out)) {
+    throw new Error(`makensis failed (exit ${res.exitCode})`);
+  }
+  return out;
+}

package/src/release.ts

@@ -22,6 +22,7 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { build } from "./build.ts";
 import { buildDmg, notarizeAndStaple, type DmgOptions } from "./dmg.ts";
+import { buildNsisInstaller, hasMakensis } from "./installer-win.ts";
 import { loadCodec } from "mirinjs/codec";
 
 const sha256File = (path: string) =>
@@ -129,28 +130,66 @@ export async function release(projectDir = process.cwd()): Promise<number> {
   let installerName: string | undefined;
   let installerSize = 0;
   if (isWindows) {
-    installerName = `${prefix}-${safeName}.zip`;
-    console.log(`[mirin release] zipping installer → ${installerName}`);
-    const zipPath = join(outDir, installerName);
-    rmSync(zipPath, { force: true });
-    // bsdtar (Windows `tar`) creates a .zip from the extension with `-a`.
-    await $`tar -a -cf ${zipPath} -C ${buildDir} ${appArtifact}`;
-    installerSize = readFileSync(zipPath).byteLength;
+    // Preferred: a real NSIS installer (Program Files / per-user install, Start
+    // Menu + Desktop shortcuts, uninstaller, Add/Remove Programs). Falls back to a
+    // portable .zip when nsis is disabled or makensis isn't installed.
+    const wantsInstaller = result.nsis !== false;
+    if (wantsInstaller && (await hasMakensis())) {
+      installerName = `${prefix}-${safeName}-setup.exe`;
+      const exePath = await buildNsisInstaller({
+        appDir: result.app,
+        appName: result.appName,
+        exeName: `${result.appName}.exe`,
+        version: result.version,
+        bundleId: result.bundleId,
+        outDir,
+        fileName: installerName,
+        options: typeof result.nsis === "object" ? result.nsis : {},
+        projectDir: result.projectDir,
+      });
+      installerSize = readFileSync(exePath).byteLength;
+    } else {
+      if (wantsInstaller) {
+        console.warn(
+          "[mirin release] makensis (NSIS) not found — shipping the portable .zip. " +
+            "Install NSIS (e.g. `scoop install nsis`) for an installer.",
+        );
+      }
+      installerName = `${prefix}-${safeName}.zip`;
+      console.log(`[mirin release] zipping → ${installerName}`);
+      const zipPath = join(outDir, installerName);
+      rmSync(zipPath, { force: true });
+      // bsdtar (Windows `tar`) creates a .zip from the extension with `-a`.
+      await $`tar -a -cf ${zipPath} -C ${buildDir} ${appArtifact}`;
+      installerSize = readFileSync(zipPath).byteLength;
+    }
   } else if (result.dmg !== false) {
-    installerName = `${prefix}-${safeName}.dmg`;
-    console.log(`[mirin release] building installer → ${installerName}`);
-    const options: DmgOptions = typeof result.dmg === "object" ? result.dmg : {};
-    const dmgPath = await buildDmg({
-      app: result.app,
-      appName: result.appName,
-      outDir,
-      fileName: installerName,
-      options,
-      projectDir: result.projectDir,
-      signIdentity: result.signIdentity,
-    });
-    await notarizeAndStaple(dmgPath); // no-op without notary credentials
-    installerSize = readFileSync(dmgPath).byteLength;
+    // The DMG is the first-install convenience; the updater bundle + manifest (the
+    // critical artifacts) are already built. Never fail the whole release over a
+    // flaky installer step — warn loudly and ship the rest.
+    const dmgName = `${prefix}-${safeName}.dmg`;
+    console.log(`[mirin release] building installer → ${dmgName}`);
+    try {
+      const options: DmgOptions = typeof result.dmg === "object" ? result.dmg : {};
+      const dmgPath = await buildDmg({
+        app: result.app,
+        appName: result.appName,
+        outDir,
+        fileName: dmgName,
+        options,
+        projectDir: result.projectDir,
+        signIdentity: result.signIdentity,
+      });
+      await notarizeAndStaple(dmgPath); // no-op without notary credentials
+      installerName = dmgName;
+      installerSize = readFileSync(dmgPath).byteLength;
+    } catch (e) {
+      console.warn(
+        `\n[mirin release] ⚠️  DMG build failed: ${e instanceof Error ? e.message : e}\n` +
+          `[mirin release] shipping the updater bundle + manifest WITHOUT a .dmg installer.\n`,
+      );
+      rmSync(join(outDir, dmgName), { force: true });
+    }
   }
 
   const mb = (n: number) => (n / 1e6).toFixed(1);