mirinjs 0.1.0-alpha.24 → 0.1.0-alpha.26

package/package.json

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

package/src/config/manifest.ts

@@ -183,6 +183,14 @@ export interface MirinConfig {
    * app worker owns AppKit/CEF (see docs/architecture.md).
    */
   workers?: Record<string, string>;
+  /**
+   * Extra directories bundled verbatim into the app (`Contents/Resources/<name>`
+   * on macOS, `resources/<name>` elsewhere), for assets the main process reads
+   * at runtime: a bundled server, templates, data files. Maps a filename-safe
+   * name to a project-relative directory. Resolve one with `resolveResource(name)`;
+   * under `mirin dev` it points at the source directory.
+   */
+  resources?: Record<string, string>;
   /**
    * Custom URL schemes this app registers as a handler for (macOS
    * `CFBundleURLTypes`), e.g. `["anko"]` so `anko://…` links launch the app (or

package/src/index.ts

@@ -62,7 +62,7 @@ export type { MenuItemTemplate, MenuRole } from "./menu.ts";
 export { menu } from "./menu.ts";
 export type { NotificationOptions } from "./notification.ts";
 export { notification } from "./notification.ts";
-export { NotAttachedError, resolveWorker } from "./runtime.ts";
+export { NotAttachedError, resolveResource, resolveWorker } from "./runtime.ts";
 export { globalShortcut } from "./shortcut.ts";
 export type { SidecarOptions, SidecarProcess } from "./sidecar.ts";
 export { resolveSidecar, sidecar } from "./sidecar.ts";

package/src/logger.ts

@@ -14,7 +14,9 @@
  * Every emitted line is also recorded to the devtools sink (docs/agent-devtools.md).
  */
 
+import { format } from "node:util";
 import { record } from "./devtools/sink.ts";
+import { writeLine } from "./shared/console.ts";
 import { firstError, formatArgs, formatStack } from "./shared/format.ts";
 
 export type LogLevel = "debug" | "info" | "warn" | "error" | "silent";
@@ -97,8 +99,7 @@ export class Logger {
     const name = this.#scope ? `[mirin:${this.#scope}]` : "[mirin]";
     const prefix = useColor ? `${COLOR.dim}${name}${COLOR.reset}` : name;
     const tag = useColor ? `${COLOR[level]}${level}${COLOR.reset}` : level;
-    const out = level === "warn" || level === "error" ? console.error : console.log;
-    out(`${prefix} ${tag}`, ...args);
+    writeLine(level === "warn" || level === "error" ? 2 : 1, `${prefix} ${tag} ${format(...args)}`);
     this.#record(level, args);
   }
 

package/src/runtime.ts

@@ -4,12 +4,13 @@
  * API lives in app/index.ts and the feature modules, which subscribe here.
  */
 
-import { join } from "node:path";
+import { isAbsolute, join } from "node:path";
 import { workerData } from "node:worker_threads";
 import type { DevtoolsConfig, WindowConfig } from "./config/index.ts";
 import { parseDevtoolsConfig } from "./devtools/options.ts";
 import { Core } from "./native.ts";
 import { RpcServer } from "./rpc-server.ts";
+import { installWorkerConsole } from "./shared/console.ts";
 
 export interface ManifestWindowConfig extends WindowConfig {
   name: string;
@@ -32,6 +33,8 @@ export interface Runtime {
   sidecarDir?: string;
   /** Dir holding bundled extra-worker JS (for `resolveWorker`). */
   workersDir?: string;
+  /** Declared resource directories: source paths in dev, bundle-relative names in prod. */
+  resources: Record<string, string>;
   /** `devtools` block from the manifest, resolved by the devtools module. */
   devtools?: DevtoolsConfig;
 }
@@ -137,7 +140,11 @@ export function claimBootSlot(): boolean {
 export function boot(): void {
   const data = (workerData ?? {}) as {
     corePath?: string;
-    manifest?: { windows?: Record<string, WindowConfig>; devtools?: unknown };
+    manifest?: {
+      windows?: Record<string, WindowConfig>;
+      devtools?: unknown;
+      resources?: Record<string, string>;
+    };
     id?: string;
     devUrl?: string;
     resourcesDir?: string;
@@ -146,6 +153,7 @@ export function boot(): void {
   };
   const corePath = data.corePath ?? process.env.MIRIN_CORE;
   if (!corePath) return; // not under the host; the API stays detached
+  installWorkerConsole();
   if (!claimBootSlot()) {
     console.error(
       "[mirin] refusing to boot a second mirinjs copy in this process — the bundle " +
@@ -199,6 +207,7 @@ export function boot(): void {
     corePath,
     sidecarDir: data.sidecarDir,
     workersDir: data.workersDir,
+    resources: data.manifest?.resources ?? {},
     devtools: parseDevtoolsConfig(data.manifest?.devtools),
   };
   core.onEvent(dispatch);
@@ -210,6 +219,19 @@ export function boot(): void {
  * Works in `mirin dev` and the built `.app`. Extra workers run off the main
  * thread and must not call window/native APIs.
  */
+/**
+ * Resolve a bundled resource directory (declared in `mirin.config.ts` `resources`)
+ * to an absolute path. Under `mirin dev` this is the source directory; in a built
+ * app it lives under the bundle's resources directory.
+ */
+export function resolveResource(name: string): string {
+  const entry = current?.resources[name];
+  if (!current || entry === undefined) throw new NotAttachedError(`resolveResource("${name}")`);
+  if (isAbsolute(entry)) return entry;
+  if (!current.resourcesDir) throw new NotAttachedError(`resolveResource("${name}")`);
+  return join(current.resourcesDir, entry);
+}
+
 export function resolveWorker(name: string): string {
   const dir = current?.workersDir;
   if (!dir) throw new NotAttachedError("resolveWorker");

package/src/shared/console.ts

@@ -0,0 +1,46 @@
+import { writeSync } from "node:fs";
+import { format } from "node:util";
+import { record } from "../devtools/sink.ts";
+import type { DevEventLevel } from "../devtools/types.ts";
+import { firstError, formatArgs, formatStack } from "./format.ts";
+
+export type LineWriter = (fd: 1 | 2, line: string) => void;
+
+// The app Worker's console normally hands output to the main thread, which sits
+// inside CEF's message loop for the life of the app, so nothing is ever written.
+// A direct fd write from the Worker thread bypasses that.
+export function writeLine(fd: 1 | 2, line: string): void {
+  try {
+    writeSync(fd, line.endsWith("\n") ? line : `${line}\n`);
+  } catch {
+    // A closed pipe (parent gone) must not take the app down with a log line.
+  }
+}
+
+const CONSOLE_LEVELS = {
+  log: "info",
+  info: "info",
+  debug: "debug",
+  warn: "warn",
+  error: "error",
+} as const satisfies Record<string, DevEventLevel>;
+
+export type ConsoleMethod = keyof typeof CONSOLE_LEVELS;
+
+/** Route `console.*` from the Worker to fd 1/2 directly and into the devtools sink. */
+export function installWorkerConsole(write: LineWriter = writeLine): void {
+  for (const method of Object.keys(CONSOLE_LEVELS) as ConsoleMethod[]) {
+    const level = CONSOLE_LEVELS[method];
+    console[method] = (...args: unknown[]) => {
+      write(level === "warn" || level === "error" ? 2 : 1, format(...args));
+      const error = firstError(args);
+      record({
+        src: "main",
+        level,
+        type: "console",
+        msg: formatArgs(args),
+        data: { method, ...(error !== undefined ? { stack: formatStack(error) } : {}) },
+      });
+    };
+  }
+}

package/src/updater/lib/version.ts

@@ -0,0 +1,45 @@
+// Loose semver: "1.2.3", "v1.2.3", "1.2.3-nightly.4". Numeric segments compare
+// as numbers, anything else lexically; a prerelease sorts below its release.
+function parse(version: string): { main: string[]; pre: string[] } {
+  const trimmed = version.trim().replace(/^v/i, "");
+  const plus = trimmed.indexOf("+");
+  const noBuild = plus === -1 ? trimmed : trimmed.slice(0, plus);
+  const dash = noBuild.indexOf("-");
+  const main = (dash === -1 ? noBuild : noBuild.slice(0, dash)).split(".");
+  const pre = dash === -1 ? [] : noBuild.slice(dash + 1).split(".");
+  return { main, pre };
+}
+
+function compareSegment(a: string | undefined, b: string | undefined): number {
+  if (a === undefined && b === undefined) return 0;
+  if (a === undefined) return -1;
+  if (b === undefined) return 1;
+  const na = /^\d+$/.test(a) ? Number(a) : null;
+  const nb = /^\d+$/.test(b) ? Number(b) : null;
+  if (na !== null && nb !== null) return na === nb ? 0 : na < nb ? -1 : 1;
+  if (na !== null) return -1;
+  if (nb !== null) return 1;
+  return a === b ? 0 : a < b ? -1 : 1;
+}
+
+/** Negative when `a` is older than `b`, zero when equal, positive when newer. */
+export function compareVersions(a: string, b: string): number {
+  const pa = parse(a);
+  const pb = parse(b);
+  for (let i = 0; i < Math.max(pa.main.length, pb.main.length); i++) {
+    const c = compareSegment(pa.main[i] ?? "0", pb.main[i] ?? "0");
+    if (c !== 0) return c;
+  }
+  if (pa.pre.length === 0 && pb.pre.length === 0) return 0;
+  if (pa.pre.length === 0) return 1;
+  if (pb.pre.length === 0) return -1;
+  for (let i = 0; i < Math.max(pa.pre.length, pb.pre.length); i++) {
+    const c = compareSegment(pa.pre[i], pb.pre[i]);
+    if (c !== 0) return c;
+  }
+  return 0;
+}
+
+export function isNewerVersion(candidate: string, current: string): boolean {
+  return compareVersions(candidate, current) > 0;
+}

package/src/updater/updater.ts

@@ -25,6 +25,7 @@ import { downloadVerifiedArtifact, verifyFileSha256 } from "./lib/integrity.ts";
 import { parseManifest } from "./lib/manifest.ts";
 import { IS_LINUX, IS_MAC, IS_WINDOWS, platformName } from "./lib/platform.ts";
 import { artifactUrl, assertTrustedUpdateUrl, trustedBaseUrl } from "./lib/urls.ts";
+import { isNewerVersion } from "./lib/version.ts";
 import type {
   Listener,
   Manifest,
@@ -85,7 +86,7 @@ export class Updater {
         platform: platformName(),
         arch: process.arch,
       });
-      if (!m.version || m.version === v.version) {
+      if (!m.version || !isNewerVersion(m.version, v.version)) {
         this.#manifest = null;
         this.#setStatus("idle");
         return null;