@fails-components/webtransport-transport-http3-quiche 1.1.3 → 1.2.0

package/CMakeLists.txt

@@ -27,6 +27,7 @@ ENDIF(WIN32)
 
 set(ABSL_PROPAGATE_CXX_STD ON)
 # include abseil
+set(ABSL_MSVC_STATIC_RUNTIME ON)
 add_subdirectory(third_party/abseil-cpp EXCLUDE_FROM_ALL)
 
 
@@ -82,12 +83,10 @@ platform/quiche_platform_impl/quiche_event_loop_impl.h
 platform/quiche_platform_impl/quiche_bug_tracker_impl.h
 platform/quiche_platform_impl/quiche_googleurl_impl.h
 platform/quiche_platform_impl/quiche_iovec_impl.h
-platform/quiche_platform_impl/quiche_mutex_impl.h
 platform/quiche_platform_impl/quiche_stack_trace_impl.h
 platform/quiche_platform_impl/quiche_stream_buffer_allocator_impl.h
 platform/quiche_platform_impl/quiche_time_utils_impl.h
 platform/quiche_platform_impl/quiche_udp_socket_platform_impl.h
-platform/quiche_platform_impl/quiche_prefetch_impl.h
 platform/quiche_platform_impl/quiche_server_stats_impl.h
 platform/quiche_platform_impl/quiche_mem_slice_impl.h
 platform/quiche_platform_impl/quiche_flag_utils_impl.h
@@ -159,9 +158,6 @@ third_party/quiche/quiche/common/platform/api/quiche_hostname_utils.h
 third_party/quiche/quiche/common/platform/api/quiche_iovec.h
 third_party/quiche/quiche/common/platform/api/quiche_logging.h
 third_party/quiche/quiche/common/platform/api/quiche_mem_slice.h
-third_party/quiche/quiche/common/platform/api/quiche_mutex.cc
-third_party/quiche/quiche/common/platform/api/quiche_mutex.h
-third_party/quiche/quiche/common/platform/api/quiche_prefetch.h
 third_party/quiche/quiche/common/platform/api/quiche_reference_counted.h
 third_party/quiche/quiche/common/platform/api/quiche_time_utils.h
 third_party/quiche/quiche/common/platform/api/quiche_url_utils.h
@@ -170,11 +166,9 @@ third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_co
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_flag_utils_impl.h
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.h
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_flags_impl.cc
-third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_prefetch_impl.h
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_logging_impl.cc
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_logging_impl.h
-third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_mutex_impl.cc
-third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_mutex_impl.h
+third_party/quiche/quiche/common/platform/api/quiche_mem_slice.cc
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.cc
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_iovec_impl.h
@@ -201,11 +195,15 @@ third_party/quiche/quiche/common/quiche_random.cc
 third_party/quiche/quiche/common/quiche_random.h
 third_party/quiche/quiche/common/quiche_simple_arena.cc
 third_party/quiche/quiche/common/quiche_simple_arena.h
+third_party/quiche/quiche/common/quiche_socket_address.cc
+third_party/quiche/quiche/common/quiche_socket_address.h
 third_party/quiche/quiche/common/quiche_text_utils.cc
 third_party/quiche/quiche/common/quiche_text_utils.h
 third_party/quiche/quiche/common/simple_buffer_allocator.cc
 third_party/quiche/quiche/common/structured_headers.h
 third_party/quiche/quiche/common/structured_headers.cc
+third_party/quiche/quiche/common/vectorized_io_utils.h
+third_party/quiche/quiche/common/vectorized_io_utils.cc
 third_party/quiche/quiche/http2/adapter/data_source.h
 third_party/quiche/quiche/http2/adapter/event_forwarder.cc
 third_party/quiche/quiche/http2/adapter/event_forwarder.h
@@ -228,9 +226,30 @@ third_party/quiche/quiche/http2/adapter/oghttp2_util.cc
 third_party/quiche/quiche/http2/adapter/oghttp2_util.h
 third_party/quiche/quiche/http2/adapter/window_manager.cc
 third_party/quiche/quiche/http2/adapter/window_manager.h
