@fails-components/webtransport 0.0.5 → 0.0.7

package/src/http3server.cc

@@ -7,6 +7,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "absl/cleanup/cleanup.h"
 #include "src/http3server.h"
 #include "src/http3dispatcher.h"
 #include "src/http3wtsessionvisitor.h"
@@ -39,7 +40,8 @@ namespace quic
                        std::move(proof_source),
                        KeyExchangeSource::Default()),
         expected_server_connection_id_length_(kQuicDefaultConnectionIdLength),
-        js_(nullptr)
+        js_(nullptr),
+        connection_id_generator_(expected_server_connection_id_length_)
   {
   }
 
@@ -59,6 +61,8 @@ namespace quic
       QUIC_LOG(ERROR) << "CreateSocket() failed: " << strerror(errno);
       return false;
     }
+    auto closer = absl::MakeCleanup([this]
+                                    { { QuicUdpSocketApi api;api.Destroy(fd_); } });
 
     overflow_supported_ = socket_api.EnableDroppedPacketCount(fd_);
     socket_api.EnableReceiveTimestamp(fd_);
@@ -83,12 +87,16 @@ namespace quic
 
     const int kEpollFlags = kSocketEventReadable | kSocketEventWritable;
 
-    eventloop_->getQuicEventLoop()->RegisterSocket(fd_, kEpollFlags, this);
-    // eventloop_->SetNonblocking(fd_); // eventuelly should be part of register socket.
-    dispatcher_.reset(CreateQuicDispatcher());
-    dispatcher_->InitializeWithWriter(new QuicDefaultPacketWriter(fd_));
+    if (eventloop_->getQuicEventLoop()->RegisterSocket(fd_, kEpollFlags, this))
+    {
+      // eventloop_->SetNonblocking(fd_); // eventuelly should be part of register socket.
+      dispatcher_.reset(CreateQuicDispatcher());
+      dispatcher_->InitializeWithWriter(new QuicDefaultPacketWriter(fd_));
+      std::move(closer).Cancel();
+      return true;
+    }
 
-    return true;
+    return false;
   }
 
   bool Http3Server::stopServerInt()
@@ -119,7 +127,7 @@ namespace quic
             new QuicSimpleCryptoServerStreamHelper()),
         std::unique_ptr<QuicAlarmFactory>(
             eventloop_->getQuicEventLoop()->CreateAlarmFactory()),
-        &http3_server_backend_, expected_server_connection_id_length_);
+        &http3_server_backend_, expected_server_connection_id_length_, connection_id_generator_);
   }
 
   Http3ServerJS::Http3ServerJS(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Http3ServerJS>(info)
@@ -149,7 +157,7 @@ namespace quic
         else
         {
           Napi::Error::New(Env(), "No secret set for Http3Server").ThrowAsJavaScriptException();
-          return ;
+          return;
         }
         if (lobj.Has("host") && !(lobj).Get("host").IsEmpty())
         {
@@ -183,6 +191,20 @@ namespace quic
           sconfig.SetMaxBidirectionalStreamsToSend(maxconn);
           sconfig.SetMaxUnidirectionalStreamsToSend(maxconn);
         }
+
+        if (lobj.Has("initialStreamFlowControlWindow") && !(lobj).Get("initialStreamFlowControlWindow").IsEmpty())
+        {
+          Napi::Value initialStreamFlowControlWindowValue = (lobj).Get("initialStreamFlowControlWindow");
+          int initialStreamFlowControlWindow = initialStreamFlowControlWindowValue.As<Napi::Number>().Int32Value();
+          sconfig.SetInitialStreamFlowControlWindowToSend(initialStreamFlowControlWindow);
+        }
+
+        if (lobj.Has("initialSessionFlowControlWindow") && !(lobj).Get("initialSessionFlowControlWindow").IsEmpty())
+        {
+          Napi::Value initialSessionFlowControlWindowValue = (lobj).Get("initialSessionFlowControlWindow");
+          int initialSessionFlowControlWindow = initialSessionFlowControlWindowValue.As<Napi::Number>().Int32Value();
+          sconfig.SetInitialSessionFlowControlWindowToSend(initialSessionFlowControlWindow);
+        }
       }
       // Callback *callback, int port, std::unique_ptr<ProofSource> proof_source,  const char *secret
 
@@ -202,7 +224,7 @@ namespace quic
       if (proofsource == nullptr)
       {
         Napi::Error::New(Env(), "LoadPemFromStream cert failed for Http3Server").ThrowAsJavaScriptException();
-        return ;
+        return;
       }
       Http3EventLoop *eventloop = nullptr;
       if (!info[1].IsUndefined())
@@ -213,7 +235,7 @@ namespace quic
       else
       {
         Napi::Error::New(Env(), "No eventloop arguments passed to Http3Server").ThrowAsJavaScriptException();
-        return ;
+        return;
       }
 
       server_ = std::make_unique<Http3Server>(eventloop, host, port, std::move(proofsource), secret.c_str(), sconfig);
@@ -270,6 +292,21 @@ namespace quic
       freeaddrinfo(servinfo);
     }
 
