review: update naming convention

Author: archandatta

server/lib/cdpmonitor/computed_test.go

@@ -62,7 +62,7 @@ func TestLayoutSettled(t *testing.T) {
 		t0 := time.Now()
 		cs.onPageLoad()
 
-		ev := ec.waitFor(t, "layout_settled", 3*time.Second)
+		ev := ec.waitFor(t, "page_layout_settled", 3*time.Second)
 		assert.GreaterOrEqual(t, time.Since(t0).Milliseconds(), int64(900), "fired too early")
 		assert.Equal(t, events.CategoryPage, ev.Category)
 	})
@@ -77,7 +77,7 @@ func TestLayoutSettled(t *testing.T) {
 		t0 := time.Now()
 		cs.onPageLoad()
 
-		ec.waitFor(t, "layout_settled", 3*time.Second)
+		ec.waitFor(t, "page_layout_settled", 3*time.Second)
 		assert.GreaterOrEqual(t, time.Since(t0).Milliseconds(), int64(900), "should fire 1s after page_load, not layout_shift")
 	})
 
@@ -90,7 +90,7 @@ func TestLayoutSettled(t *testing.T) {
 		cs.onLayoutShift()
 		t1 := time.Now()
 
-		ec.waitFor(t, "layout_settled", 3*time.Second)
+		ec.waitFor(t, "page_layout_settled", 3*time.Second)
 		assert.GreaterOrEqual(t, time.Since(t1).Milliseconds(), int64(900), "should reset after layout_shift")
 	})
 }
@@ -105,7 +105,7 @@ func TestNavigationSettled(t *testing.T) {
 		cs.onLoadingFinished()
 		cs.onPageLoad()
 
-		ev := ec.waitFor(t, "navigation_settled", 3*time.Second)
+		ev := ec.waitFor(t, "page_navigation_settled", 3*time.Second)
 		assert.Equal(t, events.CategoryPage, ev.Category)
 	})
 
@@ -120,7 +120,7 @@ func TestNavigationSettled(t *testing.T) {
 		// Interrupt before layout_settled fires.
 		require.NoError(t, cs.resetOnNavigation(0, navContext{}))
 
-		ec.assertNone(t, "navigation_settled", 1500*time.Millisecond)
+		ec.assertNone(t, "page_navigation_settled", 1500*time.Millisecond)
 	})
 }
 
@@ -139,7 +139,7 @@ func TestNavDataMetadata(t *testing.T) {
 		require.NoError(t, cs.resetOnNavigation(0, ctx))
 		cs.onPageLoad()
 
-		ev := ec.waitFor(t, "layout_settled", 3*time.Second)
+		ev := ec.waitFor(t, "page_layout_settled", 3*time.Second)
 		assert.Equal(t, events.CategoryPage, ev.Category)
 		assert.Equal(t, "s1", ev.Source.Metadata[MetadataKeyCDPSessionID])
 		assert.Equal(t, "t1", ev.Source.Metadata[MetadataKeyTargetID])
@@ -160,7 +160,7 @@ func TestNavDataMetadata(t *testing.T) {
 		cs.onLoadingFinished()
 		cs.onPageLoad()
 
-		ev := ec.waitFor(t, "navigation_settled", 3*time.Second)
+		ev := ec.waitFor(t, "page_navigation_settled", 3*time.Second)
 		assert.Equal(t, events.CategoryPage, ev.Category)
 		assert.Equal(t, "s1", ev.Source.Metadata[MetadataKeyCDPSessionID])
 		assert.Equal(t, "t1", ev.Source.Metadata[MetadataKeyTargetID])
@@ -186,6 +186,6 @@ func TestStopSuppressesTimers(t *testing.T) {
 		require.NoError(t, cs.resetOnNavigation(0, navContext{}))
 		cs.onPageLoad() // arms 1s layout_settled timer
 		cs.stop()
-		ec.assertNone(t, "layout_settled", 1500*time.Millisecond)
+		ec.assertNone(t, "page_layout_settled", 1500*time.Millisecond)
 	})
 }

server/lib/cdpmonitor/handlers_test.go

@@ -220,7 +220,7 @@ func TestPageEvents(t *testing.T) {
 			"waitingForDebugger": false,
 		},
 	})
-	ec.waitFor(t, "tab_opened", 2*time.Second)
+	ec.waitFor(t, "page_tab_opened", 2*time.Second)
 
 	srv.sendToMonitor(t, map[string]any{
 		"method": "Page.frameNavigated", "sessionId": "sess-page",
@@ -231,7 +231,7 @@ func TestPageEvents(t *testing.T) {
 			},
 		},
 	})
