@fails-components/webtransport 0.1.3 → 0.1.7

package/src/http3client.cc

@@ -63,10 +63,11 @@ namespace quic
             WriteResult WritePacket(const char *buffer, size_t buf_len,
                                     const QuicIpAddress &self_address,
                                     const QuicSocketAddress &peer_address,
-                                    PerPacketOptions *options) override
+                                    PerPacketOptions *options,
+                                    const quic::QuicPacketWriterParams& wparams) override
             {
                 WriteResult result = QuicDefaultPacketWriter::WritePacket(
-                    buffer, buf_len, self_address, peer_address, options);
+                    buffer, buf_len, self_address, peer_address, options, wparams);
                 if (IsWriteBlockedStatus(result.status))
                 {
                     bool success = event_loop_->RearmSocket(fd(), kSocketEventWritable);
@@ -148,7 +149,8 @@ namespace quic
           connection_in_progress_(false),
           num_attempts_connect_(0),
           webtransport_server_support_inform_(false),
-          connection_debug_visitor_(nullptr)
+          connection_debug_visitor_(nullptr),
+          priority_(HttpStreamPriority())
     {
         set_server_address(server_address);
         Initialize();
@@ -183,7 +185,7 @@ namespace quic
 
     void Http3Client::Initialize()
     {
-        priority_ = QuicStreamPriority();
+        priority_ = QuicStreamPriority(HttpStreamPriority());
         connect_attempted_ = false;
         auto_reconnect_ = false;
         buffer_body_ = true;
@@ -891,7 +893,6 @@ namespace quic
         response_ = "";
         response_complete_ = false;
         response_headers_complete_ = false;
-        preliminary_headers_.clear();
         response_headers_.clear();
         response_trailers_.clear();
         bytes_read_ = 0;
@@ -990,21 +991,6 @@ namespace quic
         return &response_headers_;
     }
 
-    const spdy::Http2HeaderBlock *Http3Client::preliminary_headers() const
-    {
-        for (std::pair<QuicStreamId, QuicSpdyClientStream *> stream : open_streams_)
-        {
-            size_t bytes_read =
-                stream.second->stream_bytes_read() + stream.second->header_bytes_read();
-            if (bytes_read > 0)
-            {
-                preliminary_headers_ = stream.second->preliminary_headers().Clone();
-                break;
-            }
-        }
-        return &preliminary_headers_;
-    }
-
     const spdy::Http2HeaderBlock &Http3Client::response_trailers() const
     {
         return response_trailers_;
@@ -1042,7 +1028,7 @@ namespace quic
 
     void Http3Client::OnCompleteResponse(
         QuicStreamId id, const spdy::Http2HeaderBlock &response_headers,
-        const std::string &response_body)
+        const absl::string_view &response_body)
     {
         // implement
     }
@@ -1076,8 +1062,11 @@ namespace quic
                 QUIC_LOG(ERROR) << "Invalid :status response header: " << status->second;
             }
             latest_response_headers_ = response_headers.DebugString();
-            preliminary_response_headers_ =
-                client_stream->preliminary_headers().DebugString();
+            for (const Http2HeaderBlock &headers :
+                 client_stream->preliminary_headers())
+            {
+                absl::StrAppend(&preliminary_response_headers_, headers.DebugString());
+            }
             latest_response_header_block_ = response_headers.Clone();
             latest_response_body_ = client_stream->data();
             latest_response_trailers_ =
@@ -1101,7 +1090,6 @@ namespace quic
                 client_stream->stream_error(), connected(),
                 client_stream->headers_decompressed(),
                 client_stream->response_headers(),
-                client_stream->preliminary_headers(),
                 (buffer_body() ? client_stream->data() : ""),
                 client_stream->received_trailers(),
                 // Use NumBytesConsumed to avoid counting retransmitted stream frames.
@@ -1226,7 +1214,6 @@ namespace quic
           response_complete(other.response_complete),
           response_headers_complete(other.response_headers_complete),
           response_headers(other.response_headers.Clone()),
-          preliminary_headers(other.preliminary_headers.Clone()),
           response(other.response),
           response_trailers(other.response_trailers.Clone()),
           bytes_read(other.bytes_read),
@@ -1237,14 +1224,12 @@ namespace quic
         QuicRstStreamErrorCode stream_error, bool response_complete,
         bool response_headers_complete,
         const spdy::Http2HeaderBlock &response_headers,
-        const spdy::Http2HeaderBlock &preliminary_headers,
-        const std::string &response, const spdy::Http2HeaderBlock &response_trailers,
+        const absl::string_view response, const spdy::Http2HeaderBlock &response_trailers,
         uint64_t bytes_read, uint64_t bytes_written, int64_t response_body_size)
         : stream_error(stream_error),
           response_complete(response_complete),
           response_headers_complete(response_headers_complete),
           response_headers(response_headers.Clone()),
