@fails-components/webtransport-transport-http3-quiche 1.6.3 → 1.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {
@@ -44,7 +44,7 @@
     "prebuild-install": "^7.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.10",
+    "@babel/core": "^7.29.6",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-syntax-import-attributes": "^7.23.3",
     "@types/node": "^24.0.1",

package/src/http3client.cc

@@ -84,7 +84,7 @@ namespace quic
             const std::string& cert_sct, const std::string& signature,
             const ProofVerifyContext* context, std::string* error_details,
             std::unique_ptr<ProofVerifyDetails>* details,
-            std::unique_ptr<ProofVerifierCallback> callback) {
+            std::unique_ptr<ProofVerifierCallback> callback) override {
                 auto env = envg_->getEnv();
                 Napi::HandleScope scope(env);
                 
@@ -114,10 +114,10 @@ namespace quic
 
         QuicAsyncStatus VerifyCertChain(
             const std::string& hostname, const uint16_t port,
-            const std::vector<std::string>& certs, const std::string& ocsp_response,
+            const std::vector<absl::string_view>& certs, const std::string& ocsp_response,
             const std::string& cert_sct, const ProofVerifyContext* context,
             std::string* error_details, std::unique_ptr<ProofVerifyDetails>* details,
-            uint8_t* out_alert, std::unique_ptr<ProofVerifierCallback> callback) {
+            uint8_t* out_alert, std::unique_ptr<ProofVerifierCallback> callback) override {
                 auto env = envg_->getEnv();
                 Napi::HandleScope scope(env);
                 
@@ -609,7 +609,8 @@ namespace quic
                         wtsessionobj->init(
                             static_cast<WebTransportSession *>(wtsession));
                         getJS()->processNewClientSession(wtsessionobj);
-                        auto visitor = std::make_unique<Http3WTSession::Visitor>(wtsessionobj);
+                        auto visitor = std::make_unique<Http3WTSession::Visitor>(wtsessionobj,
+                            static_cast<Http3ClientSession *>(session_.get()));
                         static_cast<Http3ClientSession *>(session_.get())->AddVisitor(id, visitor.get());
                         wtsession->SetVisitor(std::move(visitor));
                     }

package/src/http3clientsession.cc

@@ -38,6 +38,12 @@ namespace quic
         drop_response_body_(drop_response_body),
         enable_web_transport_(enable_web_transport) {}
 
+  Http3ClientSession::~Http3ClientSession() {
+     for (auto itty = svisitors_.begin(); itty != svisitors_.end(); itty++) {
+      (*itty).second->RemoveVisitorRemoveVisitor();
+    }
+  }
+
   std::unique_ptr<QuicSpdyClientStream>
   Http3ClientSession::CreateClientStream()
   {

package/src/http3clientsession.h

@@ -16,11 +16,12 @@
 
 #include "quiche/quic/core/http/quic_spdy_client_session.h"
 #include "src/http3clientstream.h"
+#include "src/http3wtsessionvisitor.h"
 
 namespace quic
 {
 
-  class Http3ClientSession : public QuicSpdyClientSession
+  class Http3ClientSession : public QuicSpdyClientSession, public Http3WTSession::VisitorRemoveVisitor
   {
   public:
     Http3ClientSession(const QuicConfig &config,
@@ -35,6 +36,7 @@ namespace quic
                        const QuicServerId &server_id,
                        QuicCryptoClientConfig *crypto_config,
                        bool drop_response_body, bool enable_web_transport);
+    ~Http3ClientSession();
 
     std::unique_ptr<QuicSpdyClientStream> CreateClientStream() override;
     WebTransportHttp3VersionSet LocallySupportedWebTransportVersions()
@@ -42,10 +44,15 @@ namespace quic
     HttpDatagramSupport LocalHttpDatagramSupport() override;
 
    void OnCanCreateNewOutgoingStream(bool unidirectional) override;
-   void AddVisitor(const WebTransportSessionId id, webtransport::SessionVisitor *visitor) {
+   void AddVisitor(const WebTransportSessionId id, Http3WTSession::Visitor *visitor) {
       svisitors_.try_emplace(id, visitor);
     }
 
+    void RemoveVisitor(Http3WTSession::Visitor* visitor) override {
+      absl::erase_if(svisitors_,
+                     [&](const auto& pair) { return pair.second == visitor; });
+    }
+
     void set_on_interim_headers(
         std::function<void(const quiche::HttpHeaderBlock &)> on_interim_headers)
     {
@@ -56,7 +63,7 @@ namespace quic
     std::function<void(const quiche::HttpHeaderBlock &)> on_interim_headers_;
     const bool drop_response_body_;
     const bool enable_web_transport_;
-    absl::flat_hash_map<QuicStreamId, webtransport::SessionVisitor *> svisitors_;
+    absl::flat_hash_map<QuicStreamId, Http3WTSession::Visitor *> svisitors_;
   };
 
 } // namespace quic

package/src/http3server.cc

@@ -11,6 +11,7 @@
 #include "src/http3server.h"
 #include "src/http3dispatcher.h"
 #include "src/http3wtsessionvisitor.h"
+#include "src/http3serversession.h"
 #include "quiche/quic/core/quic_default_packet_writer.h"
 #include "quiche/quic/core/quic_default_connection_helper.h"
 #include "quiche/quic/core/quic_default_clock.h"
@@ -607,7 +608,7 @@ namespace quic
             Http3WTSession *wtsession = new Http3WTSession();
             wtsession->init(session);
             response->visitor =
-                std::make_unique<Http3WTSession::Visitor>(wtsession);
+                std::make_unique<Http3WTSession::Visitor>(wtsession, nullptr);
             processNewSession(static_cast<Http3WTSession *>(wtsession), path, peer_address,
                      headerValue, userDataValue);
             (*prom)->resolve(std::move(response));

package/src/http3serverbackend.cc

@@ -85,7 +85,7 @@ namespace quic
       wtsession->init(session);
       response->response_headers[":status"] = "200";
       response->visitor =
-          std::make_unique<Http3WTSession::Visitor>(wtsession);
+          std::make_unique<Http3WTSession::Visitor>(wtsession, nullptr);
       server_->getJS()->processNewSession(static_cast<Http3WTSession *>(wtsession), path, peer_address.ToString(), nullptr, nullptr);
       promise->resolve(std::move(response));
       return promise;

package/src/http3serverbackend.h

@@ -17,12 +17,12 @@
 #include "quiche/quic/core/web_transport_interface.h"
 #include "quiche/common/http/http_header_block.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
+#include "src/http3wtsessionvisitor.h"
 
 namespace quic
 {
 
   class Http3Server;
-  class Http3EventLoop;
 
   template <typename T>
   class JSlikePromise
@@ -64,7 +64,7 @@ namespace quic
     struct WebTransportResponse
     {
       quiche::HttpHeaderBlock response_headers;
-      std::unique_ptr<WebTransportVisitor> visitor;
+      std::unique_ptr<Http3WTSession::Visitor> visitor;
     };
 
     using WebTransportRespPromise = JSlikePromise<WebTransportResponse>;

package/src/http3serversession.cc

@@ -42,7 +42,12 @@ namespace quic
     QUICHE_DCHECK(http3_server_backend_);
   }
 
-  Http3ServerSession::~Http3ServerSession() { DeleteConnection(); }
+  Http3ServerSession::~Http3ServerSession() {
+    DeleteConnection();
+    for (auto itty = svisitors_.begin(); itty != svisitors_.end(); itty++) {
+      (*itty).second->RemoveVisitorRemoveVisitor();
+    }
+  }
 
   std::unique_ptr<QuicCryptoServerStreamBase>
   Http3ServerSession::CreateQuicCryptoServerStream(

package/src/http3serversession.h

@@ -29,11 +29,12 @@
 // #include "quic/tools/quic_backend_response.h"
 #include "src/http3serverbackend.h"
 #include "src/http3serverstream.h" // todo
+#include "src/http3wtsessionvisitor.h"
 
 namespace quic
 {
 
-  class Http3ServerSession : public QuicServerSessionBase
+  class Http3ServerSession : public QuicServerSessionBase, public Http3WTSession::VisitorRemoveVisitor 
   {
   public:
     // Takes ownership of |connection|.
@@ -54,10 +55,15 @@ namespace quic
     void OnStreamFrame(const QuicStreamFrame &frame) override;
 
    void OnCanCreateNewOutgoingStream(bool unidirectional) override;
-   void AddVisitor(const WebTransportSessionId id, webtransport::SessionVisitor *visitor) {
+   void AddVisitor(const WebTransportSessionId id, Http3WTSession::Visitor *visitor) {
       svisitors_.try_emplace(id, visitor);
     }
 
+    void RemoveVisitor(Http3WTSession::Visitor* visitor) override {
+      absl::erase_if(svisitors_,
+                     [&](const auto& pair) { return pair.second == visitor; });
+    }
+
   protected:
     // QuicSession methods:
     QuicSpdyStream *CreateIncomingStream(QuicStreamId id) override;
@@ -91,7 +97,7 @@ namespace quic
     }
 
     Http3ServerBackend *http3_server_backend_; // Not owned.
-    absl::flat_hash_map<QuicStreamId, webtransport::SessionVisitor *> svisitors_;
+    absl::flat_hash_map<QuicStreamId, Http3WTSession::Visitor *> svisitors_;
   };
 
 } // namespace quic

package/src/http3serverstream.cc

@@ -211,7 +211,8 @@ namespace quic
       {
         WriteHeaders(std::move(resp->response_headers), false, nullptr);
         if (resp->visitor != nullptr)
-        {     
+        {
+          resp->visitor->AddVisitorRemoveVisitor(static_cast<Http3ServerSession *>(session()));
           static_cast<Http3ServerSession *>(session())->AddVisitor(id(), resp->visitor.get());
           web_transport()->SetVisitor(std::move(resp->visitor)); 
         }

package/src/http3wtsessionvisitor.cc

@@ -11,6 +11,9 @@ namespace quic
     {
         // printf("Session ~Visitor %d %x %x\n", getpid(), this, session_);
         Http3WTSessionJS *sessobj = session_->getJS();
+        if (vrvis_) {
+            vrvis_->RemoveVisitor(this);
+        }
         if (sessobj) {
             sessobj->Unref();
         } else

package/src/http3wtsessionvisitor.h

@@ -50,12 +50,33 @@ namespace quic
         // need to be called immediately after new
         void init(WebTransportSession *session);
 
-        class Visitor : public WebTransportVisitor
-        {
-        public:
-            Visitor(Http3WTSession *session) : session_(session) {}
+        class Visitor;
+
+        class VisitorRemoveVisitor {
+         public:
+          virtual void RemoveVisitor(Http3WTSession::Visitor* visitor) = 0;
+        };
+
+        class Visitor : public WebTransportVisitor {
+         public:
+          Visitor(Http3WTSession* session, VisitorRemoveVisitor* vrvis)
+              : session_(session), vrvis_(vrvis) {
+            /* printf(
+                "Session created Visitor %d %x %x\n", getpid(), this, session_);*/
+          }
+
+          ~Visitor();
+
+          void AddVisitorRemoveVisitor(VisitorRemoveVisitor *vrvis) {
+            if (vrvis_) {
+                vrvis_->RemoveVisitor(this);
+            }
+            vrvis_ = vrvis;
+          }
 
-            ~Visitor();
+          void RemoveVisitorRemoveVisitor() {
+            vrvis_ = nullptr;
+          }
 
             void OnSessionReady() override;
 
@@ -68,19 +89,18 @@ namespace quic
 
             void OnDatagramReceived(absl::string_view datagram) override;
 
-            void OnCanCreateNewOutgoingBidirectionalStream() override
-            {
-                // unclear how we can stich this together?
-                session_->TrySendingBidirectionalStreams();
-            }
+          void OnCanCreateNewOutgoingBidirectionalStream() override {
+            // unclear how we can stich this together?
+            session_->TrySendingBidirectionalStreams();
+          }
 
-            void OnCanCreateNewOutgoingUnidirectionalStream() override
-            {
-                session_->TrySendingUnidirectionalStreams();
-            }
+          void OnCanCreateNewOutgoingUnidirectionalStream() override {
+            session_->TrySendingUnidirectionalStreams();
+          }
 
-        protected:
-            Http3WTSession *session_;
+         protected:
+          Http3WTSession* session_;
+          VisitorRemoveVisitor* vrvis_;
         };
 
         bool
@@ -146,7 +166,6 @@ namespace quic
         }
 
         webtransport::DatagramStatus writeDatagramInt(char *buffer, size_t len, Napi::ObjectReference *bufferhandle);
-
         WebTransportSession *session_;
         bool echo_stream_opened_ = false;