@open-mercato/cli 0.6.5-develop.4477.1.7a250f91b8 → 0.6.5-develop.4498.1.55dc06a57c

package/dist/lib/testing/integration.js

@@ -7,6 +7,7 @@ import path from "node:path";
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 import spawn from "cross-spawn";
+import { fetchWithTimeout } from "@open-mercato/shared/lib/http/fetchWithTimeout";
 import { resolveEnvironment } from "../resolver.js";
 import { resolveSpawnCommand } from "../spawn.js";
 import { discoverIntegrationSpecFiles as discoverIntegrationSpecFilesShared } from "./integration-discovery.js";
@@ -468,6 +469,10 @@ function delay(milliseconds) {
     setTimeout(resolve, milliseconds);
   });
 }
+const READINESS_PROBE_FETCH_TIMEOUT_MS = 15e3;
+function probeFetch(input2, init = {}) {
+  return fetchWithTimeout(input2, { timeoutMs: READINESS_PROBE_FETCH_TIMEOUT_MS, ...init });
+}
 function resolveBuildCacheTtlSeconds(logPrefix) {
   const rawValue = process.env[BUILD_CACHE_TTL_ENV_VAR];
   if (!rawValue) {
@@ -885,7 +890,7 @@ function isSuccessfulBrowserNavigationStatus(status) {
 }
 async function probeLoginPage(baseUrl) {
   try {
-    const response = await fetch(`${baseUrl}/login`, {
+    const response = await probeFetch(`${baseUrl}/login`, {
       method: "GET",
       redirect: "manual"
     });
@@ -930,7 +935,7 @@ async function probeBackendLoginEndpoint(baseUrl) {
     const form = new URLSearchParams();
     form.set("email", "integration-healthcheck@example.invalid");
     form.set("password", "invalid-password");
-    const response = await fetch(`${baseUrl}/api/auth/login`, {
+    const response = await probeFetch(`${baseUrl}/api/auth/login`, {
       method: "POST",
       redirect: "manual",
       headers: {
@@ -958,7 +963,7 @@ async function probeAuthenticatedApi(baseUrl) {
     const form = new URLSearchParams();
     form.set("email", "admin@acme.com");
     form.set("password", "secret");
-    const loginResponse = await fetch(`${baseUrl}/api/auth/login`, {
+    const loginResponse = await probeFetch(`${baseUrl}/api/auth/login`, {
       method: "POST",
       redirect: "manual",
       headers: {
@@ -984,7 +989,7 @@ async function probeAuthenticatedApi(baseUrl) {
         detail: loginResponse.ok ? "POST /api/auth/login did not return an auth token" : `POST /api/auth/login returned ${loginResponse.status}`
       };
     }
-    const apiResponse = await fetch(`${baseUrl}/api/customers/people?pageSize=1`, {
+    const apiResponse = await probeFetch(`${baseUrl}/api/customers/people?pageSize=1`, {
       headers: {
         Authorization: `Bearer ${token}`
       }
@@ -1288,22 +1293,33 @@ async function tryReuseExistingEnvironment(options) {
 }
 async function waitForApplicationReadiness(baseUrl, appProcess, options) {
   const startTimestamp = Date.now();
-  const exitPromise = getProcessExitPromise(appProcess);
-  const readinessStabilizationMs = 600;
+  const intervalMs = options.intervalMs ?? APP_READY_INTERVAL_MS;
+  const readinessStabilizationMs = options.stabilizationMs ?? 600;
   let lastProbe = null;
+  let exitCode = null;
+  const exitSignal = getProcessExitPromise(appProcess).then(
+    (code) => {
+      exitCode = code ?? null;
+      return { exited: true };
+    },
+    () => {
+      exitCode = null;
+      return { exited: true };
+    }
+  );
+  const exitError = () => new Error(`Application process exited before readiness check (exit ${exitCode ?? "unknown"})`);
   while (Date.now() - startTimestamp < options.timeoutMs) {
-    const result = await Promise.race([
-      probeApplicationReadiness(baseUrl).then((probe) => ({ kind: "probe", probe })),
-      exitPromise.then((code) => ({ kind: "exit", code })),
-      delay(APP_READY_INTERVAL_MS).then(() => ({ kind: "timeout" }))
+    const cycle = await Promise.race([
+      probeApplicationReadiness(baseUrl).then((probe) => ({ probe })),
+      exitSignal
     ]);
-    if (result.kind === "probe") {
-      lastProbe = result.probe;
-      if (!result.probe.ready) {
-        continue;
-      }
+    if ("exited" in cycle) {
+      throw exitError();
+    }
+    lastProbe = cycle.probe;
+    if (cycle.probe.ready) {
       const processExited = await Promise.race([
-        exitPromise.then(() => true),
+        exitSignal.then(() => true),
         delay(readinessStabilizationMs).then(() => false)
       ]);
       if (processExited) {
@@ -1311,8 +1327,14 @@ async function waitForApplicationReadiness(baseUrl, appProcess, options) {
       }
       return;
     }
-    if (result.kind === "exit") {
-      throw new Error(`Application process exited before readiness check (exit ${result.code ?? "unknown"})`);
+    const remainingMs = options.timeoutMs - (Date.now() - startTimestamp);
+    if (remainingMs <= 0) break;
+    const waited = await Promise.race([
+      exitSignal,
+      delay(Math.min(intervalMs, remainingMs)).then(() => null)
+    ]);
+    if (waited && "exited" in waited) {
+      throw exitError();
     }
   }
   const lastFrontendDetail = lastProbe?.frontend.detail ?? "GET /login was never observed";
@@ -2738,6 +2760,7 @@ export {
   shouldUseIsolatedPortForFreshEnvironment,
   startEphemeralEnvironment,
   tryReuseExistingEnvironment,
+  waitForApplicationReadiness,
   writeEphemeralEnvironmentState
 };
 //# sourceMappingURL=integration.js.map