@elench/testkit 0.1.40 → 0.1.42

package/lib/runner/default-runtime-runner.mjs

@@ -3,81 +3,67 @@ import path from "path";
 import { execa } from "execa";
 import { bundleK6File } from "../bundler/index.mjs";
 import { resolveK6Binary } from "../config/index.mjs";
-import { persistTaskArtifacts } from "./artifacts.mjs";
-import { RUNTIME_ARTIFACT_MARKER } from "../runtime-src/k6/artifacts.js";
-import { determineDefaultRuntimeFailure } from "./default-runtime-errors.mjs";
-import { formatBatchDescriptor } from "./formatting.mjs";
-import { buildExecutionEnv } from "./template.mjs";
-import { readDatabaseUrl } from "./state-io.mjs";
 import {
   buildFileTimeoutEnv,
   formatFileTimeoutBudgetError,
 } from "../shared/file-timeout.mjs";
+import { persistTaskArtifacts } from "./artifacts.mjs";
+import { determineDefaultRuntimeFailure } from "./default-runtime-errors.mjs";
+import { RUNTIME_ARTIFACT_MARKER } from "../runtime-src/k6/artifacts.js";
+import { readDatabaseUrl } from "./state-io.mjs";
+import { buildTaskExecutionEnv } from "./template.mjs";
+import { killChildProcess } from "./processes.mjs";
 
