@mirinjs/cli 0.1.0-alpha.15 → 0.1.0-alpha.17

package/package.json

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

package/src/artifacts.ts

@@ -9,7 +9,7 @@
  *    entry from the `mirin` package, and a CEF framework downloaded once from
  *    the matching GitHub Release into `~/.mirinjs/cef/<version>`. No Rust needed.
  *
- * Alpha supports macOS arm64, Windows x64, and Linux x64.
+ * Alpha supports macOS arm64, Windows x64/arm64, and Linux x64/arm64.
  */
 
 import {
@@ -35,6 +35,8 @@ const IN_REPO = existsSync(join(REPO_ROOT, "crates", "mirin-core"));
 export interface Artifacts {
   /** libmirin_core.dylib — dlopened by the host. */
   coreDylib: string;
+  /** Standalone updater codec used by `mirin release`. */
+  codecBin: string;
   /** mirin-helper — the CEF subprocess binary. */
   helperBin: string;
   /** host entry (TS/JS) compiled with `bun build --compile`. */
@@ -53,12 +55,13 @@ export async function resolveArtifacts(opts: { release: boolean }): Promise<Arti
 
   if (IN_REPO) {
     const profile = opts.release ? "release" : "debug";
-    console.log(`[mirin] building native core + helper (${profile})…`);
+    console.log(`[mirin] building native core + helpers (${profile})…`);
     const flags = opts.release ? ["--release"] : [];
-    await $`cargo build -p mirin-core -p mirin-helper ${flags}`.cwd(REPO_ROOT);
+    await $`cargo build -p mirin-codec -p mirin-core -p mirin-helper ${flags}`.cwd(REPO_ROOT);
     const target = join(REPO_ROOT, "target", profile);
     return {
       coreDylib: join(target, coreFileName()),
+      codecBin: join(target, codecFileName()),
       helperBin: join(target, helperFileName()),
       hostEntry: join(REPO_ROOT, "packages", "mirin", "src", "host.ts"),
       cefPath,
@@ -68,6 +71,7 @@ export async function resolveArtifacts(opts: { release: boolean }): Promise<Arti
   const nativeDir = resolveNativeDir();
   return {
     coreDylib: join(nativeDir, coreFileName()),
+    codecBin: join(nativeDir, codecFileName()),
     helperBin: join(nativeDir, helperFileName()),
     hostEntry: resolvePackageFile("mirinjs/host"),
     cefPath,
@@ -86,14 +90,18 @@ function helperFileName(): string {
   return process.platform === "win32" ? "mirin-helper.exe" : "mirin-helper";
 }
 
+function codecFileName(): string {
+  return process.platform === "win32" ? "mirin-codec.exe" : "mirin-codec";
+}
+
 function assertSupportedPlatform(): void {
   const supported =
     (process.platform === "darwin" && process.arch === "arm64") ||
-    (process.platform === "win32" && process.arch === "x64") ||
-    (process.platform === "linux" && process.arch === "x64");
+    (process.platform === "win32" && (process.arch === "x64" || process.arch === "arm64")) ||
+    (process.platform === "linux" && (process.arch === "x64" || process.arch === "arm64"));
   if (!supported) {
     throw new Error(
-      "mirin alpha supports macOS arm64, Windows x64, and Linux x64 " +
+      "mirin alpha supports macOS arm64, Windows x64/arm64, and Linux x64/arm64 " +
         `(got ${process.platform}/${process.arch}).`,
     );
   }

package/src/build.ts

@@ -121,8 +121,12 @@ export interface BuildResult {
   channel: string;
   /** Update baseUrl, if `release` is configured. */
   baseUrl?: string;
+  /** Markdown release notes embedded in the updater manifest, if configured. */
+  releaseNotes?: string;
   /** libmirin_core path (for the updater codec at release time). */
   coreDylib: string;
+  /** Standalone updater codec executable used at release time. */
+  codecBin: string;
   /** Project root (so `mirin release` can resolve relative asset paths). */
   projectDir: string;
   /** DMG config from mirin.config.ts (`true`/object/`false`); default `true`. */
@@ -183,6 +187,7 @@ export async function build(
   const version = opts.version ?? appVersion(projectDir);
   const channel: string = config.release?.channel ?? "stable";
   const baseUrl: string | undefined = config.release?.baseUrl;
+  const releaseNotes: string | undefined = config.release?.notes;
   const dmg: boolean | import("mirinjs").DmgConfig = config.dmg ?? true;
   const nsis: boolean | import("mirinjs").NsisConfig = config.nsis ?? true;
   const inno: boolean | import("mirinjs").InnoConfig = config.inno ?? true;
@@ -320,7 +325,9 @@ export async function build(
     version,
     channel,
     baseUrl,
+    releaseNotes,
     coreDylib: artifacts.coreDylib,
+    codecBin: artifacts.codecBin,
     projectDir,
     dmg,
     nsis,

package/src/package/linux/package.ts

@@ -137,7 +137,7 @@ async function buildFpm(
   kind: "deb" | "rpm",
 ): Promise<LinuxPackageResult> {
   const fpm = resolveFpm();
-  const arch = kind === "deb" ? "amd64" : "x86_64";
+  const arch = linuxPackageArch(kind);
   const fileName =
     kind === "deb"
       ? `${binName}_${input.version}_${arch}.deb`
@@ -242,7 +242,8 @@ async function buildAppImage(
     stageHicolorIcon(appDirRoot, input);
   }
 
-  const fileName = `${input.appName}-${input.version}-x86_64.AppImage`;
+  const arch = linuxPackageArch("appimage");
+  const fileName = `${input.appName}-${input.version}-${arch}.AppImage`;
   const out = join(input.outDir, fileName);
   rmSync(out, { force: true });
 
@@ -250,7 +251,7 @@ async function buildAppImage(
   // --appimage-extract-and-run: run appimagetool without FUSE. ARCH is required by
   // appimagetool; NO_STRIP avoids stripping the Bun-compiled host (which would break it).
   const res = await $`${appimagetool} --appimage-extract-and-run ${appDirRoot} ${out}`
-    .env({ ...process.env, ARCH: "x86_64", NO_STRIP: "1" })
+    .env({ ...process.env, ARCH: arch, NO_STRIP: "1" })
     .nothrow()
     .quiet();
   rmSync(appDirRoot, { recursive: true, force: true });
@@ -261,6 +262,13 @@ async function buildAppImage(
   return { format: "appimage", path: out, size: size(out) };
 }
 
+function linuxPackageArch(kind: "appimage" | "deb" | "rpm"): string {
+  if (process.arch === "arm64") {
+    return kind === "deb" ? "arm64" : "aarch64";
+  }
+  return kind === "deb" ? "amd64" : "x86_64";
+}
+
 /** Resolve the effective set of formats from config + an optional CLI/caller override. */
 export function resolveLinuxFormats(
   linux: boolean | LinuxConfig | undefined,

package/src/release.ts

@@ -20,7 +20,6 @@ import { existsSync, mkdirSync, mkdtempSync, rmSync, statSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { $ } from "bun";
-import { loadCodec } from "mirinjs/codec";
 import { build } from "./build.ts";
 import { notarizeAndStaple } from "./dmg.ts";
 import { buildReleaseInstaller } from "./release/installers.ts";
@@ -35,6 +34,37 @@ import {
 // The native codec uses multiple workers, so this scales across CI runner cores.
 const RELEASE_COMPRESSION_LEVEL = 10;
 
+interface ReleaseCodec {
+  compress(src: string, dst: string, level: number): void;
+  decompress(src: string, dst: string): void;
+  diff(oldPath: string, newPath: string, patchPath: string): void;
+}
+
+export function createReleaseCodec(binary: string): ReleaseCodec {
+  const run = (operation: string, ...args: string[]) => {
+    const result = Bun.spawnSync({
+      cmd: [binary, operation, ...args],
+      stdout: "inherit",
+      stderr: "pipe",
+    });
+    if (result.exitCode !== 0) {
+      const detail = new TextDecoder().decode(result.stderr).trim();
+      throw new Error(`codec ${operation} failed${detail ? `: ${detail}` : ""}`);
+    }
+  };
+  return {
+    compress(src, dst, level) {
+      run("compress", src, dst, String(level));
+    },
+    decompress(src, dst) {
+      run("decompress", src, dst);
+    },
+    diff(oldPath, newPath, patchPath) {
+      run("diff", oldPath, newPath, patchPath);
+    },
+  };
+}
+
 async function sha256File(path: string): Promise<string> {
   const hasher = new Bun.CryptoHasher("sha256");
   for await (const chunk of Bun.file(path).stream()) {
@@ -83,20 +113,10 @@ export async function release(projectDir = process.cwd()): Promise<number> {
     isLinux,
   });
 
-  // Load the codec (zstd/bsdiff) from the *bundled* core, not the raw build output:
-  // on Windows mirin_core.dll imports libcef.dll. The DLL loader resolves imports
-  // from PATH (and the loader exe's dir), not the dll's own dir, so prepend the
-  // bundle dir to PATH so libcef.dll is found. On Linux libmirin_core.so has a
-  // NEEDED libcef.so (RUNPATH $ORIGIN), so load the *bundled* .so where libcef.so
-  // sits beside it — the raw native package has no libcef.so and dlopen fails.
-  // (On macOS the framework loads at runtime, so result.coreDylib works directly.)
-  const codecCore = isWindows
-    ? join(result.app, "mirin_core.dll")
-    : isLinux
-      ? join(result.app, "libmirin_core.so")
-      : result.coreDylib;
-  if (isWindows) process.env.PATH = `${result.app};${process.env.PATH ?? ""}`;
-  const codec = loadCodec(codecCore);
+  // Release tooling runs in plain Bun, including Windows arm64 builds where
+  // bun:ffi is unavailable. The standalone helper also avoids loading CEF merely
+  // to compress updater artifacts.
+  const codec = createReleaseCodec(result.codecBin);
 
   // Uncompressed tar — the identity + diff/patch basis (BSD tar keeps symlinks).
   const newTar = join(outDir, "_new.tar");
@@ -166,6 +186,7 @@ export async function release(projectDir = process.cwd()): Promise<number> {
     channel: result.channel,
     platform,
     arch,
+    body: result.releaseNotes,
     tarHash,
     bundle: { url: bundleName, sha256: bundleSha, size: bundleSize },
     patches,