@tokenoftrust/storefront-runner 3.1.0 → 3.1.2

package/apps/storefront/test/pipeline/pool-config.cjs

@@ -11,6 +11,10 @@
 const { defineWorkersConfig } = require("@cloudflare/vitest-pool-workers/config");
 const esbuild = require("esbuild");
 const path = require("node:path");
+// The check step's CPU budget sizes the worker pool (scripts/lib/step-cpus.cjs). Concurrent cells
+// are not held to it: they interleave on the one workerd isolate thread and wait on alarms, so 24
+// at once keep under one CPU busy (measured 2026-10-22: 11.5 CPU-s over 16.8s at 24; 87s at 3).
+const { stepWorkers } = require("../../../../scripts/lib/step-cpus.cjs");
 
 const compatibilityDate = "2024-11-01";
 const compatibilityFlags = ["nodejs_compat"];
@@ -20,6 +24,7 @@ const HOST = "pipeline-host";
  * @param {{ root: string; name: string; include: string[]; maxConcurrency?: number; testTimeout?: number }} options
  */
 function pipelinePoolConfig({ root, name, include, maxConcurrency, testTimeout = 60_000 }) {
+  const workers = stepWorkers();
   const hostModule = esbuild.buildSync({
     entryPoints: [path.join(root, "test/pipeline/pipeline-host.ts")],
     bundle: true,
@@ -42,6 +47,8 @@ function pipelinePoolConfig({ root, name, include, maxConcurrency, testTimeout =
       testTimeout,
       hookTimeout: 60_000,
       ...(maxConcurrency ? { maxConcurrency } : {}),
+      maxWorkers: workers.maxWorkers,
+      minWorkers: workers.minWorkers,
       poolOptions: {
         workers: {
           isolatedStorage: false,

package/apps/storefront/vitest.config.cts

@@ -3,8 +3,12 @@
 // node_modules/.vite/vitest.
 process.env.VITE_CJS_IGNORE_WARNING = "1";
 const { defineConfig } = require("vitest/config");
+// The check step's CPU budget sizes the worker pool (scripts/lib/step-cpus.cjs).
+const { stepWorkers } = require("../../scripts/lib/step-cpus.cjs");
 const path = require("node:path");
 
+const workers = stepWorkers();
+
 // Storefront unit tests — pure TS logic (tenant routing, search, query engine,
 // image-attr resolution, edge cache, etc.). We deliberately do NOT render .astro
 // components here: the Astro Container API needs Astro's Vite pipeline, whose
@@ -34,5 +38,7 @@ module.exports = defineConfig({
     // Folds and CI run many suites at once; a fixture-heavy test that takes 2s alone can pass 5s
     // under that load. A genuinely hung test still fails, only later.
     testTimeout: 30_000,
+    maxWorkers: workers.maxWorkers,
+    minWorkers: workers.minWorkers,
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/storefront-runner",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "license": "SEE LICENSE IN LICENSE",
   "description": "World-shareable storefront runner: multi-tenant renderer on Astro/Cloudflare. No control plane.",
   "packageManager": "pnpm@11.9.0",

package/packages/public-runtime/vitest.config.cts

@@ -3,11 +3,20 @@
 // node_modules/.vite/vitest.
 process.env.VITE_CJS_IGNORE_WARNING = "1";
 const { defineConfig } = require("vitest/config");
+// The check step's CPU budget sizes the worker pool (scripts/lib/step-cpus.cjs).
+const { stepWorkers } = require("../../scripts/lib/step-cpus.cjs");
+
+const workers = stepWorkers();
 
 module.exports = defineConfig({
   test: {
     include: ["tests/**/*.test.ts"],
     environment: "node",
     cache: false,
+    // Folds and CI run many suites at once; a fixture-heavy test that takes 0.5s alone can pass 5s
+    // under that load. A genuinely hung test still fails, only later.
+    testTimeout: 30_000,
+    maxWorkers: workers.maxWorkers,
+    minWorkers: workers.minWorkers,
   },
 });

package/scripts/lib/step-cpus.cjs

@@ -0,0 +1,48 @@
+// The CPU budget of the check step this process runs in. The check runner
+// (scripts/lib/check-runner.mjs) reserves slots for each step and exports the count as
+// TOT_STEP_CPUS; every pool a step starts (vitest workers, `node --test`
+// files, `pnpm -r` packages) sizes itself from it, so a step never uses more CPUs than it reserved.
+// With TOT_STEP_CPUS unset (a suite run by hand) every pool keeps its own default.
+//
+// CommonJS so the in-memory `.cts` vitest configs can require it as well as ESM can import it.
+"use strict";
+
+const STEP_CPUS_ENV = "TOT_STEP_CPUS";
+
+/**
+ * The step's CPU budget, or null outside a budgeted step.
+ * @param {NodeJS.ProcessEnv} [env]
+ * @returns {number | null}
+ */
+function stepCpus(env = process.env) {
+  const raw = env[STEP_CPUS_ENV];
+  if (raw === undefined || raw === "") return null;
+  const cpus = Number(raw);
+  if (!Number.isInteger(cpus) || cpus < 1) throw new Error(`${STEP_CPUS_ENV} must be a positive integer, got "${raw}"`);
+  return cpus;
+}
+
+/**
+ * vitest's worker pool for this step: at most the budget. Both are undefined outside a budgeted
+ * step, which leaves vitest's defaults.
+ * @param {NodeJS.ProcessEnv} [env]
+ * @returns {{ maxWorkers: number | undefined, minWorkers: number | undefined }}
+ */
+function stepWorkers(env = process.env) {
+  const cpus = stepCpus(env);
+  return { maxWorkers: cpus ?? undefined, minWorkers: cpus === null ? undefined : 1 };
+}
+
+/**
+ * `node --test` flags with the run's file concurrency held to the budget. A flag list that already
+ * sets --test-concurrency keeps it.
+ * @param {string[]} flags
+ * @param {NodeJS.ProcessEnv} [env]
+ */
+function nodeTestFlags(flags, env = process.env) {
+  const cpus = stepCpus(env);
+  if (cpus === null || flags.some((flag) => flag.startsWith("--test-concurrency"))) return flags;
+  return [...flags, `--test-concurrency=${cpus}`];
+}
+
+module.exports = { STEP_CPUS_ENV, stepCpus, stepWorkers, nodeTestFlags };