-	ev := ec.waitFor(t, "navigation", 2*time.Second)
+	ev := ec.waitFor(t, "page_navigation", 2*time.Second)
 	assert.Equal(t, events.CategoryPage, ev.Category)
 	assert.Equal(t, "Page.frameNavigated", ev.Source.Event)
 	var data map[string]any
@@ -242,7 +242,7 @@ func TestPageEvents(t *testing.T) {
 		"method": "Page.domContentEventFired", "sessionId": "sess-page",
 		"params": map[string]any{"timestamp": 1000.0},
 	})
-	ev2 := ec.waitFor(t, "dom_content_loaded", 2*time.Second)
+	ev2 := ec.waitFor(t, "page_dom_content_loaded", 2*time.Second)
 	assert.Equal(t, events.CategoryPage, ev2.Category)
 	var data2 map[string]any
 	require.NoError(t, json.Unmarshal(ev2.Data, &data2))
@@ -282,7 +282,7 @@ func TestTabOpened(t *testing.T) {
 				"waitingForDebugger": false,
 			},
 		})
-		ev := ec.waitFor(t, "tab_opened", 2*time.Second)
+		ev := ec.waitFor(t, "page_tab_opened", 2*time.Second)
 		assert.Equal(t, events.CategoryPage, ev.Category)
 		assert.Equal(t, "Target.attachedToTarget", ev.Source.Event)
 		var data map[string]any
@@ -305,7 +305,7 @@ func TestTabOpened(t *testing.T) {
 				"waitingForDebugger": false,
 			},
 		})
-		ec.assertNone(t, "tab_opened", 200*time.Millisecond)
+		ec.assertNone(t, "page_tab_opened", 200*time.Millisecond)
 	})
 }
 
@@ -329,15 +329,15 @@ func TestBindingAndTimeline(t *testing.T) {
 		assert.Equal(t, "Runtime.bindingCalled", ev.Source.Event)
 	})
 
-	t.Run("scroll_settled", func(t *testing.T) {
+	t.Run("interaction_scroll_settled", func(t *testing.T) {
 		srv.sendToMonitor(t, map[string]any{
 			"method": "Runtime.bindingCalled",
 			"params": map[string]any{
 				"name":    "__kernelEvent",
-				"payload": `{"type":"scroll_settled","from_x":0,"from_y":0,"to_x":0,"to_y":500,"target_selector":"body"}`,
+				"payload": `{"type":"interaction_scroll_settled","from_x":0,"from_y":0,"to_x":0,"to_y":500,"target_selector":"body"}`,
 			},
 		})
-		ev := ec.waitFor(t, "scroll_settled", 2*time.Second)
+		ev := ec.waitFor(t, "interaction_scroll_settled", 2*time.Second)
 		assert.Equal(t, events.CategoryInteraction, ev.Category)
 		var data map[string]any
 		require.NoError(t, json.Unmarshal(ev.Data, &data))
@@ -360,7 +360,7 @@ func TestBindingAndTimeline(t *testing.T) {
 				},
 			},
 		})
-		ev := ec.waitFor(t, "layout_shift", 2*time.Second)
+		ev := ec.waitFor(t, "page_layout_shift", 2*time.Second)
 		assert.Equal(t, events.KindCDP, ev.Source.Kind)
 		assert.Equal(t, "PerformanceTimeline.timelineEventAdded", ev.Source.Event)
 		var data map[string]any
@@ -458,7 +458,7 @@ func TestPerTargetStateMachines(t *testing.T) {
 				"id": "f-a", "url": "https://a.example.com", "loaderId": "l-a",
 			}},
 		})
-		ec.waitFor(t, "navigation", 2*time.Second)
+		ec.waitFor(t, "page_navigation", 2*time.Second)
 
 		srv.sendToMonitor(t, map[string]any{
 			"method": "Network.requestWillBeSent", "sessionId": "sess-a",
@@ -520,7 +520,7 @@ func TestPerTargetStateMachines(t *testing.T) {
 				"id": "f-c", "url": "https://c.example.com", "loaderId": "l-c",
 			}},
 		})
