From 3cd5bd99b4280783efdb1cbecf949ff6ee5f918c Mon Sep 17 00:00:00 2001
From: ankur22 <ankur.agarwal@grafana.com>
Date: Fri, 17 Jan 2025 10:43:27 +0000
Subject: [PATCH] Remove BaseEventEmitter from page

The events which are emitted with the page's event emitter instance
weren't being received by anything else in the codebase.
---
 js/modules/k6/browser/common/frame.go         |  1 -
 js/modules/k6/browser/common/frame_manager.go | 11 -----------
 js/modules/k6/browser/common/frame_session.go |  3 +--
 js/modules/k6/browser/common/page.go          | 11 -----------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/js/modules/k6/browser/common/frame.go b/js/modules/k6/browser/common/frame.go
index b84a3454a14..2f54b90f702 100644
--- a/js/modules/k6/browser/common/frame.go
+++ b/js/modules/k6/browser/common/frame.go
@@ -314,7 +314,6 @@ func (f *Frame) navigated(name string, url string, loaderID string) {
 	f.name = name
 	f.url = url
 	f.loaderID = loaderID
-	f.page.emit(EventPageFrameNavigated, f)
 }
 
 func (f *Frame) nullContext(execCtxID runtime.ExecutionContextID) {
diff --git a/js/modules/k6/browser/common/frame_manager.go b/js/modules/k6/browser/common/frame_manager.go
index e605aa5eae3..20c4d7d1539 100644
--- a/js/modules/k6/browser/common/frame_manager.go
+++ b/js/modules/k6/browser/common/frame_manager.go
@@ -157,8 +157,6 @@ func (m *FrameManager) frameAttached(frameID cdp.FrameID, parentFrameID cdp.Fram
 
 		m.logger.Debugf("FrameManager:frameAttached:emit:EventPageFrameAttached",
 			"fmid:%d fid:%v pfid:%v", m.ID(), frameID, parentFrameID)
-
-		m.page.emit(EventPageFrameAttached, frame)
 	}
 }
 
@@ -476,8 +474,6 @@ func (m *FrameManager) removeFramesRecursively(frame *Frame) error {
 		m.logger.Debugf("FrameManager:removeFramesRecursively:emit:EventPageFrameDetached",
 			"fmid:%d fid:%v fname:%s furl:%s",
 			m.ID(), frame.ID(), frame.Name(), frame.URL())
-
-		m.page.emit(EventPageFrameDetached, frame)
 	}
 
 	return nil
@@ -486,8 +482,6 @@ func (m *FrameManager) removeFramesRecursively(frame *Frame) error {
 func (m *FrameManager) requestFailed(req *Request, canceled bool) {
 	m.logger.Debugf("FrameManager:requestFailed", "fmid:%d rurl:%s", m.ID(), req.URL())
 
-	defer m.page.emit(EventPageRequestFailed, req)
-
 	frame := req.getFrame()
 	if frame == nil {
 		m.logger.Debugf("FrameManager:requestFailed", "frame is nil")
@@ -517,8 +511,6 @@ func (m *FrameManager) requestFinished(req *Request) {
 	m.logger.Debugf("FrameManager:requestFinished", "fmid:%d rurl:%s",
 		m.ID(), req.URL())
 
-	defer m.page.emit(EventPageRequestFinished, req)
-
 	frame := req.getFrame()
 	if frame == nil {
 		m.logger.Debugf("FrameManager:requestFinished:return",
@@ -537,8 +529,6 @@ func (m *FrameManager) requestFinished(req *Request) {
 
 func (m *FrameManager) requestReceivedResponse(res *Response) {
 	m.logger.Debugf("FrameManager:requestReceivedResponse", "fmid:%d rurl:%s", m.ID(), res.URL())
-
-	m.page.emit(EventPageResponse, res)
 }
 
 func (m *FrameManager) requestStarted(req *Request) {
@@ -546,7 +536,6 @@ func (m *FrameManager) requestStarted(req *Request) {
 
 	m.framesMu.Lock()
 	defer m.framesMu.Unlock()
-	defer m.page.emit(EventPageRequest, req)
 
 	frame := req.getFrame()
 	if frame == nil {
diff --git a/js/modules/k6/browser/common/frame_session.go b/js/modules/k6/browser/common/frame_session.go
index 9a15af6068a..b212bbca75c 100644
--- a/js/modules/k6/browser/common/frame_session.go
+++ b/js/modules/k6/browser/common/frame_session.go
@@ -661,7 +661,7 @@ func (fs *FrameSession) onConsoleAPICalled(event *cdpruntime.EventConsoleAPICall
 }
 
 func (fs *FrameSession) onExceptionThrown(event *cdpruntime.EventExceptionThrown) {
-	fs.page.emit(EventPageError, event.ExceptionDetails)
+	// TODO: Test and handle this
 }
 
 func (fs *FrameSession) onExecutionContextCreated(event *cdpruntime.EventExecutionContextCreated) {
@@ -1061,7 +1061,6 @@ func (fs *FrameSession) onTargetCrashed() {
 		k6ext.Panic(fs.ctx, "unexpected type %T", fs.session)
 	}
 	s.markAsCrashed()
-	fs.page.didCrash()
 }
 
 func (fs *FrameSession) updateEmulateMedia() error {
diff --git a/js/modules/k6/browser/common/page.go b/js/modules/k6/browser/common/page.go
index 9306810d461..1c86dd492f7 100644
--- a/js/modules/k6/browser/common/page.go
+++ b/js/modules/k6/browser/common/page.go
@@ -186,8 +186,6 @@ type PageOnHandler func(PageOnEvent) error
 
 // Page stores Page/tab related context.
 type Page struct {
-	BaseEventEmitter
-
 	Keyboard    *Keyboard
 	Mouse       *Mouse
 	Touchscreen *Touchscreen
@@ -246,7 +244,6 @@ func NewPage(
 	logger *log.Logger,
 ) (*Page, error) {
 	p := Page{
-		BaseEventEmitter: NewBaseEventEmitter(ctx),
 		ctx:              ctx,
 		session:          s,
 		browserCtx:       bctx,
@@ -561,14 +558,6 @@ func (p *Page) didClose() {
 		p.closed = true
 	}
 	p.closedMu.Unlock()
-
-	p.emit(EventPageClose, p)
-}
-
-func (p *Page) didCrash() {
-	p.logger.Debugf("Page:didCrash", "sid:%v", p.sessionID())
-
-	p.emit(EventPageCrash, p)
 }
 
 func (p *Page) evaluateOnNewDocument(source string) error {