From b84e9186b9ccf71cb05423b3923bb0c7c745b3d3 Mon Sep 17 00:00:00 2001
From: RohitR311 <rohit.rajan031101@gmail.com>
Date: Mon, 9 Dec 2024 22:05:50 +0530
Subject: [PATCH] fix: inject cookie script on page load

---
 .../browser-management/classes/RemoteBrowser.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/server/src/browser-management/classes/RemoteBrowser.ts b/server/src/browser-management/classes/RemoteBrowser.ts
index 0081cb5c..7e0a7d1a 100644
--- a/server/src/browser-management/classes/RemoteBrowser.ts
+++ b/server/src/browser-management/classes/RemoteBrowser.ts
@@ -167,13 +167,16 @@ export class RemoteBrowser {
         this.context = await this.browser.newContext(contextOptions);
         this.currentPage = await this.context.newPage();
 
-        this.currentPage.on('framenavigated', (frame) => {
+        this.currentPage.on('framenavigated', (frame) => {   
             if (frame === this.currentPage?.mainFrame()) {
-                this.currentPage.evaluate(getInjectableScript())
                 this.socket.emit('urlChanged', this.currentPage.url());
             }
         });
 
+        this.currentPage.on('load', (page) => {
+            page.evaluate(getInjectableScript())
+        })
+
         // 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'
         // });
@@ -374,11 +377,14 @@ export class RemoteBrowser {
 
             this.currentPage.on('framenavigated', (frame) => {
                 if (frame === this.currentPage?.mainFrame()) {
-                    this.currentPage.evaluate(getInjectableScript());
                     this.socket.emit('urlChanged', this.currentPage.url());
                 }
             });
 
+            this.currentPage.on('load', (page) => {
+                page.evaluate(getInjectableScript())
+            })
+
             //await this.currentPage.setViewportSize({ height: 400, width: 900 })
             this.client = await this.currentPage.context().newCDPSession(this.currentPage);
             this.socket.emit('urlChanged', this.currentPage.url());
@@ -407,10 +413,13 @@ export class RemoteBrowser {
         if (this.currentPage) {
             this.currentPage.on('framenavigated', (frame) => {
                 if (frame === this.currentPage?.mainFrame()) {
-                    this.currentPage.evaluate(getInjectableScript());
                     this.socket.emit('urlChanged', this.currentPage.url());
                 }
             });
+
+            this.currentPage.on('load', (page) => {
+                page.evaluate(getInjectableScript())
+            })
             // this.currentPage.on('load', (page) => {
             //     this.socket.emit('urlChanged', page.url());
             // })