Skip to content
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
4 changes: 3 additions & 1 deletion server/lib/cdpmonitor/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ func (m *Monitor) openConnection(ctx context.Context, devtoolsURL string) error
conn := &monitorConnection{
protocol: protocol,
surface: browsersurface.New(protocol,
browsersurface.WithAdditionalTargets("worker", "shared_worker", "service_worker", "background_page"),
// shared_worker is deliberately not tracked: attaching a DevTools session to a
// shared worker can crash Chrome when its owning page closes.
browsersurface.WithAdditionalTargets("worker", "service_worker", "background_page"),
browsersurface.WithoutLocations(),
),
ctx: ctx, cancel: cancel, done: make(chan struct{}),
Expand Down
2 changes: 1 addition & 1 deletion server/lib/cdpmonitor/monitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func TestSurfaceDiscovery(t *testing.T) {
for _, filter := range params.Filter {
types = append(types, filter.Type)
}
assert.ElementsMatch(t, []string{"page", "iframe", "worker", "shared_worker", "service_worker", "background_page"}, types)
assert.ElementsMatch(t, []string{"page", "iframe", "worker", "service_worker", "background_page"}, types)

stopResponder := make(chan struct{})
go listenAndRespond(srv, stopResponder, nil)
Expand Down
1 change: 0 additions & 1 deletion server/lib/cdpmonitor/network_metrics_chrome_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ func TestAlwaysOnNetworkMetricsChrome(t *testing.T) {
}
for _, worker := range []struct{ kind, create, request string }{
{"worker", `window.w=new Worker('/worker.js')`, `w.onmessage=e=>resolve(e.data); w.postMessage('/reset');`},
{"shared_worker", `window.sw=new SharedWorker('/shared.js'); sw.port.start()`, `sw.port.onmessage=e=>resolve(e.data); sw.port.postMessage('/reset');`},
{"service_worker", `await navigator.serviceWorker.register('/service.js'); window.service=(await navigator.serviceWorker.ready).active`, `const c=new MessageChannel(); c.port1.onmessage=e=>resolve(e.data); service.postMessage('/reset',[c.port2]);`},
} {
t.Run(worker.kind, func(t *testing.T) {
Expand Down
1 change: 0 additions & 1 deletion server/lib/cdpmonitor/workers_chrome_e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ func TestNetworkCaptureFromWorkers(t *testing.T) {

for _, worker := range []struct{ targetType, path, create, request string }{
{"worker", "/worker.js", `window.testWorker = new Worker('/worker.js')`, `testWorker.onmessage = event => resolve(event.data); testWorker.postMessage(marker);`},
{"shared_worker", "/shared.js", `window.sharedWorker = new SharedWorker('/shared.js'); sharedWorker.port.start()`, `sharedWorker.port.onmessage = event => resolve(event.data); sharedWorker.port.postMessage(marker);`},
{"service_worker", "/service.js", `await navigator.serviceWorker.register('/service.js'); window.serviceWorker = (await navigator.serviceWorker.ready).active`, `const channel = new MessageChannel(); channel.port1.onmessage = event => resolve(event.data); serviceWorker.postMessage(marker, [channel.port2]);`},
} {
t.Run(worker.targetType, func(t *testing.T) {
Expand Down