cleanup: remove package bicopy

This has a single caller that doesn't even use the full interface.

This changes behavior in that errors are no longer ignored.

While I'm here: remove nonsensical handling of `io.EOF` returned from
`io.Copy` which can never happen per the latter's documentation.

Signed-off-by: Tamir Duberstein <[email protected]>

pkg/hostagent/port_darwin.go

@@ -2,17 +2,19 @@ package hostagent
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io"
 	"net"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 
-	"github.com/lima-vm/lima/pkg/bicopy"
 	"github.com/lima-vm/lima/pkg/portfwd"
 	"github.com/lima-vm/sshocker/pkg/ssh"
 	"github.com/sirupsen/logrus"
+	"golang.org/x/sync/errgroup"
 )
 
 // forwardTCP is not thread-safe.
@@ -149,8 +151,19 @@ func (plf *pseudoLoopbackForwarder) forward(ac *net.TCPConn) error {
 		return err
 	}
 	defer unixConn.Close()
-	bicopy.Bicopy(ac, unixConn, nil)
-	return nil
+
+	g, _ := errgroup.WithContext(context.Background())
+
+	g.Go(func() error {
+		_, err := io.Copy(unixConn, ac)
+		return errors.Join(err, unixConn.CloseRead(), ac.CloseWrite())
+	})
+	g.Go(func() error {
+		_, err := io.Copy(ac, unixConn)
+		return errors.Join(err, ac.CloseRead(), unixConn.CloseWrite())
+	})
+
+	return g.Wait()
 }
 
 func (plf *pseudoLoopbackForwarder) Close() error {

pkg/portfwd/client.go

@@ -29,16 +29,10 @@ func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgen
 	rw := &GrpcClientRW{stream: stream, id: id, addr: guestAddr}
 	g.Go(func() error {
 		_, err := io.Copy(rw, conn)
-		if errors.Is(err, io.EOF) {
-			return nil
-		}
 		return err
 	})
 	g.Go(func() error {
 		_, err := io.Copy(conn, rw)
-		if errors.Is(err, io.EOF) {
-			return nil
-		}
 		return err
 	})