add handle options for sniffer

handler/sni/handler.go

@@ -112,40 +112,51 @@ func (h *sniHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
 	proto, _ := sniffing.Sniff(ctx, br)
 	ro.Proto = proto
 
+	dial := func(ctx context.Context, network, address string) (net.Conn, error) {
+		var buf bytes.Buffer
+		cc, err := h.options.Router.Dial(ctxvalue.ContextWithBuffer(ctx, &buf), "tcp", address)
+		ro.Route = buf.String()
+		return cc, err
+	}
+	dialTLS := func(ctx context.Context, network, address string, cfg *tls.Config) (net.Conn, error) {
+		var buf bytes.Buffer
+		cc, err := h.options.Router.Dial(ctxvalue.ContextWithBuffer(ctx, &buf), "tcp", address)
+		ro.Route = buf.String()
+		if err != nil {
+			return nil, err
+		}
+		cc = tls.Client(cc, cfg)
+		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) {
-			var buf bytes.Buffer
-			cc, err := h.options.Router.Dial(ctxvalue.ContextWithBuffer(ctx, &buf), "tcp", address)
-			ro.Route = buf.String()
-			return cc, err
-		},
-		DialTLS: func(ctx context.Context, network, address string, cfg *tls.Config) (net.Conn, error) {
-			var buf bytes.Buffer
-			cc, err := h.options.Router.Dial(ctxvalue.ContextWithBuffer(ctx, &buf), "tcp", address)
-			ro.Route = buf.String()
-			if err != nil {
-				return nil, err
-			}
-			cc = tls.Client(cc, cfg)
-			return cc, nil
-		},
 	}
 	conn = xnet.NewReadWriteConn(br, conn, conn)
 	switch proto {
 	case sniffing.ProtoHTTP:
-		return sniffer.HandleHTTP(ctx, conn)
+		return sniffer.HandleHTTP(ctx, conn,
+			sniffing.WithDial(dial),
+			sniffing.WithDialTLS(dialTLS),
+			sniffing.WithBypass(h.options.Bypass),
+			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.WithBypass(h.options.Bypass),
+			sniffing.WithRecorderObject(ro),
+			sniffing.WithLog(log),
+		)
 	default:
 		return errors.New("unknown traffic")
 	}

handler/sni/metadata.go

@@ -8,7 +8,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/registry"
 )