@lvce-editor/test-with-playwright-worker 22.40.3 → 22.40.5

package/dist/workerMain.js

@@ -1786,13 +1786,11 @@ const runTest = async ({
 }) => {
   const start = performance.now();
   try {
-    const {
-      expect
-    } = await import('@playwright/test');
     const url = getUrlFromTestFile(test, port, traceFocus ?? false, traceRendererWorker ?? false);
     await navigateToTest(page, url, browser);
     const testOverlay = page.locator('#TestOverlay');
-    await expect(testOverlay).toBeVisible({
+    await testOverlay.waitFor({
+      state: 'visible',
       timeout
     });
     const text = await testOverlay.textContent();
@@ -2170,7 +2168,8 @@ const startWorkerJavascriptCoverage = async (page, targetScript) => {
     const command = new Promise((resolve, reject) => {
       pendingCommands.set(id, {
         reject,
-        resolve
+        resolve,
+        sessionId
       });
     });
     void session.send('Target.sendMessageToTarget', {
@@ -2201,12 +2200,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) {
@@ -2216,6 +2217,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 {
@@ -2226,8 +2231,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);
@@ -2251,17 +2260,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);
         }
@@ -2297,8 +2300,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();
+        }
       }
     }
   };

package/package.json

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