-export async function runHttpK6Batch(targetConfig, batch, lifecycle) {
+export async function runHttpK6Task(targetConfig, task, lifecycle, lease) {
   const baseUrl = targetConfig.testkit.local?.baseUrl;
   if (!baseUrl) {
     throw new Error(`Service "${targetConfig.name}" requires local.baseUrl for HTTP suites`);
   }
 
-  console.log(
-    `\n── ${targetConfig.stackLabel} ${batch.type}:${batch.tasks[0].suiteName}${formatBatchDescriptor(batch)} ──`
-  );
-
-  return Promise.all(
-    batch.tasks.map((task) => runHttpK6Task(targetConfig, task, baseUrl, lifecycle))
-  );
-}
-
-export async function runDalBatch(targetConfig, batch, lifecycle) {
-  const databaseUrl = readDatabaseUrl(targetConfig.stateDir);
-  if (!databaseUrl) {
-    throw new Error(`Service "${targetConfig.name}" requires a database for DAL suites`);
-  }
-
-  console.log(
-    `\n── ${targetConfig.stackLabel} ${batch.type}:${batch.tasks[0].suiteName}${formatBatchDescriptor(batch)} ──`
-  );
-
-  return Promise.all(
-    batch.tasks.map((task) => runDalTask(targetConfig, task, databaseUrl, lifecycle))
-  );
-}
-
-async function runHttpK6Task(targetConfig, task, baseUrl, lifecycle) {
   const bundledFile = await bundleK6File({
     productDir: targetConfig.productDir,
     serviceName: targetConfig.name,
     sourceFile: path.join(targetConfig.productDir, task.file),
   });
-  console.log(`·· ${targetConfig.stackLabel}:${task.suiteName} → ${task.file}`);
+  if (lifecycle.isStopRequested()) {
+    throw new Error(`testkit run interrupted before starting ${task.file}`);
+  }
   return runDefaultRuntimeTask(
     targetConfig,
     task,
+    lease,
     ["run", "--address", "127.0.0.1:0", "-e", `BASE_URL=${baseUrl}`, bundledFile],
     lifecycle
   );
 }
 
-async function runDalTask(targetConfig, task, databaseUrl, lifecycle) {
+export async function runDalTask(targetConfig, task, lifecycle, lease) {
+  const databaseUrl = readDatabaseUrl(targetConfig.stateDir);
+  if (!databaseUrl) {
+    throw new Error(`Service "${targetConfig.name}" requires a database for DAL suites`);
+  }
+
   const bundledFile = await bundleK6File({
     productDir: targetConfig.productDir,
     serviceName: targetConfig.name,
     sourceFile: path.join(targetConfig.productDir, task.file),
   });
-  console.log(`·· ${targetConfig.stackLabel}:${task.suiteName} → ${task.file}`);
+  if (lifecycle.isStopRequested()) {
+    throw new Error(`testkit run interrupted before starting ${task.file}`);
+  }
   return runDefaultRuntimeTask(
     targetConfig,
     task,
+    lease,
     ["run", "--address", "127.0.0.1:0", "-e", `DATABASE_URL=${databaseUrl}`, bundledFile],
     lifecycle
   );
 }
 
-export async function runDefaultRuntimeTask(targetConfig, task, args, lifecycle, firstLine) {
+export async function runDefaultRuntimeTask(targetConfig, task, lease, args, lifecycle, firstLine) {
   const k6Binary = resolveK6Binary();
   const getFirstLine = firstLine || defaultFirstLine;
-  const summaryFile = buildDefaultRuntimeSummaryPath(targetConfig, task);
+  const summaryFile = buildDefaultRuntimeSummaryPath(lease, task);
   fs.mkdirSync(path.dirname(summaryFile), { recursive: true });
   const startedAt = Date.now();
   const fileTimeoutSeconds = targetConfig.testkit.execution.fileTimeoutSeconds;
@@ -86,17 +72,32 @@ export async function runDefaultRuntimeTask(targetConfig, task, args, lifecycle,
     [...args.slice(0, 1), "--summary-export", summaryFile, ...args.slice(1)],
     {
       cwd: targetConfig.productDir,
-      env: buildExecutionEnv(
+      env: buildTaskExecutionEnv(
         targetConfig,
+        lease,
         buildFileTimeoutEnv(fileTimeoutSeconds, startedAt),
         process.env
       ),
       reject: false,
-      cancelSignal: lifecycle.signal,
       forceKillAfterDelay: 5_000,
     }
   );
-  const { result, timedOut } = await settleDefaultRuntimeProcess(subprocess, fileTimeoutSeconds);
+  lifecycle.registerProcess(subprocess, () => {
+    killChildProcess(subprocess, "SIGINT");
+  });
+  if (lifecycle.isStopRequested()) {
+    const interruptSubprocess = () => killChildProcess(subprocess, "SIGINT");
+    if (subprocess.pid) interruptSubprocess();
+    else subprocess.once?.("spawn", interruptSubprocess);
+  }
+  console.log(`·· ${targetConfig.runtimeLabel}:${task.suiteName} → ${task.file}`);
+  let result;
+  let timedOut;
+  try {
+    ({ result, timedOut } = await settleSubprocess(subprocess, fileTimeoutSeconds));
+  } finally {
+    lifecycle.unregisterProcess(subprocess.pid);
+  }
 
   const stdout = parseDefaultRuntimeOutput(result.stdout || "");
   const stderr = parseDefaultRuntimeOutput(result.stderr || "");
@@ -125,14 +126,7 @@ export async function runDefaultRuntimeTask(targetConfig, task, args, lifecycle,
   };
 }
 
-function defaultFirstLine(output) {
-  return String(output || "")
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .find(Boolean) || null;
-}
-
-async function settleDefaultRuntimeProcess(subprocess, fileTimeoutSeconds) {
+export async function settleSubprocess(subprocess, fileTimeoutSeconds) {
   const timeoutMs = fileTimeoutSeconds * 1000 + 1_000;
   let timeoutHandle = null;
   let timedOut = false;
@@ -143,7 +137,7 @@ async function settleDefaultRuntimeProcess(subprocess, fileTimeoutSeconds) {
       new Promise((resolve) => {
         timeoutHandle = setTimeout(async () => {
           timedOut = true;
-          subprocess.kill("SIGTERM");
+          killChildProcess(subprocess, "SIGTERM");
           const result = await subprocess.catch((error) => error);
           resolve({ result, timedOut: true });
         }, timeoutMs);
@@ -154,12 +148,8 @@ async function settleDefaultRuntimeProcess(subprocess, fileTimeoutSeconds) {
   }
 }
 
-export function buildDefaultRuntimeSummaryPath(targetConfig, task) {
-  return path.join(
-    targetConfig.stateDir || path.join(targetConfig.productDir, ".testkit"),
-    "_runtime",
-    `task-${task.id}.summary.json`
-  );
+export function buildDefaultRuntimeSummaryPath(lease, task) {
+  return path.join(lease.leaseDir, "default-runtime", `task-${task.id}.summary.json`);
 }
 
 export function readDefaultRuntimeSummary(filePath) {
@@ -170,6 +160,13 @@ export function readDefaultRuntimeSummary(filePath) {
   }
 }
 
+function defaultFirstLine(output) {
+  return String(output || "")
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .find(Boolean) || null;
+}
+
 function parseDefaultRuntimeOutput(output) {
   if (!output) {
     return {

package/lib/runner/execution-config.mjs

@@ -4,7 +4,7 @@ import {
   parseFileTimeoutOption,
 } from "../shared/file-timeout.mjs";
 
-export const STACK_MODES = new Set(["shared", "pooled", "isolated"]);
+export const DATABASE_BINDINGS = new Set(["shared", "per-runtime"]);
 
 export { DEFAULT_FILE_TIMEOUT_SECONDS, parseFileTimeoutOption };
 
@@ -12,19 +12,36 @@ export function parseWorkersOption(value) {
   return parsePositiveInteger(value, "--workers");
 }
 
-export function parseStackCountOption(value) {
-  return parsePositiveInteger(value, "--stack-count");
+export function parseRuntimeInstancesOption(value, label = "runtime.instances") {
+  return parsePositiveInteger(value, label);
 }
 
-export function parseStackModeOption(value) {
-  return normalizeStackModeValue(value, "--stack-mode");
+export function normalizeRuntimeInstances(value, label = "runtime.instances") {
+  return normalizePositiveInteger(value, label);
 }
 
-export function normalizeStackModeValue(value, label = "execution.stackMode") {
+export function parseRuntimeMaxConcurrentTasksOption(
+  value,
+  label = "runtime.maxConcurrentTasks"
+) {
+  return parsePositiveInteger(value, label);
+}
+
+export function normalizeRuntimeMaxConcurrentTasks(
+  value,
+  label = "runtime.maxConcurrentTasks"
+) {
+  if (value === undefined || value === null) {
+    return Number.POSITIVE_INFINITY;
+  }
+  return normalizePositiveInteger(value, label);
+}
+
+export function normalizeDatabaseBinding(value, label = "database.binding") {
   const normalized = String(value || "").trim();
-  if (!STACK_MODES.has(normalized)) {
+  if (!DATABASE_BINDINGS.has(normalized)) {
     throw new Error(
-      `Invalid ${label} value "${value}". Expected one of: shared, pooled, isolated.`
+      `Invalid ${label} value "${value}". Expected one of: shared, per-runtime.`
     );
   }
   return normalized;
@@ -33,78 +50,22 @@ export function normalizeStackModeValue(value, label = "execution.stackMode") {
 export function resolveExecutionConfig({ cli = {}, repo = {} } = {}) {
   return normalizeExecutionConfig({
     workers: cli.workers ?? repo.workers ?? 1,
-    stackMode: cli.stackMode ?? repo.stackMode ?? "isolated",
-    stackCount: cli.stackCount ?? repo.stackCount ?? null,
     fileTimeoutSeconds:
       cli.fileTimeoutSeconds ?? repo.fileTimeoutSeconds ?? DEFAULT_FILE_TIMEOUT_SECONDS,
   });
 }
 
 export function normalizeExecutionConfig(input = {}) {
-  const workers = normalizePositiveInteger(input.workers, "execution.workers");
-  const stackMode = normalizeStackMode(input.stackMode);
-  const explicitStackCount =
-    input.stackCount == null ? null : normalizePositiveInteger(input.stackCount, "execution.stackCount");
-  const fileTimeoutSeconds = normalizeFileTimeoutSeconds(
-    input.fileTimeoutSeconds ?? DEFAULT_FILE_TIMEOUT_SECONDS
-  );
-
-  if (stackMode === "shared") {
-    if (explicitStackCount !== null && explicitStackCount !== 1) {
-      throw new Error(`execution.stackCount must be 1 when stackMode is "shared".`);
-    }
-    return {
-      workers,
-      stackMode,
-      stackCount: 1,
-      fileTimeoutSeconds,
-    };
-  }
-
-  if (stackMode === "pooled") {
-    return {
-      workers,
-      stackMode,
-      stackCount: explicitStackCount ?? 1,
-      fileTimeoutSeconds,
-    };
-  }
-
-  if (explicitStackCount !== null && explicitStackCount !== workers) {
-    throw new Error(
-      `execution.stackCount must equal execution.workers when stackMode is "isolated".`
-    );
-  }
   return {
-    workers,
-    stackMode,
-    stackCount: workers,
-    fileTimeoutSeconds,
+    workers: normalizePositiveInteger(input.workers ?? 1, "execution.workers"),
+    fileTimeoutSeconds: normalizeFileTimeoutSeconds(
+      input.fileTimeoutSeconds ?? DEFAULT_FILE_TIMEOUT_SECONDS
+    ),
   };
 }
 
-export function buildStackIds(execution) {
-  if (execution.stackMode === "shared") {
-    return ["shared"];
-  }
-
-  return Array.from({ length: execution.stackCount }, (_unused, index) => `stack-${index + 1}`);
-}
-
-export function resolveBatchStackMode(defaultMode, suiteMode = null) {
-  if (suiteMode == null) return defaultMode;
-  return normalizeStackMode(suiteMode);
-}
-
-export function resolveBatchAccessMode({ framework, type, stackMode }) {
-  if (stackMode === "isolated") return "exclusive";
-  if ((framework || "k6") === "playwright") return "exclusive";
-  if (type === "dal") return "exclusive";
-  return "shared";
-}
-
-function normalizeStackMode(value) {
-  return normalizeStackModeValue(value, "execution.stackMode");
+export function buildRuntimeIds(count) {
+  return Array.from({ length: count }, (_unused, index) => `runtime-${index + 1}`);
 }
 
 function parsePositiveInteger(value, label) {

package/lib/runner/execution-config.test.mjs

@@ -1,111 +1,67 @@
 import { describe, expect, it } from "vitest";
 import {
-  buildStackIds,
+  buildRuntimeIds,
+  DATABASE_BINDINGS,
   DEFAULT_FILE_TIMEOUT_SECONDS,
+  normalizeDatabaseBinding,
   normalizeExecutionConfig,
+  normalizeRuntimeMaxConcurrentTasks,
+  normalizeRuntimeInstances,
   parseFileTimeoutOption,
-  parseStackCountOption,
-  parseStackModeOption,
+  parseRuntimeMaxConcurrentTasksOption,
+  parseRuntimeInstancesOption,
   parseWorkersOption,
-  resolveBatchAccessMode,
-  resolveBatchStackMode,
   resolveExecutionConfig,
 } from "./execution-config.mjs";
 
 describe("execution-config", () => {
-  it("parses worker and stack CLI options", () => {
+  it("parses worker and runtime-instance options", () => {
     expect(parseWorkersOption("8")).toBe(8);
+    expect(parseRuntimeInstancesOption("2")).toBe(2);
+    expect(parseRuntimeMaxConcurrentTasksOption("4")).toBe(4);
     expect(parseFileTimeoutOption("45")).toBe(45);
-    expect(parseStackCountOption("2")).toBe(2);
-    expect(parseStackModeOption("pooled")).toBe("pooled");
     expect(() => parseWorkersOption("0")).toThrow('Invalid --workers value "0"');
+    expect(() => parseRuntimeInstancesOption("0")).toThrow('Invalid runtime.instances value "0"');
+    expect(() => parseRuntimeMaxConcurrentTasksOption("0")).toThrow(
+      'Invalid runtime.maxConcurrentTasks value "0"'
+    );
     expect(() => parseFileTimeoutOption("0")).toThrow(
       'Invalid --file-timeout-seconds value "0"'
     );
-    expect(() => parseStackModeOption("legacy")).toThrow('Invalid --stack-mode value "legacy"');
   });
 
-  it("normalizes shared, pooled, and isolated execution shapes", () => {
-    expect(normalizeExecutionConfig({ workers: 8, stackMode: "shared" })).toEqual({
-      workers: 8,
-      fileTimeoutSeconds: DEFAULT_FILE_TIMEOUT_SECONDS,
-      stackMode: "shared",
-      stackCount: 1,
-    });
-
-    expect(normalizeExecutionConfig({ workers: 8, stackMode: "pooled", stackCount: 3 })).toEqual({
+  it("normalizes execution defaults", () => {
+    expect(normalizeExecutionConfig({ workers: 8 })).toEqual({
       workers: 8,
       fileTimeoutSeconds: DEFAULT_FILE_TIMEOUT_SECONDS,
-      stackMode: "pooled",
-      stackCount: 3,
     });
-
-    expect(normalizeExecutionConfig({ workers: 8, stackMode: "isolated" })).toEqual({
-      workers: 8,
-      fileTimeoutSeconds: DEFAULT_FILE_TIMEOUT_SECONDS,
-      stackMode: "isolated",
-      stackCount: 8,
-    });
-  });
-
-  it("rejects invalid stack-count combinations", () => {
-    expect(() =>
-      normalizeExecutionConfig({ workers: 8, stackMode: "shared", stackCount: 2 })
-    ).toThrow('execution.stackCount must be 1 when stackMode is "shared"');
-
-    expect(() =>
-      normalizeExecutionConfig({ workers: 8, stackMode: "isolated", stackCount: 2 })
-    ).toThrow('execution.stackCount must equal execution.workers when stackMode is "isolated"');
   });
 
   it("applies CLI values over repo execution defaults", () => {
     expect(
       resolveExecutionConfig({
-        repo: { workers: 3, stackMode: "shared" },
-        cli: { workers: 6, fileTimeoutSeconds: 90, stackMode: "pooled", stackCount: 2 },
+        repo: { workers: 3, fileTimeoutSeconds: 30 },
+        cli: { workers: 6, fileTimeoutSeconds: 90 },
       })
     ).toEqual({
       workers: 6,
       fileTimeoutSeconds: 90,
-      stackMode: "pooled",
-      stackCount: 2,
     });
   });
 
-  it("builds stack ids from the normalized execution shape", () => {
-    expect(buildStackIds({ stackMode: "shared", stackCount: 1 })).toEqual(["shared"]);
-    expect(buildStackIds({ stackMode: "pooled", stackCount: 2 })).toEqual([
-      "stack-1",
-      "stack-2",
-    ]);
+  it("builds runtime ids from an instance count", () => {
+    expect(buildRuntimeIds(3)).toEqual(["runtime-1", "runtime-2", "runtime-3"]);
   });
 
-  it("resolves batch stack and access modes", () => {
-    expect(resolveBatchStackMode("shared", null)).toBe("shared");
-    expect(resolveBatchStackMode("shared", "isolated")).toBe("isolated");
-
-    expect(
-      resolveBatchAccessMode({
-        framework: "k6",
-        type: "integration",
-        stackMode: "shared",
-      })
-    ).toBe("shared");
-
-    expect(
-      resolveBatchAccessMode({
-        framework: "playwright",
-        type: "e2e",
-        stackMode: "pooled",
-      })
-    ).toBe("exclusive");
-
-    expect(
-      resolveBatchAccessMode({
-        framework: "k6",
-        type: "dal",
-        stackMode: "shared",
-      })
-    ).toBe("exclusive");
+  it("normalizes runtime instances and database bindings", () => {
+    expect(normalizeRuntimeInstances(2)).toBe(2);
+    expect(normalizeRuntimeMaxConcurrentTasks(undefined)).toBe(Number.POSITIVE_INFINITY);
+    expect(normalizeRuntimeMaxConcurrentTasks(3)).toBe(3);
+    for (const binding of DATABASE_BINDINGS) {
+      expect(normalizeDatabaseBinding(binding)).toBe(binding);
+    }
+    expect(() => normalizeDatabaseBinding("legacy")).toThrow(
+      'Invalid database.binding value "legacy"'
+    );
   });
 });

package/lib/runner/formatting.mjs

@@ -36,21 +36,6 @@ export function longestServiceName(results) {
   return results.reduce((max, result) => Math.max(max, result.name.length), 4);
 }
 
-export function formatBatchDescriptor(batch) {
-  const fileLabel = `${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"}`;
-  const frameworkLabel = formatFrameworkLabel(batch.framework);
-  return frameworkLabel ? ` (${frameworkLabel}, ${fileLabel})` : ` (${fileLabel})`;
-}
-
-export function formatPlaywrightBatchFiles(batch) {
-  if (!batch?.tasks?.length) return "";
-  const files = batch.tasks.map((task) => task.file);
-  if (files.length === 1) return ` · ${files[0]}`;
-  const preview = files.slice(0, 3).join(", ");
-  const suffix = files.length > 3 ? `, +${files.length - 3} more` : "";
-  return ` · ${preview}${suffix}`;
-}
-
 export function formatFrameworkLabel(framework) {
   if (!framework || framework === "k6") return "";
   return framework;

package/lib/runner/formatting.test.mjs

@@ -1,11 +1,9 @@
 import { describe, expect, it } from "vitest";
 import {
   buildRunSummaryLines,
-  formatBatchDescriptor,
   formatDuration,
   formatError,
   formatFrameworkLabel,
-  formatPlaywrightBatchFiles,
   formatServiceSummary,
   formatSuiteFramework,
   longestServiceName,
@@ -53,22 +51,6 @@ describe("runner formatting", () => {
     ).toBe("1/2 suites passed, 1/3 files passed, 1 suite skipped");
   });
 
-  it("formats batch descriptors", () => {
-    expect(formatBatchDescriptor({ framework: "k6", tasks: [{}, {}] })).toBe(" (2 files)");
-    expect(formatBatchDescriptor({ framework: "playwright", tasks: [{}] })).toBe(
-      " (playwright, 1 file)"
-    );
-  });
-
-  it("formats Playwright file previews", () => {
-    expect(formatPlaywrightBatchFiles({ tasks: [{ file: "a" }] })).toBe(" · a");
-    expect(
-      formatPlaywrightBatchFiles({
-        tasks: [{ file: "a" }, { file: "b" }, { file: "c" }, { file: "d" }],
-      })
-    ).toBe(" · a, b, c, +1 more");
-  });
-
   it("formats framework labels", () => {
     expect(formatFrameworkLabel("k6")).toBe("");
     expect(formatFrameworkLabel("playwright")).toBe("playwright");