follow-ups

Author: mxschmitt

src/CDPWebSocketRelay.ts

@@ -108,7 +108,7 @@ export class CDPWebSocketRelay {
     debugLogger(`Browser client connected.`);
 
     ws.on('message', data => {
-      if (this._extensionSocket && this._extensionSocket.readyState === WebSocket.OPEN)
+      if (this._extensionSocket?.readyState === WebSocket.OPEN)
         this._extensionSocket.send(data);
       else
         ws.close(4001, 'No extension client connected');
@@ -125,14 +125,14 @@ export class CDPWebSocketRelay {
   }
 
   private handleExtensionConnection(ws: WebSocket) {
-    if (this._extensionSocket && this._extensionSocket.readyState === WebSocket.OPEN) {
+    if (this._extensionSocket?.readyState === WebSocket.OPEN) {
       debugLogger('Closing previous extension connection.');
       this._extensionSocket.close(1000, 'New extension connection established');
     }
     this._extensionSocket = ws;
 
     ws.on('message', data => {
-      if (this._browserSocket && this._browserSocket.readyState === WebSocket.OPEN)
+      if (this._browserSocket?.readyState === WebSocket.OPEN)
         this._browserSocket.send(data);
     });
 

src/index.ts

@@ -16,7 +16,7 @@
 
 import { createServerWithTools } from './server.js';
 import common from './tools/common.js';
-import console from './tools/console.js';
+import consoleTools from './tools/console.js';
 import dialogs from './tools/dialogs.js';
 import files from './tools/files.js';
 import install from './tools/install.js';
@@ -35,7 +35,7 @@ import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 
 const snapshotTools: Tool<any>[] = [
   ...common(true),
-  ...console,
+  ...consoleTools,
   ...dialogs(true),
   ...files(true),
   ...install,
@@ -49,7 +49,7 @@ const snapshotTools: Tool<any>[] = [
 
 const screenshotTools: Tool<any>[] = [
   ...common(false),
-  ...console,
+  ...consoleTools,
   ...dialogs(false),
   ...files(false),
   ...install,

tests/capabilities.spec.ts

@@ -16,7 +16,7 @@
 
 import { test, expect } from './fixtures.js';
 
-test('test snapshot tool list', async ({ client }) => {
+test('test snapshot tool list', async ({ client, mcpExtension }) => {
   const { tools } = await client.listTools();
   expect(new Set(tools.map(t => t.name))).toEqual(new Set([
     'browser_click',
@@ -28,7 +28,7 @@ test('test snapshot tool list', async ({ client }) => {
     'browser_select_option',
     'browser_type',
     'browser_close',
-    'browser_connect',
+    ...mcpExtension ? ['browser_connect'] : [],
     'browser_install',
     'browser_navigate_back',
     'browser_navigate_forward',
@@ -47,11 +47,11 @@ test('test snapshot tool list', async ({ client }) => {
   ]));
 });
 
-test('test vision tool list', async ({ visionClient }) => {
+test('test vision tool list', async ({ visionClient, mcpExtension }) => {
   const { tools: visionTools } = await visionClient.listTools();
   expect(new Set(visionTools.map(t => t.name))).toEqual(new Set([
     'browser_close',
-    'browser_connect',
+    ...mcpExtension ? ['browser_connect'] : [],
     'browser_console_messages',
     'browser_file_upload',
     'browser_handle_dialog',

tests/fixtures.ts

@@ -17,6 +17,7 @@
 import fs from 'fs';
 import url from 'url';
 import path from 'path';
+import readline from 'node:readline';
 import { chromium, Page } from 'playwright';
 
 import { test as baseTest, expect as baseExpect } from '@playwright/test';
@@ -95,15 +96,12 @@ export const test = baseTest.extend<TestFixtures & TestOptions, WorkerFixtures>(
       });
       client = new Client({ name: 'test', version: '1.0.0' });
       await client.connect(transport);
-      transport.stderr?.addListener('data', data => {
-        const lines = data.toString().trimEnd().split('\n');
-        for (const line of lines) {
-          if (line.toString().startsWith('%%'))
-            clientOutputLines.push(line.substring(2));
-          else
-            // eslint-disable-next-line no-console
-            console.error(line);
-        }
+      readline.createInterface(transport.stderr as any as NodeJS.ReadableStream).on('line', line => {
+        if (line.toString().startsWith('%%'))
+          clientOutputLines.push(line.substring(2));
+        else
+          // eslint-disable-next-line no-console
+          console.error(line);
       });
       if (mcpExtension && mcpExtensionPage) {
         const browserConnectCall = client.callTool({