flashwright 1.64.1-flashwright.2 → 1.64.1-flashwright.3

package/lib/codeCache.js

@@ -41,7 +41,14 @@ var import_path = __toESM(require("path"));
 var import_vm = __toESM(require("vm"));
 var minimumSize = 32 * 1024;
 var pending = [];
+var loaded = [];
 var installed = false;
+var ranTests = false;
+var refreshAtExit = false;
+globalThis[/* @__PURE__ */ Symbol.for("flashwright.codeCache")] = {
+  ranTests: () => ranTests = true,
+  refreshAtExit: () => refreshAtExit = true
+};
 function installCodeCache(role) {
   if (installed || process.env.NODE_DISABLE_COMPILE_CACHE || process.env.FLASHWRIGHT_DISABLE_CODE_CACHE || process.env.NODE_V8_COVERAGE)
     return;
@@ -50,6 +57,7 @@ function installCodeCache(role) {
   if (!importModuleDynamically || typeof originalCompile !== "function")
     return;
   installed = true;
+  ranTests = ranTests || role === "cli";
   silenceDefaultLoaderWarning(importModuleDynamically);
   const roots = packageLibDirs();
   const cacheDir = import_path.default.join(import_os.default.tmpdir(), "flashwright-code-cache", `${process.version}-${process.arch}`, role);
@@ -101,6 +109,8 @@ function compileWithCache(content, filename, cacheDir, importModuleDynamically)
   const script = new import_vm.default.Script(import_module.default.wrap(content), { filename, cachedData, importModuleDynamically });
   if (!cachedData || script.cachedDataRejected)
     pending.push({ script, cacheFile, staleFiles: staleCacheFiles(cacheDir, fileKey, cacheFile) });
+  else
+    loaded.push({ script, cacheFile, size: cachedData.length });
   return script.runInThisContext({ displayErrors: true });
 }
 function staleCacheFiles(cacheDir, fileKey, cacheFile) {
@@ -121,16 +131,27 @@ function makeRequireFunction(mod) {
   return require2;
 }
 function writeCodeCaches() {
-  for (const { script, cacheFile, staleFiles } of pending.splice(0)) {
-    try {
-      import_fs.default.mkdirSync(import_path.default.dirname(cacheFile), { recursive: true });
-      const temporary = `${cacheFile}.${process.pid}`;
-      import_fs.default.writeFileSync(temporary, script.createCachedData());
-      import_fs.default.renameSync(temporary, cacheFile);
-      for (const file of staleFiles)
-        import_fs.default.rmSync(file, { force: true });
-    } catch {
-    }
+  if (!ranTests)
+    return;
+  for (const { script, cacheFile, staleFiles } of pending.splice(0))
+    writeCodeCache(cacheFile, script.createCachedData(), staleFiles);
+  if (!refreshAtExit)
+    return;
+  for (const { script, cacheFile, size } of loaded.splice(0)) {
+    const data = script.createCachedData();
+    if (data.length > size * 1.1)
+      writeCodeCache(cacheFile, data, []);
+  }
+}
+function writeCodeCache(cacheFile, data, staleFiles) {
+  try {
+    import_fs.default.mkdirSync(import_path.default.dirname(cacheFile), { recursive: true });
+    const temporary = `${cacheFile}.${process.pid}`;
+    import_fs.default.writeFileSync(temporary, data);
+    import_fs.default.renameSync(temporary, cacheFile);
+    for (const file of staleFiles)
+      import_fs.default.rmSync(file, { force: true });
+  } catch {
   }
 }
 if (/workerProcessEntry\.js$/.test(process.argv[1] || ""))

package/lib/codeCache.js.txt

@@ -1,8 +1,8 @@
 # packages/playwright/lib/codeCache.js
-# total: 6.4 KB
+# total: 7.0 KB
 
 ## Inlined (1)
-  4.9 KB  packages/playwright/src/codeCache.ts
+  5.5 KB  packages/playwright/src/codeCache.ts
 
 ## External (1)
   playwright-core/package.json

package/lib/common/index.js

@@ -40,6 +40,7 @@ __export(index_exports, {
   fixtures: () => fixtures_exports,
   ipc: () => ipc_exports,
   mergeTests: () => mergeTests,
+  originalProcessExit: () => originalProcessExit,
   poolBuilder: () => poolBuilder_exports,
   processRunner: () => process_exports,
   startProcessRunner: () => startProcessRunner,
@@ -1920,6 +1921,7 @@ var PoolBuilder = class _PoolBuilder {
 var process_exports = {};
 __export(process_exports, {
   ProcessRunner: () => ProcessRunner,
+  originalProcessExit: () => originalProcessExit,
   startProcessRunner: () => startProcessRunner
 });
 var import_bootstrap = require("playwright-core/lib/bootstrap");
@@ -1930,6 +1932,10 @@ var { setBoxedStackPrefixes } = require("playwright-core/lib/coreBundle").utils;
 var ProcessRunner = class {
   async gracefullyClose() {
   }
+  // Flashwright: see WorkerMain.canDetachTeardown.
+  canDetachTeardown() {
+    return false;
+  }
   dispatchEvent(method, params) {
     const response = { method, params };
     sendMessageToParent({ method: "__dispatch__", params: response });
@@ -1946,6 +1952,7 @@ var gracefullyCloseCalled = false;
 var forceExitInitiated = false;
 var processRunner;
 var startingEnv = { ...process.env };
+var originalProcessExit = process.exit;
 setBoxedStackPrefixes([import_package4.packageRoot]);
 function startProcessRunner(create) {
   sendMessageToParent({ method: "ready" });
@@ -1969,6 +1976,10 @@ function startProcessRunner(create) {
       const keys = /* @__PURE__ */ new Set([...Object.keys(process.env), ...Object.keys(startingEnv)]);
       const producedEnv = [...keys].filter((key) => startingEnv[key] !== process.env[key]).map((key) => [key, process.env[key] ?? null]);
       sendMessageToParent({ method: "__env_produced__", params: producedEnv });
+      if (processRunner?.canDetachTeardown()) {
+        sendMessageToParent({ method: "__teardown_detached__" });
+        globalThis[/* @__PURE__ */ Symbol.for("flashwright.codeCache")]?.refreshAtExit();
+      }
       await gracefullyCloseAndExit(false);
       return;
     }
@@ -2963,6 +2974,7 @@ function serializeLoadError(file2, error) {
   fixtures,
   ipc,
   mergeTests,
+  originalProcessExit,
   poolBuilder,
   processRunner,
   startProcessRunner,

package/lib/common/index.js.txt

@@ -1,5 +1,5 @@
 # packages/playwright/lib/common/index.js
-# total: 115.2 KB
+# total: 115.6 KB
 
 ## Inlined (20)
   12.6 KB  packages/playwright/src/common/config.ts
@@ -8,7 +8,7 @@
    0.8 KB  packages/playwright/src/common/index.ts
    1.3 KB  packages/playwright/src/common/ipc.ts
    2.1 KB  packages/playwright/src/common/poolBuilder.ts
-   4.4 KB  packages/playwright/src/common/process.ts
+   4.8 KB  packages/playwright/src/common/process.ts
    4.9 KB  packages/playwright/src/common/suiteUtils.ts
    8.7 KB  packages/playwright/src/common/test.ts
    2.0 KB  packages/playwright/src/common/testLoader.ts

package/lib/matchers/expect.js

@@ -13160,7 +13160,7 @@ function indent2(snapshot, indent3) {
 }
 
 // packages/playwright/src/matchers/expect.ts
-var { parseStackFrame, captureRawStack } = require("playwright-core/lib/coreBundle").utils;
+var { captureFilteredStackTrace, captureRawStack, filteredStackTrace, parseStackFrame } = require("playwright-core/lib/coreBundle").utils;
 var { escapeWithQuotes, isString: isString4 } = require("playwright-core/lib/coreBundle").iso;
 var { pollAgainstDeadline: pollAgainstDeadline2 } = require("playwright-core/lib/coreBundle").iso;
 var { currentZone } = require("playwright-core/lib/coreBundle").utils;
@@ -13313,7 +13313,8 @@ function callMatcherAsStep(matcherName, info, actual, matcher, args, promise) {
   const suffixes = computeMatcherTitleSuffix(matcherName, actual, args);
   const defaultTitle = `${info.poll ? "poll " : ""}${info.isSoft ? "soft " : ""}${info.isNot ? "not " : ""}${matcherName}${suffixes.titleSuffix || ""}`;
   const title = customMessage || `Expect ${escapeWithQuotes(defaultTitle, '"')}`;
-  const stackFrames = expectConfig().filteredStackTrace(captureRawStack());
+  const filter = expectConfig().filteredStackTrace;
+  const stackFrames = filter === filteredStackTrace ? captureFilteredStackTrace() : filter(captureRawStack());
   const params = { ...suffixes.params };
   if (args[0])
     params.expected = args[0];

package/lib/matchers/expect.js.txt

@@ -1,5 +1,5 @@
 # packages/playwright/lib/matchers/expect.js
-# total: 534.4 KB
+# total: 534.5 KB
 
 ## Inlined (59)
    7.9 KB  node_modules/@babel/code-frame/lib/index.js
@@ -51,7 +51,7 @@
    7.6 KB  node_modules/stack-utils/index.js
    0.4 KB  node_modules/stack-utils/node_modules/escape-string-regexp/index.js
    3.1 KB  node_modules/supports-color/index.js
-  10.3 KB  packages/playwright/src/matchers/expect.ts
+  10.4 KB  packages/playwright/src/matchers/expect.ts
   45.3 KB  packages/playwright/src/matchers/expectLibrary.ts
    3.3 KB  packages/playwright/src/matchers/matcherHint.ts
   17.4 KB  packages/playwright/src/matchers/matchers.ts

package/lib/runner/index.js

@@ -1901,6 +1901,7 @@ var debug3 = require("playwright-core/lib/utilsBundle").debug;
 var { assert } = require("playwright-core/lib/coreBundle").iso;
 var { monotonicTime: monotonicTime3, timeOrigin } = require("playwright-core/lib/coreBundle").iso;
 var { raceAgainstDeadline: raceAgainstDeadline2 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise2 } = require("playwright-core/lib/coreBundle").iso;
 var { killProcessTree } = require("playwright-core/lib/coreBundle").utils;
 var ProcessHost = class extends import_events.EventEmitter {
   constructor(entryScript, processName, env) {
@@ -1912,6 +1913,8 @@ var ProcessHost = class extends import_events.EventEmitter {
     this._callbacks = /* @__PURE__ */ new Map();
     this._producedEnv = {};
     this._requestHandlers = /* @__PURE__ */ new Map();
+    // Flashwright: resolved when a stopping worker says that it can finish on its own (see stop).
+    this._teardownDetached = new ManualPromise2();
     this._entryScript = entryScript;
     this._processName = processName;
     this._extraEnv = env;
@@ -1951,7 +1954,9 @@ var ProcessHost = class extends import_events.EventEmitter {
         return;
       if (debug3.enabled("pw:test:protocol"))
         debug3("pw:test:protocol")("\u25C0 RECV " + JSON.stringify(message));
-      if (message.method === "__env_produced__") {
+      if (message.method === "__teardown_detached__") {
+        this._teardownDetached.resolve(true);
+      } else if (message.method === "__env_produced__") {
         const producedEnv = message.params;
         this._producedEnv = Object.fromEntries(producedEnv.map((e) => [e[0], e[1] ?? void 0]));
       } else if (message.method === "__dispatch__") {
@@ -2028,14 +2033,18 @@ var ProcessHost = class extends import_events.EventEmitter {
   onRequest(method, handler) {
     this._requestHandlers.set(method, handler);
   }
-  async stop() {
+  // Flashwright: with `detachTeardown`, also returns once the process says that what it has left to
+  // do cannot change the run's outcome (see WorkerMain.canDetachTeardown); the warm session's
+  // runner waits for it to exit before it exits itself.
+  async stop(options = {}) {
     if (!this._processDidExit && !this._didSendStop) {
       this.send({ method: "__stop__" });
       this._didSendStop = true;
     }
     if (this._didExitAndRanOnExit)
       return;
-    const exitPromise = new Promise((f) => this.once("exit", () => f()));
+    const exited = new Promise((f) => this.once("exit", () => f(false)));
+    const exitPromise = options.detachTeardown ? Promise.race([exited, this._teardownDetached]) : exited;
     const timeout = +(process.env.PWTEST_CHILD_PROCESS_TIMEOUT || 5 * 60 * 1e3);
     let lastHeartbeat = monotonicTime3();
     const onHeartbeat = () => lastHeartbeat = monotonicTime3();
@@ -2043,8 +2052,11 @@ var ProcessHost = class extends import_events.EventEmitter {
     try {
       while (true) {
         const result = await raceAgainstDeadline2(() => exitPromise, lastHeartbeat + timeout);
-        if (!result.timedOut)
+        if (!result.timedOut) {
+          if (result.result)
+            (0, import_session.trackDetachedTeardown)(exited);
           return;
+        }
         if (monotonicTime3() < lastHeartbeat + timeout)
           continue;
         this.emit("processError", { message: `Error: ${this._processName} process did not exit within ${timeout}ms after stop, force-killed it` });
@@ -3092,7 +3104,7 @@ var TeleReporterEmitter = class {
 // packages/playwright/src/reporters/blob.ts
 var mime = require("playwright-core/lib/utilsBundle").mime;
 var yazl = require("playwright-core/lib/utilsBundle").yazl;
-var { ManualPromise: ManualPromise2 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise3 } = require("playwright-core/lib/coreBundle").iso;
 var { calculateSha1: calculateSha12, createGuid: createGuid2 } = require("playwright-core/lib/coreBundle").utils;
 var { removeFolders, sanitizeForFilePath } = require("playwright-core/lib/coreBundle").utils;
 var currentBlobReportVersion = 2;
@@ -3128,7 +3140,7 @@ var BlobReporter = class extends TeleReporterEmitter {
     await super.onEnd(result);
     const zipFileName = await this._prepareOutputFile();
     const zipFile = new yazl.ZipFile();
-    const zipFinishPromise = new ManualPromise2();
+    const zipFinishPromise = new ManualPromise3();
     const finishPromise = zipFinishPromise.catch((e) => {
       throw new Error(`Failed to write report ${zipFileName}: ` + e.message);
     });
@@ -5677,10 +5689,10 @@ var WorkerHost = class extends ProcessHost {
   async onExit() {
     await removeFolders3([this._params.artifactsDir]);
   }
-  async stop(didFail) {
-    if (didFail)
+  async stop(options = {}) {
+    if (options.didFail)
       this._didFail = true;
-    await super.stop();
+    await super.stop(options);
   }
   runTestGroup(runPayload) {
     this.sendMessageNoReply({ method: "runTestGroup", params: runPayload });
@@ -5707,7 +5719,7 @@ var import_workerStandby2 = require("./workerStandby");
 var import_common7 = require("../common");
 var import_util13 = require("../util");
 var colors4 = require("playwright-core/lib/utilsBundle").colors;
-var { ManualPromise: ManualPromise3 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise4 } = require("playwright-core/lib/coreBundle").iso;
 var { eventsHelper } = require("playwright-core/lib/coreBundle").utils;
 var Dispatcher = class {
   constructor(testRun, options = {}) {
@@ -5717,7 +5729,7 @@ var Dispatcher = class {
     this._isolatedJobs = /* @__PURE__ */ new Set();
     this._workerLimitPerProjectId = /* @__PURE__ */ new Map();
     this._queuedOrRunningHashCount = /* @__PURE__ */ new Map();
-    this._finished = new ManualPromise3();
+    this._finished = new ManualPromise4();
     this._isStopped = true;
     this._extraEnvByProjectId = /* @__PURE__ */ new Map();
     this._producedEnvByProjectId = /* @__PURE__ */ new Map();
@@ -5808,10 +5820,7 @@ var Dispatcher = class {
     const result = await jobDispatcher.jobResult;
     this._updateCounterForWorkerHash(job.workerHash, -1);
     if (result.didFail) {
-      void worker.stop(
-        true
-        /* didFail */
-      );
+      void worker.stop({ didFail: true });
       (0, import_workerStandby2.recordWorkerRestart)(!!result.remainingJob || !!this._queue.length);
     } else if (this._isWorkerRedundant(worker)) {
       void worker.stop();
@@ -5918,17 +5927,17 @@ var Dispatcher = class {
   producedEnvByProjectId() {
     return this._producedEnvByProjectId;
   }
-  async stop() {
+  async stop(options) {
     if (this._isStopped)
       return;
     this._isStopped = true;
-    await Promise.all(this._workerSlots.map(({ worker }) => worker?.stop()));
+    await Promise.all(this._workerSlots.map(({ worker }) => worker?.stop(options)));
     this._checkFinished();
   }
 };
 var JobDispatcher = class {
   constructor(job, testRun, onMaxFailuresReached) {
-    this.jobResult = new ManualPromise3();
+    this.jobResult = new ManualPromise4();
     this._listeners = [];
     this._failedTests = /* @__PURE__ */ new Set();
     this._failedWithNonRetriableError = /* @__PURE__ */ new Set();
@@ -6245,6 +6254,7 @@ function chunkFromParams(params) {
 
 // packages/playwright/src/runner/tasks.ts
 var import_workerStandby3 = require("./workerStandby");
+var import_session2 = require("./session");
 
 // packages/playwright/src/runner/sigIntWatcher.ts
 var SigIntWatcher = class {
@@ -6321,7 +6331,7 @@ var FixedNodeSIGINTHandler = class {
 var import_util14 = require("../util");
 var colors5 = require("playwright-core/lib/utilsBundle").colors;
 var debug4 = require("playwright-core/lib/utilsBundle").debug;
-var { ManualPromise: ManualPromise4 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise5 } = require("playwright-core/lib/coreBundle").iso;
 var { monotonicTime: monotonicTime4 } = require("playwright-core/lib/coreBundle").iso;
 var TaskRunner = class _TaskRunner {
   constructor(reporter, globalTimeoutForError) {
@@ -6340,7 +6350,7 @@ var TaskRunner = class _TaskRunner {
     const teardownStatus = await cleanup();
     return status === "passed" ? teardownStatus : status;
   }
-  async runDeferCleanup(context, deadline, cancelPromise = new ManualPromise4()) {
+  async runDeferCleanup(context, deadline, cancelPromise = new ManualPromise5()) {
     const sigintWatcher = new SigIntWatcher();
     const timeoutWatcher = new TimeoutWatcher(deadline);
     const teardownRunner = new _TaskRunner(this._reporter, this._globalTimeoutForError);
@@ -6398,7 +6408,7 @@ var TaskRunner = class _TaskRunner {
 var TimeoutWatcher = class {
   constructor(deadline) {
     this._timedOut = false;
-    this.promise = new ManualPromise4();
+    this.promise = new ManualPromise5();
     if (!deadline)
       return;
     if (deadline - monotonicTime4() <= 0) {
@@ -6522,7 +6532,7 @@ function orderTestGroupsByDuration(testGroups, durations) {
 // packages/playwright/src/runner/tasks.ts
 var import_util16 = require("../util");
 var debug5 = require("playwright-core/lib/utilsBundle").debug;
-var { ManualPromise: ManualPromise5 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise6 } = require("playwright-core/lib/coreBundle").iso;
 var { monotonicTime: monotonicTime5 } = require("playwright-core/lib/coreBundle").iso;
 var { removeFolders: removeFolders4 } = require("playwright-core/lib/coreBundle").utils;
 var readDirAsync2 = (0, import_util15.promisify)(import_fs14.default.readdir);
@@ -6858,7 +6868,8 @@ function createRunTestsTask() {
           orderTestGroupsByDuration(phaseTestGroups, durations);
         if (phaseTestGroups.length) {
           await dispatcher.run(phaseTestGroups, extraEnvByProjectId);
-          await dispatcher.stop();
+          globalThis[/* @__PURE__ */ Symbol.for("flashwright.codeCache")]?.ranTests();
+          await dispatcher.stop({ detachTeardown: !nextPhase && (0, import_session2.isWarmSessionRun)() });
           for (const [projectId, envProduced] of dispatcher.producedEnvByProjectId()) {
             const extraEnv = extraEnvByProjectId.get(projectId) || {};
             extraEnvByProjectId.set(projectId, { ...extraEnv, ...envProduced });
@@ -6936,7 +6947,7 @@ var LastRunReporter = class {
 };
 
 // packages/playwright/src/runner/testRunner.ts
-var { ManualPromise: ManualPromise6 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise7 } = require("playwright-core/lib/coreBundle").iso;
 var { setPlaywrightTestProcessEnv } = require("playwright-core/lib/coreBundle").utils;
 var { gracefullyProcessExitDoNotHang: gracefullyProcessExitDoNotHang2 } = require("playwright-core/lib/coreBundle").utils;
 var TestRunnerEvent = {
@@ -7139,7 +7150,7 @@ var TestRunner = class extends import_events3.default {
     };
     const configReporters = params.disableConfigReporters ? [] : await createReporters(config2, "test", void 0, options);
     const reporter = new InternalReporter([...configReporters, userReporter]);
-    const stop = new ManualPromise6();
+    const stop = new ManualPromise7();
     const testRun = new TestRun(config2, reporter, options);
     if (params.testIds) {
       const testIdSet = new Set(params.testIds);
@@ -7273,7 +7284,7 @@ var uiModeReporter_default = UIModeReporter;
 // packages/playwright/src/runner/testServer.ts
 var debug6 = require("playwright-core/lib/utilsBundle").debug;
 var open2 = require("playwright-core/lib/utilsBundle").open;
-var { ManualPromise: ManualPromise7 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise8 } = require("playwright-core/lib/coreBundle").iso;
 var { isUnderTest } = require("playwright-core/lib/coreBundle").utils;
 var { HttpServer: HttpServer2 } = require("playwright-core/lib/coreBundle").utils;
 var { gracefullyProcessExitDoNotHang: gracefullyProcessExitDoNotHang3 } = require("playwright-core/lib/coreBundle").utils;
@@ -7480,7 +7491,7 @@ async function runTestServer(configFile, configCLIOverrides, options) {
 }
 async function innerRunTestServer(configLocation, configCLIOverrides, options, openUI) {
   const testServer = new TestServer(configLocation, configCLIOverrides);
-  const cancelPromise = new ManualPromise7();
+  const cancelPromise = new ManualPromise8();
   const sigintWatcher = new SigIntWatcher();
   process.stdin.on("close", () => gracefullyProcessExitDoNotHang3(0));
   void sigintWatcher.promise().then(() => cancelPromise.resolve());
@@ -7856,7 +7867,7 @@ var TestServerConnection = class {
 // packages/playwright/src/runner/watchMode.ts
 var colors6 = require("playwright-core/lib/utilsBundle").colors;
 var enquirer = require("playwright-core/lib/utilsBundle").enquirer;
-var { ManualPromise: ManualPromise8 } = require("playwright-core/lib/coreBundle").iso;
+var { ManualPromise: ManualPromise9 } = require("playwright-core/lib/coreBundle").iso;
 var { createGuid: createGuid3 } = require("playwright-core/lib/coreBundle").utils;
 var { getPackageManagerExecCommand: getPackageManagerExecCommand3 } = require("playwright-core/lib/coreBundle").utils;
 var { eventsHelper: eventsHelper2 } = require("playwright-core/lib/coreBundle").utils;
@@ -7907,7 +7918,7 @@ async function runWatchModeLoop(configLocation, initialOptions) {
   } });
   const dirtyTestFiles = /* @__PURE__ */ new Set();
   const dirtyTestIds = /* @__PURE__ */ new Set();
-  let onDirtyTests = new ManualPromise8();
+  let onDirtyTests = new ManualPromise9();
   let queue = Promise.resolve();
   const changedFiles = /* @__PURE__ */ new Set();
   testServerConnection.onTestFilesChanged(({ testFiles }) => {
@@ -7926,7 +7937,7 @@ async function runWatchModeLoop(configLocation, initialOptions) {
       changedFiles.clear();
       if (dirtyTestIds.size > 0) {
         onDirtyTests.resolve("changed");
-        onDirtyTests = new ManualPromise8();
+        onDirtyTests = new ManualPromise9();
       }
     });
   });
@@ -8053,7 +8064,7 @@ async function runWatchModeLoop(configLocation, initialOptions) {
   return result === "passed" ? teardown.status : result;
 }
 function readKeyPress(handler) {
-  const promise = new ManualPromise8();
+  const promise = new ManualPromise9();
   const rl = import_readline.default.createInterface({ input: process.stdin, escapeCodeTimeout: 50 });
   import_readline.default.emitKeypressEvents(process.stdin, rl);
   if (process.stdin.isTTY)

package/lib/runner/index.js.txt

@@ -1,5 +1,5 @@
 # packages/playwright/lib/runner/index.js
-# total: 321.4 KB
+# total: 322.4 KB
 
 ## Inlined (49)
    1.3 KB  packages/playwright/src/isomorphic/events.ts
@@ -35,14 +35,14 @@
    1.7 KB  packages/playwright/src/runner/lastRun.ts
    1.6 KB  packages/playwright/src/runner/loaderHost.ts
   13.3 KB  packages/playwright/src/runner/loadUtils.ts
-   6.5 KB  packages/playwright/src/runner/processHost.ts
+   7.3 KB  packages/playwright/src/runner/processHost.ts
    7.9 KB  packages/playwright/src/runner/projectUtils.ts
    5.5 KB  packages/playwright/src/runner/rebase.ts
    3.4 KB  packages/playwright/src/runner/reporters.ts
    2.4 KB  packages/playwright/src/runner/reporterTestRun.ts
    1.6 KB  packages/playwright/src/runner/sigIntWatcher.ts
    3.5 KB  packages/playwright/src/runner/taskRunner.ts
-  15.9 KB  packages/playwright/src/runner/tasks.ts
+  16.1 KB  packages/playwright/src/runner/tasks.ts
    2.6 KB  packages/playwright/src/runner/testDurations.ts
    4.4 KB  packages/playwright/src/runner/testGroups.ts
   13.2 KB  packages/playwright/src/runner/testRunner.ts

package/lib/runner/session.js

@@ -31,17 +31,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var session_exports = {};
 __export(session_exports, {
   flushSessionBrowsers: () => flushSessionBrowsers,
+  isWarmSessionRun: () => isWarmSessionRun,
   receiveWorkerMessage: () => receiveWorkerMessage,
   requestSessionBrowser: () => requestSessionBrowser,
   runCli: () => runCli,
   sessionStandbyEnv: () => sessionStandbyEnv,
+  trackDetachedTeardown: () => trackDetachedTeardown,
   trackSessionWorker: () => trackSessionWorker
 });
 module.exports = __toCommonJS(session_exports);
-var import_child_process = __toESM(require("child_process"));
-var import_crypto = __toESM(require("crypto"));
 var import_fs = __toESM(require("fs"));
-var import_inspector = __toESM(require("inspector"));
 var import_net = __toESM(require("net"));
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
@@ -84,17 +83,26 @@ function runLocally(argv, hooks, startSessionWith) {
   hooks.loadProgram().parse(argv);
 }
 function sessionRequested() {
-  if (process.env.PWDEBUG || process.env.PWTEST_WATCH || import_inspector.default.url() || process.platform === "win32")
+  if (process.env.PWDEBUG || process.env.PWTEST_WATCH || debuggerAttached() || process.platform === "win32")
     return false;
   const value = process.env.FLASHWRIGHT_SESSION;
   if (value)
     return value !== "0" && value !== "false";
   return !process.env.CI;
 }
+function debuggerAttached() {
+  if (!process.execArgv.length && !process.env.NODE_OPTIONS)
+    return false;
+  return !!require("inspector").url();
+}
+function childProcess() {
+  return require("child_process");
+}
 function buildStamp() {
   const files = ["program.js", "common/index.js", "runner/index.js", "runner/session.js", "worker/workerProcessEntry.js"].map((file) => import_path.default.join(__dirname, "..", file));
+  const coreBundle = import_path.default.join(__dirname, "..", "..", "..", "playwright-core", "lib", "coreBundle.js");
   try {
-    files.push(require.resolve("playwright-core/lib/coreBundle"));
+    files.push(import_fs.default.existsSync(coreBundle) ? coreBundle : require.resolve("playwright-core/lib/coreBundle"));
   } catch {
   }
   return files.map((file) => {
@@ -135,7 +143,7 @@ function createRequest(argv) {
 }
 function warmKey(request) {
   const env = Object.entries(stableEnv(request.env)).sort(([a], [b]) => a < b ? -1 : 1);
-  return import_crypto.default.createHash("sha1").update(JSON.stringify([env, request.execPath, request.execArgv, request.cliPath, request.build, request.profile])).digest("hex");
+  return require("crypto").createHash("sha1").update(JSON.stringify([env, request.execPath, request.execArgv, request.cliPath, request.build, request.profile])).digest("hex");
 }
 function sessionSocketPath(cwd) {
   const uid = import_os.default.userInfo().uid;
@@ -151,10 +159,16 @@ function sessionSocketPath(cwd) {
   } catch {
     return;
   }
-  const id = import_crypto.default.createHash("sha1").update([import_path.default.join(__dirname, ".."), process.execPath, cwd].join("\0")).digest("hex").slice(0, 16);
+  const id = fnv1a64([import_path.default.join(__dirname, ".."), process.execPath, cwd].join("\0"));
   const socketFile = import_path.default.join(directory, `${id}.sock`);
   return Buffer.byteLength(socketFile) < 100 ? socketFile : void 0;
 }
+function fnv1a64(text) {
+  let hash = 0xcbf29ce484222325n;
+  for (const byte of Buffer.from(text))
+    hash = BigInt.asUintN(64, (hash ^ BigInt(byte)) * 0x100000001b3n);
+  return hash.toString(16).padStart(16, "0");
+}
 function runInSession(request) {
   const socketFile = sessionSocketPath(request.cwd);
   if (!socketFile)
@@ -217,7 +231,7 @@ function startSession(request) {
   const socketFile = sessionSocketPath(request.cwd);
   if (!socketFile)
     return;
-  const child = import_child_process.default.spawn(process.execPath, [__filename, "--flashwright-session", socketFile, request.build], {
+  const child = childProcess().spawn(process.execPath, [__filename, "--flashwright-session", socketFile, request.build], {
     detached: true,
     stdio: ["ignore", "ignore", "ignore", "ipc"],
     env: { ...process.env, FLASHWRIGHT_SESSION_ROLE: "session" }
@@ -279,19 +293,27 @@ function forwardBrowser(browser) {
   }
   pendingSends.add(sendBrowser(sessionChannel, browser));
 }
+function isWarmSessionRun() {
+  return !!outputBytes;
+}
+var detachedTeardowns = /* @__PURE__ */ new Set();
+function trackDetachedTeardown(exited) {
+  detachedTeardowns.add(exited);
+  void exited.finally(() => detachedTeardowns.delete(exited));
+}
 async function flushSessionBrowsers(exitCode) {
   if (!sessionChannel)
     return;
+  if (outputBytes && exitCode !== void 0 && sessionChannel.connected)
+    await new Promise((resolve) => sessionChannel.send({ type: "exiting", code: exitCode, ...outputBytes }, void 0, resolve));
   await Promise.all([...sessionStandbys].map(returnStandbyBrowser));
   const deadline = Date.now() + 2e3;
-  while (sessionWorkers.size && Date.now() < deadline)
-    await new Promise((resolve) => setTimeout(resolve, 5));
+  while ((sessionWorkers.size || detachedTeardowns.size) && Date.now() < deadline)
+    await Promise.race([...detachedTeardowns, new Promise((resolve) => setTimeout(resolve, 5))]);
   await Promise.all(pendingSends);
   for (const parts of workerParts.values())
     killBrowser(parts);
   workerParts.clear();
-  if (outputBytes && exitCode !== void 0 && sessionChannel.connected)
-    await new Promise((resolve) => sessionChannel.send({ type: "exiting", code: exitCode, ...outputBytes }, void 0, resolve));
   if (sessionChannel.connected)
     sessionChannel.disconnect();
 }
@@ -485,7 +507,7 @@ function runSession(socketFile, build) {
     if (warmProcesses.some((warm2) => warm2.key === key && !warm2.running))
       return;
     const standbys = browsers.filter((browser) => browser.key === key).length;
-    const child = import_child_process.default.spawn(request.execPath, [...request.execArgv, request.cliPath, ...request.argv.slice(2)], {
+    const child = childProcess().spawn(request.execPath, [...request.execArgv, request.cliPath, ...request.argv.slice(2)], {
       cwd: request.cwd,
       env: { ...warmEnv(request), FLASHWRIGHT_SESSION_ROLE: "warm", FLASHWRIGHT_SESSION_STANDBYS: String(standbys) },
       stdio: ["ignore", "pipe", "pipe", "ipc"]
@@ -556,6 +578,7 @@ function runSession(socketFile, build) {
       finished = true;
       send({ type: "exit", code, signal });
       socket.end();
+      spawnWarm(lastRequest ?? request);
     };
     const finishIfRelayed = () => {
       if (exiting && relayed.stdout >= exiting.stdout && relayed.stderr >= exiting.stderr)
@@ -584,7 +607,7 @@ function runSession(socketFile, build) {
       }
     });
     socket.on("close", () => {
-      if (warm.child.exitCode === null && warm.child.signalCode === null)
+      if (!finished && warm.child.exitCode === null && warm.child.signalCode === null)
         warm.child.kill("SIGINT");
     });
     warm.child.once("exit", (code, signal) => {
@@ -594,7 +617,6 @@ function runSession(socketFile, build) {
         finish(code, signal);
       else
         warm.child.once("close", () => finish(code, signal));
-      spawnWarm(lastRequest ?? request);
     });
     warm.child.send(request);
   };
@@ -707,6 +729,7 @@ async function runWarmProcess(hooks) {
   if (request.profile.stdinTTY)
     Object.assign(process.stdin, { isTTY: true });
   countOutputBytes();
+  globalThis[/* @__PURE__ */ Symbol.for("flashwright.codeCache")]?.refreshAtExit();
   hooks.retargetWorkers(request.argv);
   program.parse(request.argv);
 }
@@ -715,9 +738,11 @@ if (process.argv[2] === "--flashwright-session")
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   flushSessionBrowsers,
+  isWarmSessionRun,
   receiveWorkerMessage,
   requestSessionBrowser,
   runCli,
   sessionStandbyEnv,
+  trackDetachedTeardown,
   trackSessionWorker
 });

package/lib/runner/session.js.txt

@@ -1,8 +1,8 @@
 # packages/playwright/lib/runner/session.js
-# total: 25.0 KB
+# total: 25.9 KB
 
 ## Inlined (1)
-  23.4 KB  packages/playwright/src/runner/session.ts
+  24.2 KB  packages/playwright/src/runner/session.ts
 
 ## External (1)
   playwright-core/lib/coreBundle

package/lib/speculativeBrowser.js

@@ -152,6 +152,7 @@ function prepareSpeculativeContext() {
 const contextHintFile = import_path.default.join(import_os.default.tmpdir(), "flashwright-context-hints.json");
 const maxContextHints = 200;
 let rememberedContextHint = false;
+let hintReadAhead;
 function readContextHints() {
   try {
     return JSON.parse(import_fs.default.readFileSync(contextHintFile, "utf8"));
@@ -161,7 +162,10 @@ function readContextHints() {
 }
 function readContextHint() {
   const key = process.env.FLASHWRIGHT_CONTEXT_HINT_KEY;
-  return key ? readContextHints()[key] : void 0;
+  if (!key)
+    return;
+  hintReadAhead = { key, hint: readContextHints()[key] };
+  return hintReadAhead.hint;
 }
 function rememberRecycledContext(browser) {
   const key = process.env.FLASHWRIGHT_CONTEXT_HINT_KEY;
@@ -172,6 +176,9 @@ function rememberRecycledContext(browser) {
   if (rememberedContextHint || !key || !Object.keys(params).length || mayHoldSecrets || !isPlainJSON(params))
     return;
   rememberedContextHint = true;
+  const hint = hintReadAhead?.key === key ? hintReadAhead.hint : void 0;
+  if (hint && JSON.stringify(hint.params) === JSON.stringify(params) && hint.storageState === storageState)
+    return;
   try {
     const hints = readContextHints();
     if (JSON.stringify(hints[key]?.params) === JSON.stringify(params) && hints[key]?.storageState === storageState)

package/lib/worker/workerProcessEntry.js

@@ -24,12 +24,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // packages/playwright/src/worker/workerProcessEntry.ts
 var import_codeCache = require("../codeCache");
-var import_path5 = __toESM(require("path"));
+var import_path6 = __toESM(require("path"));
 var import_common4 = require("../common");
 
 // packages/playwright/src/worker/workerMain.ts
+var import_path4 = __toESM(require("path"));
 var import_common3 = require("../common");
 var globals = __toESM(require("../globals"));
+var import_package = require("../package");
 var import_expect = require("../matchers/expect");
 
 // packages/playwright/src/util.ts
@@ -837,7 +839,7 @@ function testInfoError(error) {
 // packages/playwright/src/worker/testInfo.ts
 var import_common2 = require("../common");
 var { ManualPromise: ManualPromise4 } = require("playwright-core/lib/coreBundle").iso;
-var { captureRawStack, stringifyStackFrames: stringifyStackFrames2, filteredStackTrace: filteredStackTrace3 } = require("playwright-core/lib/coreBundle").utils;
+var { captureFilteredStackTrace, stringifyStackFrames: stringifyStackFrames2 } = require("playwright-core/lib/coreBundle").utils;
 var { escapeWithQuotes: escapeWithQuotes2 } = require("playwright-core/lib/coreBundle").iso;
 var { monotonicTime: monotonicTime3 } = require("playwright-core/lib/coreBundle").iso;
 var { createCallIdGenerator } = require("playwright-core/lib/coreBundle").iso;
@@ -996,10 +998,10 @@ var TestInfoImpl = class {
     let boxedStack = parentStep?.boxedStack;
     let stack = data.stack;
     if (!boxedStack && data.box) {
-      boxedStack = filteredStackTrace3(captureRawStack()).slice(1);
+      boxedStack = captureFilteredStackTrace().slice(1);
       stack ??= boxedStack;
     }
-    stack ??= filteredStackTrace3(captureRawStack());
+    stack ??= captureFilteredStackTrace();
     const step = {
       ...data,
       stepId,
@@ -1352,7 +1354,7 @@ var colors2 = require("playwright-core/lib/utilsBundle").colors;
 var { ManualPromise: ManualPromise5 } = require("playwright-core/lib/coreBundle").iso;
 var { removeFolders } = require("playwright-core/lib/coreBundle").utils;
 var { gracefullyCloseAll } = require("playwright-core/lib/coreBundle").utils;
-var { filteredStackTrace: filteredStackTrace4 } = require("playwright-core/lib/coreBundle").utils;
+var { filteredStackTrace: filteredStackTrace3 } = require("playwright-core/lib/coreBundle").utils;
 var WorkerMain = class extends import_common3.ProcessRunner {
   constructor(params) {
     super();
@@ -1406,6 +1408,20 @@ var WorkerMain = class extends import_common3.ProcessRunner {
     }
     return this._runFinished;
   }
+  // Flashwright: in a warm session, the runner reports a run's outcome without waiting for its
+  // workers to exit, when what a stopping worker has left to do cannot change it: no test is
+  // running, no error is waiting to be reported, and only Playwright's own worker fixtures remain,
+  // which hand the browser over to the session (see the runner's session.ts). A worker whose
+  // process.exit was replaced may never exit, which the runner reports after a timeout.
+  canDetachTeardown() {
+    if (!process.env.FLASHWRIGHT_SESSION_HANDOFF || process.env.DEBUG || process.exit !== import_common3.originalProcessExit)
+      return false;
+    if (!this._runFinished.isDone() || this._currentTest || this._fatalErrors.length)
+      return false;
+    return [...this._fixtureRunner.instanceForId.values()].every(({ registration }) => {
+      return registration.scope !== "worker" || typeof registration.fn !== "function" || registration.location.file.startsWith(import_package.packageRoot + import_path4.default.sep);
+    });
+  }
   async gracefullyClose() {
     try {
       await this._stop();
@@ -1522,6 +1538,8 @@ var WorkerMain = class extends import_common3.ProcessRunner {
         await this._runTest(tests[i], entry.retry, tests[i + 1]);
         debugTest(`test finished "${tests[i].title}"`);
       }
+      if (tests.length)
+        globalThis[/* @__PURE__ */ Symbol.for("flashwright.codeCache")]?.ranTests();
     } catch (e) {
       this._fatalErrors.push(testInfoError(e));
       void this._stop();
@@ -1599,7 +1617,7 @@ var WorkerMain = class extends import_common3.ProcessRunner {
     globals.setCurrentTestInfo(testInfo);
     (0, import_expect.setExpectConfig)({
       testInfo,
-      filteredStackTrace: filteredStackTrace4,
+      filteredStackTrace: filteredStackTrace3,
       ignoreSnapshots: testInfo._projectInternal.project.ignoreSnapshots,
       updateSnapshots: testInfo.config.updateSnapshots,
       timeout: testInfo._projectInternal.expect?.timeout,
@@ -1730,7 +1748,7 @@ var WorkerMain = class extends import_common3.ProcessRunner {
     testInfo.duration = testInfo._timeoutManager.defaultSlot().elapsed + afterHooksSlot.elapsed | 0;
     this._currentTest = null;
     globals.setCurrentTestInfo(null);
-    (0, import_expect.setExpectConfig)({ testInfo: null, filteredStackTrace: filteredStackTrace4, ignoreSnapshots: false, updateSnapshots: "default" });
+    (0, import_expect.setExpectConfig)({ testInfo: null, filteredStackTrace: filteredStackTrace3, ignoreSnapshots: false, updateSnapshots: "default" });
     this.dispatchEvent("testEnd", buildTestEndPayload(testInfo));
     const preserveOutput = this._config.config.preserveOutput === "always" || this._config.config.preserveOutput === "failures-only" && testInfo._isFailure();
     if (!preserveOutput)
@@ -1861,7 +1879,7 @@ var create = (params) => new WorkerMain(params);
 // packages/playwright/src/speculativeBrowser.ts
 var import_fs4 = __toESM(require("fs"));
 var import_os = __toESM(require("os"));
-var import_path4 = __toESM(require("path"));
+var import_path5 = __toESM(require("path"));
 var speculativeOptions = { handleSIGINT: false, headless: true, ...process.env.FLASHWRIGHT_ISOLATION === "strict" ? {} : { recycleContexts: true } };
 var speculativeKey = /* @__PURE__ */ Symbol.for("flashwright.speculativeBrowser");
 function launchSpeculativeBrowser() {
@@ -1971,7 +1989,8 @@ function prepareSpeculativeContext() {
     return browser;
   });
 }
-var contextHintFile = import_path4.default.join(import_os.default.tmpdir(), "flashwright-context-hints.json");
+var contextHintFile = import_path5.default.join(import_os.default.tmpdir(), "flashwright-context-hints.json");
+var hintReadAhead;
 function readContextHints() {
   try {
     return JSON.parse(import_fs4.default.readFileSync(contextHintFile, "utf8"));
@@ -1981,7 +2000,10 @@ function readContextHints() {
 }
 function readContextHint() {
   const key = process.env.FLASHWRIGHT_CONTEXT_HINT_KEY;
-  return key ? readContextHints()[key] : void 0;
+  if (!key)
+    return;
+  hintReadAhead = { key, hint: readContextHints()[key] };
+  return hintReadAhead.hint;
 }
 async function returnSpeculativeBrowser() {
   const launch = globalThis[speculativeKey];
@@ -2005,7 +2027,7 @@ if (process.env.FLASHWRIGHT_SPECULATIVE_BROWSER) {
     if (initialized)
       return;
     try {
-      require(import_path5.default.join(__dirname, "..", "..", "test.js"));
+      require(import_path6.default.join(__dirname, "..", "..", "test.js"));
     } catch {
     }
     if (!initialized)

package/lib/worker/workerProcessEntry.js.txt

@@ -1,5 +1,5 @@
 # packages/playwright/lib/worker/workerProcessEntry.js
-# total: 79.7 KB
+# total: 81.0 KB
 
 ## Inlined (9)
    4.6 KB  packages/playwright/src/speculativeBrowser.ts
@@ -9,14 +9,15 @@
   11.9 KB  packages/playwright/src/worker/testTracing.ts
    5.4 KB  packages/playwright/src/worker/timeoutManager.ts
    0.3 KB  packages/playwright/src/worker/util.ts
-  21.3 KB  packages/playwright/src/worker/workerMain.ts
+  22.5 KB  packages/playwright/src/worker/workerMain.ts
    1.0 KB  packages/playwright/src/worker/workerProcessEntry.ts
 
-## External (7)
+## External (8)
   ../codeCache
   ../common
   ../globals
   ../matchers/expect
+  ../package
   playwright-core
   playwright-core/lib/coreBundle
   playwright-core/lib/utilsBundle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flashwright",
-  "version": "1.64.1-flashwright.2",
+  "version": "1.64.1-flashwright.3",
   "description": "Flashwright: a faster drop-in replacement for Playwright (fork of Playwright 1.64.1)",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "npm:flashwright-core@1.64.1-flashwright.2"
+    "playwright-core": "npm:flashwright-core@1.64.1-flashwright.3"
   },
   "bugs": {
     "url": "https://github.com/xcodebeast/flashwright/issues"