Use containerd/console to fix arrow keys on Windows

Author: devplayer0

go.mod

@@ -5,6 +5,7 @@ go 1.15
 require (
 	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/Masterminds/semver/v3 v3.1.0
+	github.com/containerd/console v1.0.1
 	github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
 	github.com/dustin/go-humanize v1.0.0
 	github.com/githubnemo/CompileDaemon v1.2.1

go.sum

@@ -33,6 +33,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/containerd/console v1.0.1 h1:u7SFAJyRqWcG6ogaMAx3KjSTy1e3hT9QxqX7Jco7dRc=
+github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -179,6 +181,8 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -310,6 +314,8 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f h1:6Sc1XOXTulBN6imkqo6XoAXDEzoQ4/ro6xy7Vn8+rOM=
+golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

pkg/cmd/webspace/console.go

@@ -7,8 +7,8 @@ import (
 	"log"
 	"os"
 
+	"github.com/containerd/console"
 	"github.com/spf13/cobra"
-	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/netsoc/cli/pkg/config"
 	"github.com/netsoc/cli/pkg/util"
@@ -58,23 +58,22 @@ func consoleRun(opts consoleOptions) error {
 		return fmt.Errorf("failed to open websocket connection: %w", err)
 	}
 
-	stdin := int(os.Stdin.Fd())
+	tty := console.Current()
 
-	w, h, err := util.GetTerminalSize(stdin)
+	s, err := tty.Size()
 	if err != nil {
 		return fmt.Errorf("failed to get terminal size: %w", err)
 	}
-	if err := conn.WriteJSON(util.ConsoleSize{Width: w, Height: h}); err != nil {
+	if err := conn.WriteJSON(util.ConsoleSize{Width: int(s.Width), Height: int(s.Height)}); err != nil {
 		conn.Close()
 		return fmt.Errorf("failed to send initial terminal size: %w", err)
 	}
 
-	ttyState, err := terminal.MakeRaw(stdin)
-	if err != nil {
+	if err := tty.SetRaw(); err != nil {
 		conn.Close()
-		return fmt.Errorf("failed to configure terminal: %w", err)
+		return fmt.Errorf("failed to put terminal in raw mode: %w", err)
 	}
-	defer terminal.Restore(stdin, ttyState)
+	defer tty.Reset()
 
 	rw := util.NewWebsocketIO(conn, func(s string, _ *util.WebsocketIO) {
 		util.Debugf("Received websocket text message: %v", s)

pkg/util/console_unix.go

@@ -8,32 +8,27 @@ import (
 	"os/signal"
 	"syscall"
 
-	"golang.org/x/crypto/ssh/terminal"
+	"github.com/containerd/console"
 )
 
 // ResizeListener listens for changes in console size
 func ResizeListener(sizeChan chan ConsoleSize, stop chan struct{}) {
 	winchChan := make(chan os.Signal, 1)
 	signal.Notify(winchChan, syscall.SIGWINCH)
 
-	stdin := int(os.Stdin.Fd())
+	tty := console.Current()
 	for {
 		select {
 		case <-winchChan:
-			w, h, err := terminal.GetSize(stdin)
+			s, err := tty.Size()
 			if err != nil {
 				log.Printf("Failed to get terminal size: %v", err)
 				return
 			}
 
-			sizeChan <- ConsoleSize{w, h}
+			sizeChan <- ConsoleSize{int(s.Width), int(s.Height)}
 		case <-stop:
 			return
 		}
 	}
 }
-
-// GetTerminalSize returns the dimensions of a TTY (lines x cols)
-func GetTerminalSize(fd int) (int, int, error) {
-	return terminal.GetSize(fd)
-}

pkg/util/console_windows.go

@@ -2,26 +2,5 @@
 
 package util
 
-//import (
-//	"os"
-//
-//	"github.com/TheTitanrain/w32"
-//)
-
 // ResizeListener on Windows does nothing
 func ResizeListener(sizeChan chan ConsoleSize, stop chan struct{}) {}
-
-// TODO: do this properly
-// GetTerminalSize on Windows does nothing (Windows bad)
-func GetTerminalSize(fd int) (int, int, error) {
-	//stdout := w32.HANDLE(os.Stdout.Fd())
-	//info := w32.GetConsoleScreenBufferInfo(stdout)
-
-	//lines := info.SrWindow.Bottom - info.SrWindow.Top + 1
-	//cols := info.SrWindow.Right - info.SrWindow.Left + 1
-	//cols := info.DwSize.X
-	//lines := info.DwSize.Y
-
-	//return int(cols), int(lines), nil
-	return 80, 24, nil
-}