add handle options for sniffer

handler/relay/connect.go

@@ -154,31 +154,39 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network
 			conn.SetReadDeadline(time.Time{})
 		}
 
+		dial := func(ctx context.Context, network, address string) (net.Conn, error) {
+			return cc, nil
+		}
+		dialTLS := func(ctx context.Context, network, address string, cfg *tls.Config) (net.Conn, error) {
+			return cc, nil
+		}
 		sniffer := &sniffing.Sniffer{
 			Recorder:           h.recorder.Recorder,
 			RecorderOptions:    h.recorder.Options,
-			RecorderObject:     ro,
 			Certificate:        h.md.certificate,
 			PrivateKey:         h.md.privateKey,
 			NegotiatedProtocol: h.md.alpn,
 			CertPool:           h.certPool,
 			MitmBypass:         h.md.mitmBypass,
 			ReadTimeout:        h.md.readTimeout,
-			Log:                log,
-			Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
-				return cc, nil
-			},
-			DialTLS: func(ctx context.Context, network, address string, cfg *tls.Config) (net.Conn, error) {
-				return cc, nil
-			},
 		}
 
 		conn = xnet.NewReadWriteConn(br, rw, conn)
 		switch proto {
 		case sniffing.ProtoHTTP:
-			return sniffer.HandleHTTP(ctx, conn)
+			return sniffer.HandleHTTP(ctx, conn,
+				sniffing.WithDial(dial),
+				sniffing.WithDialTLS(dialTLS),
+				sniffing.WithRecorderObject(ro),
+				sniffing.WithLog(log),
+			)
 		case sniffing.ProtoTLS:
-			return sniffer.HandleTLS(ctx, conn)
+			return sniffer.HandleTLS(ctx, conn,
+				sniffing.WithDial(dial),
+				sniffing.WithDialTLS(dialTLS),
+				sniffing.WithRecorderObject(ro),
+				sniffing.WithLog(log),
+			)
 		}
 	}
 

handler/relay/metadata.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/go-gost/core/bypass"
 	mdata "github.com/go-gost/core/metadata"
-	mdutil "github.com/go-gost/core/metadata/util"
+	mdutil "github.com/go-gost/x/metadata/util"
 	"github.com/go-gost/x/internal/util/mux"
 	"github.com/go-gost/x/registry"
 )