Skip to content

fix: initialize terminal with correct size #10369

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

Merged
merged 3 commits into from
Oct 24, 2023
Merged

fix: initialize terminal with correct size #10369

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f516846
Fit once during creation
code-asher Oct 20, 2023
418f5ab
Pass size when connecting web socket URL
code-asher Oct 20, 2023
eb2afb6
Use new struct for decoding reconnecting pty requests
code-asher Oct 20, 2023
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
Prev Previous commit
Use new struct for decoding reconnecting pty requests 
Decoding a JSON message does not touch omitted (or null) fields so once
a message with a resize comes in, every single message from that point
will cause a resize.

I am not sure if this is an actual problem in practice but at the very
least it seems unintentional.
  • Loading branch information
@code-asher
code-asher committed Oct 20, 2023
commit eb2afb6d3f310644f94458b69a475ee213be5429
2 changes: 1 addition & 1 deletion agent/reconnectingpty/reconnectingpty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ func (s *ptyState) waitForStateOrContext(ctx context.Context, state State) (Stat
// until EOF or an error writing to ptty or reading from conn.
func readConnLoop(ctx context.Context, conn net.Conn, ptty pty.PTYCmd, metrics *prometheus.CounterVec, logger slog.Logger) {
decoder := json.NewDecoder(conn)
var req codersdk.ReconnectingPTYRequest
for {
var req codersdk.ReconnectingPTYRequest
err := decoder.Decode(&req)
if xerrors.Is(err, io.EOF) {
return
Expand Down