diff --git a/src/browser/BrowserProcessStartup.ts b/scripts/lib/browser-process-startup.mts similarity index 100% rename from src/browser/BrowserProcessStartup.ts rename to scripts/lib/browser-process-startup.mts diff --git a/scripts/lib/browser-runtime-fixture-lifecycle.mjs b/scripts/lib/browser-runtime-fixture-lifecycle.mjs index 3205e34112..3d85b15ec9 100644 --- a/scripts/lib/browser-runtime-fixture-lifecycle.mjs +++ b/scripts/lib/browser-runtime-fixture-lifecycle.mjs @@ -8,12 +8,16 @@ import { spawnOwnedProviderProcess } from "../../dist/process/ProviderProcess.js import { createSystemProcessOwnershipHost } from "../../dist/process/ProcessOwnershipObservation.js"; import { liveProcesses } from "../../dist/process/ProcessOwnershipProcessTree.js"; import { CdpConnection } from "../../dist/browser/CdpConnection.js"; -import { - BROWSER_DEVTOOLS_STARTUP_TIMEOUT_MS, - waitForBrowserDevtoolsPort, -} from "../../dist/browser/BrowserProcessStartup.js"; +import { importVerifierSource } from "./verifier-source-loader.mjs"; + import { requireOrdinaryWindowsVerifierCaller } from "./windows-ordinary-user-verifier.mjs"; +const { BROWSER_DEVTOOLS_STARTUP_TIMEOUT_MS, waitForBrowserDevtoolsPort } = + await importVerifierSource( + new URL("./browser-process-startup.mts", import.meta.url).href, + import.meta.url, + ); + /** Launch the synthetic fixture browser and await CDP in its own verified process group. */ export async function startRuntimeFixtureBrowser(executable, origin) { await requireOrdinaryWindowsVerifierCaller(); diff --git a/src/application/WindowsCapabilities.ts b/scripts/lib/windows-capabilities.mts similarity index 97% rename from src/application/WindowsCapabilities.ts rename to scripts/lib/windows-capabilities.mts index 61b96c40f8..d4acd5ff6e 100644 --- a/src/application/WindowsCapabilities.ts +++ b/scripts/lib/windows-capabilities.mts @@ -6,11 +6,11 @@ import { join } from "node:path"; import { windowsNativeCapabilities, type WindowsNativeCapabilitySet, -} from "../process/WindowsAuthority.js"; +} from "../../src/process/WindowsAuthority.js"; import { probeProcessCaptureCapability, type ProcessCaptureCapability, -} from "../process/capture/ProcessCaptureCapability.js"; +} from "../../src/process/capture/ProcessCaptureCapability.js"; /** One named Windows host observation without inferred authority. */ export type WindowsCapabilityOutcome = diff --git a/scripts/verify-real-browser.mjs b/scripts/verify-real-browser.mjs index 98c4be1935..e3fa15e819 100644 --- a/scripts/verify-real-browser.mjs +++ b/scripts/verify-real-browser.mjs @@ -9,10 +9,8 @@ import { join } from "node:path"; import { fileURLToPath } from "node:url"; import { CdpBrowserProvider } from "../dist/browser/CdpBrowserProvider.js"; -import { - BROWSER_DEVTOOLS_STARTUP_TIMEOUT_MS, - waitForBrowserDevtoolsPort, -} from "../dist/browser/BrowserProcessStartup.js"; +import { importVerifierSource } from "./lib/verifier-source-loader.mjs"; + import { createBrowserScenarioProvider } from "../dist/composition/browserScenario.js"; import { inspectWebPageInputSchema, @@ -57,6 +55,12 @@ import { verifyScenarioStorageFingerprints } from "./lib/browser-scenario-storag import { verifyScenarioServiceWorkers } from "./lib/browser-scenario-service-workers-e2e.mjs"; import { verifyBrowserUrlUserInfo } from "./lib/browser-url-userinfo-e2e.mjs"; +const { BROWSER_DEVTOOLS_STARTUP_TIMEOUT_MS, waitForBrowserDevtoolsPort } = + await importVerifierSource( + new URL("./lib/browser-process-startup.mts", import.meta.url).href, + import.meta.url, + ); + const SCENARIO_SECRET_VALUE = "rea-browser-verifier-secret"; const SCENARIO_URL_SECRET_VALUE = "rea-browser-url-verifier-secret"; process.env.REA_BROWSER_VERIFIER_SECRET = SCENARIO_SECRET_VALUE; diff --git a/scripts/windows-capabilities.mjs b/scripts/windows-capabilities.mjs index bba22a3298..482ecc6fde 100644 --- a/scripts/windows-capabilities.mjs +++ b/scripts/windows-capabilities.mjs @@ -1,6 +1,10 @@ #!/usr/bin/env node -import { probeWindowsCapabilities } from "../dist/application/WindowsCapabilities.js"; +import { importVerifierSource } from "./lib/verifier-source-loader.mjs"; +const { probeWindowsCapabilities } = await importVerifierSource( + new URL("./lib/windows-capabilities.mts", import.meta.url).href, + import.meta.url, +); const report = await probeWindowsCapabilities(); await new Promise((resolveOutput) => diff --git a/tests/boundary/browser/browserProcessStartup.test.ts b/tests/boundary/browser/browserProcessStartup.test.ts index b02488cbfe..17f0171f24 100644 --- a/tests/boundary/browser/browserProcessStartup.test.ts +++ b/tests/boundary/browser/browserProcessStartup.test.ts @@ -13,7 +13,7 @@ import { BROWSER_DEVTOOLS_STARTUP_TIMEOUT_MS, BrowserStartupError, waitForBrowserDevtoolsPort, -} from "../../../src/browser/BrowserProcessStartup.js"; +} from "../../../scripts/lib/browser-process-startup.mjs"; import { assertOrdinaryWindowsVerifierCaller } from "../../../scripts/lib/windows-ordinary-user-verifier.mjs"; describe("browser process startup", () => { diff --git a/tests/boundary/browser/cdpSvgXlinkHref.test.ts b/tests/boundary/browser/cdpSvgXlinkHref.test.ts index 7d1e2a6274..668c2372c0 100644 --- a/tests/boundary/browser/cdpSvgXlinkHref.test.ts +++ b/tests/boundary/browser/cdpSvgXlinkHref.test.ts @@ -5,7 +5,7 @@ import { join } from "node:path"; import { expect } from "vitest"; import { CdpBrowserProvider } from "../../../src/browser/CdpBrowserProvider.js"; -import { waitForBrowserDevtoolsPort } from "../../../src/browser/BrowserProcessStartup.js"; +import { waitForBrowserDevtoolsPort } from "../../../scripts/lib/browser-process-startup.mjs"; import { inspectWebPageInputSchema, listBrowserTargetsInputSchema, diff --git a/tests/conformance/providers/ghidra/windowsCapabilities.test.ts b/tests/conformance/providers/ghidra/windowsCapabilities.test.ts index 77d2bca8bd..d7857c2199 100644 --- a/tests/conformance/providers/ghidra/windowsCapabilities.test.ts +++ b/tests/conformance/providers/ghidra/windowsCapabilities.test.ts @@ -4,7 +4,7 @@ import { probeWindowsCapabilities, systemNoFollowOpenCapability, type WindowsCapabilityDependencies, -} from "../../../../src/application/WindowsCapabilities.js"; +} from "../../../../scripts/lib/windows-capabilities.mjs"; const dependencies = ( overrides: Partial = {},