flashwright-core 1.64.1-flashwright.1 → 1.64.1-flashwright.2

package/README.md

@@ -13,4 +13,6 @@ npx playwright install chromium
 
 Without the test runner, `playwright` is `flashwright` and `playwright-core` is `flashwright-core`. See the [project page](https://github.com/xcodebeast/flashwright) for benchmarks, speed options and the differences from Playwright.
 
+Re-running tests, like an agent checking its work? Outside CI, a warm session keeps the browser between runs, so one test re-runs in about 0.1 s instead of 0.7 s with Playwright ([warm session](https://github.com/xcodebeast/flashwright#warm-session); `FLASHWRIGHT_SESSION=0` turns it off).
+
 Flashwright is an independent fork and is not affiliated with Microsoft. Apache-2.0, like Playwright.

package/lib/coreBundle.js

@@ -3043,6 +3043,7 @@ var init_httpServer = __esm({
 // packages/utils/processLauncher.ts
 var processLauncher_exports = {};
 __export(processLauncher_exports, {
+  adoptProcess: () => adoptProcess,
   envArrayToObject: () => envArrayToObject,
   gracefullyCloseAll: () => gracefullyCloseAll,
   gracefullyCloseSet: () => gracefullyCloseSet,
@@ -3149,10 +3150,13 @@ async function launchProcess(options) {
     options.log(`[pid=${spawnedProcess.pid}][err] ` + data);
   });
   let processClosed = false;
+  let released = false;
   let fulfillCleanup = () => {
   };
   const waitForCleanup = new Promise((f) => fulfillCleanup = f);
   spawnedProcess.once("close", (exitCode, signal) => {
+    if (released)
+      return;
     options.log(`[pid=${spawnedProcess.pid}] <process did exit: exitCode=${exitCode}, signal=${signal}>`);
     processClosed = true;
     gracefullyCloseSet.delete(gracefullyClose);
@@ -3219,7 +3223,103 @@ async function launchProcess(options) {
     killProcess();
     return waitForCleanup;
   }
-  return { launchedProcess: spawnedProcess, gracefullyClose, kill: killAndWait, killAndCleanup: killProcessAndCleanup };
+  function release() {
+    released = true;
+    gracefullyCloseSet.delete(gracefullyClose);
+    killSet.delete(killProcessAndCleanup);
+    removeProcessHandlersIfNeeded();
+    stdout.close();
+    stderr.close();
+    spawnedProcess.unref();
+    options.log(`[pid=${spawnedProcess.pid}] <released>`);
+    return { pid: spawnedProcess.pid, tempDirectories: options.tempDirectories };
+  }
+  return { launchedProcess: spawnedProcess, gracefullyClose, kill: killAndWait, killAndCleanup: killProcessAndCleanup, release };
+}
+function adoptProcess(options) {
+  const { pid } = options;
+  let processClosed = false;
+  let released = false;
+  let fulfillCleanup = () => {
+  };
+  const waitForCleanup = new Promise((f) => fulfillCleanup = f);
+  options.log(`<adopted> pid=${pid}`);
+  void options.exited.then(async () => {
+    if (released)
+      return;
+    options.log(`[pid=${pid}] <process did exit>`);
+    processClosed = true;
+    gracefullyCloseSet.delete(gracefullyClose);
+    killSet.delete(killProcessAndCleanup);
+    removeProcessHandlersIfNeeded();
+    options.onExit();
+    const errors = await removeFolders(options.tempDirectories);
+    for (let i = 0; i < options.tempDirectories.length; ++i) {
+      if (errors[i])
+        options.log(`[pid=${pid}] exception while removing ${options.tempDirectories[i]}: ${errors[i]}`);
+    }
+    fulfillCleanup();
+  });
+  addProcessHandlerIfNeeded("exit");
+  if (options.handleSIGINT)
+    addProcessHandlerIfNeeded("SIGINT");
+  if (options.handleSIGTERM)
+    addProcessHandlerIfNeeded("SIGTERM");
+  if (options.handleSIGHUP)
+    addProcessHandlerIfNeeded("SIGHUP");
+  gracefullyCloseSet.add(gracefullyClose);
+  killSet.add(killProcessAndCleanup);
+  let gracefullyClosing = false;
+  async function gracefullyClose() {
+    if (gracefullyClosing) {
+      killProcess();
+      await waitForCleanup;
+      return;
+    }
+    gracefullyClosing = true;
+    await options.attemptToGracefullyClose().catch(() => killProcess());
+    await waitForCleanup;
+  }
+  function killProcess() {
+    gracefullyCloseSet.delete(gracefullyClose);
+    killSet.delete(killProcessAndCleanup);
+    removeProcessHandlersIfNeeded();
+    if (processClosed)
+      return;
+    options.log(`[pid=${pid}] <will force kill>`);
+    try {
+      process.kill(-pid, "SIGKILL");
+    } catch (e) {
+      options.log(`[pid=${pid}] exception while trying to kill process: ${e}`);
+    }
+  }
+  function killProcessAndCleanup() {
+    killProcess();
+    for (const dir of options.tempDirectories) {
+      try {
+        import_fs6.default.rmSync(dir, { force: true, recursive: true, maxRetries: 5 });
+      } catch (e) {
+        options.log(`[pid=${pid}] exception while removing ${dir}: ${e}`);
+      }
+    }
+  }
+  function release() {
+    released = true;
+    gracefullyCloseSet.delete(gracefullyClose);
+    killSet.delete(killProcessAndCleanup);
+    removeProcessHandlersIfNeeded();
+    options.log(`[pid=${pid}] <released>`);
+    return { pid, tempDirectories: options.tempDirectories };
+  }
+  return {
+    gracefullyClose,
+    kill: () => {
+      killProcess();
+      return waitForCleanup;
+    },
+    killAndCleanup: killProcessAndCleanup,
+    release
+  };
 }
 function killProcessTree(pid) {
   try {
@@ -33792,6 +33892,85 @@ var init_chromiumSwitches = __esm({
   }
 });
 
+// packages/playwright-core/src/server/pipeTransport.ts
+var PipeTransport2;
+var init_pipeTransport2 = __esm({
+  "packages/playwright-core/src/server/pipeTransport.ts"() {
+    "use strict";
+    init_debugLogger();
+    PipeTransport2 = class {
+      constructor(pipeWrite, pipeRead) {
+        this._pendingBuffers = [];
+        this._closed = false;
+        this._pipeRead = pipeRead;
+        this._pipeWrite = pipeWrite;
+        pipeRead.on("data", (buffer) => this._dispatch(buffer));
+        pipeRead.on("close", () => {
+          this._closed = true;
+          if (this._onclose)
+            this._onclose.call(null);
+        });
+        pipeRead.on("error", (e) => debugLogger.log("error", e));
+        pipeWrite.on("error", (e) => debugLogger.log("error", e));
+        this.onmessage = void 0;
+      }
+      get onclose() {
+        return this._onclose;
+      }
+      set onclose(onclose) {
+        this._onclose = onclose;
+        if (onclose && !this._pipeRead.readable)
+          onclose();
+      }
+      send(message) {
+        if (this._closed)
+          throw new Error("Pipe has been closed");
+        this._pipeWrite.write(JSON.stringify(message) + "\0");
+      }
+      close() {
+        throw new Error("unimplemented");
+      }
+      // Flashwright: stops reading and gives the pipes to another owner, who continues the stream of
+      // messages (see browserHandoff.ts). Only possible between two messages: returns undefined when
+      // part of one has already been read.
+      release() {
+        if (this._closed || this._pendingBuffers.some((buffer) => buffer.length))
+          return;
+        this._closed = true;
+        this._pipeRead.removeAllListeners("data");
+        this._pipeRead.removeAllListeners("close");
+        this._pipeRead.pause();
+        return { write: this._pipeWrite, read: this._pipeRead };
+      }
+      _dispatch(buffer) {
+        let end = buffer.indexOf("\0");
+        if (end === -1) {
+          this._pendingBuffers.push(buffer);
+          return;
+        }
+        this._pendingBuffers.push(buffer.slice(0, end));
+        const message = Buffer.concat(this._pendingBuffers).toString();
+        setImmediate(() => {
+          if (this.onmessage)
+            this.onmessage.call(null, JSON.parse(message));
+        });
+        let start3 = end + 1;
+        end = buffer.indexOf("\0", start3);
+        while (end !== -1) {
+          const message2 = buffer.toString(void 0, start3, end);
+          setImmediate(() => {
+            if (this.onmessage)
+              this.onmessage.call(null, JSON.parse(message2));
+          });
+          start3 = end + 1;
+          end = buffer.indexOf("\0", start3);
+        }
+        this._pendingBuffers = [buffer.slice(start3)];
+      }
+    };
+  }
+});
+
 // packages/playwright-core/src/server/chromium/crConnection.ts
 var ConnectionEvents, kBrowserCloseMessageId, CRConnection, CRSession, CDPSession;
 var init_crConnection = __esm({
@@ -33852,6 +34031,9 @@ var init_crConnection = __esm({
         if (!this._closed)
           this._transport.close();
       }
+      transport() {
+        return this._transport;
+      }
       async createBrowserSession() {
         const { sessionId } = await this.rootSession.send("Target.attachToBrowserTarget");
         return new CDPSession(this.rootSession, sessionId);
@@ -37355,6 +37537,7 @@ var init_crBrowser = __esm({
     init_frames();
     init_network2();
     init_page();
+    init_pipeTransport2();
     init_crConnection();
     init_crPage();
     init_crProtocolHelper();
@@ -37367,6 +37550,7 @@ var init_crBrowser = __esm({
         this._crPages = /* @__PURE__ */ new Map();
         this._serviceWorkers = /* @__PURE__ */ new Map();
         this._isConnecting = false;
+        this._handingOff = false;
         this._version = "";
         this._majorVersion = 0;
         this._revision = "";
@@ -37400,7 +37584,16 @@ var init_crBrowser = __esm({
         browser._userAgent = version3.userAgent;
         browser.options.headful = !version3.userAgent.includes("Headless");
         if (!options.persistent) {
+          const adopted = options.adoptContext && await browser.adoptHandedOverContext(options.adoptContext).then(() => true, () => false);
+          if (options.adoptContext && !adopted)
+            await session.send("Target.disposeBrowserContext", { browserContextId: options.adoptContext.id }).catch(() => {
+            });
           await session.send("Target.setAutoAttach", { autoAttach: true, waitForDebuggerOnStart: true, flatten: true });
+          if (adopted) {
+            await session.send("Target.getTargetInfo");
+            await browser._waitForAllPagesToBeInitialized();
+            browser.startAdoptedContextRecycle();
+          }
           return browser;
         }
         browser._defaultContext = new CRBrowserContext(browser, void 0, options.persistent);
@@ -37437,6 +37630,29 @@ var init_crBrowser = __esm({
         this._contexts.set(browserContextId, context);
         return context;
       }
+      async doAdoptContext(browserContextId, options) {
+        const context = new CRBrowserContext(this, browserContextId, options);
+        await context.initialize();
+        this._contexts.set(browserContextId, context);
+        return context;
+      }
+      // Flashwright: leaves the browser as a new DevTools client would find it, attached to nothing,
+      // and gives up its pipe (see Browser.handoffForSession).
+      async doDetachForHandoff() {
+        const transport = this._connection.transport();
+        if (!(transport instanceof PipeTransport2))
+          return;
+        this._handingOff = true;
+        const sessionIds = [...this._connection._sessions.keys()].filter((sessionId) => !!sessionId);
+        const stopAttaching = this._session.send("Target.setAutoAttach", { autoAttach: false, waitForDebuggerOnStart: false, flatten: true });
+        const detached = sessionIds.map((sessionId) => this._session.send("Target.detachFromTarget", { sessionId }).catch(() => {
+        }));
+        const lastReply = this._session.send("Browser.getVersion");
+        await Promise.all([stopAttaching, ...detached, lastReply]);
+        const pipes = transport.release();
+        this._connection._onClose("Browser handed over");
+        return pipes;
+      }
       contexts() {
         return Array.from(this._contexts.values());
       }
@@ -37499,6 +37715,8 @@ var init_crBrowser = __esm({
         });
       }
       _onDetachedFromTarget(payload) {
+        if (this._handingOff)
+          return;
         const targetId = payload.targetId;
         const crPage = this._crPages.get(targetId);
         if (crPage) {
@@ -38453,70 +38671,25 @@ var init_backendAdb = __esm({
   }
 });
 
-// packages/playwright-core/src/server/pipeTransport.ts
-var PipeTransport2;
-var init_pipeTransport2 = __esm({
-  "packages/playwright-core/src/server/pipeTransport.ts"() {
+// packages/playwright-core/src/server/browserHandoff.ts
+function browserLaunchKey(browserName, options) {
+  const entries = Object.entries(options).filter(([key, value2]) => value2 !== void 0 && !kIgnoredLaunchOptions.has(key) && !key.startsWith("__testHook"));
+  entries.sort(([a], [b]) => a < b ? -1 : 1);
+  return JSON.stringify([browserName, entries]);
+}
+function takeBrowserOffer(browserName, options) {
+  const offer = globalThis[offerKey];
+  if (!offer || offer.metadata.browserName !== browserName || offer.metadata.launchKey !== browserLaunchKey(browserName, options))
+    return;
+  delete globalThis[offerKey];
+  return offer;
+}
+var offerKey, kIgnoredLaunchOptions;
+var init_browserHandoff = __esm({
+  "packages/playwright-core/src/server/browserHandoff.ts"() {
     "use strict";
-    init_debugLogger();
-    PipeTransport2 = class {
-      constructor(pipeWrite, pipeRead) {
-        this._pendingBuffers = [];
-        this._closed = false;
-        this._pipeRead = pipeRead;
-        this._pipeWrite = pipeWrite;
-        pipeRead.on("data", (buffer) => this._dispatch(buffer));
-        pipeRead.on("close", () => {
-          this._closed = true;
-          if (this._onclose)
-            this._onclose.call(null);
-        });
-        pipeRead.on("error", (e) => debugLogger.log("error", e));
-        pipeWrite.on("error", (e) => debugLogger.log("error", e));
-        this.onmessage = void 0;
-      }
-      get onclose() {
-        return this._onclose;
-      }
-      set onclose(onclose) {
-        this._onclose = onclose;
-        if (onclose && !this._pipeRead.readable)
-          onclose();
-      }
-      send(message) {
-        if (this._closed)
-          throw new Error("Pipe has been closed");
-        this._pipeWrite.write(JSON.stringify(message) + "\0");
-      }
-      close() {
-        throw new Error("unimplemented");
-      }
-      _dispatch(buffer) {
-        let end = buffer.indexOf("\0");
-        if (end === -1) {
-          this._pendingBuffers.push(buffer);
-          return;
-        }
-        this._pendingBuffers.push(buffer.slice(0, end));
-        const message = Buffer.concat(this._pendingBuffers).toString();
-        setImmediate(() => {
-          if (this.onmessage)
-            this.onmessage.call(null, JSON.parse(message));
-        });
-        let start3 = end + 1;
-        end = buffer.indexOf("\0", start3);
-        while (end !== -1) {
-          const message2 = buffer.toString(void 0, start3, end);
-          setImmediate(() => {
-            if (this.onmessage)
-              this.onmessage.call(null, JSON.parse(message2));
-          });
-          start3 = end + 1;
-          end = buffer.indexOf("\0", start3);
-        }
-        this._pendingBuffers = [buffer.slice(start3)];
-      }
-    };
+    offerKey = /* @__PURE__ */ Symbol.for("flashwright.browserOffer");
+    kIgnoredLaunchOptions = /* @__PURE__ */ new Set(["artifactsDir", "tracesDir", "downloadsPath", "timeout", "slowMo", "handleSIGINT", "handleSIGTERM", "handleSIGHUP"]);
   }
 });
 
@@ -38687,6 +38860,20 @@ function copyTestHooks(from, to) {
       to[key] = value2;
   }
 }
+async function closeOrKillProcess(gracefullyClose, kill, timeout) {
+  let timer;
+  try {
+    await Promise.race([
+      gracefullyClose(),
+      new Promise((resolve, reject) => timer = setTimeout(reject, timeout))
+    ]);
+  } catch (ignored) {
+    await kill().catch((ignored2) => {
+    });
+  } finally {
+    clearTimeout(timer);
+  }
+}
 var import_fs22, import_os10, import_path21, kNoXServerRunningError, BrowserType;
 var init_browserType = __esm({
   "packages/playwright-core/src/server/browserType.ts"() {
@@ -38702,6 +38889,7 @@ var init_browserType = __esm({
     init_processLauncher();
     init_debugLogger();
     init_browserContext();
+    init_browserHandoff();
     init_helper();
     init_instrumentation();
     init_pipeTransport2();
@@ -38768,7 +38956,8 @@ var init_browserType = __esm({
       async _innerLaunch(progress2, options, persistent, protocolLogger, maybeUserDataDir) {
         options.proxy = options.proxy ? normalizeProxySettings(options.proxy) : void 0;
         const browserLogsCollector = new RecentLogsCollector();
-        const { browserProcess, userDataDir, artifactsDir, transport, wsEndpoint } = await this._launchProcess(progress2, options, !!persistent, browserLogsCollector, maybeUserDataDir);
+        const offer = persistent ? void 0 : takeBrowserOffer(this._name, options);
+        const { browserProcess, userDataDir, artifactsDir, transport, wsEndpoint } = offer ? await this._adoptProcess(progress2, offer, options, browserLogsCollector) : await this._launchProcess(progress2, options, !!persistent, browserLogsCollector, maybeUserDataDir);
         try {
           if (options.__testHookBeforeCreateBrowser)
             await progress2.race(options.__testHookBeforeCreateBrowser());
@@ -38789,7 +38978,9 @@ var init_browserType = __esm({
             browserLogsCollector,
             wsEndpoint,
             originalLaunchOptions: options,
-            userDataDir: persistent ? userDataDir : void 0
+            userDataDir: persistent ? userDataDir : void 0,
+            launchKey: browserLaunchKey(this._name, options),
+            adoptContext: offer?.metadata.context
           };
           if (persistent)
             validateBrowserContextOptions(persistent, browserOptions);
@@ -38859,7 +39050,7 @@ var init_browserType = __esm({
         let transport = void 0;
         let browserProcess = void 0;
         const exitPromise = new ManualPromise();
-        const { launchedProcess, gracefullyClose, kill, killAndCleanup } = await progress2.race(launchProcess({
+        const { launchedProcess, gracefullyClose, kill, killAndCleanup, release } = await progress2.race(launchProcess({
           command: prepared.executable,
           args: prepared.browserArguments,
           env: this.amendEnvironment(env, prepared.userDataDir, isPersistent, options),
@@ -38887,26 +39078,14 @@ var init_browserType = __esm({
               browserProcess.onclose(exitCode, signal);
           }
         }));
-        async function closeOrKill(timeout) {
-          let timer;
-          try {
-            await Promise.race([
-              gracefullyClose(),
-              new Promise((resolve, reject) => timer = setTimeout(reject, timeout))
-            ]);
-          } catch (ignored) {
-            await kill().catch((ignored2) => {
-            });
-          } finally {
-            clearTimeout(timer);
-          }
-        }
+        const closeOrKill = (timeout) => closeOrKillProcess(gracefullyClose, kill, timeout);
         browserProcess = {
           onclose: void 0,
           process: launchedProcess,
           close: () => closeOrKill(options.__testHookBrowserCloseTimeout || DEFAULT_PLAYWRIGHT_TIMEOUT),
           kill,
-          killAndCleanup
+          killAndCleanup,
+          release
         };
         try {
           const { wsEndpoint } = await progress2.race([
@@ -38933,6 +39112,46 @@ ${updatedLog}`);
           throw error;
         }
       }
+      // Flashwright: takes over a running browser that another process launched with the same options
+      // and handed over (see browserHandoff.ts), instead of launching one.
+      async _adoptProcess(progress2, offer, options, browserLogsCollector) {
+        const { metadata } = offer;
+        const tempDirectories = [...metadata.tempDirectories];
+        let artifactsDir = options.artifactsDir;
+        if (!artifactsDir) {
+          artifactsDir = await progress2.race(import_fs22.default.promises.mkdtemp(import_path21.default.join(import_os10.default.tmpdir(), "playwright-artifacts-")));
+          tempDirectories.push(artifactsDir);
+        }
+        const transport = new PipeTransport2(offer.write, offer.read);
+        const exited = new Promise((resolve) => {
+          if (!offer.read.readable)
+            resolve();
+          offer.read.once("close", () => resolve());
+        });
+        let browserProcess = void 0;
+        const { gracefullyClose, kill, killAndCleanup, release } = adoptProcess({
+          pid: metadata.pid,
+          tempDirectories,
+          exited,
+          handleSIGINT: options.handleSIGINT ?? true,
+          handleSIGTERM: options.handleSIGTERM ?? true,
+          handleSIGHUP: options.handleSIGHUP ?? true,
+          attemptToGracefullyClose: async () => this.attemptToGracefullyCloseBrowser(transport),
+          onExit: () => browserProcess?.onclose?.(0, null),
+          log: (message) => {
+            progress2.log(message);
+            browserLogsCollector.log(message);
+          }
+        });
+        browserProcess = {
+          onclose: void 0,
+          close: () => closeOrKillProcess(gracefullyClose, kill, options.__testHookBrowserCloseTimeout || DEFAULT_PLAYWRIGHT_TIMEOUT),
+          kill,
+          killAndCleanup,
+          release
+        };
+        return { browserProcess, artifactsDir, userDataDir: "", transport };
+      }
       async connectOverCDP(progress2, params2) {
         throw new Error("CDP connections are only supported by Chromium");
       }
@@ -50598,6 +50817,13 @@ function raceWithTimeout(promise, timeout, timeoutValue) {
   const timedOut = new Promise((f) => timer = setTimeout(() => f(timeoutValue), timeout));
   return Promise.race([promise, timedOut]).finally(() => clearTimeout(timer));
 }
+function isPlainJSON(value2) {
+  if (value2 === null || ["string", "number", "boolean", "undefined"].includes(typeof value2))
+    return true;
+  if (Array.isArray(value2))
+    return value2.every(isPlainJSON);
+  return typeof value2 === "object" && Object.getPrototypeOf(value2) === Object.prototype && Object.values(value2).every(isPlainJSON);
+}
 var import_fs28, BrowserContextEvent, BrowserContext, kRecycledPageTimeout, kRecycleTimeout, paramsThatAllowContextReuse, defaultNewContextParamValues;
 var init_browserContext = __esm({
   "packages/playwright-core/src/server/browserContext.ts"() {
@@ -50756,6 +50982,32 @@ if (self.ServiceWorkerContainer) ServiceWorkerContainer.prototype.register = asy
         this._pendingRecycle.catch(() => {
         });
       }
+      // Flashwright: the context of a browser handed over by another process (see browserHandoff.ts)
+      // clears the storage of the origins the previous process's tests used on its next reset.
+      addVisitedOrigins(origins) {
+        for (const origin of origins)
+          this._origins.add(origin);
+      }
+      // Flashwright: called before the browser is handed over to another process. Waits for the reset
+      // that started when the last test ended and describes the context for the process that adopts it,
+      // or returns undefined when it cannot move: it holds state that lives in this process (a client
+      // certificate proxy, a HAR recording, a video) or that a reset cannot clear.
+      async prepareForHandoff() {
+        const params2 = this.reuseParams;
+        if (!this._recycleMode || !this.supportsRecycling() || !params2 || !this._browserContextId || this._closedStatus !== "open" || this._recyclingPrevented)
+          return;
+        if (this._clientCertificatesProxy || this.tracing.harRecorders.size || params2.recordVideo)
+          return;
+        const pending = this._pendingRecycle;
+        this._pendingRecycle = void 0;
+        if (!await (pending ?? this._recycle(nullProgress)))
+          return;
+        const rest = { ...params2 };
+        delete rest.storageState;
+        if (!isPlainJSON(rest))
+          return;
+        return { id: this._browserContextId, params: rest, origins: [...this._origins] };
+      }
       static reusableContextHash(params2) {
         const paramsCopy = { ...params2 };
         if (paramsCopy.selectorEngines?.length === 0)
@@ -51910,6 +52162,13 @@ var init_browser = __esm({
           Disconnected: "disconnected"
         };
       }
+      // Flashwright: see handoffForSession and adoptHandedOverContext.
+      doAdoptContext(contextId4, options) {
+        throw new Error("Not supported");
+      }
+      async doDetachForHandoff() {
+        return void 0;
+      }
       sdkLanguage() {
         return this.options.sdkLanguage || this.attribution.playwright.options.sdkLanguage;
       }
@@ -51964,6 +52223,7 @@ var init_browser = __esm({
             await this._contextForReuse.context.close(progress2, { reason: "Context reused" });
         }
         const context = await this.newContext(progress2, params2, recycle);
+        context.reuseParams = params2;
         this._contextForReuse = { context, hash };
         return context;
       }
@@ -51976,8 +52236,12 @@ var init_browser = __esm({
       // (newContextForReuse), which also applies the test's storage state; a test asking for a different
       // context gets a new one and this one closes.
       async prepareRecycledContext(params2, options = {}) {
-        if (this._contextForReuse)
+        const reuse = this._contextForReuse;
+        if (reuse) {
+          if (reuse.prepared && options.storageState && reuse.hash === BrowserContext.reusableContextHash(params2) + ":recycle")
+            reuse.context.prepareStorageStatePage();
           return;
+        }
         const context = await this.newContext(
           nullProgress,
           params2,
@@ -51985,11 +52249,61 @@ var init_browser = __esm({
           false
           /* announce */
         );
+        context.reuseParams = params2;
         this._contextForReuse = { context, hash: BrowserContext.reusableContextHash(params2) + ":recycle", prepared: true };
         context.startRecycle();
         if (options.storageState)
           context.prepareStorageStatePage();
       }
+      // Flashwright: a browser handed over by another process brings the context its tests used, with
+      // the tab that keeps the renderer warm. It becomes the prepared recycled context, like
+      // prepareRecycledContext's, and is reset once more before a test takes it.
+      async adoptHandedOverContext(handedOver) {
+        const params2 = { ...handedOver.params };
+        const options = { ...params2 };
+        validateBrowserContextOptions(options, this.options);
+        const context = await this.doAdoptContext(handedOver.id, options);
+        context.reuseParams = params2;
+        context.setRecycleMode(true);
+        context.addVisitedOrigins(handedOver.origins);
+        this._contextForReuse = { context, hash: BrowserContext.reusableContextHash(params2) + ":recycle", prepared: true };
+      }
+      // Called once the handed-over context's existing tab is attached.
+      startAdoptedContextRecycle() {
+        if (this._contextForReuse?.prepared)
+          this._contextForReuse.context.startRecycle();
+      }
+      // Flashwright: in a warm test session, the worker that launched this browser hands it to the
+      // next run instead of closing it (see browserHandoff.ts). Only a browser whose one open context
+      // is the recycled one, reset and healthy, is handed over; anything else returns undefined and
+      // the caller closes the browser as usual. Afterwards this object is disconnected from it.
+      // A headed browser is not handed over: its window would stay open between runs.
+      async handoffForSession() {
+        const reuse = this._contextForReuse;
+        const release = this.options.browserProcess.release;
+        if (!release || !this.options.launchKey || this.options.persistent || this.options.headful || this._startedClosing || !this.isConnected())
+          return;
+        if (!reuse || !reuse.hash.endsWith(":recycle") || this.contexts().some((context) => context !== reuse.context))
+          return;
+        const handedOverContext = await reuse.context.prepareForHandoff();
+        if (!handedOverContext)
+          return;
+        const pipes = await this.doDetachForHandoff().catch(() => void 0);
+        if (!pipes)
+          return;
+        const { pid, tempDirectories } = release();
+        this._startedClosing = true;
+        return {
+          ...pipes,
+          metadata: {
+            browserName: this.options.name,
+            launchKey: this.options.launchKey,
+            pid,
+            tempDirectories,
+            context: handedOverContext
+          }
+        };
+      }
       // Flashwright: see BrowserContext.outputDirsChanged.
       async setOutputDirs(artifactsDir, tracesDir) {
         this.options.artifactsDir = artifactsDir;
@@ -74532,6 +74846,7 @@ __export(utils_exports, {
   ZipFile: () => ZipFile,
   Zone: () => Zone,
   addSuffixToFilePath: () => addSuffixToFilePath,
+  adoptProcess: () => adoptProcess,
   blendWithWhite: () => blendWithWhite,
   calculateSha1: () => calculateSha1,
   canAccessFile: () => canAccessFile,
@@ -79231,7 +79546,7 @@ var utilsFacade = [
   [["hostPlatform", "isOfficiallySupportedPlatform", "shortPlatform"], () => (init_hostPlatform(), __toCommonJS(hostPlatform_exports))],
   [["HttpServer", "computeAllowedHosts", "isAllowedHost", "serveFolder", "urlHostFromAddress"], () => (init_httpServer(), __toCommonJS(httpServer_exports))],
   [["NET_DEFAULT_TIMEOUT", "createHttp2Server", "createHttpServer", "createHttpsServer", "createProxyAgent", "createSocket", "decorateServer", "flattenAggregateError", "happyEyeballsOptions", "httpRequest", "isURLAvailable", "proxySettingsFromString", "startHttpServer"], () => (init_network(), __toCommonJS(network_exports))],
-  [["envArrayToObject", "gracefullyCloseAll", "gracefullyCloseSet", "gracefullyProcessExitDoNotHang", "killProcessTree", "launchProcess", "spawnAsync"], () => (init_processLauncher(), __toCommonJS(processLauncher_exports))],
+  [["adoptProcess", "envArrayToObject", "gracefullyCloseAll", "gracefullyCloseSet", "gracefullyProcessExitDoNotHang", "killProcessTree", "launchProcess", "spawnAsync"], () => (init_processLauncher(), __toCommonJS(processLauncher_exports))],
   [["SerializedFS"], () => (init_serializedFS(), __toCommonJS(serializedFS_exports))],
   [["SocksProxy", "SocksProxyHandler", "parsePattern"], () => (init_socksProxy(), __toCommonJS(socksProxy_exports))],
   [["captureRawStack", "coreDir", "filterStackFile", "filteredStackTrace", "parseErrorStack", "parseStackFrame", "rewriteErrorMessage", "setBoxedStackPrefixes", "setCoreDir", "setRawStackFormatter", "showInternalStackFrames", "splitErrorMessage", "stringifyStackFrames", "withShallowStack"], () => (init_stackTrace(), __toCommonJS(stackTrace_exports))],

package/lib/vite/traceViewer/{index.Bdvc0_Yv.js → index.B5jyRlOV.js}

@@ -1 +1 @@
-import{D as e,_ as t,b as n,g as r,i,k as a,n as o,o as s,r as c,s as l,t as u,v as d}from"./assets/defaultSettingsView-DoonTZ3z.js";import"./assets/urlMatch-L3liM589.js";var f=a(e(),1),p=a(d(),1),m=r(),h=()=>{let[e,n]=f.useState(!1),[r,a]=f.useState(),[d,p]=f.useState(),[h,_]=f.useState(g),[v,y]=f.useState({done:0,total:0}),[b,x]=f.useState(!1),[S,C]=f.useState(null),[w,T]=f.useState(null),[E,D]=f.useState(!1),O=f.useCallback(e=>{let t=new URL(window.location.href);if(!e.length)return;let n=e.item(0),r=URL.createObjectURL(n);t.searchParams.append(`trace`,r);let i=t.toString();window.history.pushState({},``,i),a(r),p(n.name),x(!1),C(null)},[]);f.useEffect(()=>{let e=async e=>{if(!e.clipboardData?.files.length)return;let t=[`application/zip`,`application/x-zip-compressed`];for(let n of e.clipboardData.files)if(!t.includes(n.type))return;e.preventDefault(),O(e.clipboardData.files)};return document.addEventListener(`paste`,e),()=>document.removeEventListener(`paste`,e)}),f.useEffect(()=>{let e=e=>{let{method:t,params:n}=e.data;if(t!==`load`||!(n?.trace instanceof Blob))return;let r=new File([n.trace],`trace.zip`,{type:`application/zip`}),i=new DataTransfer;i.items.add(r),O(i.files)};return window.addEventListener(`message`,e),window.opener?.postMessage({method:`ready`},`*`),window.parent!==window&&window.parent.postMessage({method:`ready`},`*`),()=>window.removeEventListener(`message`,e)},[O]);let k=f.useCallback(e=>{e.preventDefault(),O(e.dataTransfer.files)},[O]),A=f.useCallback(e=>{e.preventDefault(),e.target.files&&O(e.target.files)},[O]);f.useEffect(()=>{let e=new URL(window.location.href).searchParams,t=e.get(`trace`);if(n(e.has(`isServer`)),t?.startsWith(`file:`)){T(t||null);return}if(e.has(`isServer`)){let e=new URLSearchParams(window.location.search).get(`ws`),t=new URL(`../${e}`,window.location.toString());t.protocol=window.location.protocol===`https:`?`wss:`:`ws:`;let n=new o(new c(t));n.onLoadTraceRequested(async e=>{a(e.traceUrl),x(!1),C(null)}),n.initialize({}).catch(()=>{})}else t&&!t.startsWith(`blob:`)&&a(t)},[]);let j=f.useCallback(async e=>{let n=new URLSearchParams;n.set(`trace`,e);let r=await fetch(`contexts?${n.toString()}`);if(!r.ok){let{error:e}=await r.json();return C(e),e}let i=new t(e,await r.json());y({done:0,total:0}),C(null),_(i)},[]);f.useEffect(()=>{(async()=>{if(!r){_(g);return}let t=e=>{e.data.method===`progress`&&y(e.data.params)};try{navigator.serviceWorker.addEventListener(`message`,t),y({done:0,total:1});let n=await j(r);n?.includes(`please grant permission for Local Network Access`)&&(await fetch(r,{method:`HEAD`,headers:{"x-pw-serviceworker":`skip`}}),n=await j(r)),n&&(e||a(void 0))}finally{navigator.serviceWorker.removeEventListener(`message`,t)}})()},[e,r,d,j]);let M=v.done!==v.total&&v.total!==0&&!S;f.useEffect(()=>{if(M){let e=setTimeout(()=>{D(!0)},200);return()=>clearTimeout(e)}else D(!1)},[M]);let N=!!(!e&&!b&&!w&&(!r||S));return(0,m.jsxs)(`div`,{className:`vbox workbench-loader`,onDragOver:e=>{e.preventDefault(),e.dataTransfer.types.includes(`Files`)&&x(!0)},children:[(0,m.jsxs)(`div`,{className:`hbox workbench-loader-header`,...N?{inert:!0}:{},children:[(0,m.jsx)(`div`,{className:`logo`,children:(0,m.jsx)(`img`,{src:`playwright-logo.svg`,alt:`Playwright logo`})}),(0,m.jsx)(`div`,{className:`product`,children:`Playwright`}),h.title&&(0,m.jsx)(`div`,{className:`title`,children:h.title}),(0,m.jsx)(`div`,{className:`spacer`}),(0,m.jsx)(s,{icon:`settings-gear`,title:`Settings`,dialogDataTestId:`settings-toolbar-dialog`,children:(0,m.jsx)(u,{location:`trace-viewer`,model:h})})]}),(0,m.jsx)(i,{model:h,inert:N}),w&&(0,m.jsxs)(`div`,{className:`drop-target`,children:[(0,m.jsx)(`div`,{children:`Trace Viewer uses Service Workers to show traces. To view trace:`}),(0,m.jsxs)(`div`,{style:{paddingTop:20},children:[(0,m.jsxs)(`div`,{children:[`1. Click `,(0,m.jsx)(`a`,{href:w,children:`here`}),` to put your trace into the download shelf`]}),(0,m.jsxs)(`div`,{children:[`2. Go to `,(0,m.jsx)(`a`,{href:`https://trace.playwright.dev`,children:`trace.playwright.dev`})]}),(0,m.jsx)(`div`,{children:`3. Drop the trace from the download shelf into the page`})]})]}),(0,m.jsx)(l,{open:E,isModal:!0,className:`progress-dialog`,children:(0,m.jsxs)(`div`,{className:`progress-content`,children:[(0,m.jsx)(`div`,{className:`title`,role:`heading`,"aria-level":1,children:`Loading Playwright Trace...`}),(0,m.jsx)(`div`,{className:`progress-wrapper`,children:(0,m.jsx)(`div`,{className:`inner-progress`,style:{width:v.total?100*v.done/v.total+`%`:0}})})]})}),N&&(0,m.jsxs)(`div`,{className:`drop-target`,children:[(0,m.jsx)(`div`,{className:`processing-error`,role:`alert`,children:S}),(0,m.jsx)(`div`,{className:`title`,role:`heading`,"aria-level":1,children:`Drop Playwright Trace to load`}),(0,m.jsx)(`div`,{children:`or`}),(0,m.jsx)(`button`,{onClick:()=>{let e=document.createElement(`input`);e.type=`file`,e.click(),e.addEventListener(`change`,e=>A(e))},type:`button`,children:`Select file`}),(0,m.jsx)(`div`,{className:`info`,children:`Playwright Trace Viewer is a Progressive Web App, it does not send your trace anywhere, it opens it locally.`}),(0,m.jsxs)(`div`,{className:`version`,children:[`Playwright v`,void 0]})]}),e&&!r&&(0,m.jsx)(`div`,{className:`drop-target`,children:(0,m.jsx)(`div`,{className:`title`,children:`Select test to see the trace`})}),b&&(0,m.jsx)(`div`,{className:`drop-target`,onDragLeave:()=>{x(!1)},onDrop:e=>k(e),children:(0,m.jsx)(`div`,{className:`title`,children:`Release to analyse the Playwright Trace`})})]})},g=new t(``,[]),_=({traceJson:e})=>{let[n,r]=f.useState(void 0),[a,o]=f.useState(0),s=f.useRef(null);return f.useEffect(()=>(s.current&&clearTimeout(s.current),s.current=setTimeout(async()=>{try{r(await v(e))}catch{r(new t(``,[]))}finally{o(a+1)}},500),()=>{s.current&&clearTimeout(s.current)}),[e,a]),(0,m.jsx)(i,{isLive:!0,model:n})};async function v(e){let n=new URLSearchParams;return n.set(`trace`,e),new t(e,await(await fetch(`contexts?${n.toString()}`)).json())}(async()=>{let e=new URLSearchParams(window.location.search);if(n(),window.location.protocol!==`file:`){if(!navigator.serviceWorker)throw Error(`Service workers are not supported.\nMake sure to serve the Trace Viewer (${window.location}) via HTTPS or localhost.`);navigator.serviceWorker.register(`sw.bundle.js`),navigator.serviceWorker.controller||await new Promise(e=>{navigator.serviceWorker.oncontrollerchange=()=>e()}),setInterval(function(){fetch(`ping`)},1e4)}let t=e.get(`trace`),r=t?.endsWith(`.json`)?(0,m.jsx)(_,{traceJson:t}):(0,m.jsx)(h,{});p.createRoot(document.querySelector(`#root`)).render(r)})();
+import{D as e,_ as t,b as n,g as r,i,k as a,n as o,o as s,r as c,s as l,t as u,v as d}from"./assets/defaultSettingsView-DoonTZ3z.js";import"./assets/urlMatch-L3liM589.js";var f=a(e(),1),p=a(d(),1),m=r(),h=()=>{let[e,n]=f.useState(!1),[r,a]=f.useState(),[d,p]=f.useState(),[h,_]=f.useState(g),[v,y]=f.useState({done:0,total:0}),[b,x]=f.useState(!1),[S,C]=f.useState(null),[w,T]=f.useState(null),[E,D]=f.useState(!1),O=f.useCallback(e=>{let t=new URL(window.location.href);if(!e.length)return;let n=e.item(0),r=URL.createObjectURL(n);t.searchParams.append(`trace`,r);let i=t.toString();window.history.pushState({},``,i),a(r),p(n.name),x(!1),C(null)},[]);f.useEffect(()=>{let e=async e=>{if(!e.clipboardData?.files.length)return;let t=[`application/zip`,`application/x-zip-compressed`];for(let n of e.clipboardData.files)if(!t.includes(n.type))return;e.preventDefault(),O(e.clipboardData.files)};return document.addEventListener(`paste`,e),()=>document.removeEventListener(`paste`,e)}),f.useEffect(()=>{let e=e=>{let{method:t,params:n}=e.data;if(t!==`load`||!(n?.trace instanceof Blob))return;let r=new File([n.trace],`trace.zip`,{type:`application/zip`}),i=new DataTransfer;i.items.add(r),O(i.files)};return window.addEventListener(`message`,e),window.opener?.postMessage({method:`ready`},`*`),window.parent!==window&&window.parent.postMessage({method:`ready`},`*`),()=>window.removeEventListener(`message`,e)},[O]);let k=f.useCallback(e=>{e.preventDefault(),O(e.dataTransfer.files)},[O]),A=f.useCallback(e=>{e.preventDefault(),e.target.files&&O(e.target.files)},[O]);f.useEffect(()=>{let e=new URL(window.location.href).searchParams,t=e.get(`trace`);if(n(e.has(`isServer`)),t?.startsWith(`file:`)){T(t||null);return}if(e.has(`isServer`)){let e=new URLSearchParams(window.location.search).get(`ws`),t=new URL(`../${e}`,window.location.toString());t.protocol=window.location.protocol===`https:`?`wss:`:`ws:`;let n=new o(new c(t));n.onLoadTraceRequested(async e=>{a(e.traceUrl),x(!1),C(null)}),n.initialize({}).catch(()=>{})}else t&&!t.startsWith(`blob:`)&&a(t)},[]);let j=f.useCallback(async e=>{let n=new URLSearchParams;n.set(`trace`,e);let r=await fetch(`contexts?${n.toString()}`);if(!r.ok){let{error:e}=await r.json();return C(e),e}let i=new t(e,await r.json());y({done:0,total:0}),C(null),_(i)},[]);f.useEffect(()=>{(async()=>{if(!r){_(g);return}let t=e=>{e.data.method===`progress`&&y(e.data.params)};try{navigator.serviceWorker.addEventListener(`message`,t),y({done:0,total:1});let n=await j(r);n?.includes(`please grant permission for Local Network Access`)&&(await fetch(r,{method:`HEAD`,headers:{"x-pw-serviceworker":`skip`}}),n=await j(r)),n&&(e||a(void 0))}finally{navigator.serviceWorker.removeEventListener(`message`,t)}})()},[e,r,d,j]);let M=v.done!==v.total&&v.total!==0&&!S;f.useEffect(()=>{if(M){let e=setTimeout(()=>{D(!0)},200);return()=>clearTimeout(e)}else D(!1)},[M]);let N=!!(!e&&!b&&!w&&(!r||S));return(0,m.jsxs)(`div`,{className:`vbox workbench-loader`,onDragOver:e=>{e.preventDefault(),e.dataTransfer.types.includes(`Files`)&&x(!0)},children:[(0,m.jsxs)(`div`,{className:`hbox workbench-loader-header`,...N?{inert:!0}:{},children:[(0,m.jsx)(`div`,{className:`logo`,children:(0,m.jsx)(`img`,{src:`playwright-logo.svg`,alt:`Playwright logo`})}),(0,m.jsx)(`div`,{className:`product`,children:`Playwright`}),h.title&&(0,m.jsx)(`div`,{className:`title`,children:h.title}),(0,m.jsx)(`div`,{className:`spacer`}),(0,m.jsx)(s,{icon:`settings-gear`,title:`Settings`,dialogDataTestId:`settings-toolbar-dialog`,children:(0,m.jsx)(u,{location:`trace-viewer`,model:h})})]}),(0,m.jsx)(i,{model:h,inert:N}),w&&(0,m.jsxs)(`div`,{className:`drop-target`,children:[(0,m.jsx)(`div`,{children:`Trace Viewer uses Service Workers to show traces. To view trace:`}),(0,m.jsxs)(`div`,{style:{paddingTop:20},children:[(0,m.jsxs)(`div`,{children:[`1. Click `,(0,m.jsx)(`a`,{href:w,children:`here`}),` to put your trace into the download shelf`]}),(0,m.jsxs)(`div`,{children:[`2. Go to `,(0,m.jsx)(`a`,{href:`https://trace.playwright.dev`,children:`trace.playwright.dev`})]}),(0,m.jsx)(`div`,{children:`3. Drop the trace from the download shelf into the page`})]})]}),(0,m.jsx)(l,{open:E,isModal:!0,className:`progress-dialog`,children:(0,m.jsxs)(`div`,{className:`progress-content`,children:[(0,m.jsx)(`div`,{className:`title`,role:`heading`,"aria-level":1,children:`Loading Playwright Trace...`}),(0,m.jsx)(`div`,{className:`progress-wrapper`,children:(0,m.jsx)(`div`,{className:`inner-progress`,style:{width:v.total?100*v.done/v.total+`%`:0}})})]})}),N&&(0,m.jsxs)(`div`,{className:`drop-target`,children:[(0,m.jsx)(`div`,{className:`processing-error`,role:`alert`,children:S}),(0,m.jsx)(`div`,{className:`title`,role:`heading`,"aria-level":1,children:`Drop Playwright Trace to load`}),(0,m.jsx)(`div`,{children:`or`}),(0,m.jsx)(`button`,{onClick:()=>{let e=document.createElement(`input`);e.type=`file`,e.click(),e.addEventListener(`change`,e=>A(e))},type:`button`,children:`Select file`}),(0,m.jsx)(`div`,{className:`info`,children:`Playwright Trace Viewer is a Progressive Web App, it does not send your trace anywhere, it opens it locally.`}),(0,m.jsxs)(`div`,{className:`version`,children:[`Playwright v`,`1.64.1`]})]}),e&&!r&&(0,m.jsx)(`div`,{className:`drop-target`,children:(0,m.jsx)(`div`,{className:`title`,children:`Select test to see the trace`})}),b&&(0,m.jsx)(`div`,{className:`drop-target`,onDragLeave:()=>{x(!1)},onDrop:e=>k(e),children:(0,m.jsx)(`div`,{className:`title`,children:`Release to analyse the Playwright Trace`})})]})},g=new t(``,[]),_=({traceJson:e})=>{let[n,r]=f.useState(void 0),[a,o]=f.useState(0),s=f.useRef(null);return f.useEffect(()=>(s.current&&clearTimeout(s.current),s.current=setTimeout(async()=>{try{r(await v(e))}catch{r(new t(``,[]))}finally{o(a+1)}},500),()=>{s.current&&clearTimeout(s.current)}),[e,a]),(0,m.jsx)(i,{isLive:!0,model:n})};async function v(e){let n=new URLSearchParams;return n.set(`trace`,e),new t(e,await(await fetch(`contexts?${n.toString()}`)).json())}(async()=>{let e=new URLSearchParams(window.location.search);if(n(),window.location.protocol!==`file:`){if(!navigator.serviceWorker)throw Error(`Service workers are not supported.\nMake sure to serve the Trace Viewer (${window.location}) via HTTPS or localhost.`);navigator.serviceWorker.register(`sw.bundle.js`),navigator.serviceWorker.controller||await new Promise(e=>{navigator.serviceWorker.oncontrollerchange=()=>e()}),setInterval(function(){fetch(`ping`)},1e4)}let t=e.get(`trace`),r=t?.endsWith(`.json`)?(0,m.jsx)(_,{traceJson:t}):(0,m.jsx)(h,{});p.createRoot(document.querySelector(`#root`)).render(r)})();

package/lib/vite/traceViewer/index.html

@@ -7,7 +7,7 @@
     <link rel="icon" href="./playwright-logo.svg" type="image/svg+xml">
     <link rel="manifest" href="./manifest.webmanifest">
     <title>Playwright Trace Viewer</title>
-    <script type="module" crossorigin src="./index.Bdvc0_Yv.js"></script>
+    <script type="module" crossorigin src="./index.B5jyRlOV.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/urlMatch-L3liM589.js">
     <link rel="modulepreload" crossorigin href="./assets/defaultSettingsView-DoonTZ3z.js">
     <link rel="stylesheet" crossorigin href="./defaultSettingsView.C8BeHuxd.css">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flashwright-core",
-  "version": "1.64.1-flashwright.1",
+  "version": "1.64.1-flashwright.2",
   "description": "Flashwright: a faster drop-in replacement for Playwright (fork of Playwright 1.64.1)",
   "repository": {
     "type": "git",