Skip to content

Commit 9425b05

Browse files
committed
review: update naming
1 parent 6a67415 commit 9425b05

File tree

6 files changed

+34
-81
lines changed

6 files changed

+34
-81
lines changed

server/cmd/api/api/api.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,9 @@ func (s *ApiService) Shutdown(ctx context.Context) error {
336336
s.cdpMonitor.Stop()
337337
}
338338
if s.captureSession != nil {
339-
_ = s.captureSession.Close()
339+
if err := s.captureSession.Close(); err != nil {
340+
logger.FromContext(ctx).Error("failed to close capture session", "err", err)
341+
}
340342
}
341343
return s.recordManager.StopAll(ctx)
342344
}

server/cmd/api/api/events.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ func (s *ApiService) PublishEvent(w http.ResponseWriter, r *http.Request) {
5050
return
5151
}
5252

53+
if ev.Type == "" {
54+
http.Error(w, "type is required", http.StatusBadRequest)
55+
return
56+
}
57+
5358
// Derive category if caller omitted it — FileWriter returns error for empty category.
5459
if ev.Category == "" {
5560
ev.Category = events.CategoryFor(ev.Type)

server/cmd/api/api/events_publish_test.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestPublishEvent(t *testing.T) {
4343
svc, cs := newPublishTestService(t, logDir)
4444

4545
b, _ := json.Marshal(events.Event{
46-
Type: "liveview.click",
46+
Type: "liveview_click",
4747
Category: events.CategoryLiveview,
4848
Source: events.Source{Kind: events.KindKernelAPI},
4949
Data: json.RawMessage(`{"x":100}`),
@@ -61,7 +61,7 @@ func TestPublishEvent(t *testing.T) {
6161
res, err := reader.Read(ctx)
6262
require.NoError(t, err)
6363
require.NotNil(t, res.Envelope)
64-
assert.Equal(t, "liveview.click", res.Envelope.Event.Type)
64+
assert.Equal(t, "liveview_click", res.Envelope.Event.Type)
6565
assert.Equal(t, events.CategoryLiveview, res.Envelope.Event.Category)
6666
})
6767

@@ -77,12 +77,28 @@ func TestPublishEvent(t *testing.T) {
7777
assert.Equal(t, http.StatusBadRequest, w.Code)
7878
})
7979

80+
t.Run("empty_type_rejected", func(t *testing.T) {
81+
logDir := t.TempDir()
82+
svc, _ := newPublishTestService(t, logDir)
83+
84+
b, _ := json.Marshal(events.Event{
85+
Category: events.CategoryConsole,
86+
Data: json.RawMessage(`{"x":1}`),
87+
})
88+
req := httptest.NewRequest(http.MethodPost, "/events/publish", bytes.NewReader(b))
89+
req.Header.Set("Content-Type", "application/json")
90+
w := httptest.NewRecorder()
91+
svc.PublishEvent(w, req)
92+
93+
assert.Equal(t, http.StatusBadRequest, w.Code)
94+
})
95+
8096
t.Run("liveview_routes_correctly", func(t *testing.T) {
8197
logDir := t.TempDir()
8298
svc, _ := newPublishTestService(t, logDir)
8399

84100
b, _ := json.Marshal(events.Event{
85-
Type: "liveview.click",
101+
Type: "liveview_click",
86102
Category: events.CategoryLiveview,
87103
Source: events.Source{Kind: events.KindKernelAPI},
88104
Data: json.RawMessage(`{"x":100}`),
@@ -111,7 +127,7 @@ func TestPublishEvent(t *testing.T) {
111127
svc, _ := newPublishTestService(t, logDir)
112128

113129
b, _ := json.Marshal(events.Event{
114-
Type: "captcha.solve",
130+
Type: "captcha_solve",
115131
Category: events.CategoryCaptcha,
116132
Source: events.Source{Kind: events.KindKernelAPI},
117133
Data: json.RawMessage(`{"token":"abc"}`),

server/cmd/api/api/events_stream_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ func TestStreamEvents(t *testing.T) {
1919

2020
// Publish 2 events before streaming
2121
cs.Publish(events.Event{
22-
Type: "console.log",
22+
Type: "console_log",
2323
Category: events.CategoryConsole,
2424
Source: events.Source{Kind: events.KindCDP},
2525
})
2626
cs.Publish(events.Event{
27-
Type: "console.log",
27+
Type: "console_log",
2828
Category: events.CategoryConsole,
2929
Source: events.Source{Kind: events.KindCDP},
3030
})
@@ -50,9 +50,9 @@ func TestStreamEvents(t *testing.T) {
5050
svc, cs := newPublishTestService(t, logDir)
5151

5252
// Publish 3 events
53-
cs.Publish(events.Event{Type: "console.log", Category: events.CategoryConsole, Source: events.Source{Kind: events.KindCDP}})
54-
cs.Publish(events.Event{Type: "console.log", Category: events.CategoryConsole, Source: events.Source{Kind: events.KindCDP}})
55-
cs.Publish(events.Event{Type: "console.log", Category: events.CategoryConsole, Source: events.Source{Kind: events.KindCDP}})
53+
cs.Publish(events.Event{Type: "console_log", Category: events.CategoryConsole, Source: events.Source{Kind: events.KindCDP}})
54+
cs.Publish(events.Event{Type: "console_log", Category: events.CategoryConsole, Source: events.Source{Kind: events.KindCDP}})
55+
cs.Publish(events.Event{Type: "console_log", Category: events.CategoryConsole, Source: events.Source{Kind: events.KindCDP}})
5656

5757
ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
5858
defer cancel()

server/cmd/api/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/onkernel/kernel-images/server/cmd/config"
2525
"github.com/onkernel/kernel-images/server/lib/chromedriverproxy"
2626
"github.com/onkernel/kernel-images/server/lib/devtoolsproxy"
27-
"github.com/onkernel/kernel-images/server/lib/logger"
2827
"github.com/onkernel/kernel-images/server/lib/events"
28+
"github.com/onkernel/kernel-images/server/lib/logger"
2929
"github.com/onkernel/kernel-images/server/lib/nekoclient"
3030
oapi "github.com/onkernel/kernel-images/server/lib/oapi"
3131
"github.com/onkernel/kernel-images/server/lib/recorder"

server/lib/events/pipeline.go

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

0 commit comments

Comments
 (0)