-          preliminary_headers(preliminary_headers.Clone()),
           response(response),
           response_trailers(response_trailers.Clone()),
           bytes_read(bytes_read),
@@ -1286,7 +1271,6 @@ namespace quic
             response_ = state.response;
             response_complete_ = state.response_complete;
             response_headers_complete_ = state.response_headers_complete;
-            preliminary_headers_ = state.preliminary_headers.Clone();
             response_headers_ = state.response_headers.Clone();
             response_trailers_ = state.response_trailers.Clone();
             bytes_read_ = state.bytes_read;

package/src/http3client.h

@@ -180,7 +180,6 @@ namespace quic
         // Group 2.
         bool response_headers_complete() const;
         const spdy::Http2HeaderBlock *response_headers() const;
-        const spdy::Http2HeaderBlock *preliminary_headers() const;
         int64_t response_size() const;
         size_t bytes_read() const;
         size_t bytes_written() const;
@@ -218,7 +217,7 @@ namespace quic
         // QuicSpdyClientBase::Reponselistener
         void OnCompleteResponse(
             QuicStreamId id, const spdy::Http2HeaderBlock &response_headers,
-            const std::string &response_body);
+            const absl::string_view &response_body);
 
         // From QuicClientPushPromiseIndex::Delegate
         bool CheckVary(const spdy::Http2HeaderBlock &client_request,
@@ -321,8 +320,7 @@ namespace quic
             PerStreamState(QuicRstStreamErrorCode stream_error, bool response_complete,
                            bool response_headers_complete,
                            const spdy::Http2HeaderBlock &response_headers,
-                           const spdy::Http2HeaderBlock &preliminary_headers,
-                           const std::string &response,
+                           const absl::string_view response,
                            const spdy::Http2HeaderBlock &response_trailers,
                            uint64_t bytes_read, uint64_t bytes_written,
                            int64_t response_body_size);
@@ -332,7 +330,6 @@ namespace quic
             bool response_complete;
             bool response_headers_complete;
             spdy::Http2HeaderBlock response_headers;
-            spdy::Http2HeaderBlock preliminary_headers;
             std::string response;
             spdy::Http2HeaderBlock response_trailers;
             uint64_t bytes_read;
@@ -398,7 +395,6 @@ namespace quic
 
         bool response_complete_;
         bool response_headers_complete_;
-        mutable spdy::Http2HeaderBlock preliminary_headers_;
         mutable spdy::Http2HeaderBlock response_headers_;
 
         // Parsed response trailers (if present), copied from the stream in OnClose.

package/src/http3clientsession.cc

@@ -37,9 +37,11 @@ Http3ClientSession::Http3ClientSession(
 
 std::unique_ptr<QuicSpdyClientStream>
 Http3ClientSession::CreateClientStream() {
-  return std::make_unique<Http3ClientStream>(
+  auto stream =  std::make_unique<Http3ClientStream>(
       GetNextOutgoingBidirectionalStreamId(), this, BIDIRECTIONAL,
       drop_response_body_);
+  stream->set_on_interim_headers(on_interim_headers_);
+  return stream;
 }
 
 bool Http3ClientSession::ShouldNegotiateWebTransport() {

package/src/http3clientsession.h

@@ -11,6 +11,9 @@
 #ifndef HTTP3_CLIENT_SESSION_H
 #define HTTP3_CLIENT_SESSION_H
 
+#include <functional>
+#include <utility>
+
 #include "quiche/quic/core/http/quic_spdy_client_session.h"
 #include "src/http3clientstream.h"
 
@@ -37,7 +40,13 @@ class Http3ClientSession : public QuicSpdyClientSession {
   bool ShouldNegotiateWebTransport() override;
   HttpDatagramSupport LocalHttpDatagramSupport() override;
 
+  void set_on_interim_headers(
+      std::function<void(const spdy::Http2HeaderBlock&)> on_interim_headers) {
+    on_interim_headers_ = std::move(on_interim_headers);
+  }
+
  private:
+  std::function<void(const spdy::Http2HeaderBlock&)> on_interim_headers_;
   const bool drop_response_body_;
   const bool enable_web_transport_;
 };

package/src/http3clientstream.cc

@@ -9,6 +9,7 @@
 // found in the LICENSE file.
 
 #include "src/http3clientstream.h"
+#include "quiche/common/platform/api/quiche_logging.h"
 
 namespace quic {
 
@@ -32,4 +33,20 @@ void Http3ClientStream::OnBodyAvailable() {
   }
 }
 
+bool Http3ClientStream::ParseAndValidateStatusCode() {
+  const size_t num_previous_interim_headers = preliminary_headers().size();
+  if (!QuicSpdyClientStream::ParseAndValidateStatusCode()) {
+    return false;
+  }
+  // The base ParseAndValidateStatusCode() may have added a preliminary header.
+  if (preliminary_headers().size() > num_previous_interim_headers) {
+    QUICHE_DCHECK_EQ(preliminary_headers().size(),
+                     num_previous_interim_headers + 1);
+    if (on_interim_headers_) {
+      on_interim_headers_(preliminary_headers().back());
+    }
+  }
+  return true;
+}
+
 }  // namespace quic

package/src/http3clientstream.h

@@ -23,7 +23,17 @@ class Http3ClientStream : public QuicSpdyClientStream {
         drop_response_body_(drop_response_body) {}
   void OnBodyAvailable() override;
 
+  void set_on_interim_headers(
+      std::function<void(const spdy::Http2HeaderBlock&)> on_interim_headers) {
+    on_interim_headers_ = std::move(on_interim_headers);
+  }
+
+ protected:
+  bool ParseAndValidateStatusCode() override;
+
+
  private:
+  std::function<void(const spdy::Http2HeaderBlock&)> on_interim_headers_;
   const bool drop_response_body_;
 };
 

package/src/http3eventloop.cc

@@ -17,19 +17,16 @@
 #include "quiche/common/platform/api/quiche_reference_counted.h"
 #include "quiche/quic/core/quic_default_clock.h"
 #include "quiche/quic/bindings/quic_libevent.h"
+#include "quiche/common/platform/api/quiche_command_line_flags.h"
+
+#include "absl/log/initialize.h"
+#include "absl/strings/string_view.h"
 
 using namespace Napi;
 
 namespace quic
 {
 
-#ifdef WIN32
-
-  bool initSockets();
-  bool destroySockets();
-
-#endif
-
   // hack since the header is faulty
   QUICHE_NO_EXPORT QuicEventLoopFactory *GetDefaultEventLoop();
 
@@ -40,9 +37,6 @@ namespace quic
   Http3EventLoop::~Http3EventLoop()
   {
     printf("Destructor eventloop\n");
-#ifdef WIN32
-    destroySockets();
-#endif
   }
 
   void Http3EventLoop::Init(Napi::Env env, Napi::Object exports)
@@ -61,7 +55,6 @@ namespace quic
     Http3ClientJS::InitExports(env, exports);
     Http3WTSessionJS::InitExports(env, exports, constr);
     Http3WTStreamJS::InitExports(env, exports, constr);
-    Napi::ObjectReference *exportref = new Napi::ObjectReference();
 
     env.SetInstanceData<Http3Constructors>(constr);
   }
@@ -116,7 +109,7 @@ namespace quic
 
   void Http3EventLoop::informAboutStream(bool incom, bool bidir, Http3WTSession *sessionobj, Http3WTStream *stream)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     if (incom)
     {
       if (bidir)
@@ -147,7 +140,7 @@ namespace quic
 
   void Http3EventLoop::informStreamRecvSignal(Http3WTStream *streamobj, WebTransportStreamError error_code, NetworkTask task)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::StreamRecvSignal;
     report.streamobj = streamobj;
     report.wtscode = error_code;
@@ -158,7 +151,7 @@ namespace quic
 
   void Http3EventLoop::informAboutStreamRead(Http3WTStream *streamobj, std::string *data, bool fin)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::StreamRead;
     report.streamobj = streamobj;
     report.para = data;
@@ -169,7 +162,7 @@ namespace quic
 
   void Http3EventLoop::informAboutStreamWrite(Http3WTStream *streamobj, Napi::ObjectReference *bufferhandle, bool success)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::StreamWrite;
     report.streamobj = streamobj;
     report.bufferhandle = bufferhandle;
@@ -180,7 +173,7 @@ namespace quic
 
   void Http3EventLoop::informAboutStreamNetworkFinish(Http3WTStream *streamobj, NetworkTask task)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::StreamNetworkFinish;
     report.streamobj = streamobj;
     report.nettask = task;
@@ -190,7 +183,7 @@ namespace quic
 
   void Http3EventLoop::informAboutStreamReset(Http3WTStream *streamobj)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::StreamReset;
     report.streamobj = streamobj;
     if (progress_)
@@ -199,7 +192,7 @@ namespace quic
 
   void Http3EventLoop::informDatagramReceived(Http3WTSession *sessionobj, absl::string_view datagram)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::DatagramReceived;
     report.sessionobj = sessionobj;
     report.para = new std::string(datagram);
@@ -207,28 +200,19 @@ namespace quic
       progress_->Send(&report, 1);
   }
 
-  void Http3EventLoop::informDatagramSend(Http3WTSession *sessionobj)
+  void Http3EventLoop::informDatagramSend(Http3WTSession *sessionobj, Napi::ObjectReference *bufferhandle)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::DatagramSend;
     report.sessionobj = sessionobj;
-    if (progress_)
-      progress_->Send(&report, 1);
-  }
-
-  void Http3EventLoop::informDatagramBufferFree(Napi::ObjectReference *bufferhandle)
-  {
-    struct Http3ProgressReport report;
-    report.type = Http3ProgressReport::DatagramBufferFree;
     report.bufferhandle = bufferhandle;
-
     if (progress_)
       progress_->Send(&report, 1);
   }
 
   void Http3EventLoop::informUnref(LifetimeHelper *obj)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::Unref;
     report.obj = obj;
 
@@ -238,7 +222,7 @@ namespace quic
 
   void Http3EventLoop::informAboutClientConnected(Http3Client *client, bool success)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::ClientConnected;
     report.clientobj = client;
     report.success = success;
@@ -248,7 +232,7 @@ namespace quic
 
   void Http3EventLoop::informClientWebtransportSupport(Http3Client *client)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::ClientWebTransportSupport;
     report.clientobj = client;
     if (progress_)
@@ -257,7 +241,7 @@ namespace quic
 
   void Http3EventLoop::informAboutNewSessionRequest(Http3Server *server, WebTransportSession *session, spdy::Http2HeaderBlock *reqheadcopy, WebTransportRespPromisePtr promise)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::NewSessionRequest;
     report.webtsession = session;
     report.serverobj = server;
@@ -269,7 +253,7 @@ namespace quic
 
   void Http3EventLoop::informAboutNewSession(Http3Server *server, Http3WTSession *session, absl::string_view path, Napi::Reference<Napi::Value> *header)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::NewSession;
     report.serverobj = server;
     report.session = session;
@@ -281,7 +265,7 @@ namespace quic
 
   void Http3EventLoop::informNewClientSession(Http3Client *client, Http3WTSession *session)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::NewClientSession;
     report.clientobj = client;
     report.session = session;
@@ -292,7 +276,7 @@ namespace quic
   void Http3EventLoop::informSessionClosed(Http3WTSession *sessionobj, WebTransportSessionError error_code,
                                            absl::string_view error_message)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::SessionClosed;
     report.sessionobj = sessionobj;
     report.para = new std::string(error_message);
@@ -303,7 +287,7 @@ namespace quic
 
   void Http3EventLoop::informSessionReady(Http3WTSession *sessionobj)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::SessionReady;
     report.sessionobj = sessionobj;
     if (progress_)
@@ -312,7 +296,7 @@ namespace quic
 
   void Http3EventLoop::informServerStatus(Http3Server *serverobj, NetworkStatus status, ServerStatusDetails *details)
   {
-    struct Http3ProgressReport report;
+    Http3ProgressReport report;
     report.type = Http3ProgressReport::ServerStatus;
     report.serverobj = serverobj;
     report.status = status;
@@ -534,12 +518,6 @@ namespace quic
     cbstream_.Call({retObj});
   }
 
-  void Http3EventLoop::processDatagramBufferFree(Napi::ObjectReference *bufferhandle)
-  {
-    bufferhandle->Unref(); // release the outgoing buffer
-    delete bufferhandle;   // free the handle object
-  }
-
   void Http3EventLoop::processDatagramReceived(Http3WTSession *sessionobj, std::string *datagram)
   {
     if (!checkQw())
@@ -565,8 +543,10 @@ namespace quic
     cbsession_.Call({retObj});
   }
 
-  void Http3EventLoop::processDatagramSend(Http3WTSession *sessionobj)
+  void Http3EventLoop::processDatagramSend(Http3WTSession *sessionobj, Napi::ObjectReference *bufferhandle)
   {
+     bufferhandle->Unref(); // release the outgoing buffer
+    delete bufferhandle;   // free the handle object
     if (!checkQw())
       return;
     HandleScope scope(qw_->Env());
@@ -867,12 +847,7 @@ namespace quic
       break;
       case Http3ProgressReport::DatagramSend:
       {
-        processDatagramSend(cur.sessionobj);
-      }
-      break;
-      case Http3ProgressReport::DatagramBufferFree:
-      {
-        processDatagramBufferFree(cur.bufferhandle);
+        processDatagramSend(cur.sessionobj, cur.bufferhandle);
       }
       break;
       case Http3ProgressReport::Unref:
@@ -891,10 +866,8 @@ namespace quic
         progress_(nullptr),
         quic_event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get()))
   {
-#ifdef WIN32
-    initSockets();
-#endif
-
+    std::vector<std::string> quiche_cmd_line;
+    quiche_cmd_line.push_back(std::string("webtransport.node"));
     if (!info[0].IsUndefined() /*|| info[1].IsFunction()*/)
     {
       Napi::Object lobj = info[0].ToObject();
@@ -945,12 +918,26 @@ namespace quic
         Napi::Error::New(Env(), "No session callback").ThrowAsJavaScriptException();
         return;
       }
+      quiche_cmd_line.push_back(std::string("-v"));
+      if (lobj.Has("quicheLogVerbose") && lobj.Get("quicheLogVerbose").IsFunction())
+      {
+         Napi::Value verboseValue = (lobj).Get("quicheLogVerbose");
+         quiche_cmd_line.push_back(verboseValue.ToString().Utf8Value());
+      } else {
+         quiche_cmd_line.push_back(std::string("-1"));
+      }
     }
     else
     {
       Napi::Error::New(Env(), "Callback not passed to Http3EventLoop internal").ThrowAsJavaScriptException();
       return;
     }
+    std::vector<const char*> quiche_cmd_line_char;
+    for (auto cur= quiche_cmd_line.begin(); cur != quiche_cmd_line.end(); cur++) {
+      quiche_cmd_line_char.push_back((*cur).c_str());
+    } 
+
+    quiche::QuicheParseCommandLineFlags("No use instruction.", quiche_cmd_line.size(), &(*quiche_cmd_line_char.begin()));
   }
 
   void Http3EventLoop::startEventLoop(const Napi::CallbackInfo &info)

