@lvce-editor/test-with-playwright-worker 20.1.0 → 21.0.0

package/dist/workerMain.js

@@ -1,11 +1,58 @@
-import { join, basename } from 'node:path';
-import { readdir } from 'node:fs/promises';
-import { expect, firefox, chromium } from '@playwright/test';
+import { join, dirname, basename } from 'node:path';
+import { readFile, writeFile, readdir } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
 import net from 'node:net';
 import os from 'node:os';
 import { fork, spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
+import { createRequire } from 'node:module';
+
+const require$1 = createRequire(import.meta.url);
+const before = `      _onWebSocketOpened(event) {
+        const request2 = this._webSocketRequests.get(event.requestId);
+        assert(request2);
+        const response2 = this._webSocketResponses.get(event.requestId);
+        assert(response2);
+        this._webSocketRequests.delete(event.requestId);
+        this._webSocketResponses.delete(event.requestId);
+        this._page.frameManager.onWebSocketRequest(webSocketId(event.frameId, event.wsid), request2.headers);
+        this._page.frameManager.onWebSocketResponse(webSocketId(event.frameId, event.wsid), response2.status, response2.statusText, response2.headers);
+      }`;
+const after = `      _onWebSocketOpened(event) {
+        const request2 = this._webSocketRequests.get(event.requestId);
+        const response2 = this._webSocketResponses.get(event.requestId);
+        if (!request2 || !response2) {
+          this._webSocketRequests.delete(event.requestId);
+          this._webSocketResponses.delete(event.requestId);
+          return;
+        }
+        this._webSocketRequests.delete(event.requestId);
+        this._webSocketResponses.delete(event.requestId);
+        this._page.frameManager.onWebSocketRequest(webSocketId(event.frameId, event.wsid), request2.headers);
+        this._page.frameManager.onWebSocketResponse(webSocketId(event.frameId, event.wsid), response2.status, response2.statusText, response2.headers);
+      }`;
+const patchCoreBundleContent = content => {
+  if (content.includes(after)) {
+    return content;
+  }
+  if (!content.includes(before)) {
+    throw new Error('Could not patch Playwright Firefox worker WebSocket handler');
+  }
+  return content.split(before).join(after);
+};
+const getCoreBundlePath = () => {
+  const packageJsonPath = require$1.resolve('playwright-core/package.json');
+  return join(dirname(packageJsonPath), 'lib', 'coreBundle.js');
+};
+const patchPlaywrightFirefoxWorkerWebSocket = async () => {
+  const file = getCoreBundlePath();
+  const content = await readFile(file, 'utf8');
+  const patched = patchCoreBundleContent(content);
+  if (patched === content) {
+    return;
+  }
+  await writeFile(file, patched);
+};
 
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
@@ -957,6 +1004,9 @@ const runElectronTest = async ({
         status: Skip$1
       };
     }
+    const {
+      expect
+    } = await import('@playwright/test');
     await withTimeout(testModule.test({
       electronApp,
       expect,
@@ -1104,6 +1154,9 @@ const runTest = async ({
 }) => {
   const start = performance.now();
   try {
+    const {
+      expect
+    } = await import('@playwright/test');
     const url = getUrlFromTestFile(test, port, traceFocus);
     await page.goto(url, {
       waitUntil: 'networkidle'
@@ -1367,15 +1420,33 @@ const getServerPath = async serverPath => {
 
 /**
  *
- * @param {{browser:'chromium'|'firefox', signal:AbortSignal, headless:boolean}} options
+ * @param {{browser:'chromium'|'firefox'|'webkit', signal:AbortSignal, headless:boolean}} options
  * @returns
  */
+const getLauncher = async browser => {
+  const {
+    chromium,
+    firefox,
+    webkit
+  } = await import('@playwright/test');
+  switch (browser) {
+    case 'chromium':
+      return chromium;
+    case 'firefox':
+      return firefox;
+    case 'webkit':
+      return webkit;
+  }
+};
 const startBrowser = async ({
   browser,
   headless,
   signal
 }) => {
-  const launcher = browser === 'firefox' ? firefox : chromium;
+  if (browser === 'firefox') {
+    await patchPlaywrightFirefoxWorkerWebSocket();
+  }
+  const launcher = await getLauncher(browser);
   const browserInstance = await launcher.launch({
     headless
   });
@@ -1431,7 +1502,7 @@ const startServer = async ({
 
 /**
  *
- * @param {{browser:'chromium'|'firefox', signal:AbortSignal, headless: boolean, onlyExtension:string, testPath:string}} options
+ * @param {{browser:'chromium'|'firefox'|'webkit', signal:AbortSignal, headless: boolean, onlyExtension:string, testPath:string}} options
  * @returns
  */
 const setupTests = async ({
@@ -1619,6 +1690,9 @@ const startElectron = async ({
   let browser;
   try {
     const endpoint = await waitForDevtoolsEndpoint(child);
+    const {
+      chromium
+    } = await import('@playwright/test');
     browser = await chromium.connectOverCDP(endpoint);
     const page = await getFirstPage(browser);
     return createElectronLaunch({
@@ -1661,7 +1735,7 @@ const tearDownTests = async ({
  * @param {string} extensionPath
  * @param {string} testPath
  * @param {string} cwd
- * @param {'chromium'|'firefox'} browser
+ * @param {'chromium'|'firefox'|'webkit'} browser
  * @param {boolean} headless
  * @param {number} timeout
  * @param {string} serverPath
@@ -1779,4 +1853,13 @@ const main = async () => {
   set(Cli, rpc);
 };
 
-main();
+const Main$1 = {
+  __proto__: null,
+  main
+};
+
+if (process.argv.includes('--browser=firefox')) {
+  await patchPlaywrightFirefoxWorkerWebSocket();
+}
+const Main = await Promise.resolve().then(function () { return Main$1; });
+await Main.main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-with-playwright-worker",
-  "version": "20.1.0",
+  "version": "21.0.0",
   "description": "Worker package for test-with-playwright",
   "repository": {
     "type": "git",