+third_party/quiche/quiche/http2/core/http2_constants.cc
+third_party/quiche/quiche/http2/core/http2_constants.h
+third_party/quiche/quiche/http2/core/http2_frame_decoder_adapter.cc
+third_party/quiche/quiche/http2/core/http2_frame_decoder_adapter.h
+third_party/quiche/quiche/http2/core/http2_structures.cc
+third_party/quiche/quiche/http2/core/http2_structures.h
 third_party/quiche/quiche/http2/core/http2_trace_logging.cc
 third_party/quiche/quiche/http2/core/http2_trace_logging.h
 third_party/quiche/quiche/http2/core/priority_write_scheduler.h
+third_party/quiche/quiche/http2/core/spdy_alt_svc_wire_format.cc
+third_party/quiche/quiche/http2/core/spdy_alt_svc_wire_format.h
+third_party/quiche/quiche/http2/core/spdy_bitmasks.h
+third_party/quiche/quiche/http2/core/spdy_frame_builder.cc
+third_party/quiche/quiche/http2/core/spdy_frame_builder.h
+third_party/quiche/quiche/http2/core/spdy_framer.cc
+third_party/quiche/quiche/http2/core/spdy_framer.h
+third_party/quiche/quiche/http2/core/spdy_protocol.cc
+third_party/quiche/quiche/http2/core/spdy_protocol.h
+third_party/quiche/quiche/http2/core/recording_headers_handler.cc
+third_party/quiche/quiche/http2/core/recording_headers_handler.h
+third_party/quiche/quiche/http2/core/spdy_headers_handler_interface.h
+third_party/quiche/quiche/http2/core/spdy_no_op_visitor.cc
+third_party/quiche/quiche/http2/core/spdy_no_op_visitor.h
+third_party/quiche/quiche/http2/core/zero_copy_output_buffer.h
 third_party/quiche/quiche/http2/decoder/decode_buffer.cc
 third_party/quiche/quiche/http2/decoder/decode_buffer.h
 third_party/quiche/quiche/http2/decoder/decode_http2_structures.cc
@@ -299,6 +318,20 @@ third_party/quiche/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.cc
 third_party/quiche/quiche/http2/hpack/decoder/hpack_whole_entry_buffer.h
 third_party/quiche/quiche/http2/hpack/decoder/hpack_whole_entry_listener.cc
 third_party/quiche/quiche/http2/hpack/decoder/hpack_whole_entry_listener.h
+third_party/quiche/quiche/http2/hpack/hpack_constants.cc
+third_party/quiche/quiche/http2/hpack/hpack_constants.h
+third_party/quiche/quiche/http2/hpack/hpack_decoder_adapter.cc
+third_party/quiche/quiche/http2/hpack/hpack_decoder_adapter.h
+third_party/quiche/quiche/http2/hpack/hpack_encoder.cc
+third_party/quiche/quiche/http2/hpack/hpack_encoder.h
+third_party/quiche/quiche/http2/hpack/hpack_entry.cc
+third_party/quiche/quiche/http2/hpack/hpack_entry.h
+third_party/quiche/quiche/http2/hpack/hpack_header_table.cc
+third_party/quiche/quiche/http2/hpack/hpack_header_table.h
+third_party/quiche/quiche/http2/hpack/hpack_output_stream.cc
+third_party/quiche/quiche/http2/hpack/hpack_output_stream.h
+third_party/quiche/quiche/http2/hpack/hpack_static_table.cc
+third_party/quiche/quiche/http2/hpack/hpack_static_table.h
 third_party/quiche/quiche/http2/hpack/hpack_static_table_entries.inc
 third_party/quiche/quiche/http2/hpack/http2_hpack_constants.cc
 third_party/quiche/quiche/http2/hpack/http2_hpack_constants.h
@@ -312,10 +345,6 @@ third_party/quiche/quiche/http2/hpack/varint/hpack_varint_decoder.cc
 third_party/quiche/quiche/http2/hpack/varint/hpack_varint_decoder.h
 third_party/quiche/quiche/http2/hpack/varint/hpack_varint_encoder.cc
 third_party/quiche/quiche/http2/hpack/varint/hpack_varint_encoder.h
