Avoid dead lock on deferred pty close and infinite reconnect loop

client/command/connect.go

@@ -223,6 +223,7 @@ func (c *Connect) Execute(
 
 	// Listen for state updates.
 	go func() {
+	STATELOOP:
 		for {
 			if st, err := c.ss.DecodeState(ctx); err != nil {
 				break
@@ -236,7 +237,7 @@ func (c *Connect) Execute(
 
 			select {
 			case <-ctx.Done():
-				break
+				break STATELOOP
 			default:
 			}
 		}

client/command/open.go

@@ -208,7 +208,7 @@ func (c *Open) Execute(
 		)
 	}
 
-	// Store initial sizxe of the terminal.
+	// Store initial size of the terminal.
 	cols, rows, err := terminal.GetSize(stdin)
 	if err != nil {
 		return errors.Trace(
@@ -231,7 +231,11 @@ func (c *Open) Execute(
 		)
 	}
 	// Restores the terminal once we're done.
-	defer terminal.Restore(stdin, old)
+	defer func() {
+		terminal.Restore(stdin, old)
+		// Let's attempt to clean things up with a newline.
+		fmt.Printf("\n")
+	}()
 
 	// Start shell.
 	c.cmd = exec.Command(c.shell)
@@ -255,9 +259,6 @@ func (c *Open) Execute(
 		cancel()
 	}()
 
-	// Closes the newly created pty.
-	defer c.pty.Close()
-
 	// Main loops.
 
 	// c.errC is used to capture user facing errors generated from the
@@ -362,10 +363,7 @@ func (c *Open) Execute(
 
 	<-ctx.Done()
 
-	// By then we probably show a prompt so lets add add a newline.
-	fmt.Printf("\n")
-
-	return userErr
+	return errors.Trace(userErr)
 }
 
 // ReconnectLoop handles reconnecting the host to warpd. Each time the
@@ -377,6 +375,7 @@ func (c *Open) ConnLoop(
 	ctx context.Context,
 ) {
 	first := true
+CONNLOOP:
 	for {
 		var conn net.Conn
 		var err error
@@ -419,7 +418,7 @@ func (c *Open) ConnLoop(
 
 		select {
 		case <-ctx.Done():
-			break
+			break CONNLOOP
 		default:
 		}
 	}
@@ -506,6 +505,7 @@ func (c *Open) ManageSession(
 
 	// Listen for state updates.
 	go func() {
+	STATELOOP:
 		for {
 			if st, err := ss.DecodeState(ctx); err != nil {
 				break
@@ -516,7 +516,7 @@ func (c *Open) ManageSession(
 			}
 			select {
 			case <-ctx.Done():
-				break
+				break STATELOOP
 			default:
 			}
 		}

lib/plex/plex.go

@@ -12,6 +12,7 @@ func Run(
 	src io.Reader,
 ) {
 	buf := make([]byte, 1024)
+PLEXLOOP:
 	for {
 		nr, err := src.Read(buf)
 		if nr > 0 {
@@ -24,7 +25,7 @@ func Run(
 		}
 		select {
 		case <-ctx.Done():
-			break
+			break PLEXLOOP
 		default:
 		}
 	}