@lvce-editor/test-with-playwright-worker 22.7.0 → 22.7.1

package/dist/workerMain.js

@@ -3,8 +3,7 @@ import { readFile, writeFile, readdir, mkdtemp, rm } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
 import net from 'node:net';
 import os, { tmpdir } from 'node:os';
-import { fork, spawn } from 'node:child_process';
-import { createInterface } from 'node:readline';
+import { fork } from 'node:child_process';
 import { createRequire } from 'node:module';
 
 const require$1 = createRequire(import.meta.url);
@@ -1760,101 +1759,26 @@ const getElectronProcessArgs = ({
   platform = process.platform,
   userDataDir
 }) => {
-  return ['--remote-debugging-port=0', ...(platform === 'linux' ? ['--no-sandbox'] : []), ...args, `--user-data-dir=${userDataDir}`];
+  return [...(platform === 'linux' ? ['--no-sandbox'] : []), ...args, `--user-data-dir=${userDataDir}`];
 };
 
-const SIGINT = 'SIGINT';
-
-const electronConnectionTimeout = 120_000;
-const devtoolsRegex = /^DevTools listening on (ws:\/\/.*)$/;
-const waitForDevtoolsEndpoint = async child => {
-  const {
-    stderr
-  } = child;
-  if (!stderr) {
-    throw new Error('Electron stderr is unavailable');
-  }
-  const lines = createInterface({
-    input: stderr
-  });
-  const {
-    promise,
-    reject,
-    resolve
-  } = Promise.withResolvers();
-  const stderrLines = [];
-  const onExit = () => {
-    const details = stderrLines.length > 0 ? `: ${stderrLines.join('\n')}` : '';
-    reject(new Error(`Electron exited before DevTools endpoint was available${details}`));
-  };
-  const onLine = line => {
-    stderrLines.push(line);
-    const match = line.match(devtoolsRegex);
-    if (match) {
-      resolve(match[1]);
-    }
-  };
-  child.once('exit', onExit);
-  lines.on('line', onLine);
-  try {
-    return await promise;
-  } finally {
-    child.off('exit', onExit);
-    lines.off('line', onLine);
-    lines.close();
-  }
-};
-const getFirstPage = async browser => {
-  const context = browser.contexts()[0];
-  const pages = context.pages();
-  if (pages.length > 0) {
-    return pages[0];
-  }
-  return context.waitForEvent('page', {
-    timeout: 15_000
-  });
-};
-const waitForChildExit = async child => {
-  if (child.exitCode !== null || child.signalCode !== null) {
-    return;
-  }
-  await new Promise(resolve => {
-    const timeout = setTimeout(resolve, 5000);
-    child.once('exit', () => {
-      clearTimeout(timeout);
-      resolve();
-    });
-  });
-};
-const stopElectronProcess = async child => {
-  if (child.exitCode === null && child.signalCode === null) {
-    child.kill(SIGINT);
-    await waitForChildExit(child);
-  }
-  if (child.exitCode === null && child.signalCode === null) {
-    child.kill('SIGKILL');
-    await waitForChildExit(child);
-  }
-};
+const electronLaunchTimeout = 120_000;
 const closeElectron = async ({
-  browser,
-  child,
+  electronApp,
   userDataDir
 }) => {
   try {
-    await browser.close();
+    await electronApp.close();
   } catch {
     // ignore close errors during cleanup
   }
-  await stopElectronProcess(child);
   await rm(userDataDir, {
     force: true,
     recursive: true
   });
 };
 const createElectronLaunch = ({
-  browser,
-  child,
+  electronApp,
   page,
   signal,
   userDataDir
@@ -1869,8 +1793,7 @@ const createElectronLaunch = ({
     process.off('SIGINT', handleSigint);
     process.off('SIGTERM', handleSigterm);
     await closeElectron({
-      browser,
-      child,
+      electronApp,
       userDataDir
     });
   };
@@ -1895,13 +1818,6 @@ const createElectronLaunch = ({
   signal.addEventListener('abort', handleAbort);
   process.once('SIGINT', handleSigint);
   process.once('SIGTERM', handleSigterm);
-  const electronApp = {
-    close: dispose,
-    process: () => {
-      return child;
-    },
-    [Symbol.asyncDispose]: dispose
-  };
   return {
     electronApp,
     page,
@@ -1918,44 +1834,44 @@ const startElectron = async ({
     args: launchOptions.args,
     userDataDir
   });
-  const child = spawn(launchOptions.executablePath, args, {
-    env: launchOptions.env,
-    stdio: ['ignore', 'ignore', 'pipe']
-  });
-  let browser;
+  let electronApp;
   try {
-    const endpoint = await waitForDevtoolsEndpoint(child);
     const {
-      chromium
+      _electron
     } = await import('@playwright/test');
-    browser = await chromium.connectOverCDP(endpoint, {
-      timeout: electronConnectionTimeout
+    electronApp = await _electron.launch({
+      args: [...args],
+      env: launchOptions.env,
+      executablePath: launchOptions.executablePath,
+      timeout: electronLaunchTimeout
+    });
+    const page = await electronApp.firstWindow({
+      timeout: electronLaunchTimeout
     });
-    const page = await getFirstPage(browser);
     return createElectronLaunch({
-      browser,
-      child,
+      electronApp,
       page,
       signal,
       userDataDir
     });
   } catch (error) {
-    if (browser) {
-      try {
-        await browser.close();
-      } catch {
-        // ignore close errors during cleanup
-      }
+    if (electronApp) {
+      await closeElectron({
+        electronApp,
+        userDataDir
+      });
+    } else {
+      await rm(userDataDir, {
+        force: true,
+        recursive: true
+      });
     }
-    await stopElectronProcess(child);
-    await rm(userDataDir, {
-      force: true,
-      recursive: true
-    });
     throw error;
   }
 };
 
+const SIGINT = 'SIGINT';
+
 const tearDownTests = async ({
   child,
   controller,

package/package.json

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