@impz/testing 6.6.1 → 6.7.0

package/dist/index.js

@@ -18923,12 +18923,12 @@ var BACKUP_TREE = {
   buildImageDir: (digest) => join("images", toDigestHex(digest))
 };
 
-// packages/daemon/testing/start-test-impd.ts
+// packages/daemon/src/test-utils/start-test-impd.ts
 import { copyFileSync as copyFileSync5, mkdirSync as mkdirSync31, mkdtempSync, writeFileSync as writeFileSync16 } from "fs";
 import { rm as rm2 } from "fs/promises";
 import { tmpdir } from "os";
 
-// packages/test-utils/src/claim-free-ports.ts
+// packages/shared/src/test-utils/claim-free-ports.ts
 import { onTestFinished } from "bun:test";
 import { randomInt } from "crypto";
 import { existsSync, readFileSync } from "fs";
@@ -18991,7 +18991,7 @@ function readBusyPorts() {
   return busy;
 }
 
-// packages/daemon/testing/start-test-impd.ts
+// packages/daemon/src/test-utils/start-test-impd.ts
 import { createORPCClient as createORPCClient2 } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 import invariant7 from "tiny-invariant";
@@ -19011,6 +19011,10 @@ function formatBytes(bytes) {
   const digits = unit === 0 || value >= 100 ? 0 : 1;
   return `${value.toFixed(digits)} ${UNITS[unit] ?? "B"}`;
 }
