fix xnet.Pipe

internal/net/net.go

@@ -129,12 +129,12 @@ func (c *readWriteConn) CloseRead() error {
 	if sc, ok := c.Conn.(xio.CloseRead); ok {
 		return sc.CloseRead()
 	}
-	return nil
+	return xio.ErrUnsupported
 }
 
 func (c *readWriteConn) CloseWrite() error {
 	if sc, ok := c.Conn.(xio.CloseWrite); ok {
 		return sc.CloseWrite()
 	}
-	return nil
+	return xio.ErrUnsupported
 }

internal/net/pipe.go

@@ -15,7 +15,7 @@ const (
 	tcpWaitTimeout = 10 * time.Second
 )
 
-func Pipe(ctx context.Context, rw1, rw2 io.ReadWriter) error {
+func Pipe(ctx context.Context, rw1, rw2 io.ReadWriteCloser) error {
 	wg := sync.WaitGroup{}
 	wg.Add(2)
 
@@ -55,7 +55,7 @@ func Pipe(ctx context.Context, rw1, rw2 io.ReadWriter) error {
 	return nil
 }
 
-func pipeBuffer(dst io.ReadWriter, src io.ReadWriter, bufferSize int) error {
+func pipeBuffer(dst io.ReadWriteCloser, src io.ReadWriteCloser, bufferSize int) error {
 	buf := bufpool.Get(bufferSize)
 	defer bufpool.Put(buf)
 
@@ -65,8 +65,13 @@ func pipeBuffer(dst io.ReadWriter, src io.ReadWriter, bufferSize int) error {
 	if cr, ok := src.(xio.CloseRead); ok {
 		cr.CloseRead()
 	}
+
 	if cw, ok := dst.(xio.CloseWrite); ok {
-		cw.CloseWrite()
+		if e := cw.CloseWrite(); e == xio.ErrUnsupported {
+			dst.Close()
+		}
+	} else {
+		dst.Close()
 	}
 
 	// Set TCP half-close timeout.

internal/net/proxyproto/conn.go

@@ -3,9 +3,38 @@ package proxyproto
 import (
 	"net"
 
+	xio "github.com/go-gost/x/internal/io"
 	proxyproto "github.com/pires/go-proxyproto"
 )
 
+type serverConn struct {
+	net.Conn
+}
+
+func (c *serverConn) CloseRead() error {
+	if sc, ok := c.Conn.(xio.CloseRead); ok {
+		return sc.CloseRead()
+	}
+	if conn, ok := c.Conn.(*proxyproto.Conn); ok {
+		if tcpConn, ok := conn.TCPConn(); ok {
+			return tcpConn.CloseRead()
+		}
+	}
+	return xio.ErrUnsupported
+}
+
+func (c *serverConn) CloseWrite() error {
+	if sc, ok := c.Conn.(xio.CloseWrite); ok {
+		return sc.CloseWrite()
+	}
+	if conn, ok := c.Conn.(*proxyproto.Conn); ok {
+		if tcpConn, ok := conn.TCPConn(); ok {
+			return tcpConn.CloseWrite()
+		}
+	}
+	return xio.ErrUnsupported
+}
+
 func WrapClientConn(ppv int, src, dst net.Addr, c net.Conn) net.Conn {
 	if ppv <= 0 {
 		return c

internal/net/proxyproto/listener.go

@@ -7,13 +7,27 @@ import (
 	proxyproto "github.com/pires/go-proxyproto"
 )
 
+type listener struct {
+	net.Listener
+}
+
+func (ln *listener) Accept() (net.Conn, error) {
+	conn, err := ln.Listener.Accept()
+	if err != nil {
+		return nil, err
+	}
+	return &serverConn{Conn: conn}, nil
+}
+
 func WrapListener(ppv int, ln net.Listener, readHeaderTimeout time.Duration) net.Listener {
 	if ppv <= 0 {
 		return ln
 	}
 
-	return &proxyproto.Listener{
-		Listener:          ln,
-		ReadHeaderTimeout: readHeaderTimeout,
+	return &listener{
+		Listener: &proxyproto.Listener{
+			Listener:          ln,
+			ReadHeaderTimeout: readHeaderTimeout,
+		},
 	}
 }