chore: update quic-go to 0.53.0

2026-02-26 16:57:08 +00:00 · 2025-06-28 18:16:29 +08:00
parent 6f4fe71e41
commit 56c3462b76
19 changed files with 69 additions and 69 deletions
--- a/transport/hysteria/core/client.go
+++ b/transport/hysteria/core/client.go
@@ -41,7 +41,7 @@ type Client struct {
 	tlsConfig  *tlsC.Config
 	quicConfig *quic.Config

-	quicSession    quic.Connection
+	quicSession    *quic.Conn
 	reconnectMutex sync.Mutex
 	closed         bool

@@ -103,7 +103,7 @@ func (c *Client) connectToServer(dialer utils.PacketDialer) error {
 	return nil
 }

-func (c *Client) handleControlStream(qs quic.Connection, stream quic.Stream) (bool, string, error) {
+func (c *Client) handleControlStream(qs *quic.Conn, stream *quic.Stream) (bool, string, error) {
 	// Send protocol version
 	_, err := stream.Write([]byte{protocolVersion})
 	if err != nil {
@@ -133,7 +133,7 @@ func (c *Client) handleControlStream(qs quic.Connection, stream quic.Stream) (bo
 	return sh.OK, sh.Message, nil
 }

-func (c *Client) handleMessage(qs quic.Connection) {
+func (c *Client) handleMessage(qs *quic.Conn) {
 	for {
 		msg, err := qs.ReceiveDatagram(context.Background())
 		if err != nil {
@@ -162,7 +162,7 @@ func (c *Client) handleMessage(qs quic.Connection) {
 	}
 }

-func (c *Client) openStreamWithReconnect(dialer utils.PacketDialer) (quic.Connection, quic.Stream, error) {
+func (c *Client) openStreamWithReconnect(dialer utils.PacketDialer) (*quic.Conn, *wrappedQUICStream, error) {
 	c.reconnectMutex.Lock()
 	defer c.reconnectMutex.Unlock()
 	if c.closed {
@@ -298,7 +298,7 @@ func (c *Client) Close() error {
 }

 type quicConn struct {
-	Orig             quic.Stream
+	Orig             *wrappedQUICStream
 	PseudoLocalAddr  net.Addr
 	PseudoRemoteAddr net.Addr
 	Established      bool
@@ -360,8 +360,8 @@ type UDPConn interface {
 }

 type quicPktConn struct {
-	Session      quic.Connection
-	Stream       quic.Stream
+	Session      *quic.Conn
+	Stream       *wrappedQUICStream
 	CloseFunc    func()
 	UDPSessionID uint32
 	MsgCh        <-chan *udpMessage
--- a/transport/hysteria/core/stream.go
+++ b/transport/hysteria/core/stream.go
@@ -9,7 +9,7 @@ import (
 // Handle stream close properly
 // Ref: https://github.com/libp2p/go-libp2p-quic-transport/blob/master/stream.go
 type wrappedQUICStream struct {
-	Stream quic.Stream
+	Stream *quic.Stream
 }

 func (s *wrappedQUICStream) StreamID() quic.StreamID {
--- a/transport/hysteria/transport/client.go
+++ b/transport/hysteria/transport/client.go
@@ -62,7 +62,7 @@ func (ct *ClientTransport) quicPacketConn(proto string, rAddr net.Addr, serverPo
 	}
 }

-func (ct *ClientTransport) QUICDial(proto string, server string, serverPorts string, tlsConfig *tlsC.Config, quicConfig *quic.Config, obfs obfsPkg.Obfuscator, hopInterval time.Duration, dialer utils.PacketDialer) (quic.Connection, error) {
+func (ct *ClientTransport) QUICDial(proto string, server string, serverPorts string, tlsConfig *tlsC.Config, quicConfig *quic.Config, obfs obfsPkg.Obfuscator, hopInterval time.Duration, dialer utils.PacketDialer) (*quic.Conn, error) {
 	serverUDPAddr, err := dialer.RemoteAddr(server)
 	if err != nil {
 		return nil, err
--- a/transport/tuic/common/congestion.go
+++ b/transport/tuic/common/congestion.go
@@ -13,7 +13,7 @@ const (
 	DefaultConnectionReceiveWindow = 67108864 // 64 MB/s
 )

-func SetCongestionController(quicConn quic.Connection, cc string, cwnd int) {
+func SetCongestionController(quicConn *quic.Conn, cc string, cwnd int) {
 	if cwnd == 0 {
 		cwnd = 32
 	}
--- a/transport/tuic/common/stream.go
+++ b/transport/tuic/common/stream.go
@@ -9,7 +9,7 @@ import (
 )

 type quicStreamConn struct {
-	quic.Stream
+	*quic.Stream
 	lock  sync.Mutex
 	lAddr net.Addr
 	rAddr net.Addr
@@ -62,6 +62,6 @@ func (q *quicStreamConn) RemoteAddr() net.Addr {

 var _ net.Conn = (*quicStreamConn)(nil)

-func NewQuicStreamConn(stream quic.Stream, lAddr, rAddr net.Addr, closeDeferFn func()) net.Conn {
+func NewQuicStreamConn(stream *quic.Stream, lAddr, rAddr net.Addr, closeDeferFn func()) net.Conn {
 	return &quicStreamConn{Stream: stream, lAddr: lAddr, rAddr: rAddr, closeDeferFn: closeDeferFn}
 }
--- a/transport/tuic/congestion/bbr_sender.go
+++ b/transport/tuic/congestion/bbr_sender.go
@@ -20,7 +20,7 @@ const (
 	DefaultBBRMaxCongestionWindow = 10000
 )

-func GetInitialPacketSize(quicConn quic.Connection) congestion.ByteCount {
+func GetInitialPacketSize(quicConn *quic.Conn) congestion.ByteCount {
 	return congestion.ByteCount(quicConn.Config().InitialPacketSize)
 }

--- a/transport/tuic/congestion_v2/bbr_sender.go
+++ b/transport/tuic/congestion_v2/bbr_sender.go
@@ -930,6 +930,6 @@ func bdpFromRttAndBandwidth(rtt time.Duration, bandwidth Bandwidth) congestion.B
 	return congestion.ByteCount(rtt) * congestion.ByteCount(bandwidth) / congestion.ByteCount(BytesPerSecond) / congestion.ByteCount(time.Second)
 }

-func GetInitialPacketSize(quicConn quic.Connection) congestion.ByteCount {
+func GetInitialPacketSize(quicConn *quic.Conn) congestion.ByteCount {
 	return congestion.ByteCount(quicConn.Config().InitialPacketSize)
 }
--- a/transport/tuic/server.go
+++ b/transport/tuic/server.go
@@ -69,7 +69,7 @@ func (s *Server) Close() error {

 type serverHandler struct {
 	*Server
-	quicConn quic.EarlyConnection
+	quicConn *quic.Conn
 	uuid     uuid.UUID

 	v4Handler common.ServerHandler
@@ -138,7 +138,7 @@ func (s *serverHandler) handleMessage() (err error) {

 func (s *serverHandler) handleStream() (err error) {
 	for {
-		var quicStream quic.Stream
+		var quicStream *quic.Stream
 		quicStream, err = s.quicConn.AcceptStream(context.Background())
 		if err != nil {
 			return err
@@ -175,7 +175,7 @@ func (s *serverHandler) handleStream() (err error) {

 func (s *serverHandler) handleUniStream() (err error) {
 	for {
-		var stream quic.ReceiveStream
+		var stream *quic.ReceiveStream
 		stream, err = s.quicConn.AcceptUniStream(context.Background())
 		if err != nil {
 			return err
--- a/transport/tuic/v4/client.go
+++ b/transport/tuic/v4/client.go
@@ -42,7 +42,7 @@ type clientImpl struct {
 	*ClientOption
 	udp bool

-	quicConn  quic.Connection
+	quicConn  *quic.Conn
 	connMutex sync.Mutex

 	openStreams atomic.Int64
@@ -71,7 +71,7 @@ func (t *clientImpl) SetLastVisited(last time.Time) {
 	t.lastVisited.Store(last)
 }

-func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn common.DialFunc) (quic.Connection, error) {
+func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn common.DialFunc) (*quic.Conn, error) {
 	t.connMutex.Lock()
 	defer t.connMutex.Unlock()
 	if t.quicConn != nil {
@@ -81,7 +81,7 @@ func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn co
 	if err != nil {
 		return nil, err
 	}
-	var quicConn quic.Connection
+	var quicConn *quic.Conn
 	if t.ReduceRtt {
 		quicConn, err = transport.DialEarly(ctx, addr, t.TlsConfig, t.QuicConfig)
 	} else {
@@ -113,7 +113,7 @@ func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn co
 	return quicConn, nil
 }

-func (t *clientImpl) sendAuthentication(quicConn quic.Connection) (err error) {
+func (t *clientImpl) sendAuthentication(quicConn *quic.Conn) (err error) {
 	defer func() {
 		t.deferQuicConn(quicConn, err)
 	}()
@@ -138,12 +138,12 @@ func (t *clientImpl) sendAuthentication(quicConn quic.Connection) (err error) {
 	return nil
 }

-func (t *clientImpl) handleUniStream(quicConn quic.Connection) (err error) {
+func (t *clientImpl) handleUniStream(quicConn *quic.Conn) (err error) {
 	defer func() {
 		t.deferQuicConn(quicConn, err)
 	}()
 	for {
-		var stream quic.ReceiveStream
+		var stream *quic.ReceiveStream
 		stream, err = quicConn.AcceptUniStream(context.Background())
 		if err != nil {
 			return err
@@ -189,7 +189,7 @@ func (t *clientImpl) handleUniStream(quicConn quic.Connection) (err error) {
 	}
 }

-func (t *clientImpl) handleMessage(quicConn quic.Connection) (err error) {
+func (t *clientImpl) handleMessage(quicConn *quic.Conn) (err error) {
 	defer func() {
 		t.deferQuicConn(quicConn, err)
 	}()
@@ -237,14 +237,14 @@ func (t *clientImpl) handleMessage(quicConn quic.Connection) (err error) {
 	}
 }

-func (t *clientImpl) deferQuicConn(quicConn quic.Connection, err error) {
+func (t *clientImpl) deferQuicConn(quicConn *quic.Conn, err error) {
 	var netError net.Error
 	if err != nil && errors.As(err, &netError) {
 		t.forceClose(quicConn, err)
 	}
 }

-func (t *clientImpl) forceClose(quicConn quic.Connection, err error) {
+func (t *clientImpl) forceClose(quicConn *quic.Conn, err error) {
 	t.connMutex.Lock()
 	defer t.connMutex.Unlock()
 	if quicConn == nil {
--- a/transport/tuic/v4/packet.go
+++ b/transport/tuic/v4/packet.go
@@ -15,13 +15,13 @@ import (

 type quicStreamPacketConn struct {
 	connId    uint32
-	quicConn  quic.Connection
+	quicConn  *quic.Conn
 	inputConn *N.BufferedConn

 	udpRelayMode          common.UdpRelayMode
 	maxUdpRelayPacketSize int

-	deferQuicConnFn func(quicConn quic.Connection, err error)
+	deferQuicConnFn func(quicConn *quic.Conn, err error)
 	closeDeferFn    func()
 	writeClosed     *atomic.Bool

@@ -57,7 +57,7 @@ func (q *quicStreamPacketConn) close() (err error) {
 		if err != nil {
 			return
 		}
-		var stream quic.SendStream
+		var stream *quic.SendStream
 		stream, err = q.quicConn.OpenUniStream()
 		if err != nil {
 			return
@@ -149,7 +149,7 @@ func (q *quicStreamPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err erro
 	}
 	switch q.udpRelayMode {
 	case common.QUIC:
-		var stream quic.SendStream
+		var stream *quic.SendStream
 		stream, err = q.quicConn.OpenUniStream()
 		if err != nil {
 			return
--- a/transport/tuic/v4/server.go
+++ b/transport/tuic/v4/server.go
@@ -28,7 +28,7 @@ type ServerOption struct {
 	MaxUdpRelayPacketSize int
 }

-func NewServerHandler(option *ServerOption, quicConn quic.EarlyConnection, uuid uuid.UUID) common.ServerHandler {
+func NewServerHandler(option *ServerOption, quicConn *quic.Conn, uuid uuid.UUID) common.ServerHandler {
 	return &serverHandler{
 		ServerOption: option,
 		quicConn:     quicConn,
@@ -40,7 +40,7 @@ func NewServerHandler(option *ServerOption, quicConn quic.EarlyConnection, uuid

 type serverHandler struct {
 	*ServerOption
-	quicConn quic.EarlyConnection
+	quicConn *quic.Conn
 	uuid     uuid.UUID

 	authCh   chan struct{}
--- a/transport/tuic/v5/client.go
+++ b/transport/tuic/v5/client.go
@@ -41,7 +41,7 @@ type clientImpl struct {
 	*ClientOption
 	udp bool

-	quicConn  quic.Connection
+	quicConn  *quic.Conn
 	connMutex sync.Mutex

 	openStreams atomic.Int64
@@ -70,7 +70,7 @@ func (t *clientImpl) SetLastVisited(last time.Time) {
 	t.lastVisited.Store(last)
 }

-func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn common.DialFunc) (quic.Connection, error) {
+func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn common.DialFunc) (*quic.Conn, error) {
 	t.connMutex.Lock()
 	defer t.connMutex.Unlock()
 	if t.quicConn != nil {
@@ -80,7 +80,7 @@ func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn co
 	if err != nil {
 		return nil, err
 	}
-	var quicConn quic.Connection
+	var quicConn *quic.Conn
 	if t.ReduceRtt {
 		quicConn, err = transport.DialEarly(ctx, addr, t.TlsConfig, t.QuicConfig)
 	} else {
@@ -110,7 +110,7 @@ func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn co
 	return quicConn, nil
 }

-func (t *clientImpl) sendAuthentication(quicConn quic.Connection) (err error) {
+func (t *clientImpl) sendAuthentication(quicConn *quic.Conn) (err error) {
 	defer func() {
 		t.deferQuicConn(quicConn, err)
 	}()
@@ -139,12 +139,12 @@ func (t *clientImpl) sendAuthentication(quicConn quic.Connection) (err error) {
 	return nil
 }

-func (t *clientImpl) handleUniStream(quicConn quic.Connection) (err error) {
+func (t *clientImpl) handleUniStream(quicConn *quic.Conn) (err error) {
 	defer func() {
 		t.deferQuicConn(quicConn, err)
 	}()
 	for {
-		var stream quic.ReceiveStream
+		var stream *quic.ReceiveStream
 		stream, err = quicConn.AcceptUniStream(context.Background())
 		if err != nil {
 			return err
@@ -190,7 +190,7 @@ func (t *clientImpl) handleUniStream(quicConn quic.Connection) (err error) {
 	}
 }

-func (t *clientImpl) handleMessage(quicConn quic.Connection) (err error) {
+func (t *clientImpl) handleMessage(quicConn *quic.Conn) (err error) {
 	defer func() {
 		t.deferQuicConn(quicConn, err)
 	}()
@@ -245,14 +245,14 @@ func (t *clientImpl) handleMessage(quicConn quic.Connection) (err error) {
 	}
 }

-func (t *clientImpl) deferQuicConn(quicConn quic.Connection, err error) {
+func (t *clientImpl) deferQuicConn(quicConn *quic.Conn, err error) {
 	var netError net.Error
 	if err != nil && errors.As(err, &netError) {
 		t.forceClose(quicConn, err)
 	}
 }

-func (t *clientImpl) forceClose(quicConn quic.Connection, err error) {
+func (t *clientImpl) forceClose(quicConn *quic.Conn, err error) {
 	t.connMutex.Lock()
 	defer t.connMutex.Unlock()
 	if quicConn == nil {
--- a/transport/tuic/v5/frag.go
+++ b/transport/tuic/v5/frag.go
@@ -16,7 +16,7 @@ import (
 // "-3" from quic-go's DatagramFrame.MaxDataLen
 var MaxFragSize = 1200 - PacketOverHead - 3

-func fragWriteNative(quicConn quic.Connection, packet Packet, buf *bytes.Buffer, fragSize int) (err error) {
+func fragWriteNative(quicConn *quic.Conn, packet Packet, buf *bytes.Buffer, fragSize int) (err error) {
 	fullPayload := packet.DATA
 	off := 0
 	fragID := uint8(0)
--- a/transport/tuic/v5/packet.go
+++ b/transport/tuic/v5/packet.go
@@ -17,13 +17,13 @@ import (

 type quicStreamPacketConn struct {
 	connId    uint16
-	quicConn  quic.Connection
+	quicConn  *quic.Conn
 	inputConn *N.BufferedConn

 	udpRelayMode          common.UdpRelayMode
 	maxUdpRelayPacketSize int

-	deferQuicConnFn func(quicConn quic.Connection, err error)
+	deferQuicConnFn func(quicConn *quic.Conn, err error)
 	closeDeferFn    func()
 	writeClosed     *atomic.Bool

@@ -61,7 +61,7 @@ func (q *quicStreamPacketConn) close() (err error) {
 		if err != nil {
 			return
 		}
-		var stream quic.SendStream
+		var stream *quic.SendStream
 		stream, err = q.quicConn.OpenUniStream()
 		if err != nil {
 			return
@@ -165,7 +165,7 @@ func (q *quicStreamPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err erro
 		if err != nil {
 			return
 		}
-		var stream quic.SendStream
+		var stream *quic.SendStream
 		stream, err = q.quicConn.OpenUniStream()
 		if err != nil {
 			return
--- a/transport/tuic/v5/server.go
+++ b/transport/tuic/v5/server.go
@@ -27,7 +27,7 @@ type ServerOption struct {
 	MaxUdpRelayPacketSize int
 }

-func NewServerHandler(option *ServerOption, quicConn quic.EarlyConnection, uuid uuid.UUID) common.ServerHandler {
+func NewServerHandler(option *ServerOption, quicConn *quic.Conn, uuid uuid.UUID) common.ServerHandler {
 	return &serverHandler{
 		ServerOption: option,
 		quicConn:     quicConn,
@@ -39,7 +39,7 @@ func NewServerHandler(option *ServerOption, quicConn quic.EarlyConnection, uuid

 type serverHandler struct {
 	*ServerOption
-	quicConn quic.EarlyConnection
+	quicConn *quic.Conn
 	uuid     uuid.UUID

 	authCh   chan struct{}