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

package/bin/client/recorderv3/services.js

@@ -303,34 +303,16 @@ 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),
-                });
-            }
+            // Fetch debug data from /json endpoint (more reliable for matching)
             const debugData = await this.getDebugURLs();
             this.log("📊 CDP debug data received", {
                 totalPages: debugData.length,
                 pages: debugData.map((p) => ({ id: p.id, type: p.type, url: p.url })),
             });
-            // Exact match
+            // Exact URL match
             for (const pageData of debugData) {
                 if (pageData.type === "page" && pageData.url === pageUrl) {
-                    this.log("✅ Found exact URL match", {
+                    this.log("✅ Found exact URL match in /json", {
                         id: pageData.id,
                         url: pageUrl,
                     });
@@ -338,16 +320,14 @@ export class RemoteBrowserService extends EventEmitter {
                 }
             }
             this.log("⚠️ No exact match found, trying normalized URLs", { pageUrl });
-            // Normalized match
+            // Normalized URL match
             const normalizeUrl = (url) => {
                 try {
                     const u = new URL(url);
                     const normalized = u.hostname.replace(/^www\./, "") + u.pathname + u.search;
-                    this.log("🔧 Normalized URL", { original: url, normalized });
                     return normalized;
                 }
                 catch {
-                    this.log("❌ Failed to normalize URL", { url });
                     return url;
                 }
             };
@@ -356,7 +336,7 @@ export class RemoteBrowserService extends EventEmitter {
                 if (pageData.type === "page") {
                     const normalizedDebugUrl = normalizeUrl(pageData.url);
                     if (normalizedDebugUrl === normalizedPageUrl) {
-                        this.log("✅ Found normalized URL match", {
+                        this.log("✅ Found normalized URL match in /json", {
                             id: pageData.id,
                             pageUrl: normalizedPageUrl,
                             debugUrl: normalizedDebugUrl,
@@ -365,6 +345,35 @@ export class RemoteBrowserService extends EventEmitter {
                     }
                 }
             }
+            // If still not found, try CDP session as fallback
+            this.log("⚠️ Not found in /json, trying CDP Target.getTargetInfo", { pageUrl });
+            try {
+                const cdpSession = await page.context().newCDPSession(page);
+                const { targetInfo } = await cdpSession.send("Target.getTargetInfo");
+                await cdpSession.detach();
+                if (targetInfo && targetInfo.targetId) {
+                    // Verify this target ID exists in debug data
+                    const targetExists = debugData.some((d) => d.id === targetInfo.targetId);
+                    if (targetExists) {
+                        this.log("✅ Got target ID from CDP session and verified in /json", {
+                            targetId: targetInfo.targetId,
+                            url: pageUrl,
+                        });
+                        return targetInfo.targetId;
+                    }
+                    else {
+                        this.log("⚠️ Target ID from CDP session not found in /json (ID mismatch)", {
+                            cdpTargetId: targetInfo.targetId,
+                            availableIds: debugData.map((d) => d.id),
+                        });
+                    }
+                }
+            }
+            catch (cdpError) {
+                this.log("⚠️ Failed to get target ID from CDP session", {
+                    error: cdpError instanceof Error ? cdpError.message : String(cdpError),
+                });
+            }
             this.log("❌ No match found for page", {
                 pageUrl,
                 normalizedPageUrl,
@@ -444,34 +453,9 @@ export class RemoteBrowserService extends EventEmitter {
                 oldId,
                 url: page.url(),
             });
-            // 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)
+            // Try to find by old ID first (most common case - ID hasn't changed)
+            let debugInfo = debugData.find((d) => d.id === oldId && !matchedDebugIds.has(d.id));
+            // Fallback: Try to find by URL (page ID may have changed)
             if (!debugInfo) {
                 this.log("⚠️ Page ID not found in CDP, attempting to match by URL", {
                     oldId,
@@ -484,6 +468,14 @@ export class RemoteBrowserService extends EventEmitter {
                         newId: debugInfo.id,
                         url: page.url(),
                     });
+                    // Update selected page ID if this was the selected page and ID changed
+                    if (oldId === this._selectedPageId) {
+                        updatedSelectedPageId = debugInfo.id;
+                        this.log("🔄 Updated selected page ID", {
+                            oldId,
+                            newId: debugInfo.id,
+                        });
+                    }
                 }
             }
             else {
@@ -496,14 +488,6 @@ export class RemoteBrowserService extends EventEmitter {
             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: debugInfo.id,
@@ -528,6 +512,7 @@ export class RemoteBrowserService extends EventEmitter {
                     pageUrl: page.url(),
                     availableDebugIds: debugData.map((d) => d.id),
                     availableDebugUrls: debugData.map((d) => d.url),
+                    alreadyMatched: Array.from(matchedDebugIds),
                 });
             }
         }
@@ -559,11 +544,27 @@ export class RemoteBrowserService extends EventEmitter {
                 await page.goto(url, { waitUntil: "domcontentloaded" });
                 this.log("✅ Navigation complete", { finalUrl: page.url() });
             }
-            // Wait for CDP to register the page
-            this.log("⏳ Waiting for CDP registration...");
-            await new Promise((resolve) => setTimeout(resolve, 500));
-            const id = await this.getPageId(page);
-            this.log("🔍 Retrieved page ID after wait", { id, url: page.url() });
+            // Wait longer for CDP to register and stabilize the page
+            this.log("⏳ Waiting for CDP registration and stabilization...");
+            await new Promise((resolve) => setTimeout(resolve, 1000)); // Increased to 1 second
+            // Try multiple times to get a stable page ID
+            let id = null;
+            let attempts = 0;
+            const maxAttempts = 5;
+            while (!id && attempts < maxAttempts) {
+                attempts++;
+                this.log(`🔍 Attempt ${attempts}/${maxAttempts} to get page ID`);
+                id = await this.getPageId(page);
+                if (!id) {
+                    this.log(`⏳ Page ID not found, waiting 500ms before retry...`);
+                    await new Promise((resolve) => setTimeout(resolve, 500));
+                }
+            }
+            this.log("🔍 Retrieved page ID after retries", {
+                id,
+                url: page.url(),
+                attempts,
+            });
             if (id) {
                 this.pages.set(id, page);
                 this._selectedPageId = id;
@@ -576,7 +577,10 @@ export class RemoteBrowserService extends EventEmitter {
                 });
             }
             else {
-                this.log("❌ Failed to get page ID for new tab", { url: page.url() });
+                this.log("❌ Failed to get page ID for new tab after all retries", {
+                    url: page.url(),
+                    attempts,
+                });
                 // Try to get debug data to see what's available
                 const debugData = await this.getDebugURLs();
                 this.log("🔍 Current CDP state after failed ID retrieval", {

package/package.json

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