From 6a2755e4ae5dd09a3ad1c1d24215e616bc7b7357 Mon Sep 17 00:00:00 2001
From: RohitR311 <rohit.rajan031101@gmail.com>
Date: Mon, 2 Dec 2024 17:05:19 +0530
Subject: [PATCH] fix: emit socket urlChanged on frame navigation

---
 .../classes/RemoteBrowser.ts                  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/server/src/browser-management/classes/RemoteBrowser.ts b/server/src/browser-management/classes/RemoteBrowser.ts
index eb4051c6..769787da 100644
--- a/server/src/browser-management/classes/RemoteBrowser.ts
+++ b/server/src/browser-management/classes/RemoteBrowser.ts
@@ -165,6 +165,13 @@ export class RemoteBrowser {
         contextOptions.userAgent = browserUserAgent;
         this.context = await this.browser.newContext(contextOptions);
         this.currentPage = await this.context.newPage();
+
+        this.currentPage.on('framenavigated', (frame) => {
+            if (frame === this.currentPage?.mainFrame()) {
+                this.socket.emit('urlChanged', this.currentPage.url());
+            }
+        });
+
         // await this.currentPage.setExtraHTTPHeaders({
         //     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'
         // });
@@ -362,6 +369,13 @@ export class RemoteBrowser {
         if (page) {
             await this.stopScreencast();
             this.currentPage = page;
+
+            this.currentPage.on('framenavigated', (frame) => {
+                if (frame === this.currentPage?.mainFrame()) {
+                    this.socket.emit('urlChanged', this.currentPage.url());
+                }
+            });
+
             //await this.currentPage.setViewportSize({ height: 400, width: 900 })
             this.client = await this.currentPage.context().newCDPSession(this.currentPage);
             this.socket.emit('urlChanged', this.currentPage.url());
@@ -388,9 +402,14 @@ export class RemoteBrowser {
         await this.currentPage?.close();
         this.currentPage = newPage;
         if (this.currentPage) {
-            this.currentPage.on('load', (page) => {
-                this.socket.emit('urlChanged', page.url());
-            })
+            this.currentPage.on('framenavigated', (frame) => {
+                if (frame === this.currentPage?.mainFrame()) {
+                    this.socket.emit('urlChanged', this.currentPage.url());
+                }
+            });
+            // this.currentPage.on('load', (page) => {
+            //     this.socket.emit('urlChanged', page.url());
+            // })
             this.client = await this.currentPage.context().newCDPSession(this.currentPage);
             await this.subscribeToScreencast();
         } else {