-third_party/quiche/quiche/http2/http2_constants.cc
-third_party/quiche/quiche/http2/http2_constants.h
-third_party/quiche/quiche/http2/http2_structures.cc
-third_party/quiche/quiche/http2/http2_structures.h
 #third_party/quiche/quiche/http2/platform/api/http2_macros.h
 #third_party/quiche/quiche/quic/bindings/quic_libevent.h
 #third_party/quiche/quiche/quic/bindings/quic_libevent.cc
@@ -348,6 +377,8 @@ third_party/quiche/quiche/quic/core/congestion_control/hybrid_slow_start.h
 third_party/quiche/quiche/quic/core/congestion_control/loss_detection_interface.h
 third_party/quiche/quiche/quic/core/congestion_control/pacing_sender.cc
 third_party/quiche/quiche/quic/core/congestion_control/pacing_sender.h
+third_party/quiche/quiche/quic/core/congestion_control/prague_sender.cc
+third_party/quiche/quiche/quic/core/congestion_control/prague_sender.h
 third_party/quiche/quiche/quic/core/congestion_control/prr_sender.cc
 third_party/quiche/quiche/quic/core/congestion_control/prr_sender.h
 third_party/quiche/quiche/quic/core/congestion_control/rtt_stats.cc
@@ -471,6 +502,8 @@ third_party/quiche/quiche/quic/core/frames/quic_goaway_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_goaway_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_handshake_done_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_handshake_done_frame.h
+third_party/quiche/quiche/quic/core/frames/quic_immediate_ack_frame.cc
+third_party/quiche/quiche/quic/core/frames/quic_immediate_ack_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_inlined_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_max_streams_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_max_streams_frame.h
@@ -563,8 +596,6 @@ third_party/quiche/quiche/quic/core/packet_number_indexed_queue.h
 third_party/quiche/quiche/quic/core/proto/cached_network_parameters_proto.h
 third_party/quiche/quiche/quic/core/proto/crypto_server_config_proto.h
 third_party/quiche/quiche/quic/core/proto/source_address_token_proto.h
-third_party/quiche/quiche/quic/core/qpack/qpack_blocking_manager.cc
-third_party/quiche/quiche/quic/core/qpack/qpack_blocking_manager.h
 third_party/quiche/quiche/quic/core/qpack/qpack_decoded_headers_accumulator.cc
 third_party/quiche/quiche/quic/core/qpack/qpack_decoded_headers_accumulator.h
 third_party/quiche/quiche/quic/core/qpack/qpack_decoder.cc
@@ -601,6 +632,8 @@ third_party/quiche/quiche/quic/core/qpack/qpack_static_table.cc
 third_party/quiche/quiche/quic/core/qpack/qpack_static_table.h
 third_party/quiche/quiche/quic/core/qpack/qpack_stream_receiver.h
 third_party/quiche/quiche/quic/core/qpack/qpack_stream_sender_delegate.h
+third_party/quiche/quiche/quic/core/qpack/new_qpack_blocking_manager.h
+third_party/quiche/quiche/quic/core/qpack/new_qpack_blocking_manager.cc
 third_party/quiche/quiche/quic/core/qpack/value_splitting_header_list.cc
 third_party/quiche/quiche/quic/core/qpack/value_splitting_header_list.h
 third_party/quiche/quiche/quic/core/quic_ack_listener_interface.cc
@@ -668,7 +701,6 @@ third_party/quiche/quiche/quic/core/quic_dispatcher.cc
 third_party/quiche/quiche/quic/core/quic_dispatcher.h
 third_party/quiche/quiche/quic/core/quic_error_codes.cc
 third_party/quiche/quiche/quic/core/quic_error_codes.h
-third_party/quiche/quiche/quic/core/quic_flags_list.h
 third_party/quiche/quiche/quic/core/quic_flow_controller.cc
 third_party/quiche/quiche/quic/core/quic_flow_controller.h
 third_party/quiche/quiche/quic/core/quic_framer.cc
@@ -775,45 +807,14 @@ third_party/quiche/quiche/quic/platform/api/quic_logging.h
 #third_party/quiche/quiche/quic/platform/api/quic_mem_slice_storage.cc
 #third_party/quiche/quiche/quic/platform/api/quic_mem_slice_storage.h
 third_party/quiche/quiche/quic/platform/api/quic_server_stats.h
