@cosmicdrift/kumiko-testing 0.353.0 → 0.354.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-testing",
-  "version": "0.353.0",
+  "version": "0.354.1",
   "description": "Test template for Kumiko apps: per-flow seedTenant, app test stack, canonical test preloads, bunfig generator and integration runner.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -66,6 +66,10 @@
       "types": "./src/e2e/index.ts",
       "default": "./src/e2e/index.ts"
     },
+    "./e2e/constants": {
+      "types": "./src/e2e/constants.ts",
+      "default": "./src/e2e/constants.ts"
+    },
     "./e2e/seed-route": {
       "types": "./src/e2e/seed-route.ts",
       "default": "./src/e2e/seed-route.ts"
@@ -75,9 +79,9 @@
     "kumiko-testing": "./bin/kumiko-testing.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-bundled-features": "0.353.0",
-    "@cosmicdrift/kumiko-dev-server": "0.353.0",
-    "@cosmicdrift/kumiko-framework": "0.353.0",
+    "@cosmicdrift/kumiko-bundled-features": "0.354.1",
+    "@cosmicdrift/kumiko-dev-server": "0.354.1",
+    "@cosmicdrift/kumiko-framework": "0.354.1",
     "zod": "^4.4.3"
   },
   "peerDependencies": {

package/src/changes.json

@@ -1,4 +1,10 @@
 [
+  {
+    "version": "0.354.0",
+    "type": "improvement",
+    "title": "trackInFlightRequests(page) export for captureScreenshot",
+    "detail": "Export trackInFlightRequests(page) so captureScreenshot counts requests from the initial load; the first untracked call waits for network idle, and a pushState during a delayed navigation no longer drops in-flight requests"
+  },
   {
     "version": "0.353.0",
     "type": "fix",

package/src/e2e/auth-kit.ts

@@ -65,10 +65,11 @@ async function postAuth(
   path: string,
   data: Record<string, unknown>,
   email: string,
+  bucketKey: string = email,
 ): Promise<APIResponse> {
   const response = await request.post(path, {
     data,
-    headers: { [CLIENT_IP_HEADER]: syntheticClientIpFor(email) },
+    headers: { [CLIENT_IP_HEADER]: syntheticClientIpFor(bucketKey) },
   });
   if (!response.ok()) {
     throw new Error(
@@ -96,15 +97,24 @@ function assertNoUnansweredMfa(email: string, reply: z.infer<typeof loginReplySc
   }
 }
 
+export type LoginViaApiOptions = {
+  // Rate-limit bucket (see syntheticClientIpFor) instead of the account's email,
+  // for runs that log the same account in repeatedly and must not share its bucket.
+  readonly bucketKey?: string;
+};
+
 export async function loginViaApi(
   request: APIRequestContext,
   credentials: LoginCredentials,
+  options: LoginViaApiOptions = {},
 ): Promise<void> {
+  const bucketKey = options.bucketKey ?? credentials.email;
   const response = await postAuth(
     request,
     "/api/auth/login",
     { email: credentials.email, password: credentials.password },
     credentials.email,
+    bucketKey,
   );
   const reply = loginReplySchema.parse(await response.json());
   if (credentials.mfaTotpSecret === undefined) {
@@ -131,6 +141,7 @@ export async function loginViaApi(
       code: await unburnedTotpCode(credentials.mfaTotpSecret),
     },
     credentials.email,
+    bucketKey,
   );
 }
 

package/src/e2e/index.ts

@@ -8,12 +8,14 @@ export {
   apiCommand,
   apiQuery,
   apiWrite,
+  CLIENT_IP_HEADER,
   clearSession,
   createHttpApi,
   csrfFetch,
   csrfHeaderFromCookies,
   enrollTotpViaApi,
   type LoginCredentials,
+  type LoginViaApiOptions,
   loginViaApi,
   loginViaUi,
   syntheticClientIpFor,
@@ -58,6 +60,7 @@ export {
   type Scenario,
   type ScenarioFixtures,
   type ThemeScreenshotDigest,
+  trackInFlightRequests,
   validateScenarios,
 } from "./screenshots";
 export type { CapturedMail } from "./seed-contract";

package/src/e2e/screenshots.ts

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import { mkdirSync, statSync } from "node:fs";
 import { dirname } from "node:path";
 import { isRealProviderRun } from "@cosmicdrift/kumiko-framework/testing/real-providers";
-import { expect, type Page, type Request } from "@playwright/test";
+import { expect, type Page, errors as playwrightErrors, type Request } from "@playwright/test";
 import { DESKTOP_VIEWPORT } from "./constants";
 import { pinEnglishLocale } from "./pin-english-locale";
 import { requireScreenshotDir, SCREENSHOT_DIR_ENV } from "./screenshot-dir";
@@ -92,18 +92,31 @@ function isMainFrameNavigationRequest(page: Page, request: Request): boolean {
 // Chromium drops the old document's fetches on a cross-document navigation
 // (reload, goto, location.href) without requestfinished or requestfailed, so
 // they would stay in flight forever. framenavigated alone can't tell that commit
-// apart from a pushState, which must keep them: only a framenavigated preceded by
-// a main-frame navigation request is a new document.
+// apart from a pushState in the still-live old document, which must keep them:
+// only a framenavigated after the navigation request's response is a new
+// document (a delayed navigation response leaves the old document running).
 function countInFlightDataRequests(page: Page): () => number {
   const inFlight = new Set<Request>();
   let pendingDocumentNavigation: Request | undefined;
+  let pendingNavigationResponded = false;
   page.on("request", (request) => {
     if (DATA_REQUEST_TYPES.has(request.resourceType())) inFlight.add(request);
-    else if (isMainFrameNavigationRequest(page, request)) pendingDocumentNavigation = request;
+    else if (isMainFrameNavigationRequest(page, request)) {
+      pendingDocumentNavigation = request;
+      pendingNavigationResponded = false;
+    }
+  });
+  page.on("response", (response) => {
+    if (response.request() === pendingDocumentNavigation) pendingNavigationResponded = true;
   });
   page.on("framenavigated", (frame) => {
-    if (frame === page.mainFrame() && pendingDocumentNavigation !== undefined) {
+    if (
+      frame === page.mainFrame() &&
+      pendingDocumentNavigation !== undefined &&
+      pendingNavigationResponded
+    ) {
       pendingDocumentNavigation = undefined;
+      pendingNavigationResponded = false;
       inFlight.clear();
     }
   });
@@ -113,7 +126,10 @@ function countInFlightDataRequests(page: Page): () => number {
   page.on("requestfailed", (request) => {
     inFlight.delete(request);
     // A navigation that never commits (204, download) leaves the old document alive.
-    if (request === pendingDocumentNavigation) pendingDocumentNavigation = undefined;
+    if (request === pendingDocumentNavigation) {
+      pendingDocumentNavigation = undefined;
+      pendingNavigationResponded = false;
+    }
   });
   return () => inFlight.size;
 }
@@ -619,13 +635,15 @@ export function runMatrix<T extends string>(
   }
 }
 
-// Per-page in-flight counter for captureScreenshot() — a call mid-flow attaches
-// its own page.on("request") listener the first time it sees a given page, so a
-// second captureScreenshot() on that page reuses the same tracker instead of
-// missing requests that were already in flight when the listener attached.
 const inFlightTrackersByPage = new WeakMap<Page, () => number>();
 
-function inFlightTrackerFor(page: Page): () => number {
+/**
+ * Starts counting in-flight data requests (fetch/xhr) on `page`; idempotent per
+ * page. Call it before the first navigation (a fixture or beforeEach) so that
+ * captureScreenshot() also sees requests started by the initial page load.
+ * Requests that began before registration are invisible to it.
+ */
+export function trackInFlightRequests(page: Page): () => number {
   const existing = inFlightTrackersByPage.get(page);
   if (existing !== undefined) return existing;
   const tracker = countInFlightDataRequests(page);
@@ -633,6 +651,17 @@ function inFlightTrackerFor(page: Page): () => number {
   return tracker;
 }
 
+// Bounded because a page holding an EventSource (dev hot-reload) never goes network-idle.
+const UNTRACKED_PAGE_IDLE_TIMEOUT_MS = 3_000;
+
+async function waitForNetworkIdleBestEffort(page: Page): Promise<void> {
+  try {
+    await page.waitForLoadState("networkidle", { timeout: UNTRACKED_PAGE_IDLE_TIMEOUT_MS });
+  } catch (error) {
+    if (!(error instanceof playwrightErrors.TimeoutError)) throw error;
+  }
+}
+
 // "viewport": what the window shows. "fullPage": Playwright's document-height
 // capture, which renders a sticky sidebar floating mid-page. "content": grows the
 // viewport until nothing overflows, including WorkspaceShell's internally
@@ -714,10 +743,11 @@ async function growViewportToContent(page: Page, name: string, width: number): P
 // spec (solon's `shot(page, id)`, offlot's inline docs/screenshots/e2e/* writes) —
 // reuses the runner's settle logic and reduced-motion default, and is a no-op
 // when SCREENSHOT_DIR is unset so a plain e2e run never writes into the repo.
-// Limitation: the in-flight tracker attaches on the first call per page, so data
-// requests already running at that moment are invisible to it. Right after a
-// click, `await expect(...)` the loaded state (or call this once earlier on the
-// page) before the first shot.
+// Limitation: without an earlier trackInFlightRequests(page) the tracker attaches
+// on the first call, so requests already running then are invisible to it; that
+// first call only waits for network idle (best effort, skipped on timeout for
+// pages with a never-ending stream). Register the tracker before navigating, or
+// `await expect(...)` the loaded state after a click.
 export async function captureScreenshot(
   page: Page,
   name: string,
@@ -730,7 +760,10 @@ export async function captureScreenshot(
   const identities = opts.presentIdentities ?? [];
   assertPresentableMappings(identities);
   await page.emulateMedia({ reducedMotion: opts.reducedMotion ?? DEFAULT_REDUCED_MOTION });
-  await waitForSettledPage(page, inFlightTrackerFor(page));
+  const alreadyTracked = inFlightTrackersByPage.has(page);
+  const tracker = trackInFlightRequests(page);
+  if (!alreadyTracked) await waitForNetworkIdleBestEffort(page);
+  await waitForSettledPage(page, tracker);
   const path = `${dir}/${name}.png`;
   mkdirSync(dirname(path), { recursive: true });
   // Before the content fit too: a presented value of another length can change the overflow.

package/src/e2e/seed-route.ts

@@ -4,6 +4,7 @@ import {
   getInbox,
   mailTransportInMemoryFeature,
 } from "@cosmicdrift/kumiko-bundled-features/mail-transport-inmemory";
+import { TenantQueries } from "@cosmicdrift/kumiko-bundled-features/tenant";
 import {
   type ExtraRouteDefinition,
   ExtraRouteRejection,
@@ -206,6 +207,15 @@ export function createE2eSeedRoutes(
       return parsed;
     },
     handler: async (c, verified, deps) => {
+      // seededTenantIds is never pruned, so a tenant removed after seeding must still 404.
+      const tenantRow = await deps.dispatchSystemQuery({
+        handlerQn: TenantQueries.me,
+        payload: {},
+        tenantId: verified.tenantId,
+      });
+      if (tenantRow === null) {
+        return c.json({ error: `unknown tenant ${verified.tenantId}` }, 404);
+      }
       const write: SeedWriter = async (handlerQn, payload, tenantId) =>
         unwrapSavedRow(handlerQn, await deps.dispatchSystemWrite({ handlerQn, payload, tenantId }));
       try {