From 5bfe7ba169d29fd99ef8e8d995d07c4d5de96f79 Mon Sep 17 00:00:00 2001
From: wwqgtxx <wwqgtxx@gmail.com>
Date: Thu, 2 Nov 2023 11:22:01 +0800
Subject: [PATCH] chore: better tls handshake

---
 component/tls/utls.go        | 2 +-
 transport/gun/gun.go         | 4 ++--
 transport/vmess/websocket.go | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/component/tls/utls.go b/component/tls/utls.go
index e3d101dc..3aa030d3 100644
--- a/component/tls/utls.go
+++ b/component/tls/utls.go
@@ -21,7 +21,7 @@ type UClientHelloID struct {
 var initRandomFingerprint UClientHelloID
 var initUtlsClient string
 
-func UClient(c net.Conn, config *tls.Config, fingerprint UClientHelloID) net.Conn {
+func UClient(c net.Conn, config *tls.Config, fingerprint UClientHelloID) *UConn {
 	utlsConn := utls.UClient(c, copyConfig(config), utls.ClientHelloID{
 		Client:  fingerprint.Client,
 		Version: fingerprint.Version,
diff --git a/transport/gun/gun.go b/transport/gun/gun.go
index cfe8aa3d..d6ef6317 100644
--- a/transport/gun/gun.go
+++ b/transport/gun/gun.go
@@ -209,11 +209,11 @@ func NewHTTP2Client(dialFn DialFn, tlsConfig *tls.Config, Fingerprint string, re
 			if realityConfig == nil {
 				if fingerprint, exists := tlsC.GetFingerprint(Fingerprint); exists {
 					utlsConn := tlsC.UClient(pconn, cfg, fingerprint)
-					if err := utlsConn.(*tlsC.UConn).HandshakeContext(ctx); err != nil {
+					if err := utlsConn.HandshakeContext(ctx); err != nil {
 						pconn.Close()
 						return nil, err
 					}
-					state := utlsConn.(*tlsC.UConn).ConnectionState()
+					state := utlsConn.ConnectionState()
 					if p := state.NegotiatedProtocol; p != http2.NextProtoTLS {
 						utlsConn.Close()
 						return nil, fmt.Errorf("http2: unexpected ALPN protocol %s, want %s", p, http2.NextProtoTLS)
diff --git a/transport/vmess/websocket.go b/transport/vmess/websocket.go
index 9b325ee9..3f4c0a33 100644
--- a/transport/vmess/websocket.go
+++ b/transport/vmess/websocket.go
@@ -330,7 +330,7 @@ func streamWebsocketConn(ctx context.Context, conn net.Conn, c *WebsocketConfig,
 			if fingerprint, exists := tlsC.GetFingerprint(c.ClientFingerprint); exists {
 				utlsConn := tlsC.UClient(conn, c.TLSConfig, fingerprint)
 
-				if err := utlsConn.(*tlsC.UConn).BuildWebsocketHandshakeState(); err != nil {
+				if err := utlsConn.BuildWebsocketHandshakeState(); err != nil {
 					return nil, fmt.Errorf("parse url %s error: %w", c.Path, err)
 				}
 
@@ -360,6 +360,13 @@ func streamWebsocketConn(ctx context.Context, conn net.Conn, c *WebsocketConfig,
 			} else {
 				conn = tls.Client(conn, dialer.TLSConfig)
 			}
+			if tlsConn, ok := conn.(interface {
+				HandshakeContext(ctx context.Context) error
+			}); ok {
+				if err = tlsConn.HandshakeContext(ctx); err != nil {
+					return nil, err
+				}
+			}
 		}
 		request := &http.Request{
 			Method: http.MethodGet,