mirinjs 0.1.0-alpha.6 → 0.1.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mirinjs",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.8",
   "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/host.ts

@@ -52,6 +52,8 @@ const coreConfig = JSON.parse(
 );
 // 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
@@ -63,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/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;
@@ -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

@@ -15,7 +15,15 @@
 
 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";
@@ -214,31 +222,36 @@ export class Updater {
       if (IS_WINDOWS) {
         const runningApp = join(this.#resourcesDir()!, "..");
         const exe = join(runningApp, `${this.#version()!.name}.exe`);
+        const script = join(tmpdir(), `mirin-apply-${this.#version()!.name}.ps1`);
         const ps = [
           `$ErrorActionPreference='SilentlyContinue'`,
-          // Wait for the host process to exit (it locks the exe).
+          // 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 }`,
-          // 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.
+          // 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 -FilePath ${psq(exe)} -WorkingDirectory ${psq(runningApp)}`,
-        ].join("; ");
-        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();
+          `Remove-Item -Force ${psq(script)}`, // self-clean
+        ].join("\n");
+        writeFileSync(script, ps, "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). So spawn
+        // the swap via WMI Win32_Process.Create: the WMI service launches it, outside
+        // our job, so it survives. `await` the short launcher so the swap process
+        // exists before core.quit() (no race), then quit.
+        const wmiPath = script.replace(/'/g, "''");
+        const wmi =
+          `([wmiclass]'Win32_Process').Create('powershell -NoProfile -NonInteractive ` +
+          `-WindowStyle Hidden -ExecutionPolicy Bypass -File "${wmiPath}"') | Out-Null`;
+        const launcher = Bun.spawn(
+          ["powershell", "-NoProfile", "-NonInteractive", "-Command", wmi],
+          { stdin: "ignore", stdout: "ignore", stderr: "ignore" },
+        );
+        await launcher.exited;
       } else {
         const runningApp = join(this.#resourcesDir()!, "..", "..");
         const script = [