-third_party/quiche/quiche/quic/platform/api/quic_socket_address.cc
-third_party/quiche/quiche/quic/platform/api/quic_socket_address.h
 third_party/quiche/quiche/quic/platform/api/quic_stack_trace.h
 third_party/quiche/quiche/quic/platform/api/quic_thread.h
 third_party/quiche/quiche/quic/tools/quic_simple_crypto_server_stream_helper.cc
 third_party/quiche/quiche/quic/tools/quic_simple_crypto_server_stream_helper.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_constants.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_constants.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_decoder_adapter.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_decoder_adapter.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_encoder.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_encoder.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_entry.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_entry.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_header_table.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_header_table.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_output_stream.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_output_stream.h
-third_party/quiche/quiche/spdy/core/hpack/hpack_static_table.cc
-third_party/quiche/quiche/spdy/core/hpack/hpack_static_table.h
-third_party/quiche/quiche/spdy/core/http2_frame_decoder_adapter.cc
-third_party/quiche/quiche/spdy/core/http2_frame_decoder_adapter.h
-third_party/quiche/quiche/spdy/core/recording_headers_handler.cc
-third_party/quiche/quiche/spdy/core/recording_headers_handler.h
-third_party/quiche/quiche/spdy/core/spdy_alt_svc_wire_format.cc
-third_party/quiche/quiche/spdy/core/spdy_alt_svc_wire_format.h
-third_party/quiche/quiche/spdy/core/spdy_bitmasks.h
-third_party/quiche/quiche/spdy/core/spdy_frame_builder.cc
-third_party/quiche/quiche/spdy/core/spdy_frame_builder.h
-#third_party/quiche/quiche/spdy/core/spdy_frame_reader.cc
-#third_party/quiche/quiche/spdy/core/spdy_frame_reader.h
-third_party/quiche/quiche/spdy/core/spdy_framer.cc
-third_party/quiche/quiche/spdy/core/spdy_framer.h
-third_party/quiche/quiche/spdy/core/spdy_headers_handler_interface.h
-third_party/quiche/quiche/spdy/core/spdy_no_op_visitor.cc
-third_party/quiche/quiche/spdy/core/spdy_no_op_visitor.h
-third_party/quiche/quiche/spdy/core/spdy_protocol.cc
-third_party/quiche/quiche/spdy/core/spdy_protocol.h
-third_party/quiche/quiche/spdy/core/zero_copy_output_buffer.h
+third_party/quiche/quiche/web_transport/web_transport_headers.cc
+third_party/quiche/quiche/web_transport/web_transport_headers.h
+third_party/quiche/quiche/web_transport/web_transport_priority_scheduler.cc
+third_party/quiche/quiche/web_transport/web_transport_priority_scheduler.h
 )
 
 IF(APPLE OR WIN32)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {
@@ -50,13 +50,13 @@
     "@types/node": "^18.15.3",
     "eslint": "^9.3.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard": "^16.0.2",
-    "eslint-plugin-import": "^2.25.2",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-promise": "^7.2.1",
     "prettier": "^3.2.5",
+    "prettier-linter-helpers": "^1.0.0",
+    "synckit": "^0.11.4",
     "typescript": "^4.8.4"
   },
   "binary": {

package/src/http3backendresponse.cc

@@ -15,7 +15,7 @@ namespace quic
 
   Http3BackendResponse::ServerPushInfo::ServerPushInfo(
       std::string request_url,
-      spdy::Http2HeaderBlock headers,
+      quiche::HttpHeaderBlock headers,
       spdy::SpdyPriority priority,
       std::string body)
       : request_url(request_url),

package/src/http3backendresponse.h

@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "absl/strings/string_view.h"
-#include "quiche/spdy/core/spdy_protocol.h"
+#include "quiche/http2/core/spdy_protocol.h"
 
 namespace quic
 {
@@ -30,13 +30,13 @@ namespace quic
     struct ServerPushInfo
     {
       ServerPushInfo(std::string request_url,
-                     spdy::Http2HeaderBlock headers,
+                     quiche::HttpHeaderBlock headers,
                      spdy::SpdyPriority priority,
                      std::string body);
       ServerPushInfo(const ServerPushInfo &other);
 
       std::string request_url;
-      spdy::Http2HeaderBlock headers;
+      quiche::HttpHeaderBlock headers;
       spdy::SpdyPriority priority;
       std::string body;
     };
@@ -62,18 +62,18 @@ namespace quic
 
     ~Http3BackendResponse();
 
-    const std::vector<spdy::Http2HeaderBlock> &early_hints() const
+    const std::vector<quiche::HttpHeaderBlock> &early_hints() const
     {
       return early_hints_;
     }
     SpecialResponseType response_type() const { return response_type_; }
-    const spdy::Http2HeaderBlock &headers() const { return headers_; }
-    const spdy::Http2HeaderBlock &trailers() const { return trailers_; }
+    const quiche::HttpHeaderBlock &headers() const { return headers_; }
+    const quiche::HttpHeaderBlock &trailers() const { return trailers_; }
     const absl::string_view body() const { return absl::string_view(body_); }
 
-    void AddEarlyHints(const spdy::Http2HeaderBlock &headers)
+    void AddEarlyHints(const quiche::HttpHeaderBlock &headers)
     {
-      spdy::Http2HeaderBlock hints = headers.Clone();
+      quiche::HttpHeaderBlock hints = headers.Clone();
       hints[":status"] = "103";
       early_hints_.push_back(std::move(hints));
     }
@@ -83,11 +83,11 @@ namespace quic
       response_type_ = response_type;
     }
 
-    void set_headers(spdy::Http2HeaderBlock headers)
+    void set_headers(quiche::HttpHeaderBlock headers)
     {
       headers_ = std::move(headers);
     }
-    void set_trailers(spdy::Http2HeaderBlock trailers)
+    void set_trailers(quiche::HttpHeaderBlock trailers)
     {
       trailers_ = std::move(trailers);
     }
@@ -97,10 +97,10 @@ namespace quic
     }
 
   private:
