@dev-blinq/cucumber_client 1.0.1598-dev → 1.0.1599-dev

package/bin/client/recorderv3/services.js

@@ -218,10 +218,12 @@ export class RemoteBrowserService extends EventEmitter {
     context;
     pages = new Map();
     _selectedPageId = null;
+    wsUrlBase; // Store the base URL
     constructor({ CDP_CONNECT_URL, context }) {
         super();
         this.CDP_CONNECT_URL = CDP_CONNECT_URL;
         this.context = context;
+        this.wsUrlBase = this.CDP_CONNECT_URL.replace(/^http/, "ws") + "/devtools/page/";
         this.log("🚀 RemoteBrowserService initialized", { CDP_CONNECT_URL });
         this.initializeListeners();
     }
@@ -229,9 +231,16 @@ export class RemoteBrowserService extends EventEmitter {
         const timestamp = new Date().toISOString();
         console.log(`[${timestamp}] [RemoteBrowserService] ${message}`, data ? JSON.stringify(data, null, 2) : "");
     }
-    // Simplified: Get the ID directly from the page
+    /**
+     * Gets the CDP Target ID for a page *directly* from the page.
+     * This is the only reliable method during restarts.
+     */
     async getCdpTargetId(page) {
         try {
+            if (page.isClosed()) {
+                this.log("⚠️ Attempted to get CDP ID from a closed page");
+                return null;
+            }
             const cdpSession = await page.context().newCDPSession(page);
             const { targetInfo } = await cdpSession.send("Target.getTargetInfo");
             await cdpSession.detach();
@@ -246,38 +255,27 @@ export class RemoteBrowserService extends EventEmitter {
             return null;
         }
     }
-    async getDebugURLs() {
-        const url = `${this.CDP_CONNECT_URL}/json?t=${Date.now()}`; // Cache-busting
-        try {
-            const response = await fetch(url, { cache: "no-store" });
-            if (!response.ok) {
-                this.log("❌ Failed to fetch debug URLs", { status: response.status });
-                throw new Error("Error while fetching debug URL");
-            }
-            return await response.json();
-        }
-        catch (error) {
-            this.log("❌ Exception while fetching debug URLs", { error });
-            return [];
-        }
-    }
     async initializeListeners() {
         this.log("📡 Initializing listeners");
         this.context.on("page", async (page) => {
             const stableTabId = uuidv4();
             this.log("🆕 New page event triggered", { stableTabId, url: page.url() });
+            // We get the ID immediately, but it might be null if the page is too new
             const cdpTargetId = await this.getCdpTargetId(page);
             this.pages.set(stableTabId, { page, cdpTargetId });
             if (cdpTargetId) {
                 this.log("✅ Page mapped to CDP ID", { stableTabId, cdpTargetId });
             }
             else {
-                this.log("⚠️ Could not find CDP ID for new page", { stableTabId });
+                this.log("⚠️ Could not find CDP ID for new page yet", { stableTabId });
             }
-            if (this.pages.size === 1) {
+            if (!this._selectedPageId) {
+                // Select the first page that opens
                 this._selectedPageId = stableTabId;
+                this.log("🎯 Initial selected page set", { selectedPageId: this._selectedPageId });
             }
             await this.syncState();
+            // Add listeners
             page.on("load", () => this.syncState());
             page.on("framenavigated", () => this.syncState());
             page.on("close", async () => {
@@ -317,36 +315,46 @@ export class RemoteBrowserService extends EventEmitter {
     }
     async getState() {
         this.log("📊 Getting current state");
-        // Get the *live* list of debuggable pages
-        const debugData = await this.getDebugURLs();
-        const debugMap = new Map(debugData.map((d) => [d.id, d]));
         const pagesData = [];
+        const pagesToDelete = []; // To clean up closed pages
         for (const [stableTabId, pageInfo] of this.pages.entries()) {
             try {
-                // Re-verify the CDP ID in case it changed
+                if (pageInfo.page.isClosed()) {
+                    this.log("🧹 Found closed page during getState, marking for deletion", { stableTabId });
+                    pagesToDelete.push(stableTabId);
+                    continue;
+                }
+                // Get the one, true, live CDP ID
                 const currentCdpId = await this.getCdpTargetId(pageInfo.page);
                 if (currentCdpId && pageInfo.cdpTargetId !== currentCdpId) {
                     this.log("🔄 CDP ID changed", { stableTabId, old: pageInfo.cdpTargetId, new: currentCdpId });
-                    pageInfo.cdpTargetId = currentCdpId;
+                    pageInfo.cdpTargetId = currentCdpId; // Update our internal reference
+                }
+                // Manually construct the WebSocket URL
+                const wsDebuggerUrl = currentCdpId ? `${this.wsUrlBase}${currentCdpId}` : "";
+                if (!wsDebuggerUrl) {
+                    this.log("⚠️ Could not get CDP ID, wsDebuggerUrl will be empty", { stableTabId });
                 }
-                // Get the debug info from the live map
-                const debugInfo = currentCdpId ? debugMap.get(currentCdpId) : undefined;
                 pagesData.push({
                     id: stableTabId,
                     title: await pageInfo.page.title(),
                     url: pageInfo.page.url(),
-                    wsDebuggerUrl: debugInfo?.webSocketDebuggerUrl || "",
+                    wsDebuggerUrl: wsDebuggerUrl, // Use the constructed URL
                 });
             }
             catch (error) {
-                // This likely means the page was closed during the loop
-                this.log("❌ Error getting page data (page might be closed)", { stableTabId });
-                this.pages.delete(stableTabId); // Clean up dead page
+                this.log("❌ Error getting page data", { stableTabId, error });
+                pagesToDelete.push(stableTabId); // Mark for deletion
             }
         }
-        // Ensure selectedPageId is valid
+        pagesToDelete.forEach((id) => this.pages.delete(id));
         if (this._selectedPageId && !this.pages.has(this._selectedPageId)) {
             this._selectedPageId = pagesData.length > 0 ? pagesData[0].id : null;
+            this.log("🔄 Corrected selectedPageId", { new: this._selectedPageId });
+        }
+        if (!this._selectedPageId && pagesData.length > 0) {
+            this._selectedPageId = pagesData[0].id;
+            this.log("🎯 Set default selectedPageId", { new: this._selectedPageId });
         }
         const state = {
             pages: pagesData,
@@ -358,11 +366,10 @@ export class RemoteBrowserService extends EventEmitter {
     async createTab(url = "about:blank") {
         try {
             this.log("🆕 Creating new tab", { url });
-            const page = await this.context.newPage(); // Triggers 'page' event
+            const page = await this.context.newPage(); // This will trigger the 'page' event
             if (url !== "about:blank") {
                 await page.goto(url, { waitUntil: "domcontentloaded" });
             }
-            // Find the stableTabId that was just created by the 'page' event
             for (const [stableTabId, pageInfo] of this.pages.entries()) {
                 if (pageInfo.page === page) {
                     this._selectedPageId = stableTabId;
@@ -381,7 +388,7 @@ export class RemoteBrowserService extends EventEmitter {
             this.log("🗑️ Closing tab", { stableTabId });
             const pageInfo = this.pages.get(stableTabId);
             if (pageInfo) {
-                await pageInfo.page.close(); // Triggers 'close' event
+                await pageInfo.page.close(); // This will trigger the 'close' event
             }
             else {
                 this.log("⚠️ Page not found for closing", { stableTabId });
@@ -411,16 +418,21 @@ export class RemoteBrowserService extends EventEmitter {
     }
     getSelectedPage() {
         const pageInfo = this._selectedPageId ? this.pages.get(this._selectedPageId) : null;
+        this.log("🔍 Getting selected page", {
+            selectedPageId: this._selectedPageId,
+            found: !!pageInfo,
+            url: pageInfo?.page.url(),
+        });
         return pageInfo?.page || null;
     }
     destroy() {
         this.log("💥 Destroying RemoteBrowserService");
         this.context.removeAllListeners("page");
         for (const [, pageInfo] of this.pages.entries()) {
-            pageInfo.page.removeAllListeners();
+            pageInfo.page.removeAllListeners(); // Remove all listeners from each page
         }
         this.pages.clear();
         this._selectedPageId = null;
-        this.removeAllListeners();
+        this.removeAllListeners(); // Remove listeners on the emitter itself
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1598-dev",
+  "version": "1.0.1599-dev",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",