Migrate coder sync to wsep

Author: cmoog

Diff for: internal/entclient/env.go

@@ -2,8 +2,6 @@ package entclient
 
 import (
 	"context"
-	"net/url"
-	"strconv"
 	"time"
 
 	"nhooyr.io/websocket"
@@ -24,16 +22,6 @@ func (c Client) Envs(user *User, org Org) ([]Environment, error) {
 	return envs, err
 }
 
-type WushOptions struct {
-	TTY   bool
-	Stdin bool
-}
-
-var defaultWushOptions = WushOptions{
-	TTY:   false,
-	Stdin: true,
-}
-
 func (c Client) DialWsep(ctx context.Context, env Environment) (*websocket.Conn, error) {
 	u := c.copyURL()
 	if c.BaseURL.Scheme == "https" {
@@ -61,41 +49,3 @@ func (c Client) DialWsep(ctx context.Context, env Environment) (*websocket.Conn,
 	}
 	return conn, nil
 }
-
-func (c Client) DialWush(env Environment, opts *WushOptions, cmd string, args ...string) (*websocket.Conn, error) {
-	u := c.copyURL()
-	if c.BaseURL.Scheme == "https" {
-		u.Scheme = "wss"
-	} else {
-		u.Scheme = "ws"
-	}
-	u.Path = "/proxy/environments/" + env.ID + "/wush-lite"
-	query := make(url.Values)
-	query.Set("command", cmd)
-	query["args[]"] = args
-	if opts == nil {
-		opts = &defaultWushOptions
-	}
-	query.Set("tty", strconv.FormatBool(opts.TTY))
-	query.Set("stdin", strconv.FormatBool(opts.Stdin))
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
-	defer cancel()
-
-	fullURL := u.String() + "?" + query.Encode()
-
-	conn, resp, err := websocket.Dial(ctx, fullURL,
-		&websocket.DialOptions{
-			HTTPHeader: map[string][]string{
-				"Cookie": {"session_token=" + c.Token},
-			},
-		},
-	)
-	if err != nil {
-		if resp != nil {
-			return nil, bodyError(resp)
-		}
-		return nil, err
-	}
-	return conn, nil
-}

Diff for: internal/sync/sync.go

@@ -22,7 +22,7 @@ import (
 	"go.coder.com/flog"
 
 	"cdr.dev/coder-cli/internal/entclient"
-	"cdr.dev/coder-cli/wush"
+	"cdr.dev/wsep"
 )
 
 // Sync runs a live sync daemon.
@@ -67,22 +67,31 @@ func (s Sync) syncPaths(delete bool, local, remote string) error {
 	return nil
 }
 
-func (s Sync) remoteRm(remote string) error {
-	conn, err := s.Client.DialWush(s.Environment, nil, "rm", "-rf", remote)
+func (s Sync) remoteRm(ctx context.Context, remote string) error {
+	conn, err := s.Client.DialWsep(ctx, s.Environment)
 	if err != nil {
 		return err
 	}
 	defer conn.Close(websocket.CloseNormalClosure, "")
-	wc := wush.NewClient(context.Background(), conn)
-	go io.Copy(os.Stdout, wc.Stderr)
-	go io.Copy(os.Stderr, wc.Stdout)
-	code, err := wc.Wait()
+
+	execer := wsep.RemoteExecer(conn)
+	process, err := execer.Start(ctx, wsep.Command{
+		Command: "rm",
+		Args:    []string{"-rf", remote},
+	})
 	if err != nil {
-		return xerrors.Errorf("wush failure: %w", err)
+		return err
 	}
-	if code != 0 {
+	go io.Copy(os.Stdout, process.Stderr())
+	go io.Copy(os.Stderr, process.Stdout())
+
+	err = process.Wait()
+	if code, ok := err.(wsep.ExitError); ok {
 		return fmt.Errorf("rm exit status: %v", code)
 	}
+	if err != nil {
+		return xerrors.Errorf("execution failure: %w", err)
+	}
 	return nil
 }
 
@@ -128,7 +137,10 @@ func (s Sync) handleCreate(localPath string) error {
 }
 
 func (s Sync) handleDelete(localPath string) error {
-	return s.remoteRm(s.convertPath(localPath))
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+
+	return s.remoteRm(ctx, s.convertPath(localPath))
 }
 
 func (s Sync) handleRename(localPath string) error {