-		ec.waitFor(t, "navigation", 2*time.Second)
+		ec.waitFor(t, "page_navigation", 2*time.Second)
 
 		// Start a request, then finish it (arms the 500 ms network_idle timer).
 		srv.sendToMonitor(t, map[string]any{

server/lib/cdpmonitor/interaction.js

@@ -113,7 +113,7 @@
       var pos = scrollPos(target);
       if (Math.abs(pos.x - fromX) > 5 || Math.abs(pos.y - fromY) > 5) {
         send(JSON.stringify({
-          type: 'scroll_settled',
+          type: 'interaction_scroll_settled',
           from_x: fromX, from_y: fromY,
           to_x: pos.x, to_y: pos.y,
           target_selector: s

server/lib/cdpmonitor/monitor_test.go

@@ -86,7 +86,7 @@ func TestScreenshot(t *testing.T) {
 		m.tryScreenshot(context.Background(), "Page.loadEventFired", "")
 		require.Eventually(t, func() bool { return captureCount.Load() == 1 }, 2*time.Second, 20*time.Millisecond)
 
-		ev := ec.waitFor(t, "screenshot", 2*time.Second)
+		ev := ec.waitFor(t, "monitor_screenshot", 2*time.Second)
 		assert.Equal(t, events.CategorySystem, ev.Category)
 		assert.Equal(t, events.KindLocalProcess, ev.Source.Kind)
 		assert.Equal(t, "Page.loadEventFired", ev.Source.Event)

server/lib/cdpmonitor/types.go

@@ -21,34 +21,34 @@ const (
 	EventNetworkRequest       = "network_request"        // Network.requestWillBeSent
 	EventNetworkResponse      = "network_response"       // Network.loadingFinished (with prior responseReceived)
 	EventNetworkLoadingFailed = "network_loading_failed" // Network.loadingFailed
-	EventNavigation           = "navigation"             // Page.frameNavigated
-	EventDOMContentLoaded     = "dom_content_loaded"     // Page.domContentEventFired
-	EventPageLoad             = "page_load"              // Page.loadEventFired
-	EventLayoutShift          = "layout_shift"           // PerformanceTimeline event of type "layout-shift"
-	EventTabOpened            = "tab_opened"             // Target.attachedToTarget for type=page
+	EventNavigation           = "page_navigation"        // Page.frameNavigated
+	EventDOMContentLoaded     = "page_dom_content_loaded" // Page.domContentEventFired
+	EventPageLoad             = "page_load"               // Page.loadEventFired
+	EventLayoutShift          = "page_layout_shift"       // PerformanceTimeline event of type "layout-shift"
+	EventTabOpened            = "page_tab_opened"         // Target.attachedToTarget for type=page
 )
 
 // Computed events — synthetic events derived by computed.go state machines.
 // None of these correspond to a single CDP notification; they are inferred from
 // sequences of CDP events and debounce timers.
 const (
-	EventNetworkIdle       = "network_idle"        // 500 ms after all in-flight requests finish
-	EventLayoutSettled     = "layout_settled"      // 1 s after page_load with no intervening layout shifts
-	EventNavigationSettled = "navigation_settled"  // fires once dom_content_loaded + network_idle + layout_settled all hold
+	EventNetworkIdle       = "network_idle"           // 500 ms after all in-flight requests finish
+	EventLayoutSettled     = "page_layout_settled"    // 1 s after page_load with no intervening layout shifts
+	EventNavigationSettled = "page_navigation_settled" // fires once page_dom_content_loaded + network_idle + page_layout_settled all hold
 )
 
 // Interaction events — fired by injected page-side JS (interaction.js) via the
 // Runtime.bindingCalled mechanism. They originate in the browser's renderer
 // process, not from Chrome's network or page domains.
 const (
-	EventInteractionClick = "interaction_click"  // document click (target selector, coords, text)
-	EventInteractionKey   = "interaction_key"    // keydown (key name, target selector)
-	EventScrollSettled    = "scroll_settled"     // 300 ms after the last scroll event on a target
+	EventInteractionClick = "interaction_click"         // document click (target selector, coords, text)
+	EventInteractionKey   = "interaction_key"           // keydown (key name, target selector)
+	EventScrollSettled    = "interaction_scroll_settled" // 300 ms after the last scroll event on a target
 )
 
 // Monitor lifecycle and internal events — emitted by the monitor itself, not by Chrome.
 const (
-	EventScreenshot             = "screenshot"              // ffmpeg frame capture on page load or JS exception
+	EventScreenshot             = "monitor_screenshot"    // ffmpeg frame capture on page load or JS exception
 	EventMonitorDisconnected    = "monitor_disconnected"    // WebSocket to Chrome closed unexpectedly
 	EventMonitorReconnected     = "monitor_reconnected"     // successfully reconnected after a disconnect
 	EventMonitorReconnectFailed = "monitor_reconnect_failed" // reconnect attempts exhausted