@impz/testing 6.3.1 → 6.4.0

package/dist/index.js

@@ -20055,6 +20055,7 @@ var ImpSchema = z16.object({
   public: z16.object({ auth: PublicAuthSchema }).optional(),
   createdAt: z16.date(),
   lastActiveAt: z16.date(),
+  lastRequestAt: z16.date().optional(),
   ramMib: z16.int().nonnegative().optional(),
   rssMib: z16.int().nonnegative().optional(),
   sleptAt: z16.date().optional(),
@@ -21966,7 +21967,7 @@ import { join as join47 } from "path";
 // packages/daemon/package.json
 var package_default = {
   name: "@impz/daemon",
-  version: "6.3.1",
+  version: "6.4.0",
   private: true,
   description: "impd: the imp host daemon",
   type: "module",
@@ -22336,6 +22337,7 @@ function toImpRecord(row) {
     ip: row.ip,
     createdAt: new Date(row.created_at),
     lastActiveAt: new Date(row.last_active_at),
+    lastRequestAt: toDate(row.last_request_at),
     sleptAt: toDate(row.slept_at),
     holdUntil: toDate(row.hold_until),
     error: row.error,
@@ -22506,6 +22508,13 @@ async function updateImpMove(db, id, moveState) {
 async function updateImpActivity(db, id, at) {
   await db.updateTable("imps").set({ last_active_at: at.getTime() }).where("id", "=", id).execute();
 }
+async function updateImpRequest(db, id, at) {
+  const atMs = at.getTime();
+  await db.updateTable("imps").set({
+    last_active_at: sql`MAX(last_active_at, ${atMs})`,
+    last_request_at: sql`MAX(COALESCE(last_request_at, 0), ${atMs})`
+  }).where("id", "=", id).execute();
+}
 async function updateImpDisk(db, id, disk) {
   const before = await readImpById(db, id);
   const row = await db.updateTable("imps").set({ disk_bytes: disk.diskBytes, disk_grow_pending: disk.isGrowPending ? 1 : 0 }).where("id", "=", id).returningAll().executeTakeFirstOrThrow();
@@ -26002,6 +26011,9 @@ function createImpPresenter(context, readSilentSince) {
     if (imp.maxMemoryMib > imp.memoryMib) {
       api.maxMemoryMib = imp.maxMemoryMib;
     }
+    if (imp.lastRequestAt !== null) {
+      api.lastRequestAt = imp.lastRequestAt;
+    }
     if (imp.sleptAt !== null) {
       api.sleptAt = imp.sleptAt;
     }
@@ -28821,6 +28833,13 @@ var MIGRATION_044_ADD_IMP_IMAGE_DIGESTS = {
   }
 };
 
+// packages/daemon/src/platform/db/migrations/migration-045-add-imp-last-request.ts
+var MIGRATION_045_ADD_IMP_LAST_REQUEST = {
+  async up(db) {
+    await db.schema.alterTable("imps").addColumn("last_request_at", "integer").execute();
+  }
+};
+
 // packages/daemon/src/platform/db/run-migrations.ts
 var MIGRATIONS = {
   "001_create_initial_schema": MIGRATION_001_CREATE_INITIAL_SCHEMA,
@@ -28866,7 +28885,8 @@ var MIGRATIONS = {
   "041_add_move_send_steps": MIGRATION_041_ADD_MOVE_SEND_STEPS,
   "042_add_secret_env": MIGRATION_042_ADD_SECRET_ENV,
   "043_merge_secret_kinds": MIGRATION_043_MERGE_SECRET_KINDS,
-  "044_add_imp_image_digests": MIGRATION_044_ADD_IMP_IMAGE_DIGESTS
+  "044_add_imp_image_digests": MIGRATION_044_ADD_IMP_IMAGE_DIGESTS,
+  "045_add_imp_last_request": MIGRATION_045_ADD_IMP_LAST_REQUEST
 };
 var PROVIDER = {
   getMigrations: () => Promise.resolve(MIGRATIONS)
@@ -38204,12 +38224,9 @@ function createAgentWatchdog(deps) {
 import { chmodSync as chmodSync5, lchownSync, mkdirSync as mkdirSync10, rmSync as rmSync13 } from "fs";
 
 // packages/daemon/src/vm/storage/disk-full-error.ts
-var GIB = 1024 ** 3;
-
 class DiskFullError extends ImpdError {
   name = "DiskFullError";
   constructor(availableBytes, reserveBytes, requestedBytes) {
-    const formatGib = (bytes) => `${(bytes / GIB).toFixed(1)} GiB`;
     super("DISK_FULL", {
       status: 507,
       message: `not enough free disk: ${formatGib(availableBytes)} free, ${formatGib(requestedBytes)} wanted, and ${formatGib(reserveBytes)} is held in reserve (IMP_DISK_RESERVE_GIB)`,
@@ -38220,6 +38237,10 @@ class DiskFullError extends ImpdError {
 function isDiskFullError(error) {
   return isImpdError(error, "DISK_FULL");
 }
+var GIB = 1024 ** 3;
+function formatGib(bytes) {
+  return `${(bytes / GIB).toFixed(1)} GiB`;
+}
 
 // packages/daemon/src/imp-ops/watchdog/write-watchdog-snapshot.ts
 async function writeWatchdogSnapshot(context, ops, imp) {
@@ -39187,6 +39208,10 @@ function createBootTemplates(deps) {
       return null;
     }
   };
+  const probeCurrent = (name) => {
+    const meta = readMeta(name);
+    return meta !== null && buildTemplateKey(deps.identity, meta) === name;
+  };
   const readReady = (key) => {
     const directory = join18(root, key);
     const meta = readMeta(key);
@@ -39458,10 +39483,6 @@ function createBootTemplates(deps) {
         return [];
       }
       const live = new Set(building.listKeys());
-      const probeCurrent = (name) => {
-        const meta = readMeta(name);
-        return meta !== null && buildTemplateKey(deps.identity, meta) === name;
-      };
       const stale = readdirSync3(root).filter((name) => name !== PLACEHOLDER_NAME && !live.has(name) && (name.startsWith(".") || !probeCurrent(name)));
       for (const name of stale) {
         removeDir(name);
@@ -42166,6 +42187,7 @@ function createImpRuntime(parts) {
         await updateImpActivity(context.db, imp.id, new Date);
       }
     },
+    recordRequest: (impId) => updateImpRequest(context.db, impId, new Date(context.now())),
     requireRunning,
     trySleepImp: makeLockFreeSleep(lock.tryWithImpId, (imp, reason, policy) => imp !== undefined && isSleepAllowed(imp, policy) ? sleepIfRunning(imp, reason, buildYoungGuestWait(imp.id, policy)) : Promise.resolve("skipped")),
     sleepAllImps: async () => {
@@ -50358,44 +50380,6 @@ function createImageBuilds(deps, writer) {
   const logger = getImpdLogger("image");
   const buildRuns = createBuildRuns(() => deps.clock.now());
   const buildSlots = createBuildSlots();
-  const resolvePinnedDockerfile = async (dockerfile, images, engine, signal) => {
-    const platform = await engine.readPlatform(signal);
-    const pins = new Map;
-    const used = [];
-    const stores = new Set;
-    const keys = new Map;
-    for (const image of images) {
-      if (!ImageRefSchema.safeParse(image.ref).success) {
-        throw new ImpdError("BAD_REQUEST", {
-          message: `${image.use} ${JSON.stringify(image.ref)} is not an image reference`
-        });
-      }
-      const registryProblem = checkReferenceRegistry(image.ref);
-      if (registryProblem !== null) {
-        throw new ImpdError("BAD_REQUEST", {
-          message: `${image.use} ${image.ref}: ${registryProblem}`
-        });
-      }
-      const key = toImageKey(image.ref);
-      const known = keys.get(key);
-      if (known === undefined) {
-        signal.throwIfAborted();
-        const inspect = await engine.loadImage(image, signal);
-        keys.set(key, pickPin(image, inspect, platform));
-        stores.add(readImageStore(inspect));
-      }
-      pins.set(image.ref, keys.get(key) ?? "");
-    }
-    for (const image of images) {
-      used.push({ use: image.use, ref: image.ref, pin: pins.get(image.ref) ?? "" });
-    }
-    const store = [...stores].find((candidate) => candidate !== "unknown") ?? "unknown";
-    try {
-      return { dockerfile: renderPinnedDockerfile(dockerfile, pins, platform), pins: used, store };
-    } catch (error) {
-      throw toBadRequest(error);
-    }
-  };
   const createFromContext = async (tarPath, name, givenDockerfile, options) => {
     const signal = options.signal;
     const imageName = requireClientImageName(name);
@@ -50553,6 +50537,47 @@ function createImageBuilds(deps, writer) {
     listBuildRuns: buildRuns.list
   };
 }
+function toBadRequest(error) {
+  return error instanceof DockerfileError ? new ImpdError("BAD_REQUEST", { message: `the Dockerfile: ${error.message}` }) : error;
+}
+async function resolvePinnedDockerfile(dockerfile, images, engine, signal) {
+  const platform = await engine.readPlatform(signal);
+  const pins = new Map;
+  const used = [];
+  const stores = new Set;
+  const keys = new Map;
+  for (const image of images) {
+    if (!ImageRefSchema.safeParse(image.ref).success) {
+      throw new ImpdError("BAD_REQUEST", {
+        message: `${image.use} ${JSON.stringify(image.ref)} is not an image reference`
+      });
+    }
+    const registryProblem = checkReferenceRegistry(image.ref);
+    if (registryProblem !== null) {
+      throw new ImpdError("BAD_REQUEST", {
+        message: `${image.use} ${image.ref}: ${registryProblem}`
+      });
+    }
+    const key = toImageKey(image.ref);
+    const known = keys.get(key);
+    if (known === undefined) {
+      signal.throwIfAborted();
+      const inspect = await engine.loadImage(image, signal);
+      keys.set(key, pickPin(image, inspect, platform));
+      stores.add(readImageStore(inspect));
+    }
+    pins.set(image.ref, keys.get(key) ?? "");
+  }
+  for (const image of images) {
+    used.push({ use: image.use, ref: image.ref, pin: pins.get(image.ref) ?? "" });
+  }
+  const store = [...stores].find((candidate) => candidate !== "unknown") ?? "unknown";
+  try {
+    return { dockerfile: renderPinnedDockerfile(dockerfile, pins, platform), pins: used, store };
+  } catch (error) {
+    throw toBadRequest(error);
+  }
+}
 function toImageKey(ref) {
   const named = parseImageReference(ref);
   return `${named.registry}/${named.path}:${named.tag ?? "latest"}@${named.digest ?? ""}`;
@@ -50581,9 +50606,6 @@ function pickPin(image, inspect, platform) {
   }
   return pin;
 }
-function toBadRequest(error) {
-  return error instanceof DockerfileError ? new ImpdError("BAD_REQUEST", { message: `the Dockerfile: ${error.message}` }) : error;
-}
 function normalizeDockerfilePath(path) {
   const normalized = posix3.normalize(path ?? "Dockerfile");
   if (normalized.startsWith("/") || normalized === ".." || normalized.startsWith("../") || normalized === "." || normalized.endsWith("/")) {
@@ -51544,7 +51566,8 @@ function checkIdle(signals, settings) {
   const activeReason = findActiveReason(signals, settings);
   return {
     activeReason,
-    sleep: activeReason === null && settings.now - signals.lastActiveAt >= settings.idleTimeoutMs
+    sleep: activeReason === null && settings.now - signals.lastActiveAt >= settings.idleTimeoutMs,
+    isRequestOpen: signals.proxyConnections > 0
   };
 }
 function findActiveReason(signals, settings) {
@@ -51617,6 +51640,10 @@ function createIdleLoop(deps) {
       idleTimeoutMs: deps.config.idleTimeoutS * 1000,
       cpuPercent: deps.config.idleCpuPercent
     });
+    if (decision.isRequestOpen) {
+      await updateImpRequest(deps.db, imp.id, new Date(now));
+      return;
+    }
     if (decision.activeReason !== null) {
       await updateImpActivity(deps.db, imp.id, new Date(now));
       return;
@@ -54532,7 +54559,7 @@ function startWakeProxy(deps) {
       });
     }
     try {
-      await deps.imps.recordActivity(name);
+      await deps.imps.recordRequest(imp.id);
     } catch {}
     return sendUpstream(request, server, `${imp.ip}:${String(imp.httpPort)}`, {
       release: opened.release,
@@ -57135,7 +57162,6 @@ function createZfsCheckpoints(ctx) {
 
 // packages/daemon/src/vm/storage/zfs/create-zfs-moves.ts
 import { join as join43 } from "path";
-var ID_ATTEMPTS3 = 5;
 function createZfsMoves(ctx) {
   const openMoveFiles = async (snapshots, removeMoveSnapshot) => {
     const moveId = Bun.randomUUIDv7();
@@ -57202,16 +57228,6 @@ function createZfsMoves(ctx) {
     }
     return steps;
   };
-  const pickCheckpointId = (entries, picked, buildId) => {
-    const tried = { id: "" };
-    for (let attempt = 0;attempt < ID_ATTEMPTS3; attempt += 1) {
-      tried.id = buildId();
-      if (listCheckpointSnapshots(entries, tried.id).length === 0 && !picked.includes(tried.id)) {
-        return tried.id;
-      }
-    }
-    throw new CheckpointIdTakenError(tried.id);
-  };
   const writeReceived = async (impId, steps, readStep, buildId) => {
     checkReceiveSteps(steps);
     const buildStaged = (dataset) => `${ctx.datasets.staging}/mvin-${impId}-${String(dataset)}`;
@@ -57325,6 +57341,17 @@ function checkReceiveSteps(steps) {
     throw new Error("zfs: a move with no steps");
   }
 }
+var ID_ATTEMPTS3 = 5;
+function pickCheckpointId(entries, picked, buildId) {
+  const tried = { id: "" };
+  for (let attempt = 0;attempt < ID_ATTEMPTS3; attempt += 1) {
+    tried.id = buildId();
+    if (listCheckpointSnapshots(entries, tried.id).length === 0 && !picked.includes(tried.id)) {
+      return tried.id;
+    }
+  }
+  throw new CheckpointIdTakenError(tried.id);
+}
 
 // packages/daemon/src/vm/storage/zfs/zfs-reclaim.ts
 function planReclaimStep(entries, roots) {
@@ -58566,13 +58593,26 @@ function buildStubVmm() {
     const serving = [...vms].filter(([pid, vm]) => alive.has(pid) && vm.apiSocket === paths.apiSocket);
     return serving.at(-1)?.[1];
   };
+  const waitForever = (onPark) => {
+    waiting.parked += 1;
+    onPark?.();
+    return new Promise(() => {});
+  };
+  const startFakeVm = async (step, paths) => {
+    const outcome = await chooseOutcome(step);
+    if (outcome === "fail") {
+      throw new StubVmError(`${step} failed: no agent
+log tail`);
+    }
+    const pid = startPid();
+    pidFiles.set(paths.pidFile, pid);
+    if (outcome === "ok") {
+      setVm(pid, paths, "Running");
+    }
+    return { pid, firecrackerVersion: "v1.17.0", agentVersion: agent.version, timings: {} };
+  };
   const buildRunner = (generation) => {
     const parkedBuild = Promise.withResolvers();
-    const waitForever = (onPark) => {
-      waiting.parked += 1;
-      onPark?.();
-      return new Promise(() => {});
-    };
     const runInGeneration = async (call, onPark) => {
       if (generation !== counter.generation) {
         return waitForever(onPark);
@@ -58592,19 +58632,6 @@ function buildStubVmm() {
       }
       return read();
     };
-    const startFakeVm = async (step, paths) => {
-      const outcome = await chooseOutcome(step);
-      if (outcome === "fail") {
-        throw new StubVmError(`${step} failed: no agent
-log tail`);
-      }
-      const pid = startPid();
-      pidFiles.set(paths.pidFile, pid);
-      if (outcome === "ok") {
-        setVm(pid, paths, "Running");
-      }
-      return { pid, firecrackerVersion: "v1.17.0", agentVersion: agent.version, timings: {} };
-    };
     const runner = {
       startVm: (plan) => runInGeneration(async () => {
         boots.push({ hostname: plan.hostname, isIdentityReset: plan.isIdentityReset });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impz/testing",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "description": "A real impd on stand-ins, for Bun tests of code that drives impd through @impz/client",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
     "@orpc/openapi": "^1.16.0",
     "@orpc/openapi-client": "^1.16.0",
     "@orpc/server": "^1.16.0",
-    "@peculiar/x509": "^1.14.3",
+    "@peculiar/x509": "^2.2.0",
     "@zgeoff/kysely-bun-sqlite": "^0.3.0",
     "better-auth": "^1.7.11",
     "dns-packet": "^5.6.1",
@@ -43,7 +43,7 @@
     "ts-pattern": "^5.9.2",
     "xstate": "^5.33.3",
     "zod": "^4.6.7",
-    "@impz/client": "6.3.1"
+    "@impz/client": "6.4.0"
   },
   "engines": {
     "bun": ">=1.4.3"