@fails-components/webtransport-transport-http3-quiche 1.2.1 → 1.3.1

package/CMakeLists.txt

@@ -88,7 +88,6 @@ 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_server_stats_impl.h
-platform/quiche_platform_impl/quiche_mem_slice_impl.h
 platform/quiche_platform_impl/quiche_flag_utils_impl.h
 #protofiles
 #${PROTO_SRCS}
@@ -157,7 +156,6 @@ third_party/quiche/quiche/common/platform/api/quiche_hostname_utils.cc
 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_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
@@ -168,7 +166,6 @@ third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_fl
 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_logging_impl.cc
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_logging_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
@@ -189,6 +186,8 @@ third_party/quiche/quiche/common/quiche_ip_address.h
 third_party/quiche/quiche/common/quiche_ip_address_family.cc
 third_party/quiche/quiche/common/quiche_ip_address_family.h
 third_party/quiche/quiche/common/quiche_linked_hash_map.h
+third_party/quiche/quiche/common/quiche_mem_slice.cc
+third_party/quiche/quiche/common/quiche_mem_slice.h
 third_party/quiche/quiche/common/quiche_mem_slice_storage.h
 third_party/quiche/quiche/common/quiche_mem_slice_storage.cc
 third_party/quiche/quiche/common/quiche_random.cc

package/eslint.config.js

@@ -1,21 +1,22 @@
-
-import js from "@eslint/js"
-import promise from "eslint-plugin-promise"
-import babelParser from "@babel/eslint-parser"
+import js from '@eslint/js'
+import promise from 'eslint-plugin-promise'
+import babelParser from '@babel/eslint-parser'
+import importplug from 'eslint-plugin-import'
+// eslint-disable-next-line import/extensions
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
-import globals from "globals";
+import globals from 'globals'
 
 export default [
   js.configs.recommended,
   eslintPluginPrettierRecommended,
   {
     plugins: {
-      promise
+      promise,
+      import: importplug
     },
     languageOptions: {
       globals: {
         ...globals.node
-
       },
       parser: babelParser,
       ecmaVersion: 2020,
@@ -24,28 +25,36 @@ export default [
           legacyDecorators: true,
           jsx: true
         },
-        requireConfigFile: false,
+        requireConfigFile: false
       }
     },
     ignores: [
-      "build/*",
-      "dist/*",
-      "node_modules/*",
-      ".snapshots/*",
-      "*.min.js"
+      'build/*',
+      'dist/*',
+      'node_modules/*',
+      '.snapshots/*',
+      '*.min.js'
     ],
     rules: {
-      "space-before-function-paren": 0,
-      "import/export": 0,
-      "promise/catch-or-return": "error",
-      "no-useless-return": 1,
-      "camelcase": 1,
-    },
+      'space-before-function-paren': 0,
+      'import/export': 0,
+      'promise/catch-or-return': 'error',
+      'no-useless-return': 1,
+      camelcase: 1,
+      'import/extensions': [
+        'error',
+        'always',
+        {
+          js: 'always',
+          jsx: 'always'
+        }
+      ]
+    }
   },
   {
-    files: ["test/*.spec.js"],
+    files: ['test/*.spec.js'],
     rules: {
-      "no-undef": 0
+      'no-undef': 0
     }
-  },
-];
+  }
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {

package/src/http3server.cc

@@ -395,7 +395,11 @@ namespace quic
     }
   }*/
 
-  void Http3ServerJS::processNewSession(Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header, Napi::Reference<Napi::Value> *userData)
+  void Http3ServerJS::processNewSession(Http3WTSession *session,
+     const std::string &path,
+     const std::string& peer_address,
+     Napi::Reference<Napi::Value> *header,
+     Napi::Reference<Napi::Value> *userData)
   {
     Napi::HandleScope scope(Env());
 
@@ -421,12 +425,16 @@ namespace quic
       retObj.Set("userData", userData->Value());
       userData->Unref();
     }
+    retObj.Set("peerAddress", peer_address);
     objVal.Get("onHttpWTSessionVisitor")
         .As<Napi::Function>()
         .Call(objVal, {retObj});
   }
 
-  void Http3ServerJS::processNewSessionRequest(WebTransportSession *session, const quiche::HttpHeaderBlock &reqhead, WebTransportRespPromisePtr promise)
+  void Http3ServerJS::processNewSessionRequest(WebTransportSession *session,
+     const quiche::HttpHeaderBlock &reqhead,  
+     const std::string&  peer_address, 
+     WebTransportRespPromisePtr promise)
   {
     Napi::HandleScope scope(Env());
 
@@ -464,7 +472,8 @@ namespace quic
                                                  });
     retObj.Set("session", wtsObj);
     retObj.Set("protocol", "http3:libquiche");