package/src/http3eventloop.h

@@ -93,7 +93,6 @@ namespace quic
             StreamNetworkFinish,
             DatagramReceived,
             DatagramSend,
-            DatagramBufferFree,
             Unref
         } type;
         union
@@ -216,8 +215,7 @@ namespace quic
         void informAboutStreamNetworkFinish(Http3WTStream *streamobj, NetworkTask task);
 
         void informDatagramReceived(Http3WTSession *sessionobj, absl::string_view datagram);
-        void informDatagramBufferFree(Napi::ObjectReference *bufferhandle);
-        void informDatagramSend(Http3WTSession *sessionobj);
+        void informDatagramSend(Http3WTSession *sessionobj, Napi::ObjectReference *bufferhandle);
 
         void informUnref(LifetimeHelper *obj);
 
@@ -282,8 +280,7 @@ namespace quic
         void processStreamNetworkFinish(Http3WTStream *streamobj, NetworkTask task);
 
         void processDatagramReceived(Http3WTSession *sessionobj, std::string *datagram);
-        void processDatagramSend(Http3WTSession *sessionobj);
-        void processDatagramBufferFree(Napi::ObjectReference *bufferhandle);
+        void processDatagramSend(Http3WTSession *sessionobj, Napi::ObjectReference *bufferhandle);
 
         bool shutDownEventLoopInt();