-    std::vector<spdy::Http2HeaderBlock> early_hints_;
+    std::vector<quiche::HttpHeaderBlock> early_hints_;
     SpecialResponseType response_type_;
-    spdy::Http2HeaderBlock headers_;
-    spdy::Http2HeaderBlock trailers_;
+    quiche::HttpHeaderBlock headers_;
+    quiche::HttpHeaderBlock trailers_;
     std::string body_;
   };
 

package/src/http3client.cc

@@ -39,7 +39,7 @@
 #include "quiche/quic/tools/quic_url.h"
 #include "quiche/common/quiche_text_utils.h"
 
-using spdy::Http2HeaderBlock;
+using quiche::HttpHeaderBlock;
 
 namespace quic
 {
@@ -162,7 +162,8 @@ namespace quic
                              std::unique_ptr<ProofVerifier> proof_verifier,
                              std::unique_ptr<SessionCache> session_cache,
                              std::unique_ptr<QuicConnectionHelperInterface> helper,
-                             QuicConfig config) :
+                             QuicConfig config,
+                             const std::vector<std::string>& protocols) :
           initialized_(false),
           store_response_(false),
           latest_response_code_(-1),
@@ -188,7 +189,8 @@ namespace quic
           num_attempts_connect_(0),
           webtransport_server_support_inform_(false),
           connection_debug_visitor_(nullptr),
-          priority_(HttpStreamPriority())
+          priority_(HttpStreamPriority()),
+          protocols_(protocols)
     {
        
     }
@@ -200,7 +202,7 @@ namespace quic
 
     void Http3Client::setHostname(QuicSocketAddress server_address, const std::string &server_hostname)
     {
-        server_id_ = QuicServerId(server_hostname, server_address.port(), false);
+        server_id_ = QuicServerId(server_hostname, server_address.port());
         set_server_address(server_address);
         Initialize();
     }
