remove unnecessary conn

dialer/http2/conn.go

@@ -0,0 +1,63 @@
+package http2
+
+import (
+	"errors"
+	"net"
+	"time"
+
+	mdata "github.com/go-gost/gost/v3/pkg/metadata"
+)
+
+// a dummy HTTP2 client conn used by HTTP2 client connector
+type conn struct {
+	localAddr  net.Addr
+	remoteAddr net.Addr
+	onClose    func()
+}
+
+func (c *conn) Close() error {
+	if c.onClose != nil {
+		c.onClose()
+	}
+	return nil
+}
+
+func (c *conn) Read(b []byte) (n int, err error) {
+	return 0, &net.OpError{Op: "read", Net: "nop", Source: nil, Addr: nil, Err: errors.New("read not supported")}
+}
+
+func (c *conn) Write(b []byte) (n int, err error) {
+	return 0, &net.OpError{Op: "write", Net: "nop", Source: nil, Addr: nil, Err: errors.New("write not supported")}
+}
+
+func (c *conn) LocalAddr() net.Addr {
+	return c.localAddr
+}
+
+func (c *conn) RemoteAddr() net.Addr {
+	return c.remoteAddr
+}
+
+func (c *conn) SetDeadline(t time.Time) error {
+	return &net.OpError{Op: "set", Net: "nop", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
+}
+
+func (c *conn) SetReadDeadline(t time.Time) error {
+	return &net.OpError{Op: "set", Net: "nop", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
+}
+
+func (c *conn) SetWriteDeadline(t time.Time) error {
+	return &net.OpError{Op: "set", Net: "nop", Source: nil, Addr: nil, Err: errors.New("deadline not supported")}
+}
+
+type metadataConn struct {
+	net.Conn
+	md mdata.Metadata
+}
+
+func withMetadata(md mdata.Metadata, c net.Conn) net.Conn {
+	return &metadataConn{
+		Conn: c,
+		md:   md,
+	}
+}

dialer/http2/dialer.go

@@ -12,7 +12,6 @@ import (
 	"github.com/go-gost/gost/v3/pkg/logger"
 	md "github.com/go-gost/gost/v3/pkg/metadata"
 	"github.com/go-gost/gost/v3/pkg/registry"
-	http2_util "github.com/go-gost/x/internal/util/http2"
 )
 
 func init() {
@@ -90,12 +89,19 @@ func (d *http2Dialer) Dial(ctx context.Context, address string, opts ...dialer.D
 		d.clients[address] = client
 	}
 
-	return http2_util.NewClientConn(
-		&net.TCPAddr{}, raddr,
-		client,
-		func() {
+	var c net.Conn
+	c = &conn{
+		localAddr:  &net.TCPAddr{},
+		remoteAddr: raddr,
+		onClose: func() {
 			d.clientMutex.Lock()
 			defer d.clientMutex.Unlock()
 			delete(d.clients, address)
-		}), nil
+		},
+	}
+	c = withMetadata(md.MapMetadata{
+		"client": client,
+	}, c)
+
+	return c, nil
 }