mirinjs 0.1.0-alpha.1 → 0.1.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirinjs",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.10",
   "description": "Build desktop apps with Bun, TypeScript, and Chromium (CEF). The Bun-native Electron alternative.",
   "type": "module",
   "license": "MIT",

package/src/app.ts

@@ -289,6 +289,25 @@ class MirinApp extends Emitter<AppEvents> {
   /** Auto-updater (macOS). Inert unless the app was built with `release` set. */
   readonly updater: Updater = updater;
 
+  /** This app's bundle id (mirin.config `id`). `undefined` when run detached. */
+  get id(): string | undefined {
+    try {
+      return runtime().id;
+    } catch {
+      return undefined;
+    }
+  }
+
+  /** True under `mirin dev`; false in a packaged build (and when detached). Use it
+   *  to keep dev and installed data (caches, databases) separate. */
+  get isDev(): boolean {
+    try {
+      return runtime().isDev;
+    } catch {
+      return false;
+    }
+  }
+
   /** macOS Dock-icon controls. Hiding suits resident, hotkey-summoned apps. */
   readonly dock: Dock = {
     hide: () => this.#setDock(false),

package/src/config.ts

@@ -42,6 +42,9 @@ export interface WindowConfig {
   title?: string;
   width?: number;
   height?: number;
+  /** Minimum window size; the OS prevents resizing below it. */
+  minWidth?: number;
+  minHeight?: number;
   /** Screen position (bottom-left origin, points). Centered when absent. */
   x?: number;
   y?: number;
@@ -78,6 +81,12 @@ export interface MirinConfig {
   /** Reverse-DNS app id, e.g. "dev.peje.hello". */
   id: string;
   name: string;
+  /**
+   * Publisher / company name (e.g. "Netko Labs"). Shown in the Windows installer,
+   * the exe's file properties (CompanyName), and Add/Remove Programs. Defaults to
+   * the app `name`.
+   */
+  publisher?: string;
   /** Main-process entry, relative to the project root (runs in the Bun Worker). */
   main: string;
   /**
@@ -109,6 +118,14 @@ export interface MirinConfig {
    * `.zip`. Requires `makensis` (NSIS) on the build machine.
    */
   nsis?: boolean | NsisConfig;
+  /**
+   * Windows installer via **Inno Setup** — a modern flat wizard
+   * (`WizardStyle=modern`, the installer VS Code ships). Preferred over `nsis`
+   * when both are available; `true`/omitted builds the default installer, an
+   * object customizes it, `false` falls back to NSIS / the portable `.zip`.
+   * Requires `iscc` (Inno Setup 6+) on the build machine.
+   */
+  inno?: boolean | InnoConfig;
   /**
    * External binaries bundled into the `.app` and spawned at runtime with
    * `app.sidecar(name)`. Maps a logical name to a path (relative to the project
@@ -138,6 +155,12 @@ export interface MirinConfig {
    */
   urlSchemes?: string[];
   windows: Record<string, WindowConfig>;
+  /**
+   * Single-instance app (default true): a second launch focuses the running
+   * window and exits, instead of opening another window. Set false to allow
+   * multiple instances (each gets its own CEF cache dir).
+   */
+  singleInstance?: boolean;
 }
 
 /** A bundled sidecar binary with optional hardened-runtime entitlements. */
@@ -222,6 +245,13 @@ export interface NsisConfig {
   include?: string;
 }
 
+/**
+ * Inno Setup installer options — the same knobs as {@link NsisConfig}
+ * (perMachine, oneClick, shortcuts, license, publisher, runAfterFinish,
+ * installerIcon, and a raw `include` injected as `.iss` instead of NSIS script).
+ */
+export type InnoConfig = NsisConfig;
+
 export interface ReleaseConfig {
   /** Flat directory URL hosting `{channel}-{platform}-{arch}-*` update files. */
   baseUrl: string;

package/src/host.ts

@@ -50,6 +50,10 @@ const coreConfig = JSON.parse(
       process.env.MIRIN_DEV_URL ? { dev: true } : { resources_path: resourcesDir },
     ),
 );
+// Opt out of single-instance (the core default) when the app allows multiple.
+if (manifest.singleInstance === false) coreConfig.single_instance = false;
+// The app's bundle id keys the per-app CEF cache dir (Windows has no OS bundle id).
+if (typeof manifest.id === "string") coreConfig.identifier = manifest.id;
 
 // Load the native core on the main thread FIRST. The Worker also dlopens the
 // same dylib in its boot; doing the main-thread dlopen before spawning the
@@ -61,6 +65,7 @@ const worker = new Worker(workerPath, {
   workerData: {
     corePath,
     manifest,
+    id: typeof manifest.id === "string" ? manifest.id : undefined,
     devUrl: process.env.MIRIN_DEV_URL,
     resourcesDir,
     sidecarDir,

package/src/index.ts

@@ -52,6 +52,7 @@ export type {
   ReleaseConfig,
   DmgConfig,
   NsisConfig,
+  InnoConfig,
   SidecarSpec,
   SidecarEntitlement,
 } from "./config.ts";

package/src/native.ts

@@ -24,7 +24,7 @@ const symbols = {
   mirin_window_control: { args: [FFIType.u32, FFIType.ptr], returns: FFIType.void },
   mirin_window_set_material: { args: [FFIType.u32, FFIType.ptr], returns: FFIType.void },
   mirin_window_set_position: { args: [FFIType.u32, FFIType.f64, FFIType.f64], returns: FFIType.void },
-  mirin_window_maybe_start_drag: { args: [FFIType.u32, FFIType.i32, FFIType.i32, FFIType.i32], returns: FFIType.void },
+  mirin_window_maybe_start_drag: { args: [FFIType.u32, FFIType.i32, FFIType.i32, FFIType.i32, FFIType.i32], returns: FFIType.void },
   mirin_app_quit: { args: [], returns: FFIType.void },
   mirin_app_set_dock_visible: { args: [FFIType.i32], returns: FFIType.void },
   mirin_set_app_menu: { args: [FFIType.ptr], returns: FFIType.void },
@@ -114,8 +114,8 @@ export class Core {
     this.#lib.symbols.mirin_window_set_position(id, x, y);
   }
 
-  windowMaybeStartDrag(id: number, x: number, y: number, detail: number): void {
-    this.#lib.symbols.mirin_window_maybe_start_drag(id, x, y, detail);
+  windowMaybeStartDrag(id: number, x: number, y: number, detail: number, ht: number): void {
+    this.#lib.symbols.mirin_window_maybe_start_drag(id, x, y, detail, ht);
   }
 
   quit(): void {

package/src/rpc-server.ts

@@ -29,6 +29,8 @@ interface ControlFrame {
   verb?: string;
   /** Click count for pointer actions (2 = double-click → maximize). */
   detail?: number;
+  /** Win32 resize hit-test code when the mousedown is on a window edge/corner. */
+  ht?: number;
 }
 
 type IncomingFrame = RequestFrame | ControlFrame;

package/src/runtime.ts

@@ -18,6 +18,10 @@ export interface Runtime {
   core: Core;
   rpc: RpcServer;
   manifestWindows: ManifestWindowConfig[];
+  /** App bundle id (mirin.config `id`); undefined when detached. */
+  id?: string;
+  /** True under `mirin dev`; false in a packaged build. */
+  isDev: boolean;
   devUrl?: string;
   /** Contents/Resources of the running .app (for the updater). Absent in dev. */
   resourcesDir?: string;
@@ -87,6 +91,7 @@ export function boot(): void {
   const data = (workerData ?? {}) as {
     corePath?: string;
     manifest?: { windows?: Record<string, WindowConfig> };
+    id?: string;
     devUrl?: string;
     resourcesDir?: string;
     sidecarDir?: string;
@@ -107,7 +112,7 @@ export function boot(): void {
   rpc.setControlHandler((frame, webview) => {
     switch (frame.action) {
       case "window.maybeStartDrag":
-        core.windowMaybeStartDrag(webview, frame.x ?? 0, frame.y ?? 0, frame.detail ?? 1);
+        core.windowMaybeStartDrag(webview, frame.x ?? 0, frame.y ?? 0, frame.detail ?? 1, frame.ht ?? 0);
         break;
       case "window.control":
         if (frame.verb) core.windowControl(webview, frame.verb);
@@ -126,6 +131,8 @@ export function boot(): void {
     core,
     rpc,
     manifestWindows,
+    id: data.id,
+    isDev: !!data.devUrl,
     devUrl: data.devUrl,
     resourcesDir: data.resourcesDir,
     corePath,

package/src/updater.ts

@@ -13,9 +13,17 @@
  * packaged app with `release` set; in `mirin dev` the updater is idle.
  */
 
-import { homedir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
-import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  renameSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
 import { $ } from "bun";
 import { runtime } from "./runtime.ts";
 import { loadCodec } from "./codec.ts";
@@ -213,20 +221,59 @@ export class Updater {
       // to exit (the exe/bundle is locked while running), swaps the folder, relaunches.
       if (IS_WINDOWS) {
         const runningApp = join(this.#resourcesDir()!, "..");
-        const exe = join(runningApp, `${this.#version()!.name}.exe`);
+        const name = this.#version()!.name;
+        const exe = join(runningApp, `${name}.exe`);
+        const script = join(tmpdir(), `mirin-apply-${name}.ps1`);
+        const applyVbs = join(tmpdir(), `mirin-apply-${name}.vbs`);
+        const launchVbs = join(tmpdir(), `mirin-launch-${name}.vbs`);
         const ps = [
           `$ErrorActionPreference='SilentlyContinue'`,
+          // Never let the app dir be this process's cwd (Windows can't delete a cwd).
+          `Set-Location $env:TEMP`,
+          // Wait for the host to exit (it locks the exe), then a beat for CEF's
+          // helper subprocesses to release their file locks (libcef.dll etc.).
           `while (Get-Process -Id ${process.pid} -ErrorAction SilentlyContinue) { Start-Sleep -Milliseconds 200 }`,
-          `Start-Sleep -Milliseconds 400`,
-          `Remove-Item -Recurse -Force ${psq(runningApp)}`,
+          `Start-Sleep -Milliseconds 700`,
+          // Replace the app folder, retrying ~10s while any lingering lock clears.
+          `for ($i=0; $i -lt 50; $i++) { Remove-Item -Recurse -Force ${psq(runningApp)}; if (-not (Test-Path ${psq(runningApp)})) { break }; Start-Sleep -Milliseconds 200 }`,
           `Move-Item -Force ${psq(this.#staged)} ${psq(runningApp)}`,
-          `Start-Process ${psq(exe)}`,
-        ].join("; ");
-        Bun.spawn(["powershell", "-NoProfile", "-NonInteractive", "-Command", ps], {
+          `Start-Process -FilePath ${psq(exe)} -WorkingDirectory ${psq(runningApp)}`,
+          // self-clean the temp launch scripts (this .ps1 + the two .vbs shims)
+          `Remove-Item -Force ${psq(script)},${psq(applyVbs)},${psq(launchVbs)}`,
+        ].join("\n");
+        writeFileSync(script, ps, "utf8");
+
+        // No terminal window may appear during the update. powershell.exe is a
+        // console-subsystem program: launching it directly (even with
+        // -WindowStyle Hidden) flashes a console, because the OS allocates the
+        // console before powershell can hide it. wscript.exe is a GUI-subsystem
+        // host with no console; its Shell.Run(cmd, 0) starts powershell with
+        // SW_HIDE in the initial STARTUPINFO, so no window is ever shown.
+        writeFileSync(
+          applyVbs,
+          `CreateObject("WScript.Shell").Run "powershell -NoProfile -NonInteractive ` +
+            `-ExecutionPolicy Bypass -WindowStyle Hidden -File ""${script}""", 0, False\n`,
+          "utf8",
+        );
+
+        // The swap MUST outlive this process. A Bun.spawn child is in our job
+        // object and is killed when we quit — even with unref/detached (verified).
+        // WMI's Win32_Process.Create has the WMI service spawn it, outside our job,
+        // so it survives. Issue that WMI call from a console-less wscript host too,
+        // so the launcher itself never flashes a window. `await` the short launcher
+        // so the swap process exists before core.quit() (no race), then quit.
+        writeFileSync(
+          launchVbs,
+          `GetObject("winmgmts:Win32_Process").Create ` +
+            `"wscript.exe //B //Nologo ""${applyVbs}""", Null, Null, pid\n`,
+          "utf8",
+        );
+        const launcher = Bun.spawn(["wscript.exe", "//B", "//Nologo", launchVbs], {
           stdin: "ignore",
           stdout: "ignore",
           stderr: "ignore",
-        }).unref();
+        });
+        await launcher.exited;
       } else {
         const runningApp = join(this.#resourcesDir()!, "..", "..");
         const script = [