@lvce-editor/test-with-playwright-worker 22.40.2 → 22.40.4

package/dist/workerMain.js

@@ -1768,12 +1768,13 @@ const getUrlFromTestFile = (absolutePath, port, traceFocus, traceRendererWorker)
   }
   return url.href;
 };
-const navigateToTest = async (page, url) => {
+const navigateToTest = async (page, url, browser) => {
   await page.goto(url, {
-    waitUntil: 'domcontentloaded'
+    waitUntil: browser === 'webkit' ? 'commit' : 'domcontentloaded'
   });
 };
 const runTest = async ({
+  browser,
   page,
   port,
   svgScreenshotOptions,
@@ -1789,7 +1790,7 @@ const runTest = async ({
       expect
     } = await import('@playwright/test');
     const url = getUrlFromTestFile(test, port, traceFocus ?? false, traceRendererWorker ?? false);
-    await navigateToTest(page, url);
+    await navigateToTest(page, url, browser);
     const testOverlay = page.locator('#TestOverlay');
     await expect(testOverlay).toBeVisible({
       timeout
@@ -1861,6 +1862,7 @@ const getResultCounts$1 = status => {
  * @param {{testSrc:string, tests:string[], filter?: string, headless:boolean, page: import('@playwright/test').Page, port:number, timeout:number, onResult:any, onFinalResult:any}} param0
  */
 const runTests = async ({
+  browser = 'chromium',
   filter,
   headless,
   onFinalResult,
@@ -1882,6 +1884,7 @@ const runTests = async ({
   const filteredTests = filter ? tests.filter(test => test.includes(filter)) : tests;
   for (const test of filteredTests) {
     const result = await runTest({
+      browser,
       page,
       port,
       test,
@@ -2041,6 +2044,7 @@ const readTestResultsText = async (page, timeout) => {
   return text;
 };
 const runTestsWithReusedPage = async ({
+  browser,
   filter,
   onFinalResult,
   onResult,
@@ -2056,7 +2060,7 @@ const runTestsWithReusedPage = async ({
     const url = getAllTestsUrl(port, filter, traceFocus ?? false, rendererWorkerTraceDirectory !== undefined);
     await page.goto(url, {
       timeout,
-      waitUntil: 'domcontentloaded'
+      waitUntil: browser === 'webkit' ? 'commit' : 'domcontentloaded'
     });
     const text = await readTestResultsText(page, timeout);
     results = parseTestResults(text);
@@ -2166,7 +2170,8 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
     const command = new Promise((resolve, reject) => {
       pendingCommands.set(id, {
         reject,
-        resolve
+        resolve,
+        sessionId
       });
     });
     void session.send('Target.sendMessageToTarget', {
@@ -2197,12 +2202,14 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
         callCount: true,
         detailed: true
       });
-      const timer = setInterval(() => {
-        trackPromise(pendingEntries, readTargetCoverage(sendToTarget, sessionId, entries), error => {
-          recordCollectionError(error);
-        });
-      }, 50);
-      timers.set(sessionId, timer);
+      if (!stopped && sessions.has(sessionId)) {
+        const timer = setInterval(() => {
+          trackPromise(pendingEntries, readTargetCoverage(sendToTarget, sessionId, entries), error => {
+            recordCollectionError(error);
+          });
+        }, 50);
+        timers.set(sessionId, timer);
+      }
     }
     await sendToTarget(sessionId, 'Runtime.runIfWaitingForDebugger');
     if (matches) {
@@ -2212,6 +2219,10 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
   const onAttached = target => {
     trackPromise(tasks, handleAttachedTarget(target), async error => {
       recordCollectionError(error);
+      const message = error instanceof Error ? error.message : String(error);
+      if (message.includes('No session with given id') || message.includes('Target closed')) {
+        return;
+      }
       try {
         await sendToTarget(target.sessionId, 'Runtime.runIfWaitingForDebugger');
       } catch {
@@ -2222,8 +2233,12 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
   const onDetached = ({
     sessionId
   }) => {
-    if (!sessions.has(sessionId)) {
-      return;
+    for (const [id, pending] of pendingCommands) {
+      if (pending.sessionId !== sessionId) {
+        continue;
+      }
+      pendingCommands.delete(id);
+      pending.reject(new Error('Target closed'));
     }
     sessions.delete(sessionId);
     const timer = timers.get(sessionId);
@@ -2247,17 +2262,11 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
       }
       stopped = true;
       session.off('Target.attachedToTarget', onAttached);
-      session.off('Target.detachedFromTarget', onDetached);
       try {
         for (const timer of timers.values()) {
           clearInterval(timer);
         }
         timers.clear();
-        await session.send('Target.setAutoAttach', {
-          autoAttach: false,
-          flatten: false,
-          waitForDebuggerOnStart: false
-        });
         while (tasks.size > 0) {
           await Promise.all(tasks);
         }
@@ -2293,8 +2302,18 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
         }
         return result;
       } finally {
-        session.off('Target.receivedMessageFromTarget', onReceivedMessage);
-        await session.detach();
+        try {
+          // Disabling auto-attach detaches worker sessions, so finish all coverage commands first.
+          await session.send('Target.setAutoAttach', {
+            autoAttach: false,
+            flatten: false,
+            waitForDebuggerOnStart: false
+          });
+        } finally {
+          session.off('Target.detachedFromTarget', onDetached);
+          session.off('Target.receivedMessageFromTarget', onReceivedMessage);
+          await session.detach();
+        }
       }
     }
   };
@@ -3016,6 +3035,7 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
         page,
         run: async () => {
           await runTestsWithReusedPage({
+            browser,
             ...filterOption,
             onFinalResult,
             onResult,
@@ -3038,6 +3058,7 @@ const runAllTests = async (extensionPath, testPath, cwd, browser, headless, time
       page,
       run: async () => {
         await runTests({
+          browser,
           ...filterOption,
           headless,
           onFinalResult,

package/package.json

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