diff --git a/src/inspector/JavaScriptRuntimeScope.cancellation.test.ts b/src/inspector/JavaScriptRuntimeScope.cancellation.test.ts index 822fe091d6..cf220c1748 100644 --- a/src/inspector/JavaScriptRuntimeScope.cancellation.test.ts +++ b/src/inspector/JavaScriptRuntimeScope.cancellation.test.ts @@ -1,6 +1,5 @@ -import { mkdtemp, rm, writeFile } from "node:fs/promises"; -import { tmpdir } from "node:os"; -import { join } from "node:path"; +import { writeFile } from "node:fs/promises"; +import { dirname, join } from "node:path"; import { pathToFileURL } from "node:url"; import { afterEach, expect, it, vi } from "vitest"; @@ -83,8 +82,8 @@ import { listElectronTargetsInputSchema } from "../domain/javascript/electronObs import { V8InspectorProvider } from "./V8InspectorProvider.js"; import { startFakeCdpBrowser } from "../../tests/fixtures/fakeCdpBrowser.js"; import { startFakeV8Inspector } from "../../tests/fixtures/inspector/fakeV8Inspector.js"; +import { createNodeDiscoveryTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; -const roots: string[] = []; const fixtures: { close(): Promise }[] = []; const record = (value: unknown): Record | undefined => @@ -103,14 +102,11 @@ afterEach(async () => { fileAccess.discoveryGate = undefined; fileAccess.calls = []; await Promise.all(fixtures.splice(0).map((fixture) => fixture.close())); - await Promise.all( - roots.splice(0).map((root) => rm(root, { recursive: true, force: true })), - ); }); const targetFile = async (): Promise => { - const root = await mkdtemp(join(tmpdir(), "rea-inspector-cancel-")); - roots.push(root); + // Node discovery reports this path, so its root must be reported exactly. + const root = await createNodeDiscoveryTempDirectory("rea-inspector-cancel-"); const path = join(root, "entry.js"); await writeFile(path, "// inert target file\n"); fileAccess.path = path; @@ -119,7 +115,7 @@ const targetFile = async (): Promise => { it("stops Inspector target authorization after the current stat settles", async () => { const path = await targetFile(); - const extraPath = join(roots[0]!, "second.js"); + const extraPath = join(dirname(path), "second.js"); await writeFile(extraPath, "// second inert target file\n"); fileAccess.extraPath = extraPath; const fake = await startFakeV8Inspector({ diff --git a/tests/fixtures/temporaryDirectory.ts b/tests/fixtures/temporaryDirectory.ts index b6405eb718..4fc3bbba1b 100644 --- a/tests/fixtures/temporaryDirectory.ts +++ b/tests/fixtures/temporaryDirectory.ts @@ -31,3 +31,40 @@ export const createTestTempDirectory = async ( }); return canonicalDirectory; }; + +/** Characters Node's Inspector discovery metadata cannot carry losslessly. */ +const NODE_DISCOVERY_AMBIGUOUS = /[_"\\]/u; + +/** + * Like `createTestTempDirectory`, for fixtures whose paths Node reports through + * Inspector discovery metadata. + * + * Node replaces `"` and `\` with `_` in that metadata, so + * `authorizeRuntimeTargetLocation` never stats a reported POSIX path containing + * `_`, `"` or `\`. A temporary root such as macOS's per-user + * `/private/var/folders///T`, where `` often contains `_`, would make + * every fixture unverifiable. On POSIX this uses the canonical temporary + * directory when it is free of those characters, otherwise the canonical + * `/tmp`, and fails when neither is. Windows keeps `createTestTempDirectory`: + * Node discovery paths are never verified there. + */ +export const createNodeDiscoveryTempDirectory = async ( + prefix: string, +): Promise => { + if (process.platform === "win32") return createTestTempDirectory(prefix); + const primary = await realpath(tmpdir()); + const base = NODE_DISCOVERY_AMBIGUOUS.test(primary) + ? await realpath("/tmp") + : primary; + const canonicalDirectory = await realpath( + await mkdtemp(join(base, normalizeTestTemporaryPrefix(prefix))), + ); + onTestFinished(async () => { + await removeTestWorkspace(canonicalDirectory); + }); + if (NODE_DISCOVERY_AMBIGUOUS.test(canonicalDirectory)) + throw new Error( + `No temporary directory free of '_', '"' and '\\' for Node discovery fixtures: ${canonicalDirectory}`, + ); + return canonicalDirectory; +};