@dev-blinq/cucumber_client 1.0.1592-dev → 1.0.1594-dev

package/bin/client/recorderv3/services.js

@@ -231,11 +231,9 @@ export class RemoteBrowserService extends EventEmitter {
     async initializeListeners() {
         this.log("📡 Initializing listeners");
         this.context.on("page", async (page) => {
-            const stableTabId = uuidv4(); // Create a stable ID immediately
+            const stableTabId = uuidv4();
             this.log("🆕 New page event triggered", { stableTabId, url: page.url() });
-            // Add to map immediately with the stable ID
             this.pages.set(stableTabId, { page, cdpTargetId: null });
-            // Asynchronously find its CDP ID
             const cdpTargetId = await this.findCdpTargetId(page);
             if (cdpTargetId) {
                 this.pages.get(stableTabId).cdpTargetId = cdpTargetId;
@@ -244,15 +242,12 @@ export class RemoteBrowserService extends EventEmitter {
             else {
                 this.log("⚠️ Could not find CDP ID for new page", { stableTabId });
             }
-            // If this is the first page, select it
             if (this.pages.size === 1) {
                 this._selectedPageId = stableTabId;
             }
             await this.syncState();
-            // Listen for page updates
             page.on("load", async () => {
                 this.log("🔄 Page load event", { stableTabId, url: page.url() });
-                // Navigation can *sometimes* change the CDP ID. We must re-verify.
                 const newCdpId = await this.findCdpTargetId(page);
                 const pageInfo = this.pages.get(stableTabId);
                 if (pageInfo && newCdpId && pageInfo.cdpTargetId !== newCdpId) {
@@ -283,13 +278,10 @@ export class RemoteBrowserService extends EventEmitter {
                 await this.syncState();
             });
             page.on("framenavigated", async (frame) => {
-                // This event fires for *all* frames (iframes and the main page)
-                // We'll sync state to capture any potential title changes
                 this.log("🔄 Frame navigated event", { stableTabId, url: frame.url() });
                 await this.syncState();
             });
         });
-        // Initialize with existing pages
         const existingPages = this.context.pages();
         this.log("📄 Found existing pages", { count: existingPages.length });
         for (const page of existingPages) {
@@ -308,68 +300,40 @@ export class RemoteBrowserService extends EventEmitter {
         }
         await this.syncState();
     }
-    // Renamed from getPageId to be more descriptive
     async findCdpTargetId(page) {
         try {
-            const pageUrl = page.url();
-            this.log("🔍 Finding CDP target ID for page", { pageUrl });
-            const debugData = await this.getDebugURLs();
-            // Try to find a page in CDP that is not already mapped
-            const unmappedCdpPages = debugData.filter((debugPage) => {
-                if (debugPage.type !== "page")
-                    return false;
-                // Check if any page in our map *already* has this CDP ID
-                for (const info of this.pages.values()) {
-                    if (info.cdpTargetId === debugPage.id)
-                        return false;
-                }
-                return true;
-            });
-            // 1. Exact URL match
-            let match = unmappedCdpPages.find((p) => p.url === pageUrl);
-            if (match) {
-                this.log("✅ Found CDP ID by exact URL", { id: match.id, url: pageUrl });
-                return match.id;
+            // This is the most direct and reliable way to get the ID
+            const cdpSession = await page.context().newCDPSession(page);
+            const { targetInfo } = await cdpSession.send("Target.getTargetInfo");
+            await cdpSession.detach();
+            if (targetInfo && targetInfo.targetId) {
+                this.log("✅ Found CDP ID by session", { id: targetInfo.targetId, url: page.url() });
+                return targetInfo.targetId;
             }
-            // 2. Normalized URL match
-            const normalizeUrl = (url) => {
-                try {
-                    const u = new URL(url);
-                    return u.hostname.replace(/^www\./, "") + u.pathname + u.search;
-                }
-                catch {
-                    return url;
-                }
-            };
-            const normalizedPageUrl = normalizeUrl(pageUrl);
-            match = unmappedCdpPages.find((p) => normalizeUrl(p.url) === normalizedPageUrl);
-            if (match) {
-                this.log("✅ Found CDP ID by normalized URL", { id: match.id, url: pageUrl });
-                return match.id;
+            else {
+                throw new Error("Target.getTargetInfo did not return a targetId");
             }
-            // 3. Fallback to CDP Session
+        }
+        catch (cdpError) {
+            // If the session fails, fall back to a simple URL match
+            this.log("⚠️ CDP session failed, trying URL match as fallback...", { url: page.url(), cdpError });
             try {
-                const cdpSession = await page.context().newCDPSession(page);
-                const { targetInfo } = await cdpSession.send("Target.getTargetInfo");
-                await cdpSession.detach();
-                if (targetInfo && targetInfo.targetId) {
-                    this.log("✅ Found CDP ID by session", { id: targetInfo.targetId });
-                    return targetInfo.targetId;
+                const debugData = await this.getDebugURLs(); // This now has the cache-busting fix
+                const match = debugData.find((p) => p.type === "page" && p.url === page.url());
+                if (match) {
+                    this.log("✅ Found CDP ID by exact URL as fallback", { id: match.id, url: page.url() });
+                    return match.id;
                 }
             }
-            catch (cdpError) {
-                this.log("⚠️ Failed to get target ID from CDP session", { error: cdpError });
+            catch (fetchError) {
+                this.log("❌ Error in fallback getDebugURLs", { fetchError });
             }
-            this.log("❌ No match found for page", { pageUrl });
-            return null;
-        }
-        catch (error) {
-            this.log("❌ Error finding CDP target ID", { error });
-            return null;
         }
+        this.log("❌ No match found for page", { url: page.url() });
+        return null;
     }
     async getDebugURLs() {
-        const url = `${this.CDP_CONNECT_URL}/json`;
+        const url = `${this.CDP_CONNECT_URL}/json?_=${Date.now()}`; // Cache-busting query param
         try {
             const response = await fetch(url, { cache: "no-store" });
             if (!response.ok) {
@@ -379,7 +343,7 @@ export class RemoteBrowserService extends EventEmitter {
         }
         catch (error) {
             this.log("❌ Exception while fetching debug URLs", { error });
-            return []; // Return empty array on failure
+            return [];
         }
     }
     async syncState() {
@@ -400,12 +364,9 @@ export class RemoteBrowserService extends EventEmitter {
         this.log("📊 Getting current state");
         const debugData = await this.getDebugURLs();
         const pagesData = [];
-        // Re-verify CDP Target IDs for all pages, as they might have changed
         for (const [stableTabId, pageInfo] of this.pages.entries()) {
             let currentCdpId = pageInfo.cdpTargetId;
-            // Find the CDP info for our KNOWN cdpTargetId
             let debugInfo = debugData.find((d) => d.id === currentCdpId);
-            // If not found (e.g., ID changed), try to find it again
             if (!debugInfo) {
                 this.log("⚠️ Re-finding CDP ID for", { stableTabId });
                 const newCdpId = await this.findCdpTargetId(pageInfo.page);
@@ -427,7 +388,6 @@ export class RemoteBrowserService extends EventEmitter {
                 this.log("❌ Error getting page data (page might be closed)", { stableTabId });
             }
         }
-        // Ensure selectedPageId is valid
         if (this._selectedPageId && !this.pages.has(this._selectedPageId)) {
             this._selectedPageId = this.pages.size > 0 ? Array.from(this.pages.keys())[0] : null;
             this.log("🔄 Corrected selectedPageId", { new: this._selectedPageId });
@@ -446,8 +406,6 @@ export class RemoteBrowserService extends EventEmitter {
             if (url !== "about:blank") {
                 await page.goto(url, { waitUntil: "domcontentloaded" });
             }
-            // The 'page' event handler now manages setting the selected ID
-            // We just need to find the new page and select it
             for (const [stableTabId, pageInfo] of this.pages.entries()) {
                 if (pageInfo.page === page) {
                     this._selectedPageId = stableTabId;
@@ -471,7 +429,6 @@ export class RemoteBrowserService extends EventEmitter {
             else {
                 this.log("⚠️ Page not found for closing", { stableTabId });
             }
-            // 'close' event handler will manage state update
         }
         catch (error) {
             this.log("❌ Error closing tab", { error });
@@ -495,7 +452,6 @@ export class RemoteBrowserService extends EventEmitter {
             this.log("❌ Error selecting tab", { error });
         }
     }
-    // ... (getSelectedPage remains the same, but operates on new state)
     getSelectedPage() {
         const pageInfo = this._selectedPageId ? this.pages.get(this._selectedPageId) : null;
         this.log("🔍 Getting selected page", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-blinq/cucumber_client",
-  "version": "1.0.1592-dev",
+  "version": "1.0.1594-dev",
   "description": " ",
   "main": "bin/index.js",
   "types": "bin/index.d.ts",
@@ -37,7 +37,7 @@
     "@babel/traverse": "^7.27.1",
     "@babel/types": "^7.27.1",
     "@cucumber/tag-expressions": "^6.1.1",
-    "@dev-blinq/cucumber-js": "1.0.200-dev",
+    "@dev-blinq/cucumber-js": "1.0.201-dev",
     "@faker-js/faker": "^8.4.1",
     "automation_model": "1.0.890-dev",
     "axios": "^1.7.4",