mirinjs 0.1.0-alpha.4 → 0.1.0-alpha.6

package/package.json

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

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,8 @@ 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;
 
 // 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

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

@@ -107,7 +107,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);

package/src/updater.ts

@@ -13,7 +13,7 @@
  * 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 { $ } from "bun";
@@ -216,17 +216,29 @@ export class Updater {
         const exe = join(runningApp, `${this.#version()!.name}.exe`);
         const ps = [
           `$ErrorActionPreference='SilentlyContinue'`,
+          // Wait for the host process to exit (it locks the exe).
           `while (Get-Process -Id ${process.pid} -ErrorAction SilentlyContinue) { Start-Sleep -Milliseconds 200 }`,
-          `Start-Sleep -Milliseconds 400`,
-          `Remove-Item -Recurse -Force ${psq(runningApp)}`,
+          // Give CEF's helper subprocesses a beat to exit and release their file
+          // locks (libcef.dll etc.) — they go just after the host.
+          `Start-Sleep -Milliseconds 700`,
+          // Replace the app folder, retrying while any lingering lock clears
+          // (~10s max). Unlike Unix, Windows can't delete a dir that's still a
+          // process's cwd or holds an open handle — hence the neutral cwd below.
+          `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)}`,
+          `Start-Process -FilePath ${psq(exe)} -WorkingDirectory ${psq(runningApp)}`,
         ].join("; ");
-        Bun.spawn(["powershell", "-NoProfile", "-NonInteractive", "-Command", ps], {
-          stdin: "ignore",
-          stdout: "ignore",
-          stderr: "ignore",
-        }).unref();
+        Bun.spawn(
+          ["powershell", "-NoProfile", "-NonInteractive", "-WindowStyle", "Hidden", "-Command", ps],
+          {
+            // Run from a neutral dir, NOT the inherited install dir — otherwise the
+            // app folder is this PowerShell's cwd and Windows refuses to delete it.
+            cwd: tmpdir(),
+            stdin: "ignore",
+            stdout: "ignore",
+            stderr: "ignore",
+          },
+        ).unref();
       } else {
         const runningApp = join(this.#resourcesDir()!, "..", "..");
         const script = [