Repository navigation
fix: replace time.Sleep with context-aware sleeps in doPressKey and doDragMouse - #146
Merged
Merged
Conversation
…oDragMouse time.Sleep in doPressKey (key hold duration) and doDragMouse (pre-drag delay) blocks without respecting context cancellation. While holding the inputMu mutex, this prevents timely cleanup on request cancellation. Extract a sleepWithContext helper and use it in all three sleep sites (doPressKey, doDragMouse, doSleep). On cancellation, best-effort cleanup releases held keys/mouse buttons before returning. Co-authored-by: Cursor <cursoragent@cursor.com>
AbdulRashidReshamwala
pushed a commit
to reclaimprotocol/popcorn-images
that referenced
this pull request
Mar 26, 2026
…oDragMouse (kernel#146) ## Summary - `doPressKey` used `time.Sleep` for the key hold duration, blocking without respecting context cancellation while holding `inputMu` - `doDragMouse` used `time.Sleep` for the optional pre-drag delay, same problem - Both are especially problematic in the batch flow where the mutex is held for the entire batch ## Changes - Extract a `sleepWithContext` helper that uses `select` with `time.NewTimer` and `ctx.Done()` - Refactor `doSleep` to use the shared helper - Replace `time.Sleep` in `doPressKey` with `sleepWithContext`; on cancellation, best-effort release held keys using a background context - Replace `time.Sleep` in `doDragMouse` with `sleepWithContext`; on cancellation, best-effort release mouse button and modifier keys - No remaining `time.Sleep` calls in `computer.go` ## Test plan - [x] `go build ./...` and `go vet ./...` pass - [x] `go test ./cmd/api/api/...` passes - [ ] Verify key hold and drag delay are interruptible by cancelling a request mid-sleep Made with [Cursor](https://cursor.com) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Touches low-level input simulation and cleanup behavior; cancellation paths now run `xdotool` releases via `context.Background()`, which could change how interrupted requests leave system input state. > > **Overview** > Makes input-related delays context-aware to avoid blocking while `inputMu` is held (notably during `BatchComputerAction`). > > Replaces `time.Sleep` in `doPressKey` key-hold and `doDragMouse` pre-drag delay with a shared `sleepWithContext` helper, and refactors `doSleep` to use it as well. On cancellation, both key-hold and drag delay now perform **best-effort cleanup** (releasing keys and/or mouse button) via `context.Background()` before returning an error. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 90ff857. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> Co-authored-by: Cursor <cursoragent@cursor.com>
kernel-internal
Bot
changed the title
kernel-internal
Bot
changed the title
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Date of sync: 2026-04-15
Summary
Private sync
Upstream merge
kernel-browser
New image versions
Merge conflicts resolved