-
+    retObj.Set("peerAddress", peer_address);
+                                          
     objVal.Get("onSessionRequest")
         .As<Napi::Function>()
         .Call(objVal, {retObj});
@@ -524,6 +533,13 @@ namespace quic
         else
           return Napi::Error::New(Env(), "No session passed for finishSessionRequest").ThrowAsJavaScriptException();
 
+        std::string peer_address;
+        if (lobj.Has("peerAddress") && !(lobj).Get("peerAddress").IsEmpty()) {
+          Napi::Value peerAddressValue = lobj.Get("peerAddress");
+          peer_address= peerAddressValue.ToString().Utf8Value();
+        } else 
+          return Napi::Error::New(Env(), "No peerAddress passed for finishSessionRequest").ThrowAsJavaScriptException();
+        
         if (lobj.Has("promise") && !(lobj).Get("promise").IsEmpty())
         {
           Napi::Value promiseVal = (lobj).Get("promise");
@@ -576,7 +592,8 @@ namespace quic
             wtsession->init(session);
             response->visitor =
                 std::make_unique<Http3WTSession::Visitor>(wtsession);
-            processNewSession(static_cast<Http3WTSession *>(wtsession), path, headerValue, userDataValue);
+            processNewSession(static_cast<Http3WTSession *>(wtsession), path, peer_address,
+                     headerValue, userDataValue);
             (*prom)->resolve(std::move(response));
           }
         }

package/src/http3server.h

@@ -84,8 +84,8 @@ namespace quic
             exports.Set("Http3WebTransportServer", tplsrv);
         }
 
-        void processNewSession(Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header, Napi::Reference<Napi::Value> *userData);
-        void processNewSessionRequest(WebTransportSession *session, const quiche::HttpHeaderBlock &reqheadcopy, WebTransportRespPromisePtr promise);
+        void processNewSession(Http3WTSession *session, const std::string &path,  const std::string &peer_address, Napi::Reference<Napi::Value> *header, Napi::Reference<Napi::Value> *userData);
+        void processNewSessionRequest(WebTransportSession *session, const quiche::HttpHeaderBlock &reqheadcopy,  const std::string &peer_address, WebTransportRespPromisePtr promise);
 
     protected:
         std::unique_ptr<Http3Server> server_;

package/src/http3serverbackend.cc

@@ -46,7 +46,8 @@ namespace quic
   Http3ServerBackend::WebTransportRespPromisePtr
   Http3ServerBackend::ProcessWebTransportRequest(
       const quiche::HttpHeaderBlock &request_headers,
-      WebTransportSession *session)
+      WebTransportSession *session,
+      const QuicSocketAddress peer_address)
   {
     WebTransportRespPromisePtr promise = std::make_shared<WebTransportRespPromise>();
     if (!SupportsWebTransport())
@@ -73,7 +74,7 @@ namespace quic
       // not necessary anymore
 
       // second step inform the js side
-      server_->getJS()->processNewSessionRequest(session, request_headers, promise);
+      server_->getJS()->processNewSessionRequest(session, request_headers, peer_address.ToString(), promise);
       return promise;
     } 
     
@@ -85,7 +86,7 @@ namespace quic
       response->response_headers[":status"] = "200";
       response->visitor =
           std::make_unique<Http3WTSession::Visitor>(wtsession);
-      server_->getJS()->processNewSession(static_cast<Http3WTSession *>(wtsession), path, nullptr, 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

@@ -16,6 +16,7 @@
 #include "quiche/quic/core/quic_types.h"
 #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"
 
 namespace quic
 {
@@ -78,7 +79,8 @@ namespace quic
 
     WebTransportRespPromisePtr ProcessWebTransportRequest(
         const quiche::HttpHeaderBlock & /*request_headers*/,
-        WebTransportSession * /*session*/);
+        WebTransportSession * /*session*/,
+        const QuicSocketAddress/* peer_address */);
     bool SupportsWebTransport() { return true; }
     bool UsesDatagramContexts() { return true; }
     bool SupportsExtendedConnect() { return true; }

package/src/http3serverstream.cc

@@ -197,10 +197,11 @@ namespace quic
 
     if (web_transport() != nullptr)
     {
+      quic::QuicSocketAddress peer_address = spdy_session()->connection()->peer_address();
       // to do synchronize lifetime of object, so maybe store promises
       Http3ServerBackend::WebTransportRespPromisePtr response =
           http3_server_backend_->ProcessWebTransportRequest(
-              request_headers_, web_transport());
+              request_headers_, web_transport(), peer_address);
       pending_proms_.insert(response);
       response->finally([this, response](Http3ServerBackend::WebTransportResponse *resp)
                         { 

package/platform/quiche_platform_impl/quiche_mem_slice_impl.h

@@ -1,2 +0,0 @@
-// use the default
-#include "quiche/common/platform/default/quiche_platform_impl/quiche_mem_slice_impl.h"