+    const uint32_t kInitialSessionFlowControlWindow = 1 * 1024 * 1024; // 1 MB
+    const uint32_t kInitialStreamFlowControlWindow = 64 * 1024;        // 64 KB
+    if (config_.GetInitialStreamFlowControlWindowToSend() ==
+        kDefaultFlowControlSendWindow)
+    {
+      config_.SetInitialStreamFlowControlWindowToSend(
+          kInitialStreamFlowControlWindow);
+    }
+    if (config_.GetInitialSessionFlowControlWindowToSend() ==
+        kDefaultFlowControlSendWindow)
+    {
+      config_.SetInitialSessionFlowControlWindowToSend(
+          kInitialSessionFlowControlWindow);
+    }
+
     QuicSocketAddress address(ipaddress, port_);
     if (!CreateUDPSocketAndListen(address))
       return false; // move to this class

package/src/http3server.h

@@ -18,6 +18,7 @@
 #include "src/http3serverbackend.h"
 #include "src/http3eventloop.h"
 #include "quiche/quic/core/crypto/quic_crypto_server_config.h"
+#include "quiche/quic/core/deterministic_connection_id_generator.h"
 #include "quiche/quic/core/quic_udp_socket.h"
 #include "quiche/quic/core/quic_dispatcher.h"
 #include "quiche/quic/core/quic_packet_reader.h"
@@ -61,7 +62,6 @@ namespace quic
             exports.Set("Http3WebTransportServer", tplsrv);
         }
 
-
         void doUnref() override
         {
             Unref();
@@ -127,6 +127,7 @@ namespace quic
         QuicDispatcher *CreateQuicDispatcher();
 
         Http3EventLoop *eventloop_;
+        DeterministicConnectionIdGenerator connection_id_generator_;
     };
 
 }

package/src/http3serverbackend.h

@@ -15,7 +15,7 @@
 
 #include "quiche/quic/core/quic_types.h"
 #include "quiche/quic/core/web_transport_interface.h"
-#include "quiche/spdy/core/spdy_header_block.h"
+#include "quiche/spdy/core/http2_header_block.h"
 
 namespace quic
 {

package/src/http3wtsessionvisitor.cc

@@ -25,7 +25,7 @@ namespace quic
         session_->eventloop_->informSessionClosed(session_, error_code, error_message);
     }
 
-    void Http3WTSession::Visitor::OnSessionReady(const spdy::SpdyHeaderBlock &)
+    void Http3WTSession::Visitor::OnSessionReady(const spdy::Http2HeaderBlock &)
     {
         session_->eventloop_->informSessionReady(session_);
 

package/src/http3wtsessionvisitor.h

@@ -62,7 +62,7 @@ namespace quic
 
             ~Visitor();
 
-            void OnSessionReady(const spdy::SpdyHeaderBlock &) override;
+            void OnSessionReady(const spdy::Http2HeaderBlock &) override;
 
             void OnSessionClosed(WebTransportSessionError error_code,
                                  const std::string &error_message) override;

package/src/webtransport.js

@@ -24,6 +24,7 @@ if (
 ) {
   wtpath = buildpath + '/Debug/webtransport.node'
 }
+console.log('load webtransport binary:', wtpath)
 
 const wtrouter = require(wtpath)
 

package/test/testsuite.js

@@ -123,7 +123,7 @@ export async function echoTestsConnection(transport) {
   refArray1.set(data2, data1.length)
 
   const resultArray1 = new Uint8Array(i)
-  console.log("TEST 1: start")
+  console.log('TEST 1: start')
 
   while (true && i > 0) {
     const { done, value } = await reader.read()
@@ -155,8 +155,8 @@ export async function echoTestsConnection(transport) {
   testArraysEqual(refArray1, resultArray1)
 
   console.log('webtransport sending bidistream success')
-  console.log("TEST 1: finish")
-  console.log("TEST 2: start")
+  console.log('TEST 1: finish')
+  console.log('TEST 2: start')
   const bidiReader = transport.incomingBidirectionalStreams.getReader()
   const incombidi = await bidiReader.read()
   if (incombidi.value) {
@@ -204,9 +204,9 @@ export async function echoTestsConnection(transport) {
     }
     testArraysEqual(refArray2, resultArray2)
   }
-  console.log("TEST 2: finish")
+  console.log('TEST 2: finish')
 
-  console.log("TEST 3: start")
+  console.log('TEST 3: start')
   console.log('now unidirectional tests')
   const unidioutstream = await transport.createUnidirectionalStream()
   const unidiwrite = unidioutstream.getWriter()
@@ -262,8 +262,8 @@ export async function echoTestsConnection(transport) {
       throw new Error('incoming unidi stream test failed')
     }
   }
-  console.log("TEST 3: finish")
-  console.log("TEST 4: start")
+  console.log('TEST 3: finish')
+  console.log('TEST 4: start')
   console.log('finally test datagrams')
   const datawrite = await transport.datagrams.writable.getWriter()
   const data7 = new Uint8Array([83, 84, 85])
@@ -300,6 +300,6 @@ export async function echoTestsConnection(transport) {
     throw new Error('datagram stream test failed')
   }
   console.log('test datagrams finished')
-  console.log("TEST 4: finish")
+  console.log('TEST 4: finish')
   console.log('start close stream tests')
 }

package/platform/quiche_platform_impl/quic_flags_impl.h

@@ -1,9 +0,0 @@
-// from envoy so LICENSE.envoy applies
-#ifndef QUIC_FLAGS_IMPL
-#define QUIC_FLAGS_IMPL
-
-
-#include "third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quic_flags_impl.h"
-
-
-#endif