@@ -249,7 +251,7 @@ namespace quic
 
     void Http3Client::SendRequest(const std::string &uri)
     {
-        spdy::Http2HeaderBlock headers;
+        quiche::HttpHeaderBlock headers;
         if (!PopulateHeaderBlockFromUrl(uri, &headers))
         {
             return;
@@ -259,7 +261,7 @@ namespace quic
 
     void Http3Client::SendRequestAndRstTogether(const std::string &uri)
     {
-        spdy::Http2HeaderBlock headers;
+        quiche::HttpHeaderBlock headers;
         if (!PopulateHeaderBlockFromUrl(uri, &headers))
         {
             return;
@@ -275,13 +277,13 @@ namespace quic
     }
 
     void Http3Client::GetOrCreateStreamAndSendRequest(
-        const spdy::Http2HeaderBlock *headers, absl::string_view body, bool fin)
+        const quiche::HttpHeaderBlock *headers, absl::string_view body, bool fin)
     {
-        std::shared_ptr<spdy::Http2HeaderBlock> spdy_headers;
+        std::shared_ptr<quiche::HttpHeaderBlock> spdy_headers;
         bool hasheaders = false;
         if (headers != nullptr)
         {
-            spdy_headers = std::make_shared<spdy::Http2HeaderBlock>(headers->Clone());
+            spdy_headers = std::make_shared<quiche::HttpHeaderBlock>(headers->Clone());
             hasheaders = true;
         }
 
@@ -315,13 +317,13 @@ namespace quic
             });
     }
 
