-
Notifications
You must be signed in to change notification settings - Fork 46
[kernel 1116] browser logging: cdp pipeline #194
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
archandatta
wants to merge
3
commits into
main
Choose a base branch
from
archand/kernel-1116/cdp-pipeline
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package api | ||
|
|
||
| import ( | ||
| "context" | ||
| "net/http" | ||
|
|
||
| "github.com/google/uuid" | ||
| "github.com/onkernel/kernel-images/server/lib/logger" | ||
| ) | ||
|
|
||
| // StartCapture handles POST /events/start. | ||
| // Generates a new capture session ID, seeds the pipeline, then starts the | ||
| // CDP monitor. If already running, the monitor is stopped and | ||
| // restarted with a fresh session ID | ||
| func (s *ApiService) StartCapture(w http.ResponseWriter, r *http.Request) { | ||
| s.monitorMu.Lock() | ||
| defer s.monitorMu.Unlock() | ||
|
|
||
| s.captureSession.Start(uuid.New().String()) | ||
|
|
||
| if err := s.cdpMonitor.Start(context.Background()); err != nil { | ||
| logger.FromContext(r.Context()).Error("failed to start CDP monitor", "err", err) | ||
| http.Error(w, "failed to start capture", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| w.WriteHeader(http.StatusOK) | ||
| } | ||
|
|
||
| // StopCapture handles POST /events/stop | ||
| func (s *ApiService) StopCapture(w http.ResponseWriter, r *http.Request) { | ||
| s.monitorMu.Lock() | ||
| defer s.monitorMu.Unlock() | ||
| s.cdpMonitor.Stop() | ||
| w.WriteHeader(http.StatusOK) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package cdpmonitor | ||
|
|
||
| import ( | ||
| "context" | ||
| "sync/atomic" | ||
|
|
||
| "github.com/onkernel/kernel-images/server/lib/events" | ||
| ) | ||
|
|
||
| // UpstreamProvider abstracts *devtoolsproxy.UpstreamManager for testability. | ||
| type UpstreamProvider interface { | ||
| Current() string | ||
| Subscribe() (<-chan string, func()) | ||
| } | ||
|
|
||
| // PublishFunc publishes an Event to the pipeline. | ||
| type PublishFunc func(ev events.Event) | ||
|
|
||
| // Monitor manages a CDP WebSocket connection with auto-attach session fan-out. | ||
| // Single-use per capture session: call Start to begin, Stop to tear down. | ||
| type Monitor struct { | ||
| running atomic.Bool | ||
| } | ||
|
|
||
| // New creates a Monitor. displayNum is the X display for ffmpeg screenshots. | ||
| func New(_ UpstreamProvider, _ PublishFunc, _ int) *Monitor { | ||
| return &Monitor{} | ||
| } | ||
|
|
||
| // IsRunning reports whether the monitor is actively capturing. | ||
| func (m *Monitor) IsRunning() bool { | ||
| return m.running.Load() | ||
| } | ||
|
|
||
| // Start begins CDP capture. Restarts if already running. | ||
| func (m *Monitor) Start(_ context.Context) error { | ||
| return nil | ||
| } | ||
|
|
||
| // Stop tears down the monitor. Safe to call multiple times. | ||
| func (m *Monitor) Stop() {} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Session ID changed before monitor restart causes misattribution
Medium Severity
captureSession.Start(newID)is called beforecdpMonitor.Start(), which atomically changes the session ID while the old monitor may still be publishing events. SincecaptureSessionIDis anatomic.Pointerreadable without holdingmonitorMu, any events published by the old monitor's goroutines during the transition window will be incorrectly tagged with the new session ID. The session ID change needs to happen after the old monitor is fully stopped, not before.