Skip to content

fix: prevent IdleTimeout from closing control connection during activ… #577

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.

Sign up for GitHub

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: prevent IdleTimeout from closing control connection during activ… #577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1d5544
fix: prevent IdleTimeout from closing control connection during activ…
claude[bot] Sep 1, 2025
25b233a
Merge branch 'main' into claude/issue-430-20250901-2248
fclairamb Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions client_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,25 @@ func (c *clientHandler) handleCommandsStreamError(err error) {
var errNetError net.Error
if errors.As(err, &errNetError) { //nolint:nestif // too much effort to change for now
if errNetError.Timeout() {
// Check if there's an active data transfer before closing the control connection
c.transferMu.Lock()
hasActiveTransfer := c.isTransferOpen
c.transferMu.Unlock()

if hasActiveTransfer {
// If there's an active data transfer, extend the deadline and continue
extendedDeadline := time.Now().Add(time.Duration(time.Second.Nanoseconds() * int64(c.server.settings.IdleTimeout)))
if errSet := c.conn.SetDeadline(extendedDeadline); errSet != nil {
c.logger.Error("Could not extend read deadline during active transfer", "err", errSet)
}

if c.debug {
c.logger.Debug("Idle timeout occurred during active transfer, extending deadline")
}

return
}

// We have to extend the deadline now
if errSet := c.conn.SetDeadline(time.Now().Add(time.Minute)); errSet != nil {
c.logger.Error("Could not set read deadline", "err", errSet)
Expand Down
Loading