@guanzhu.me/pw-cli 0.0.19 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanzhu.me/pw-cli",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Persistent Playwright browser CLI with headed defaults, profile support, queueing, and script execution",
   "bin": {
     "pw-cli": "./bin/pw-cli.js"

package/src/browser-manager.js

@@ -11,22 +11,34 @@ const { readState, writeState, clearState, getProfileDir } = require('./state');
 const { probeCDP, findFreePort, sleep, fetchActivePageUrl } = require('./utils');
 
 function loadPlaywrightUtilsBundle() {
-  const candidates = [
-    '../node_modules/@playwright/cli/node_modules/playwright-core/lib/utilsBundleImpl',
-    '../node_modules/@playwright/cli/node_modules/playwright-core/lib/utilsBundleImpl/index.js',
+  // playwright-core's package.json "exports" blocks deep subpath requires, so
+  // we locate the package root via require.resolve on package.json, then load
+  // the internal module by absolute path.
+  const searchPaths = [
+    path.join(__dirname, '..'),                           // local dev
+    path.join(__dirname, '..', 'node_modules', '@playwright', 'cli'),  // nested under pw-cli
   ];
 
-  for (const candidate of candidates) {
+  // Also search from the global npm root where @playwright/cli might live
+  try {
+    const globalRoot = execSync('npm root -g', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    searchPaths.push(path.join(globalRoot, '@playwright', 'cli'));
+    searchPaths.push(globalRoot);
+  } catch {}
+
+  for (const searchPath of searchPaths) {
     try {
-      return require(candidate);
+      const pkgJson = require.resolve('playwright-core/package.json', { paths: [searchPath] });
+      const utilsBundle = path.join(path.dirname(pkgJson), 'lib', 'utilsBundleImpl');
+      return require(utilsBundle);
     } catch (error) {
-      if (error.code !== 'MODULE_NOT_FOUND') {
+      if (error.code !== 'MODULE_NOT_FOUND' && error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
         throw error;
       }
     }
   }
 
-  throw new Error('Unable to load playwright-core utilsBundleImpl from @playwright/cli. Reinstall @playwright/cli or playwright.');
+  throw new Error('Unable to load playwright-core utilsBundleImpl. Reinstall @playwright/cli or playwright.');
 }
 
 const { ws, wsServer } = loadPlaywrightUtilsBundle();
@@ -262,13 +274,14 @@ class ExtensionConnection {
 }
 
 class CDPRelayServer {
-  constructor(server, browserChannel, userDataDir, executablePath) {
+  constructor(server, browserChannel, userDataDir, executablePath, extensionToken) {
     this._playwrightConnection = null;
     this._extensionConnection = null;
     this._nextSessionId = 1;
     this._browserChannel = browserChannel;
     this._userDataDir = userDataDir;
     this._executablePath = executablePath;
+    this._extensionToken = extensionToken || null;
     const uuid = crypto.randomUUID();
     const address = server.address();
     this._wsHost = `ws://127.0.0.1:${address.port}`;
@@ -314,6 +327,9 @@ class CDPRelayServer {
     url.searchParams.set('mcpRelayUrl', relayUrl);
     url.searchParams.set('client', JSON.stringify({ name: clientName }));
     url.searchParams.set('protocolVersion', '1');
+    if (this._extensionToken) {
+      url.searchParams.set('token', this._extensionToken);
+    }
 
     const executablePath = this._executablePath || resolveExtensionExecutablePath(this._browserChannel);
     const args = [];
@@ -338,6 +354,13 @@ class CDPRelayServer {
       return;
     }
     if (url.pathname === this._extensionPath) {
+      if (this._extensionToken) {
+        const token = url.searchParams.get('token');
+        if (token !== this._extensionToken) {
+          socket.close(4003, 'Invalid token');
+          return;
+        }
+      }
       this._handleExtensionConnection(socket);
       return;
     }
@@ -479,7 +502,8 @@ async function startExtensionRelay(extension) {
     server.once('error', reject);
     server.listen(0, '127.0.0.1', resolve);
   });
-  const relay = new CDPRelayServer(server, browser, null, null);
+  const extensionToken = process.env.PLAYWRIGHT_MCP_EXTENSION_TOKEN || null;
+  const relay = new CDPRelayServer(server, browser, null, null, extensionToken);
   await relay.ensureExtensionConnectionForMCPContext('pw-cli');
   return { relay, server };
 }