Fix tty for dev client

Author: cmoog

dev/client/main.go

@@ -4,11 +4,14 @@ import (
 	"context"
 	"io"
 	"os"
+	"os/signal"
+	"syscall"
 
 	"cdr.dev/wsep"
 	"github.com/spf13/pflag"
 	"go.coder.com/cli"
 	"go.coder.com/flog"
+	"golang.org/x/crypto/ssh/terminal"
 	"nhooyr.io/websocket"
 )
 
@@ -71,6 +74,27 @@ func do(fl *pflag.FlagSet, tty bool) {
 	if err != nil {
 		flog.Fatal("failed to start remote command: %v", err)
 	}
+	if tty {
+		ch := make(chan os.Signal, 1)
+		signal.Notify(ch, syscall.SIGWINCH)
+		go func() {
+			for range ch {
+				width, height, err := terminal.GetSize(int(os.Stdin.Fd()))
+				if err != nil {
+					continue
+				}
+				process.Resize(ctx, uint16(height), uint16(width))
+			}
+		}()
+		ch <- syscall.SIGWINCH
+
+		oldState, err := terminal.MakeRaw(int(os.Stdin.Fd()))
+		if err != nil {
+			flog.Fatal("failed to make terminal raw for tty: %w", err)
+		}
+		defer terminal.Restore(int(os.Stdin.Fd()), oldState)
+	}
+
 	go io.Copy(os.Stdout, process.Stdout())
 	go io.Copy(os.Stderr, process.Stderr())
 	go io.Copy(process.Stdin(), os.Stdin)

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	go.coder.com/cli v0.4.0
 	go.coder.com/flog v0.0.0-20190906214207-47dd47ea0512
+	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	nhooyr.io/websocket v1.8.6
 )

go.sum

@@ -112,6 +112,7 @@ github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eT
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=

tty_test.go

@@ -49,7 +49,7 @@ func testTTY(ctx context.Context, t *testing.T, e Execer) {
 		t.Logf("bash tty stderr = %s", stderr)
 		assert.True(t, "stderr is empty", len(stderr) == 0)
 	}()
-	time.Sleep(5 * time.Second)
+	time.Sleep(3 * time.Second)
 
 	process.Close()
 	wg.Wait()