Skip to content

Commit 7550bc1

Browse files
committed
review: remove dead code
1 parent 5dd9273 commit 7550bc1

8 files changed

Lines changed: 1 addition & 92 deletions

File tree

server/lib/cdpmonitor/cdp_proto.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,6 @@ type cdpTargetAttachedToTargetParams struct {
263263
WaitingForDebugger bool `json:"waitingForDebugger"`
264264
}
265265

266-
// cdpTargetTargetCreatedParams mirrors Target.targetCreated params.
267-
type cdpTargetTargetCreatedParams struct {
268-
TargetInfo cdpTargetTargetInfo `json:"targetInfo"`
269-
}
270-
271-
// cdpTargetTargetDestroyedParams mirrors Target.targetDestroyed params.
272-
type cdpTargetTargetDestroyedParams struct {
273-
TargetID string `json:"targetId"`
274-
}
275-
276266
// cdpTargetDetachedFromTargetParams mirrors Target.detachedFromTarget params.
277267
type cdpTargetDetachedFromTargetParams struct {
278268
SessionID string `json:"sessionId"`

server/lib/cdpmonitor/cdp_proto_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ func TestLayer1Roundtrip(t *testing.T) {
3737
{"Page.loadEventFired", "Page_loadEventFired.json", func() any { return new(cdpPageLoadEventFiredParams) }},
3838
{"PerformanceTimeline.timelineEventAdded", "PerformanceTimeline_timelineEventAdded.json", func() any { return new(cdpPerformanceTimelineEventAddedParams) }},
3939
{"Target.attachedToTarget", "Target_attachedToTarget.json", func() any { return new(cdpTargetAttachedToTargetParams) }},
40-
{"Target.targetCreated", "Target_targetCreated.json", func() any { return new(cdpTargetTargetCreatedParams) }},
41-
{"Target.targetDestroyed", "Target_targetDestroyed.json", func() any { return new(cdpTargetTargetDestroyedParams) }},
4240
{"Target.detachedFromTarget", "Target_detachedFromTarget.json", func() any { return new(cdpTargetDetachedFromTargetParams) }},
4341
}
4442

server/lib/cdpmonitor/handlers.go

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,6 @@ func (m *Monitor) dispatchEvent(msg cdpMessage) {
107107
if m.decodeParams(msg.Method, msg.Params, &p) {
108108
m.handleAttachedToTarget(p)
109109
}
110-
case "Target.targetCreated":
111-
var p cdpTargetTargetCreatedParams
112-
if m.decodeParams(msg.Method, msg.Params, &p) {
113-
m.handleTargetCreated(p, msg.SessionID)
114-
}
115-
case "Target.targetDestroyed":
116-
var p cdpTargetTargetDestroyedParams
117-
if m.decodeParams(msg.Method, msg.Params, &p) {
118-
m.handleTargetDestroyed(p, msg.SessionID)
119-
}
120110
case "Target.detachedFromTarget":
121111
var p cdpTargetDetachedFromTargetParams
122112
if m.decodeParams(msg.Method, msg.Params, &p) {
@@ -434,22 +424,6 @@ func (m *Monitor) handleAttachedToTarget(p cdpTargetAttachedToTargetParams) {
434424
})
435425
}
436426

437-
func (m *Monitor) handleTargetCreated(p cdpTargetTargetCreatedParams, sessionID string) {
438-
data, _ := json.Marshal(map[string]any{
439-
"target_id": p.TargetInfo.TargetID,
440-
"target_type": p.TargetInfo.Type,
441-
"url": p.TargetInfo.URL,
442-
})
443-
m.publishEvent(EventTargetCreated, events.CategoryPage, events.Source{Kind: events.KindCDP}, "Target.targetCreated", data, sessionID)
444-
}
445-
446-
func (m *Monitor) handleTargetDestroyed(p cdpTargetTargetDestroyedParams, sessionID string) {
447-
data, _ := json.Marshal(map[string]any{
448-
"target_id": p.TargetID,
449-
})
450-
m.publishEvent(EventTargetDestroyed, events.CategoryPage, events.Source{Kind: events.KindCDP}, "Target.targetDestroyed", data, sessionID)
451-
}
452-
453427
func (m *Monitor) handleDetachedFromTarget(p cdpTargetDetachedFromTargetParams) {
454428
if p.SessionID == "" {
455429
return

server/lib/cdpmonitor/handlers_test.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -235,33 +235,6 @@ func TestPageEvents(t *testing.T) {
235235
assert.Equal(t, events.CategoryPage, ev3.Category)
236236
}
237237

238-
func TestTargetEvents(t *testing.T) {
239-
srv := newTestServer(t)
240-
defer srv.close()
241-
242-
_, ec, cleanup := startMonitor(t, srv, nil)
243-
defer cleanup()
244-
245-
srv.sendToMonitor(t, map[string]any{
246-
"method": "Target.targetCreated",
247-
"params": map[string]any{
248-
"targetInfo": map[string]any{"targetId": "t-1", "type": "page", "url": "https://new.example.com"},
249-
},
250-
})
251-
ev := ec.waitFor(t, "target_created", 2*time.Second)
252-
assert.Equal(t, events.CategoryPage, ev.Category)
253-
var data map[string]any
254-
require.NoError(t, json.Unmarshal(ev.Data, &data))
255-
assert.Equal(t, "t-1", data["target_id"])
256-
257-
srv.sendToMonitor(t, map[string]any{
258-
"method": "Target.targetDestroyed",
259-
"params": map[string]any{"targetId": "t-1"},
260-
})
261-
ev2 := ec.waitFor(t, "target_destroyed", 2*time.Second)
262-
assert.Equal(t, events.CategoryPage, ev2.Category)
263-
}
264-
265238
func TestBindingAndTimeline(t *testing.T) {
266239
srv := newTestServer(t)
267240
defer srv.close()

server/lib/cdpmonitor/monitor.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -423,20 +423,10 @@ func (m *Monitor) attachExistingTargets(ctx context.Context) {
423423
}
424424
targetID := ti.TargetID
425425
m.asyncWg.Go(func() {
426-
res, err := m.send(ctx, "Target.attachToTarget", map[string]any{
426+
_, _ = m.send(ctx, "Target.attachToTarget", map[string]any{
427427
"targetId": targetID,
428428
"flatten": true,
429429
}, "")
430-
if err != nil {
431-
return
432-
}
433-
var attachResp struct {
434-
SessionID string `json:"sessionId"`
435-
}
436-
if json.Unmarshal(res, &attachResp) == nil && attachResp.SessionID != "" {
437-
m.enableDomains(ctx, attachResp.SessionID, targetTypePage)
438-
_ = m.injectScript(ctx, attachResp.SessionID)
439-
}
440430
})
441431
}
442432
}

server/lib/cdpmonitor/testdata/Target_targetCreated.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

server/lib/cdpmonitor/testdata/Target_targetDestroyed.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

server/lib/cdpmonitor/types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ const (
2525
EventDOMContentLoaded = "dom_content_loaded" // Page.domContentEventFired
2626
EventPageLoad = "page_load" // Page.loadEventFired
2727
EventLayoutShift = "layout_shift" // PerformanceTimeline event of type "layout-shift"
28-
EventTargetCreated = "target_created" // Target.targetCreated
29-
EventTargetDestroyed = "target_destroyed" // Target.targetDestroyed
3028
)
3129

3230
// Computed events — synthetic events derived by computed.go state machines.

0 commit comments

Comments
 (0)