-    void Http3Client::SendMessageAsync(const spdy::Http2HeaderBlock &headers,
+    void Http3Client::SendMessageAsync(const quiche::HttpHeaderBlock &headers,
                                        absl::string_view body)
     {
         return SendMessageAsync(headers, body, /*fin=*/true);
     }
 
-    void Http3Client::SendMessageAsync(const spdy::Http2HeaderBlock &headers,
+    void Http3Client::SendMessageAsync(const quiche::HttpHeaderBlock &headers,
                                        absl::string_view body, bool fin)
     {
         // Always force creation of a stream for SendMessage.
@@ -498,7 +500,7 @@ namespace quic
         if (override_sni_set_)
         {
             // This should only be set before the initial Connect()
-            server_id_ = QuicServerId(override_sni_, address().port(), false);
+            server_id_ = QuicServerId(override_sni_, address().port());
         }
         connection_in_progress_ = true;
         connectionrecheck_ = true;
@@ -616,13 +618,22 @@ namespace quic
 
     void Http3Client::openWTSessionInt(absl::string_view path)
     {
-        spdy::Http2HeaderBlock headers;
+        quiche::HttpHeaderBlock headers;
         headers[":scheme"] = "https";
         headers[":authority"] = "localhost";
         headers[":path"] = path;
         headers[":method"] = "CONNECT";
         headers[":protocol"] = "webtransport";
-
+        if (protocols_.size() > 0) { // not very efficient
+            std::string protocols = "";
+            for (size_t i=0; i < protocols_.size(); i++) {
+                protocols += protocols_[i];
+                if (i!= protocols_.size()-1) {
+                    protocols += ',';
+                }
+            }
+            headers["wt-available-protocols"] = protocols;
+        }
         SendMessageAsync(headers, "", /*fin=*/false);
     }
 
@@ -915,7 +926,7 @@ namespace quic
         return response_headers_complete_;
     }
 
-    const spdy::Http2HeaderBlock *Http3Client::response_headers() const
+    const quiche::HttpHeaderBlock *Http3Client::response_headers() const
     {
         for (std::pair<QuicStreamId, QuicSpdyClientStream *> stream : open_streams_)
         {
@@ -928,7 +939,7 @@ namespace quic
         return &response_headers_;
     }
 
-    const spdy::Http2HeaderBlock &Http3Client::response_trailers() const
+    const quiche::HttpHeaderBlock &Http3Client::response_trailers() const
     {
         return response_trailers_;
     }
@@ -964,7 +975,7 @@ namespace quic
     }
 
     void Http3Client::OnCompleteResponse(
-        QuicStreamId id, const spdy::Http2HeaderBlock &response_headers,
+        QuicStreamId id, const quiche::HttpHeaderBlock &response_headers,
         const absl::string_view &response_body)
     {
         // implement
@@ -982,7 +993,7 @@ namespace quic
         QuicSpdyClientStream *client_stream =
             static_cast<QuicSpdyClientStream *>(stream);
 
-        const Http2HeaderBlock &response_headers = client_stream->response_headers();
+        const HttpHeaderBlock &response_headers = client_stream->response_headers();
 
         OnCompleteResponse(stream->id(), response_headers, client_stream->data());
 
@@ -999,7 +1010,7 @@ namespace quic
                 QUIC_LOG(ERROR) << "Invalid :status response header: " << status->second;
             }
             latest_response_headers_ = response_headers.DebugString();
-            for (const Http2HeaderBlock &headers :
+            for (const HttpHeaderBlock &headers :
                  client_stream->preliminary_headers())
             {
                 absl::StrAppend(&preliminary_response_headers_, headers.DebugString());
@@ -1044,7 +1055,7 @@ namespace quic
     }
 
     Http3Client::Http3ClientDataToResend::Http3ClientDataToResend(
-        std::unique_ptr<spdy::Http2HeaderBlock> headers, absl::string_view body,
+        std::unique_ptr<quiche::HttpHeaderBlock> headers, absl::string_view body,
         bool fin, Http3Client *client)
         : headers_(std::move(headers)), body_(body), fin_(fin),
           client_(client) {}
@@ -1071,8 +1082,8 @@ namespace quic
     Http3Client::PerStreamState::PerStreamState(
         QuicRstStreamErrorCode stream_error, bool response_complete,
         bool response_headers_complete,
-        const spdy::Http2HeaderBlock &response_headers,
-        const absl::string_view response, const spdy::Http2HeaderBlock &response_trailers,
+        const quiche::HttpHeaderBlock &response_headers,
+        const absl::string_view response, const quiche::HttpHeaderBlock &response_trailers,
         uint64_t bytes_read, uint64_t bytes_written, int64_t response_body_size)
         : stream_error(stream_error),
           response_complete(response_complete),
@@ -1087,7 +1098,7 @@ namespace quic
     Http3Client::PerStreamState::~PerStreamState() = default;
 
     bool Http3Client::PopulateHeaderBlockFromUrl(
-        const std::string &uri, spdy::Http2HeaderBlock *headers)
+        const std::string &uri, quiche::HttpHeaderBlock *headers)
     {
         std::string url;
         if (absl::StartsWith(uri, "https://") || absl::StartsWith(uri, "http://"))
@@ -1141,6 +1152,7 @@ namespace quic
     {
         bool allowPooling = false;
         std::vector<WebTransportHash> serverCertificateHashes;
+        std::vector<std::string> protocols;
         std::string privkey;
         QuicConfig cconfig;
         auto env = info.Env();
@@ -1240,6 +1252,26 @@ namespace quic
                     cconfig.SetInitialMaxStreamDataBytesIncomingBidirectionalToSend(streamFlowControlWindowSizeLimitWindow);
                     cconfig.SetInitialMaxStreamDataBytesUnidirectionalToSend(streamFlowControlWindowSizeLimitWindow);
                 }
+                if (lobj.Has("protocols") && !(lobj).Get("protocols").IsEmpty()) {
+                    Napi::Value protocolValue = (lobj).Get("protocols");
+                    if (protocolValue.IsArray())
+                    {
+                        Napi::Array protocolArray = protocolValue.As<Napi::Array>();
+                        unsigned int length = protocolArray.Length();
+
+                        for (unsigned int i = 0; i < length; i++)
+                        {
+                            Napi::Value protocolValue = protocolArray.Get(i);
+                            Napi::String protocolString = protocolValue.ToString();
+                            protocols.push_back(protocolString.Utf8Value());
+                        }
+                    }
+                    else
+                    {
+                        Napi::Error::New(env, "protocols is not an array").ThrowAsJavaScriptException();
+                        return;
+                    }
+                }
             }
         }
 
@@ -1271,7 +1303,7 @@ namespace quic
 
         std::unique_ptr<Http3SessionCache> cache;
 
-        client_ = std::make_unique<Http3Client>(this, std::move(verifier), std::move(cache), std::move(helper), cconfig);
+        client_ = std::make_unique<Http3Client>(this, std::move(verifier), std::move(cache), std::move(helper), cconfig, protocols);
         client_->SetUserAgentID("fails-components/webtransport");
 
         Ref(); // do not garbage collect
@@ -1380,10 +1412,10 @@ namespace quic
 
     void Http3ClientJS::processClientWebtransportSupport()
     {
+        Http3Client *obj = getObj();
         Napi::HandleScope scope(Env());
         Napi::Object objVal = Value().Get("jsobj").As<Napi::Object>();
         Napi::Object retObj = Napi::Object::New(Env());
-
         objVal.Get("onClientWebTransportSupport")
             .As<Napi::Function>()
             .Call(objVal, {retObj});