Skip to content

Commit

Permalink
Remove BaseEventEmitter from page
Browse files Browse the repository at this point in the history
The events which are emitted with the page's event emitter instance
weren't being received by anything else in the codebase.
  • Loading branch information
ankur22 committed Jan 17, 2025
1 parent d530b24 commit 3cd5bd9
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 25 deletions.
1 change: 0 additions & 1 deletion js/modules/k6/browser/common/frame.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 0 additions & 11 deletions js/modules/k6/browser/common/frame_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -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
Expand All @@ -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")
Expand Down Expand Up @@ -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",
Expand All @@ -537,16 +529,13 @@ 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) {
m.logger.Debugf("FrameManager:requestStarted", "fmid:%d rurl:%s", m.ID(), req.URL())

m.framesMu.Lock()
defer m.framesMu.Unlock()
defer m.page.emit(EventPageRequest, req)

frame := req.getFrame()
if frame == nil {
Expand Down
3 changes: 1 addition & 2 deletions js/modules/k6/browser/common/frame_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
11 changes: 0 additions & 11 deletions js/modules/k6/browser/common/page.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -246,7 +244,6 @@ func NewPage(
logger *log.Logger,
) (*Page, error) {
p := Page{
BaseEventEmitter: NewBaseEventEmitter(ctx),
ctx: ctx,
session: s,
browserCtx: bctx,
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 3cd5bd9

Please sign in to comment.