From baebb98bc6d6ab1ebed4f4dbef5442e7bbdf5c30 Mon Sep 17 00:00:00 2001 From: bchanot Date: Wed, 21 Oct 2026 00:30:47 +0200 Subject: [PATCH] fix(tests): serve.mjs marks immutable by the resolved file's folder, not the request prefix; offline harness kills its server when setup fails --- scripts/browser/r4-offline-import.mjs | 9 +++++---- .../browser/results/2026-10-20-r4-offline-import.json | 2 +- scripts/browser/serve.mjs | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/browser/r4-offline-import.mjs b/scripts/browser/r4-offline-import.mjs index 4bc0e076..556a6395 100644 --- a/scripts/browser/r4-offline-import.mjs +++ b/scripts/browser/r4-offline-import.mjs @@ -147,10 +147,11 @@ async function offlineRun(page, context, server, mode) { /** One engine and mode: its own server, browser and context. */ async function runOne(pw, engine, mode) { const server = startChildServer() - const baseUrl = await server.url - const headers = await cacheHeaders(baseUrl) - const session = await launchEngine(pw, engine) + let session = null try { + const baseUrl = await server.url + const headers = await cacheHeaders(baseUrl) + session = await launchEngine(pw, engine) const context = await session.browser.newContext({ locale: 'fr-FR' }) const seed = { draft: null, locale: 'fr', skipDisclaimer: true } const { page, events } = await probedPage(context, seed) @@ -158,7 +159,7 @@ async function runOne(pw, engine, mode) { const run = await offlineRun(page, context, server, mode) return { engine, mode, headers, ...run, pageErrors: events.pageErrors } } finally { - await closeEngine(session) + if (session) await closeEngine(session) server.child.kill('SIGKILL') } } diff --git a/scripts/browser/results/2026-10-20-r4-offline-import.json b/scripts/browser/results/2026-10-20-r4-offline-import.json index 857c0637..a505c821 100644 --- a/scripts/browser/results/2026-10-20-r4-offline-import.json +++ b/scripts/browser/results/2026-10-20-r4-offline-import.json @@ -24,7 +24,7 @@ "bytes": 8175, "sha256": "f667c4c5222bc7cd3311da788e3ecd6cf6156a4a9757b21c8730d93463ac5200" }, - "headCommit": "4509313" + "headCommit": "1598b9b" }, "runs": [ {"engine":"chromium","mode":"emulate","headers":{"envJs":"no-store, no-cache, must-revalidate","workerChunk":"public, max-age=31536000, immutable","asNginx":true},"online":"editor","replaced":true,"offline":"editor","errorText":null,"pageErrors":[],"problems":[]}, diff --git a/scripts/browser/serve.mjs b/scripts/browser/serve.mjs index f391e29f..829614a8 100644 --- a/scripts/browser/serve.mjs +++ b/scripts/browser/serve.mjs @@ -170,7 +170,8 @@ async function route(root, path, mounts) { return { body: LOCAL_TOOL_ENV_JS, type: MIME['.js'], cache: NO_STORE } } const file = await fileUnder(root, path) - if (file && path.startsWith('/assets/')) { + // By where the file lives, not the request's spelling (`/assets/..%2f…`). + if (file && file.startsWith(join(root, 'assets') + sep)) { return { ...(await fileAnswer(file)), cache: IMMUTABLE } } if (file) return fileAnswer(file)