use new quic-go API

Author: marten-seemann

client.go

@@ -63,8 +63,6 @@ func (d *Dialer) init() {
 func (d *Dialer) Dial(ctx context.Context, urlStr string, reqHdr http.Header) (*http.Response, *Session, error) {
 	d.initOnce.Do(func() { d.init() })
 
-	// Technically, this is not true. DATAGRAMs could be sent using the Capsule protocol.
-	// However, quic-go currently enforces QUIC datagram support if HTTP/3 datagrams are enabled.
 	quicConf := d.QUICConfig
 	if quicConf == nil {
 		quicConf = &quic.Config{EnableDatagrams: true}
@@ -117,35 +115,65 @@ func (d *Dialer) Dial(ctx context.Context, urlStr string, reqHdr http.Header) (*
 	if err != nil {
 		return nil, nil, err
 	}
-	tr := &http3.Transport{
-		EnableDatagrams: true,
-		StreamHijacker: func(ft http3.FrameType, connTracingID quic.ConnectionTracingID, str *quic.Stream, e error) (hijacked bool, err error) {
-			if isWebTransportError(e) {
-				return true, nil
-			}
-			if ft != webTransportFrameType {
-				return false, nil
-			}
-			id, err := quicvarint.Read(quicvarint.NewReader(str))
+	tr := &http3.Transport{EnableDatagrams: true}
+
+	conn := tr.NewRawClientConn(qconn)
+
+	go func() {
+		for {
+			str, err := qconn.AcceptStream(context.Background())
 			if err != nil {
-				if isWebTransportError(err) {
-					return true, nil
-				}
-				return false, err
+				return
 			}
-			d.conns.AddStream(connTracingID, str, sessionID(id))
-			return true, nil
-		},
-		UniStreamHijacker: func(st http3.StreamType, connTracingID quic.ConnectionTracingID, str *quic.ReceiveStream, err error) (hijacked bool) {
-			if st != webTransportUniStreamType && !isWebTransportError(err) {
-				return false
+
+			go func() {
+				typ, err := quicvarint.Peek(str)
+				if err != nil {
+					return
+				}
+				if typ != webTransportFrameType {
+					conn.HandleBidirectionalStream(str)
+					return
+				}
+				// read the frame type (already peeked above)
+				if _, err := quicvarint.Read(quicvarint.NewReader(str)); err != nil {
+					return
+				}
+				// read the session ID
+				id, err := quicvarint.Read(quicvarint.NewReader(str))
+				if err != nil {
+					return
+				}
+				d.conns.AddStream(qconn, str, sessionID(id))
+			}()
+		}
+	}()
+
+	go func() {
+		for {
+			str, err := qconn.AcceptUniStream(context.Background())
+			if err != nil {
+				return
 			}
-			d.conns.AddUniStream(connTracingID, str)
-			return true
-		},
-	}
 
-	conn := tr.NewClientConn(qconn)
+			go func() {
+				typ, err := quicvarint.Peek(str)
+				if err != nil {
+					return
+				}
+				if typ != webTransportUniStreamType {
+					conn.HandleUnidirectionalStream(str)
+					return
+				}
+				// read the stream type (already peeked above)
+				if _, err := quicvarint.Read(quicvarint.NewReader(str)); err != nil {
+					return
+				}
+				d.conns.AddUniStream(qconn, str)
+			}()
+		}
+	}()
+
 	select {
 	case <-conn.ReceivedSettings():
 	case <-ctx.Done():
@@ -168,7 +196,7 @@ func (d *Dialer) Dial(ctx context.Context, urlStr string, reqHdr http.Header) (*
 		return nil, nil, errNoWebTransport
 	}
 
-	requestStr, err := conn.OpenRequestStream(ctx) // TODO: put this on the Connection (maybe introduce a ClientConnection?)
+	requestStr, err := conn.OpenRequestStream(ctx)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -188,7 +216,7 @@ func (d *Dialer) Dial(ctx context.Context, urlStr string, reqHdr http.Header) (*
 		protocol = d.negotiateProtocol(protocolHeader)
 	}
 	sessID := sessionID(requestStr.StreamID())
-	return rsp, d.conns.AddSession(context.WithoutCancel(ctx), conn.Conn(), sessID, requestStr, protocol), nil
+	return rsp, d.conns.AddSession(context.WithoutCancel(ctx), qconn, sessID, requestStr, protocol), nil
 }
 
 func (d *Dialer) negotiateProtocol(theirs []string) string {

errors.go

@@ -33,21 +33,6 @@ func httpCodeToWebtransportCode(h quic.StreamErrorCode) (StreamErrorCode, error)
 	return StreamErrorCode(shifted - shifted/0x1f), nil
 }
 
-func isWebTransportError(e error) bool {
-	if e == nil {
-		return false
-	}
-	var strErr *quic.StreamError
-	if !errors.As(e, &strErr) {
-		return false
-	}
-	if strErr.ErrorCode == WTSessionGoneErrorCode {
-		return true
-	}
-	_, err := httpCodeToWebtransportCode(strErr.ErrorCode)
-	return err == nil
-}
-
 const (
 	// WTBufferedStreamRejectedErrorCode is the error code of the
 	// WT_BUFFERED_STREAM_REJECTED error.

go.mod

@@ -4,7 +4,7 @@ go 1.24
 
 require (
 	github.com/dunglas/httpsfv v1.1.0
-	github.com/quic-go/quic-go v0.57.1
+	github.com/quic-go/quic-go v0.58.1-0.20260103101554-29b1a154ebc8
 	github.com/stretchr/testify v1.11.1
 )
 

go.sum

@@ -11,8 +11,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
 github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
-github.com/quic-go/quic-go v0.57.1 h1:25KAAR9QR8KZrCZRThWMKVAwGoiHIrNbT72ULHTuI10=
-github.com/quic-go/quic-go v0.57.1/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s=
+github.com/quic-go/quic-go v0.58.1-0.20260103101554-29b1a154ebc8 h1:5tj3IFn2lUw0063zA+91YC8Vsg2uTbJEggwOcmi5xMA=
+github.com/quic-go/quic-go v0.58.1-0.20260103101554-29b1a154ebc8/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
@@ -27,8 +27,6 @@ golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
 golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
 golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

interop/main.go

@@ -53,6 +53,7 @@ func main() {
 		},
 		CheckOrigin: func(r *http.Request) bool { return true },
 	}
+	webtransport.ConfigureHTTP3Server(s.H3)
 	defer s.Close()
 
 	wmux.HandleFunc("/unidirectional", func(w http.ResponseWriter, r *http.Request) {
@@ -111,13 +112,13 @@ func getTLSConf(start, end time.Time) (*tls.Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &tls.Config{
+	return http3.ConfigureTLSConfig(&tls.Config{
 		Certificates: []tls.Certificate{{
 			Certificate: [][]byte{cert.Raw},
 			PrivateKey:  priv,
 			Leaf:        cert,
 		}},
-	}, nil
+	}), nil
 }
 
 func generateCert(start, end time.Time) (*x509.Certificate, *ecdsa.PrivateKey, error) {