@machinen/runtime 0.1.0 → 0.1.1

package/dist/index.js

@@ -1152,7 +1152,8 @@ function connectOnceWithTimeout(udsPath, timeoutMs) {
 import { execFileSync as execFileSync9 } from "child_process";
 import {
   closeSync as closeSync7,
-  existsSync as existsSync16,
+  existsSync as existsSync17,
+  mkdirSync as mkdirSync12,
   mkdtempSync as mkdtempSync8,
   openSync as openSync7,
   readFileSync as readFileSync11,
@@ -1162,7 +1163,7 @@ import {
   writeSync as writeSync6
 } from "fs";
 import { homedir as homedir8, tmpdir as tmpdir8 } from "os";
-import { join as join16, resolve as resolve9 } from "path";
+import { dirname as dirname9, join as join16, resolve as resolve9 } from "path";
 import debugLib16 from "debug";
 
 // src/phase-timer.ts
@@ -1889,7 +1890,7 @@ import { execFileSync as execFileSync8 } from "child_process";
 import { randomBytes as randomBytes4 } from "crypto";
 import {
   closeSync as closeSync6,
-  existsSync as existsSync15,
+  existsSync as existsSync16,
   openSync as openSync6,
   readdirSync as readdirSync7,
   readFileSync as readFileSync10,
@@ -2184,7 +2185,7 @@ import { randomBytes as randomBytes3 } from "crypto";
 import { once } from "events";
 import {
   closeSync as closeSync5,
-  existsSync as existsSync14,
+  existsSync as existsSync15,
   mkdtempSync as mkdtempSync6,
   openSync as openSync5,
   rmSync as rmSync9,
@@ -3776,7 +3777,7 @@ function prebakeRootfsImageFromTree(args) {
 
 // src/vm/bundle.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { existsSync as existsSync12, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync5, rmSync as rmSync8, statSync as statSync8, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync5, rmSync as rmSync8, statSync as statSync8, writeFileSync as writeFileSync7 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
 import { join as join11, resolve as resolve4 } from "path";
 
@@ -3784,6 +3785,7 @@ import { join as join11, resolve as resolve4 } from "path";
 import { spawnSync as spawnSync3 } from "child_process";
 import {
   cpSync,
+  existsSync as existsSync9,
   lstatSync,
   mkdirSync as mkdirSync7,
   mkdtempSync as mkdtempSync3,
@@ -3794,10 +3796,12 @@ import {
   statSync as statSync5,
   writeFileSync as writeFileSync5
 } from "fs";
-import { tmpdir as tmpdir2 } from "os";
+import { createRequire as createRequire3 } from "module";
+import { arch as osArch2, platform as osPlatform5, tmpdir as tmpdir2 } from "os";
 import { dirname as dirname7, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import debugLib8 from "debug";
+var require_3 = createRequire3(import.meta.url);
 var debug8 = debugLib8("machinen:mkinitramfs");
 var DEFAULT_WORKSPACE_EXCLUDES = /* @__PURE__ */ new Set([
   ".git",
@@ -4225,17 +4229,41 @@ function appendFinalEntries(parts, opts) {
   parts.push(newc("tmp", 17407));
   parts.push(newc("TRAILER!!!", 0));
 }
-function defaultInitPath() {
+var cachedGuestPaths = null;
+function resolveGuestPaths() {
+  if (cachedGuestPaths) {
+    return cachedGuestPaths;
+  }
+  const pkgName = `@machinen/vmm-${osArch2()}-${osPlatform5()}`;
+  try {
+    const mod = require_3(pkgName);
+    if (mod.initPath && mod.fuseAgentPath && mod.execAgentPath && existsSync9(mod.initPath)) {
+      cachedGuestPaths = {
+        initPath: mod.initPath,
+        fuseAgentPath: mod.fuseAgentPath,
+        execAgentPath: mod.execAgentPath
+      };
+      return cachedGuestPaths;
+    }
+  } catch {
+  }
   const here = dirname7(fileURLToPath2(import.meta.url));
-  return join8(here, "..", "..", "microvm", "test-fixtures", "init");
+  const fixtures = join8(here, "..", "..", "microvm", "test-fixtures");
+  cachedGuestPaths = {
+    initPath: join8(fixtures, "init"),
+    fuseAgentPath: join8(fixtures, "fuse-agent"),
+    execAgentPath: join8(fixtures, "exec-agent")
+  };
+  return cachedGuestPaths;
+}
+function defaultInitPath() {
+  return resolveGuestPaths().initPath;
 }
 function defaultFuseAgentPath() {
-  const here = dirname7(fileURLToPath2(import.meta.url));
-  return join8(here, "..", "..", "microvm", "test-fixtures", "fuse-agent");
+  return resolveGuestPaths().fuseAgentPath;
 }
 function defaultExecAgentPath() {
-  const here = dirname7(fileURLToPath2(import.meta.url));
-  return join8(here, "..", "..", "microvm", "test-fixtures", "exec-agent");
+  return resolveGuestPaths().execAgentPath;
 }
 function cli(argv) {
   if (argv[0] === "--workspace") {
@@ -4342,7 +4370,7 @@ import { execFileSync as execFileSync6, spawnSync as spawnSync4 } from "child_pr
 import { createHash as createHash2 } from "crypto";
 import {
   closeSync as closeSync3,
-  existsSync as existsSync9,
+  existsSync as existsSync10,
   fsyncSync as fsyncSync3,
   mkdirSync as mkdirSync8,
   mkdtempSync as mkdtempSync4,
@@ -4358,7 +4386,7 @@ import {
   writeSync as writeSync2,
   lstatSync as lstatSync2
 } from "fs";
-import { createRequire as createRequire3 } from "module";
+import { createRequire as createRequire4 } from "module";
 import { arch as arch2, homedir as homedir6, platform as platform4, tmpdir as tmpdir3 } from "os";
 import { dirname as dirname8, join as join9, resolve as resolve2 } from "path";
 import debugLib9 from "debug";
@@ -4370,7 +4398,7 @@ function okMarkerPath2(imgPath) {
   return `${imgPath}.ok`;
 }
 function markMountDiskImageClean(imgPath) {
-  if (!existsSync9(imgPath)) {
+  if (!existsSync10(imgPath)) {
     return;
   }
   const okPath = okMarkerPath2(imgPath);
@@ -4398,7 +4426,7 @@ function markMountDiskImageClean(imgPath) {
 }
 function ensureMountDiskImage(hostAbs, opts = {}) {
   const hostResolved = resolve2(hostAbs);
-  if (!existsSync9(hostResolved)) {
+  if (!existsSync10(hostResolved)) {
     throw new BootError(
       "BOOT_MOUNT_HOST_NOT_FOUND",
       `ensureMountDiskImage: host directory not found at ${hostResolved}`
@@ -4417,9 +4445,9 @@ function ensureMountDiskImage(hostAbs, opts = {}) {
   opts.onPhase?.("manifest-hash", Date.now() - hashT0);
   const imgPath = join9(cacheDir, `${key}.sqfs`);
   const okPath = okMarkerPath2(imgPath);
-  if (!opts.force && existsSync9(imgPath)) {
+  if (!opts.force && existsSync10(imgPath)) {
     debug9("cache hit key=%s img=%s", key.slice(0, 12), imgPath);
-    if (!existsSync9(okPath)) {
+    if (!existsSync10(okPath)) {
       debug9("cache hit but no clean marker \u2014 rematerialising img=%s", imgPath);
     } else {
       try {
@@ -4526,7 +4554,7 @@ function resolveMksquashfsEnvOverride() {
   if (!envOverride) {
     return void 0;
   }
-  if (existsSync9(envOverride)) {
+  if (existsSync10(envOverride)) {
     debug9("resolved via MACHINEN_MKSQUASHFS=%s", envOverride);
     return envOverride;
   }
@@ -4535,13 +4563,13 @@ function resolveMksquashfsEnvOverride() {
     `MACHINEN_MKSQUASHFS=${envOverride} is set but that file does not exist.`
   );
 }
-var require_3 = createRequire3(import.meta.url);
+var require_4 = createRequire4(import.meta.url);
 function findBundledMksquashfs() {
   const pkg = `@machinen/squashfs-tools-${arch2()}-${platform4()}`;
   try {
-    const pkgJson = require_3.resolve(`${pkg}/package.json`);
+    const pkgJson = require_4.resolve(`${pkg}/package.json`);
     const candidate = join9(dirname8(pkgJson), "bin", "mksquashfs");
-    if (existsSync9(candidate)) {
+    if (existsSync10(candidate)) {
       return candidate;
     }
   } catch {
@@ -4559,7 +4587,7 @@ var KEG_ONLY_DIRS = [
 function findKegOnlyMksquashfs() {
   for (const dir of KEG_ONLY_DIRS) {
     const candidate = join9(dir, "mksquashfs");
-    if (existsSync9(candidate)) {
+    if (existsSync10(candidate)) {
       return candidate;
     }
   }
@@ -4669,13 +4697,13 @@ function randomSuffix() {
 
 // src/vm/helpers.ts
 import { randomBytes } from "crypto";
-import { closeSync as closeSync4, existsSync as existsSync10, openSync as openSync4, writeSync as writeSync3 } from "fs";
-import { createRequire as createRequire4 } from "module";
-import { arch as osArch2, platform as osPlatform5, totalmem as totalmem2 } from "os";
+import { closeSync as closeSync4, existsSync as existsSync11, openSync as openSync4, writeSync as writeSync3 } from "fs";
+import { createRequire as createRequire5 } from "module";
+import { arch as osArch3, platform as osPlatform6, totalmem as totalmem2 } from "os";
 import { resolve as resolve3 } from "path";
 import debugLib10 from "debug";
 var debug10 = debugLib10("machinen:boot");
-var require_4 = createRequire4(import.meta.url);
+var require_5 = createRequire5(import.meta.url);
 var SNAP_SCRATCH_BYTES = 8 * 1024 * 1024 * 1024;
 function allocateSparseFile3(path, sizeBytes) {
   const fd = openSync4(path, "w");
@@ -4712,7 +4740,7 @@ function resolveVmmBinary() {
   const envOverride = process.env.MACHINEN_VMM;
   if (envOverride) {
     const abs = resolve3(envOverride);
-    if (!existsSync10(abs)) {
+    if (!existsSync11(abs)) {
       throw new BootError(
         "BOOT_VMM_MISSING",
         `MACHINEN_VMM is set to ${envOverride}, but that file does not exist.`
@@ -4720,11 +4748,11 @@ function resolveVmmBinary() {
     }
     return abs;
   }
-  const key = `${osArch2()}-${osPlatform5()}`;
+  const key = `${osArch3()}-${osPlatform6()}`;
   const pkgName = `@machinen/vmm-${key}`;
   try {
-    const mod = require_4(pkgName);
-    if (!mod.binary || !existsSync10(mod.binary)) {
+    const mod = require_5(pkgName);
+    if (!mod.binary || !existsSync11(mod.binary)) {
       throw new BootError(
         "BOOT_VMM_PACKAGE_BROKEN",
         `${pkgName} is installed but its binary is missing at ${mod.binary}.`
@@ -4904,7 +4932,7 @@ async function setGuestHostname(vm, hostname) {
 
 // src/vm/image-config.ts
 import { execFileSync as execFileSync7 } from "child_process";
-import { existsSync as existsSync11, mkdirSync as mkdirSync9, readFileSync as readFileSync9, statSync as statSync7, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync9, readFileSync as readFileSync9, statSync as statSync7, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir7 } from "os";
 import { join as join10 } from "path";
 function imageConfigCacheDir() {
@@ -4934,7 +4962,7 @@ function warmImageConfigCache(imagePath, config) {
 }
 function readImageConfig(imagePath) {
   const cachePath = imageConfigCachePath(imagePath);
-  if (cachePath && existsSync11(cachePath)) {
+  if (cachePath && existsSync12(cachePath)) {
     try {
       const raw = readFileSync9(cachePath, "utf8");
       const cached = JSON.parse(raw);
@@ -4969,7 +4997,7 @@ function resolveLiveMounts(mounts, cwd, udsDir) {
   return mounts.map((m, i) => {
     validateMountGuest(m.guest);
     const hostAbs = resolve4(cwd ?? process.cwd(), m.host);
-    if (!existsSync12(hostAbs)) {
+    if (!existsSync13(hostAbs)) {
       throw new BootError(
         "BOOT_MOUNT_HOST_NOT_FOUND",
         `liveMounts[${i}] host path not found: ${m.host}`
@@ -5052,7 +5080,7 @@ function synthesizeAndPackBundle(opts, mergedGuestEnv, liveMounts, packerOpts) {
   let imageConfig;
   if (opts.image) {
     baseAbs = resolve4(opts.cwd ?? process.cwd(), opts.image);
-    if (!existsSync12(baseAbs)) {
+    if (!existsSync13(baseAbs)) {
       cleanup();
       throw new BootError("BOOT_IMAGE_NOT_FOUND", `image tarball not found: ${baseAbs}`);
     }
@@ -5099,7 +5127,7 @@ function synthesizeAndPackBundle(opts, mergedGuestEnv, liveMounts, packerOpts) {
       throw err;
     }
     const hostAbs = resolve4(opts.cwd ?? process.cwd(), opts.mount.host);
-    if (!existsSync12(hostAbs)) {
+    if (!existsSync13(hostAbs)) {
       cleanup();
       throw new BootError(
         "BOOT_MOUNT_HOST_NOT_FOUND",
@@ -5150,13 +5178,13 @@ function synthesizeAndPackBundle(opts, mergedGuestEnv, liveMounts, packerOpts) {
     if (opts._restoreMountDisk) {
       try {
         const r = opts._restoreMountDisk;
-        if (!existsSync12(r.lowerPath)) {
+        if (!existsSync13(r.lowerPath)) {
           throw new BootError(
             "BOOT_SNAPSHOT_NOT_FOUND",
             `restore: bundle is missing mount-lower at ${r.lowerPath}`
           );
         }
-        if (!existsSync12(r.upperPath)) {
+        if (!existsSync13(r.upperPath)) {
           throw new BootError(
             "BOOT_SNAPSHOT_NOT_FOUND",
             `restore: bundle is missing mount-upper at ${r.upperPath}`
@@ -5204,7 +5232,7 @@ function synthesizeAndPackBundle(opts, mergedGuestEnv, liveMounts, packerOpts) {
 
 // src/vm/snapshot.ts
 import { spawn as nodeSpawn3 } from "child_process";
-import { existsSync as existsSync13, mkdirSync as mkdirSync11, readdirSync as readdirSync6, statSync as statSync9, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync11, readdirSync as readdirSync6, statSync as statSync9, writeFileSync as writeFileSync8 } from "fs";
 import { join as join12, resolve as resolve5 } from "path";
 import debugLib11 from "debug";
 var debugSnapshot = debugLib11("machinen:snapshot");
@@ -5266,7 +5294,7 @@ async function performSnapshot(ctx, opts) {
 }
 function prepareBundleDir(outDir) {
   const snapDir = resolve5(outDir);
-  if (existsSync13(snapDir)) {
+  if (existsSync14(snapDir)) {
     if (!statSync9(snapDir).isDirectory()) {
       throw new SnapshotError(
         "SNAPSHOT_DUMP_FAILED",
@@ -5548,7 +5576,7 @@ async function boot(opts = {}) {
   await validatePortForwardOpts(opts, portForward);
   const binaryInput = opts.binary ?? resolveVmmBinary();
   const binary = resolve6(opts.cwd ?? process.cwd(), binaryInput);
-  if (!existsSync14(binary)) {
+  if (!existsSync15(binary)) {
     throw new BootError("BOOT_VMM_MISSING", `VMM binary not found at ${binary}`);
   }
   if (opts.cmd && !opts.image) {
@@ -5956,7 +5984,7 @@ function prepareScratchDisk(opts, env) {
   }
   if (typeof opts.snapshot === "string") {
     const bundleDisk = resolve6(opts.cwd ?? process.cwd(), opts.snapshot);
-    if (!existsSync14(bundleDisk)) {
+    if (!existsSync15(bundleDisk)) {
       throw new BootError("BOOT_SNAPSHOT_NOT_FOUND", `snapshot image not found: ${bundleDisk}`);
     }
     if (opts.cmd) {
@@ -5988,14 +6016,14 @@ function prepareScratchDisk(opts, env) {
 function validateKernelDtb(opts, env) {
   if (opts.kernel) {
     const abs = resolve6(opts.cwd ?? process.cwd(), opts.kernel);
-    if (!existsSync14(abs)) {
+    if (!existsSync15(abs)) {
       throw new BootError("BOOT_KERNEL_NOT_FOUND", `kernel not found: ${abs}`);
     }
     env.MACHINEN_KERNEL = abs;
   }
   if (opts.dtb) {
     const abs = resolve6(opts.cwd ?? process.cwd(), opts.dtb);
-    if (!existsSync14(abs)) {
+    if (!existsSync15(abs)) {
       throw new BootError("BOOT_DTB_NOT_FOUND", `dtb not found: ${abs}`);
     }
     env.MACHINEN_DTB = abs;
@@ -6071,7 +6099,7 @@ async function bringUpGvproxy(opts, binary, env, portForward) {
 function materializeRootdisk(opts, env, phases) {
   if (typeof opts.rootDisk === "string") {
     const rootDiskAbs = resolve6(opts.cwd ?? process.cwd(), opts.rootDisk);
-    if (!existsSync14(rootDiskAbs)) {
+    if (!existsSync15(rootDiskAbs)) {
       throw new BootError("BOOT_IMAGE_NOT_FOUND", `rootDisk image not found: ${rootDiskAbs}`);
     }
     env.MACHINEN_ROOTDISK = rootDiskAbs;
@@ -6435,7 +6463,7 @@ async function restore(opts) {
   const snapDir = resolve7(opts.snapDir);
   const imgDir = join14(snapDir, "img");
   const metaPath = join14(snapDir, "meta.json");
-  if (!existsSync15(imgDir) || !statSync10(imgDir).isDirectory()) {
+  if (!existsSync16(imgDir) || !statSync10(imgDir).isDirectory()) {
     throw new BootError("BOOT_SNAPSHOT_NOT_FOUND", `restore: ${imgDir} not found`);
   }
   const imgEntries = readdirSync7(imgDir);
@@ -6447,7 +6475,7 @@ async function restore(opts) {
   }
   phases.start("snapshot-meta-read");
   let meta = { snappedAt: 0 };
-  if (existsSync15(metaPath)) {
+  if (existsSync16(metaPath)) {
     try {
       meta = JSON.parse(readFileSync10(metaPath, "utf8"));
     } catch {
@@ -6457,10 +6485,10 @@ async function restore(opts) {
   let resolvedImage;
   if (opts.image) {
     resolvedImage = resolve7(opts.cwd ?? process.cwd(), opts.image);
-    if (!existsSync15(resolvedImage)) {
+    if (!existsSync16(resolvedImage)) {
       throw new BootError("BOOT_IMAGE_NOT_FOUND", `restore: image not found: ${resolvedImage}`);
     }
-  } else if (meta.sourceImage && existsSync15(meta.sourceImage)) {
+  } else if (meta.sourceImage && existsSync16(meta.sourceImage)) {
     resolvedImage = meta.sourceImage;
     debugRestore("using meta.sourceImage path=%s", resolvedImage);
   } else if (meta.sourceImage) {
@@ -6546,7 +6574,7 @@ async function restore(opts) {
   if (meta.mountDisk) {
     const lowerAbs = join14(snapDir, meta.mountDisk.lower);
     const upperAbs = join14(snapDir, meta.mountDisk.upper);
-    if (!existsSync15(lowerAbs) || !existsSync15(upperAbs)) {
+    if (!existsSync16(lowerAbs) || !existsSync16(upperAbs)) {
       throw new BootError(
         "BOOT_SNAPSHOT_NOT_FOUND",
         `restore: bundle's mount overlay is missing one of:
@@ -6889,7 +6917,7 @@ function resolveBaseDtb(explicit, cwd = process.cwd()) {
 function resolveBaseAsset(spec, explicit, cwd) {
   if (explicit) {
     const abs = resolve9(cwd, explicit);
-    if (!existsSync16(abs)) {
+    if (!existsSync17(abs)) {
       throw new ProvisionError(spec.missingCode, `${spec.kind} not found: ${abs}`);
     }
     return abs;
@@ -6897,7 +6925,7 @@ function resolveBaseAsset(spec, explicit, cwd) {
   const assetsDir = process.env.MACHINEN_ASSETS_DIR;
   if (assetsDir) {
     const p = resolve9(assetsDir, spec.assetsDirName);
-    if (!existsSync16(p)) {
+    if (!existsSync17(p)) {
       throw new ProvisionError(
         "PROVISION_ASSETS_DIR_INVALID",
         `MACHINEN_ASSETS_DIR=${assetsDir} does not contain ${spec.assetsDirName}`
@@ -6906,7 +6934,7 @@ function resolveBaseAsset(spec, explicit, cwd) {
     return p;
   }
   const cached = join16(cliCachedBaseDir(), spec.cliCacheName);
-  if (existsSync16(cached)) {
+  if (existsSync17(cached)) {
     return cached;
   }
   throw new ProvisionError(
@@ -6928,6 +6956,7 @@ async function provision(opts) {
   const kernelAbs = resolveBaseKernel(opts.kernel, cwd);
   const dtbAbs = resolveBaseDtb(opts.dtb, cwd);
   const outAbs = resolve9(cwd, opts.out);
+  mkdirSync12(dirname9(outAbs), { recursive: true });
   const t0 = Date.now();
   const workDir = mkdtempSync8(join16(tmpdir8(), "machinen-provision-"));
   const diskPath = join16(workDir, "scratch.img");