+// packages/shared/src/get-error-message.ts
+function getErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
 // packages/shared/src/merge-bytes.ts
 function mergeBytes(chunks) {
   const merged = new Uint8Array(chunks.reduce((sum, chunk) => sum + chunk.byteLength, 0));
@@ -19234,11 +19238,6 @@ import { randomBytes } from "crypto";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { dirname, join as join2 } from "path";
 
-// packages/daemon/src/platform/process/get-error-message.ts
-function getErrorMessage(error) {
-  return error instanceof Error ? error.message : String(error);
-}
-
 // packages/daemon/src/platform/process/get-impd-logger.ts
 import { getLogger } from "@logtape/logtape";
 function getImpdLogger(area) {
@@ -21972,7 +21971,7 @@ import { join as join48 } from "path";
 // packages/daemon/package.json
 var package_default = {
   name: "@impz/daemon",
-  version: "6.6.1",
+  version: "6.7.0",
   private: true,
   description: "impd: the imp host daemon",
   type: "module",
@@ -21980,13 +21979,9 @@ var package_default = {
     ".": "./src/index.ts",
     "./read-text": "./src/platform/process/read-text.ts",
     "./real-clock": "./src/platform/process/real-clock.ts",
-    "./testing": "./testing/index.ts",
-    "./testing/build-stub-clock": "./testing/platform/build-stub-clock.ts",
-    "./testing/data-layout": "./src/vm/storage/data-layout.ts",
-    "./testing/pebble-images": "./testing/network/pebble-images.ts",
-    "./testing/start-stub-agent": "./testing/vm/start-stub-agent.ts",
-    "./testing/start-test-impd": "./testing/start-test-impd.ts",
-    "./testing/test-token": "./testing/test-token.ts",
+    "./test-utils": "./src/test-utils/index.ts",
+    "./test-utils/data-layout": "./src/vm/storage/data-layout.ts",
+    "./test-utils/*": "./src/test-utils/*.ts",
     "./package.json": "./package.json"
   },
   dependencies: {
@@ -22029,7 +22024,8 @@ var package_default = {
   },
   devDependencies: {
     "@faker-js/faker": "catalog:",
-    "@impz/test-utils": "workspace:*",
+    "@impz/cli": "workspace:*",
+    "@impz/e2e-harness": "workspace:*",
     "@modelcontextprotocol/client": "catalog:",
     "@msw/data": "catalog:",
     "@types/dns-packet": "catalog:",
@@ -26317,7 +26313,11 @@ async function sendAgentRequest(vsockPath, request, timeoutMs = 5000) {
   const connection = await openAgentConnection(vsockPath, timeoutMs);
   try {
     sendRequestFrame(connection, request);
-    const frame = await readFrameWithin(connection, timeoutMs);
+    const frame = await readFrameWithin(connection, {
+      call: `${request.op} response`,
+      vsockPath,
+      timeoutMs
+    });
     if (frame?.type !== FRAME_TYPES.response) {
       throw new Error(`agent ${request.op}: no response`);
     }
@@ -26379,8 +26379,8 @@ async function sendThaw(vsockPath) {
   const response = await sendAgentRequest(vsockPath, { op: "thaw" });
   decodeAgentMessage(OKSchema, response);
 }
-function readFrameWithin(connection, timeoutMs) {
-  return requireWithin(connection.next(), timeoutMs, () => new Error(`agent did not answer within ${String(timeoutMs)} ms`));
+function readFrameWithin(connection, wait) {
+  return requireWithin(connection.next(), wait.timeoutMs, () => new Error(`agent at ${wait.vsockPath} sent no ${wait.call} within ${String(wait.timeoutMs)} ms`));
 }
 
 // packages/daemon/src/imps/imps/consistent-disk.ts
@@ -33480,7 +33480,11 @@ async function openStream(vsockPath, request, startTimeoutMs) {
   let output;
   try {
     sendRequestFrame(connection, request);
-    const first = await readFrameWithin(connection, startTimeoutMs);
+    const first = await readFrameWithin(connection, {
+      call: `${request.op} start`,
+      vsockPath,
+      timeoutMs: startTimeoutMs
+    });
     if (first === null) {
       throw new Error("agent closed the exec connection before the process started");
     }
@@ -41333,7 +41337,11 @@ async function openRelayStream(vsockPath, request, feature, answerTimeoutMs) {
   const connection = await openAgentConnection(vsockPath);
   try {
     sendRequestFrame(connection, request);
-    const answer = await readFrameWithin(connection, answerTimeoutMs);
+    const answer = await readFrameWithin(connection, {
+      call: `${request.op} answer`,
+      vsockPath,
+      timeoutMs: answerTimeoutMs
+    });
     if (answer?.type !== FRAME_TYPES.response) {
       throw new Error(`agent closed the ${request.op} connection before it answered`);
     }
@@ -41379,12 +41387,16 @@ function buildListenRequest(spec) {
   }
   return { op: "listen", network: "tcp", address: `127.0.0.1:${String(spec.port)}` };
 }
-async function openListener(vsockPath, spec) {
+async function openListener(vsockPath, spec, answerTimeoutMs = ANSWER_TIMEOUT_MS) {
   const feature = spec.network === "ssh-agent" ? "agent-forwarding" : "reverse-forward";
   const connection = await openAgentConnection(vsockPath);
   try {
     sendRequestFrame(connection, buildListenRequest(spec));
-    const answer = await readFrameWithin(connection, ANSWER_TIMEOUT_MS);
+    const answer = await readFrameWithin(connection, {
+      call: "listener answer",
+      vsockPath,
+      timeoutMs: answerTimeoutMs
+    });
     if (answer?.type !== FRAME_TYPES.response) {
       throw new Error("agent closed the listen connection before it answered");
     }
@@ -42286,7 +42298,7 @@ async function sendServicesRestart(vsockPath, service) {
   const response = await sendAgentRequest(vsockPath, { op: "services.restart", service }, STOP_TIMEOUT_MS).catch(handleUnknownOp("services"));
   decodeAgentMessage(OKSchema, response);
 }
-async function openServiceLogStream(vsockPath, request) {
+async function openServiceLogStream(vsockPath, request, startTimeoutMs = LOGS_START_TIMEOUT_MS) {
   const connection = await openAgentConnection(vsockPath);
   try {
     sendRequestFrame(connection, {
@@ -42296,7 +42308,11 @@ async function openServiceLogStream(vsockPath, request) {
       follow: request.follow,
       ...request.cursor !== undefined && { cursor: request.cursor }
     });
-    const first = await readFrameWithin(connection, LOGS_START_TIMEOUT_MS);
+    const first = await readFrameWithin(connection, {
+      call: "services.logs start",
+      vsockPath,
+      timeoutMs: startTimeoutMs
+    });
     if (first === null) {
       throw new Error("agent closed the log connection before it answered");
     }
@@ -58516,12 +58532,12 @@ async function setupDefaultImage(config, images) {
   }
 }
 
-// packages/daemon/testing/network/read-no-tailscale.ts
+// packages/daemon/src/test-utils/network/read-no-tailscale.ts
 function readNoTailscale() {
   return Promise.resolve({ state: null, hostname: null, dnsName: null, ip: null, ips: [] });
 }
 
-// packages/daemon/testing/platform/build-stub-ticker-timer.ts
+// packages/daemon/src/test-utils/platform/build-stub-ticker-timer.ts
 function buildStubTickerTimer() {
   const pending = new Map;
   const holdRun = (label, run, durationMs) => {
@@ -58547,12 +58563,12 @@ function buildStubTickerTimer() {
   };
 }
 
-// packages/daemon/testing/platform/format-run-prefix.ts
+// packages/daemon/src/test-utils/platform/format-run-prefix.ts
 function formatRunPrefix(owner) {
   return `pid${String(owner.pid)}-ns${owner.namespace}-`;
 }
 
-// packages/daemon/testing/platform/open-migrated-copy.ts
+// packages/daemon/src/test-utils/platform/open-migrated-copy.ts
 import { Database as Database4 } from "bun:sqlite";
 var TEMPLATE = {};
 function openMigratedCopy() {
@@ -58567,14 +58583,14 @@ async function serializeMigratedDatabase() {
   return bytes;
 }
 
-// packages/daemon/testing/platform/pick-impd-port.ts
+// packages/daemon/src/test-utils/platform/pick-impd-port.ts
 var FIRST_PORT = 10100;
 var PORT_SPAN = 9900;
 function pickImpdPort(draw) {
   return FIRST_PORT + Math.floor(draw * PORT_SPAN);
 }
 
-// packages/daemon/testing/platform/read-run-owner.ts
+// packages/daemon/src/test-utils/platform/read-run-owner.ts
 import { readlinkSync as readlinkSync2 } from "fs";
 function readRunOwner() {
   return {
@@ -58583,7 +58599,7 @@ function readRunOwner() {
   };
 }
 
-// packages/daemon/testing/platform/start-impd-log-capture.ts
+// packages/daemon/src/test-utils/platform/start-impd-log-capture.ts
 import { resetSync } from "@logtape/logtape";
 
 // packages/daemon/src/platform/process/setup-logging.ts
@@ -58616,7 +58632,7 @@ function renderLogLine(record) {
 `;
 }
 
-// packages/daemon/testing/platform/start-impd-log-capture.ts
+// packages/daemon/src/test-utils/platform/start-impd-log-capture.ts
 var listeners = new Set;
 function startImpdLogCapture(onLine) {
   if (listeners.size === 0) {
@@ -58634,10 +58650,10 @@ function startImpdLogCapture(onLine) {
   };
 }
 
-// packages/daemon/testing/test-token.ts
+// packages/daemon/src/test-utils/test-token.ts
 var TEST_TOKEN = "test-token";
 
-// packages/daemon/testing/vm/build-stub-vmm.ts
+// packages/daemon/src/test-utils/vm/build-stub-vmm.ts
 import { existsSync as existsSync33, mkdirSync as mkdirSync30, renameSync as renameSync8, writeFileSync as writeFileSync15 } from "fs";
 var STUB_AGENT_VERSION = "0.1.0";
 var IMPD_OWNER = { uid: process.getuid?.() ?? 0, cgroup: null };
@@ -59041,7 +59057,7 @@ log tail`);
   };
 }
 
-// packages/daemon/testing/start-test-impd.ts
+// packages/daemon/src/test-utils/start-test-impd.ts
 var FAKE_VM_RAM_MIB = 300;
 var FAKE_VM_RSS_MIB = 340;
 var TEST_DRIVE = "d1".repeat(32);
@@ -59384,7 +59400,7 @@ function buildTestIdentity(dataDir, drive) {
 import { randomBytes as randomBytes12 } from "crypto";
 import { Duplex } from "stream";
 
-// packages/daemon/testing/vm/start-stub-agent.ts
+// packages/daemon/src/test-utils/vm/start-stub-agent.ts
 import { onTestFinished as onTestFinished2 } from "bun:test";
 import { mkdirSync as mkdirSync32 } from "fs";
 import { createServer as createServer3 } from "net";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impz/testing",
-  "version": "6.6.1",
+  "version": "6.7.0",
   "description": "A real impd on stand-ins, for Bun tests of code that drives impd through @impz/client",
   "license": "MIT",
   "repository": {
@@ -43,7 +43,7 @@
     "ts-pattern": "^5.9.2",
     "xstate": "^5.33.3",
     "zod": "^4.6.7",
-    "@impz/client": "6.6.1"
+    "@impz/client": "6.7.0"
   },
   "engines": {
     "bun": ">=1.4.3"
@@ -51,8 +51,8 @@
   "peerDependencies": {
     "@opentelemetry/exporter-metrics-otlp-proto": "^0.300.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.300.0",
-    "@opentelemetry/resources": "^2.12.0",
-    "@opentelemetry/sdk-metrics": "^2.12.0",
+    "@opentelemetry/resources": "^3.0.0",
+    "@opentelemetry/sdk-metrics": "^3.0.0",
     "@opentelemetry/sdk-trace-base": "^2.12.0",
     "acme-client": "^5.4.0"
   },