From dbcea11f2ad73b3b03f35a352859dd7d51084158 Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Sat, 22 Nov 2025 13:22:56 +0100
Subject: [PATCH] fix tests

---
 playwriter/src/extension/cdp-relay.ts |  5 +++++
 playwriter/src/mcp.test.ts            | 20 +++++++++++---------
 playwriter/src/utils.ts               |  4 ++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/playwriter/src/extension/cdp-relay.ts b/playwriter/src/extension/cdp-relay.ts
index 3affeac..1dd0644 100644
--- a/playwriter/src/extension/cdp-relay.ts
+++ b/playwriter/src/extension/cdp-relay.ts
@@ -344,6 +344,11 @@ export async function startPlayWriterCDPRelayServer({ port = 19988, host = '127.
             pending.reject(new Error('Extension connection replaced'))
           }
           extensionPendingRequests.clear()
+
+          for (const client of playwrightClients.values()) {
+            client.ws.close(1000, 'Extension Replaced')
+          }
+          playwrightClients.clear()
         }
 
         extensionWs = ws
diff --git a/playwriter/src/mcp.test.ts b/playwriter/src/mcp.test.ts
index cc735f2..484f087 100644
--- a/playwriter/src/mcp.test.ts
+++ b/playwriter/src/mcp.test.ts
@@ -14,13 +14,18 @@ import { spawn } from 'node:child_process'
 const execAsync = promisify(exec)
 
 async function getExtensionServiceWorker(context: BrowserContext) {
-    let serviceWorker = context.serviceWorkers().find(sw => sw.url().startsWith('chrome-extension://'))
+
+    let serviceWorkers = context.serviceWorkers().filter(sw => sw.url().startsWith('chrome-extension://'))
+
+
+    let serviceWorker = serviceWorkers[0]
     if (!serviceWorker) {
         serviceWorker = await context.waitForEvent('serviceworker', {
             predicate: (sw) => sw.url().startsWith('chrome-extension://')
         })
     }
 
+
     return serviceWorker
 }
 
@@ -109,10 +114,7 @@ describe('MCP Server Tests', () => {
         })
 
         // Wait for service worker and connect
-        let serviceWorker = browserContext.serviceWorkers()[0]
-        if (!serviceWorker) {
-            serviceWorker = await browserContext.waitForEvent('serviceworker')
-        }
+        const serviceWorker = await getExtensionServiceWorker(browserContext)
 
         // Create a page to attach to
         const page = await browserContext.newPage()
@@ -299,8 +301,8 @@ describe('MCP Server Tests', () => {
         expect(result.isConnected).toBe(true)
 
         // 3. Verify we can connect via direct CDP and see the page
-        const cdpUrl = getCdpUrl()
-        let directBrowser = await chromium.connectOverCDP(cdpUrl)
+
+        let directBrowser = await chromium.connectOverCDP(getCdpUrl())
         let contexts = directBrowser.contexts()
         let pages = contexts[0].pages()
 
@@ -321,7 +323,7 @@ describe('MCP Server Tests', () => {
         // connecting to relay will succeed, but listing pages should NOT show our page
 
         // Connect to relay again
-        directBrowser = await chromium.connectOverCDP(cdpUrl)
+        directBrowser = await chromium.connectOverCDP(getCdpUrl())
         contexts = directBrowser.contexts()
         pages = contexts[0].pages()
 
@@ -338,7 +340,7 @@ describe('MCP Server Tests', () => {
 
         // 7. Verify page is back
 
-        directBrowser = await chromium.connectOverCDP(cdpUrl)
+        directBrowser = await chromium.connectOverCDP(getCdpUrl())
         // Wait a bit for targets to populate
         await new Promise(r => setTimeout(r, 500))
 
diff --git a/playwriter/src/utils.ts b/playwriter/src/utils.ts
index 079e23b..ca51430 100644
--- a/playwriter/src/utils.ts
+++ b/playwriter/src/utils.ts
@@ -1,4 +1,4 @@
-export function getCdpUrl({ port = 19988, host = '127.0.0.1', clientId }: { port?: number; host?: string; clientId?: string } = {}) {
-  const id = clientId || Math.random().toString(36).substring(2, 15)
+export function getCdpUrl({ port = 19988, host = '127.0.0.1' }: { port?: number; host?: string } = {}) {
+  const id = `${Math.random().toString(36).substring(2, 15)}_${Date.now()}`
   return `ws://${host}:${port}/cdp/${id}`
 }