@dev-blinq/cucumber_client 1.0.1586-dev → 1.0.1587-dev

package/bin/client/recorderv3/services.js

@@ -303,6 +303,25 @@ export class RemoteBrowserService extends EventEmitter {
         try {
             const pageUrl = page.url();
             this.log("🔍 Getting page ID", { pageUrl });
+            // Try to get the CDP target ID directly from the page
+            // This is more reliable than URL matching
+            try {
+                const cdpSession = await page.context().newCDPSession(page);
+                const { targetInfo } = await cdpSession.send("Target.getTargetInfo");
+                await cdpSession.detach();
+                if (targetInfo && targetInfo.targetId) {
+                    this.log("✅ Got target ID from CDP session", {
+                        targetId: targetInfo.targetId,
+                        url: pageUrl,
+                    });
+                    return targetInfo.targetId;
+                }
+            }
+            catch (cdpError) {
+                this.log("⚠️ Failed to get target ID from CDP session, falling back to URL matching", {
+                    error: cdpError instanceof Error ? cdpError.message : String(cdpError),
+                });
+            }
             const debugData = await this.getDebugURLs();
             this.log("📊 CDP debug data received", {
                 totalPages: debugData.length,
@@ -417,44 +436,112 @@ export class RemoteBrowserService extends EventEmitter {
             debugPages: debugData.map((p) => ({ id: p.id, type: p.type, url: p.url })),
         });
         const pagesData = [];
-        for (const [id, page] of this.pages.entries()) {
+        const updatedPages = new Map();
+        const matchedDebugIds = new Set(); // Track which CDP IDs we've already matched
+        let updatedSelectedPageId = this._selectedPageId;
+        for (const [oldId, page] of this.pages.entries()) {
             this.log("🔍 Processing page from internal map", {
-                id,
+                oldId,
                 url: page.url(),
             });
-            const debugInfo = debugData.find((d) => d.id === id);
-            if (debugInfo) {
-                this.log("✅ Found matching debug info", {
-                    id,
+            // Try to get the current CDP target ID directly from the page
+            let currentId = null;
+            try {
+                const cdpSession = await page.context().newCDPSession(page);
+                const { targetInfo } = await cdpSession.send("Target.getTargetInfo");
+                await cdpSession.detach();
+                if (targetInfo && targetInfo.targetId) {
+                    currentId = targetInfo.targetId;
+                    this.log("✅ Got current target ID from CDP session", {
+                        oldId,
+                        currentId,
+                        url: page.url(),
+                    });
+                }
+            }
+            catch (cdpError) {
+                this.log("⚠️ Failed to get target ID from CDP session", {
+                    oldId,
+                    error: cdpError instanceof Error ? cdpError.message : String(cdpError),
+                });
+            }
+            // If we got the current ID from CDP session, use it
+            let debugInfo = currentId ? debugData.find((d) => d.id === currentId) : null;
+            // Fallback 1: Try to find by old ID
+            if (!debugInfo) {
+                debugInfo = debugData.find((d) => d.id === oldId && !matchedDebugIds.has(d.id));
+            }
+            // Fallback 2: Try to find by URL (only if not already matched)
+            if (!debugInfo) {
+                this.log("⚠️ Page ID not found in CDP, attempting to match by URL", {
+                    oldId,
+                    pageUrl: page.url(),
+                });
+                debugInfo = debugData.find((d) => d.type === "page" && d.url === page.url() && !matchedDebugIds.has(d.id));
+                if (debugInfo) {
+                    this.log("✅ Found page by URL match, updating ID", {
+                        oldId,
+                        newId: debugInfo.id,
+                        url: page.url(),
+                    });
+                }
+            }
+            else {
+                this.log("✅ Found matching debug info by ID", {
+                    id: debugInfo.id,
                     debugUrl: debugInfo.url,
                     pageUrl: page.url(),
                 });
+            }
+            if (debugInfo) {
+                // Mark this CDP ID as matched to avoid duplicate matches
+                matchedDebugIds.add(debugInfo.id);
+                // Update selected page ID if this was the selected page and ID changed
+                if (oldId === this._selectedPageId && oldId !== debugInfo.id) {
+                    updatedSelectedPageId = debugInfo.id;
+                    this.log("🔄 Updated selected page ID", {
+                        oldId,
+                        newId: debugInfo.id,
+                    });
+                }
                 try {
                     const pageData = {
-                        id,
+                        id: debugInfo.id,
                         title: await page.title(),
                         url: page.url(),
                         wsDebuggerUrl: debugInfo.webSocketDebuggerUrl || "",
                     };
                     pagesData.push(pageData);
+                    updatedPages.set(debugInfo.id, page);
                     this.log("✅ Page added to state", pageData);
                 }
                 catch (error) {
                     this.log("❌ Error getting page data", {
-                        id,
+                        id: oldId,
                         error: error instanceof Error ? error.message : String(error),
                     });
                 }
             }
             else {
-                this.log("⚠️ No matching debug info found", {
-                    id,
+                this.log("⚠️ No matching debug info found by ID or URL", {
+                    oldId,
                     pageUrl: page.url(),
                     availableDebugIds: debugData.map((d) => d.id),
                     availableDebugUrls: debugData.map((d) => d.url),
                 });
             }
         }
+        // Update the internal pages map with current CDP IDs
+        if (updatedPages.size !== this.pages.size || updatedSelectedPageId !== this._selectedPageId) {
+            this.log("🔄 Updating internal state with new CDP IDs", {
+                oldPagesCount: this.pages.size,
+                newPagesCount: updatedPages.size,
+                oldSelectedId: this._selectedPageId,
+                newSelectedId: updatedSelectedPageId,
+            });
+            this.pages = updatedPages;
+            this._selectedPageId = updatedSelectedPageId;
+        }
         const state = {
             pages: pagesData,
             selectedPageId: this._selectedPageId,

package/package.json

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