Skip to content
This repository has been archived by the owner on Jan 30, 2025. It is now read-only.

Add frame lifecycle event listener #594

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions common/frame_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ func (m *FrameManager) frameAttached(frameID cdp.FrameID, parentFrameID cdp.Fram
}
if parentFrame, ok := m.frames[parentFrameID]; ok {
frame := NewFrame(m.ctx, m, parentFrame, frameID, m.logger)

events := make(chan Event)
go m.listenFrameLifecycleEvents(frame, events)

// TODO: create a addFrame func
m.frames[frameID] = frame
parentFrame.addChildFrame(frame)
Expand All @@ -165,6 +169,29 @@ func (m *FrameManager) frameAttached(frameID cdp.FrameID, parentFrameID cdp.Fram
}
}

func (m *FrameManager) listenFrameLifecycleEvents(f *Frame, events chan Event) {
f.on(m.ctx, []string{EventFrameAddLifecycle, EventFrameRemoveLifecycle}, events)
for {
select {
case <-m.ctx.Done():
return
case ev := <-events:
lce, ok := ev.data.(LifecycleEvent)
if !ok {
continue
}
f.lifecycleEventsMu.Lock()
switch ev.data {
case EventFrameAddLifecycle:
f.lifecycleEvents[lce] = true
case EventFrameRemoveLifecycle:
delete(f.lifecycleEvents, lce)
}
f.lifecycleEventsMu.Unlock()
}
}
}

func (m *FrameManager) frameDetached(frameID cdp.FrameID) {
m.logger.Debugf("FrameManager:frameDetached", "fmid:%d fid:%v", m.ID(), frameID)

Expand Down Expand Up @@ -248,6 +275,9 @@ func (m *FrameManager) frameNavigated(frameID cdp.FrameID, parentFrameID cdp.Fra

// Initial main frame navigation.
frame = NewFrame(m.ctx, m, nil, frameID, m.logger)
events := make(chan Event)
go m.listenFrameLifecycleEvents(frame, events)

mainFrame = frame
} else if isMainFrame && frame.ID() != string(frameID) {
m.logger.Debugf("FrameManager:frameNavigated:MainFrame:delete",
Expand Down Expand Up @@ -652,6 +682,13 @@ func (m *FrameManager) NavigateFrame(frame *Frame, url string, parsedOpts *Frame
return resp, nil
}

func (m *FrameManager) callForFrame(fid cdp.FrameID, call func(f *Frame)) {
m.framesMu.Lock()
defer m.framesMu.Unlock()

call(m.frames[fid])
}

// Page returns the page that this frame manager belongs to.
func (m *FrameManager) Page() api.Page {
if m.page != nil {
Expand Down
5 changes: 5 additions & 0 deletions common/frame_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,11 @@ func (fs *FrameSession) onPageLifecycle(event *cdppage.EventLifecycleEvent) {
fs.manager.frameLifecycleEvent(event.FrameID, LifecycleEventLoad)
case "DOMContentLoaded":
fs.manager.frameLifecycleEvent(event.FrameID, LifecycleEventDOMContentLoad)
case "networkIdle":
// TODO: maybe move this to the frame manager.
fs.manager.callForFrame(event.FrameID, func(f *Frame) {
f.emit(EventFrameAddLifecycle, LifecycleEventNetworkIdle)
})
}

eventToMetric := map[string]*k6metrics.Metric{
Expand Down