add context for conn

dialer/http2/conn.go

@@ -1,11 +1,10 @@
 package http2
 
 import (
+	"context"
 	"errors"
 	"net"
 	"time"
-
-	mdata "github.com/go-gost/core/metadata"
 )
 
 // a dummy HTTP2 client conn used by HTTP2 client connector
@@ -13,7 +12,7 @@ type conn struct {
 	localAddr  net.Addr
 	remoteAddr net.Addr
 	onClose    func()
-	md         mdata.Metadata
+	ctx        context.Context
 }
 
 func (c *conn) Close() error {
@@ -51,7 +50,6 @@ 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")}
 }
 
-// Metadata implements metadata.Metadatable interface.
-func (c *conn) Metadata() mdata.Metadata {
-	return c.md
+func (c *conn) Context() context.Context {
+	return c.ctx
 }

dialer/http2/dialer.go

@@ -10,7 +10,8 @@ import (
 	"github.com/go-gost/core/dialer"
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
-	ctxvalue "github.com/go-gost/x/ctx"
+	xctx "github.com/go-gost/x/ctx"
+	ictx "github.com/go-gost/x/internal/ctx"
 	net_dialer "github.com/go-gost/x/internal/net/dialer"
 	"github.com/go-gost/x/internal/net/proxyproto"
 	mdx "github.com/go-gost/x/metadata"
@@ -25,7 +26,6 @@ type http2Dialer struct {
 	clients     map[string]*http.Client
 	clientMutex sync.Mutex
 	logger      logger.Logger
-	md          metadata
 	options     dialer.Options
 }
 
@@ -100,8 +100,8 @@ func (d *http2Dialer) Dial(ctx context.Context, address string, opts ...dialer.D
 
 					conn = proxyproto.WrapClientConn(
 						d.options.ProxyProtocol,
-						ctxvalue.SrcAddrFromContext(ctx),
-						ctxvalue.DstAddrFromContext(ctx),
+						xctx.SrcAddrFromContext(ctx),
+						xctx.DstAddrFromContext(ctx),
 						conn)
 
 					return conn, nil
@@ -116,7 +116,7 @@ func (d *http2Dialer) Dial(ctx context.Context, address string, opts ...dialer.D
 		d.clients[address] = client
 	}
 
-	var c net.Conn = &conn{
+	return &conn{
 		localAddr:  &net.TCPAddr{},
 		remoteAddr: raddr,
 		onClose: func() {
@@ -124,8 +124,6 @@ func (d *http2Dialer) Dial(ctx context.Context, address string, opts ...dialer.D
 			defer d.clientMutex.Unlock()
 			delete(d.clients, address)
 		},
-		md: mdx.NewMetadata(map[string]any{"client": client}),
-	}
-
-	return c, nil
+		ctx: ictx.ContextWithMetadata(ctx, mdx.NewMetadata(map[string]any{"client": client})),
+	}, nil
 }

dialer/http2/h2/dialer.go

@@ -15,7 +15,8 @@ import (
 	"github.com/go-gost/core/dialer"
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
-	ctxvalue "github.com/go-gost/x/ctx"
+	xctx "github.com/go-gost/x/ctx"
+	ictx "github.com/go-gost/x/internal/ctx"
 	"github.com/go-gost/x/internal/net/proxyproto"
 	"github.com/go-gost/x/registry"
 	"golang.org/x/net/http2"
@@ -103,8 +104,8 @@ func (d *h2Dialer) Dial(ctx context.Context, address string, opts ...dialer.Dial
 
 					conn = proxyproto.WrapClientConn(
 						d.options.ProxyProtocol,
-						ctxvalue.SrcAddrFromContext(ctx),
-						ctxvalue.DstAddrFromContext(ctx),
+						xctx.SrcAddrFromContext(ctx),
+						xctx.DstAddrFromContext(ctx),
 						conn)
 
 					return conn, nil
@@ -121,8 +122,8 @@ func (d *h2Dialer) Dial(ctx context.Context, address string, opts ...dialer.Dial
 
 					conn = proxyproto.WrapClientConn(
 						d.options.ProxyProtocol,
-						ctxvalue.SrcAddrFromContext(ctx),
-						ctxvalue.DstAddrFromContext(ctx),
+						xctx.SrcAddrFromContext(ctx),
+						xctx.DstAddrFromContext(ctx),
 						conn)
 
 					return conn, nil
@@ -169,7 +170,7 @@ func (d *h2Dialer) Dial(ctx context.Context, address string, opts ...dialer.Dial
 		d.logger.Trace(string(dump))
 	}
 
-	resp, err := client.Do(req)
+	resp, err := client.Do(req.WithContext(ictx.Copy(ctx)))
 	if err != nil {
 		return nil, err
 	}