@fails-components/webtransport-transport-http3-quiche 1.0.11 → 1.1.2

package/CMakeLists.txt

@@ -539,6 +539,8 @@ third_party/quiche/quiche/quic/core/http/quic_spdy_stream.cc
 third_party/quiche/quiche/quic/core/http/quic_spdy_stream.h
 third_party/quiche/quiche/quic/core/http/quic_spdy_stream_body_manager.cc
 third_party/quiche/quiche/quic/core/http/quic_spdy_stream_body_manager.h
+third_party/quiche/quiche/quic/core/http/metadata_decoder.cc
+third_party/quiche/quiche/quic/core/http/metadata_decoder.h
 third_party/quiche/quiche/quic/core/http/spdy_utils.cc
 third_party/quiche/quiche/quic/core/http/spdy_utils.h
 third_party/quiche/quiche/quic/core/http/web_transport_http3.cc
@@ -609,6 +611,8 @@ third_party/quiche/quiche/quic/core/quic_alarm_factory.h
 third_party/quiche/quiche/quic/core/quic_arena_scoped_ptr.h
 third_party/quiche/quiche/quic/core/quic_bandwidth.cc
 third_party/quiche/quiche/quic/core/quic_bandwidth.h
+third_party/quiche/quiche/quic/core/quic_blocked_writer_list.cc
+third_party/quiche/quiche/quic/core/quic_blocked_writer_list.h
 third_party/quiche/quiche/quic/core/quic_blocked_writer_interface.h
 third_party/quiche/quiche/quic/core/quic_buffered_packet_store.cc
 third_party/quiche/quiche/quic/core/quic_buffered_packet_store.h
@@ -621,6 +625,8 @@ third_party/quiche/quiche/quic/core/quic_config.cc
 third_party/quiche/quiche/quic/core/quic_config.h
 third_party/quiche/quiche/quic/core/quic_connection.cc
 third_party/quiche/quiche/quic/core/quic_connection.h
+third_party/quiche/quiche/quic/core/quic_connection_alarms.cc
+third_party/quiche/quiche/quic/core/quic_connection_alarms.h
 third_party/quiche/quiche/quic/core/quic_connection_context.cc
 third_party/quiche/quiche/quic/core/quic_connection_context.h
 third_party/quiche/quiche/quic/core/quic_connection_id.cc

package/build.js

@@ -1,9 +1,9 @@
 import { arch, argv, env, platform } from 'node:process'
 import { spawn } from 'node:child_process'
-import { cp, rename, mkdtemp, rm, access, readdir } from 'node:fs/promises'
+import { cp, rename, mkdtemp, rm, access } from 'node:fs/promises'
 import { constants } from 'node:fs'
 import path from 'node:path'
-import pkg from './package.json' assert { type: 'json' }
+import pkg from './package.json' with { type: 'json' }
 import { tmpdir } from 'node:os'
 
 const binplatform = platform + '_' + arch
@@ -87,7 +87,7 @@ const extractthirdparty = async () => {
       'transports/http3-quiche/third_party/googleurl',
       'transports/http3-quiche/third_party/protobuf'
     ]
-    for (let mod in submodules) {
+    for (const mod in submodules) {
       const sub = submodules[mod]
       await callGit(
         [
@@ -141,8 +141,8 @@ const prebuild = (args) => {
 
     proc.on('close', (code) => {
       console.log(`child process exited with code ${code}`)
-      if (code == 0) resolve()
-      else reject()
+      if (code === 0) resolve()
+      else reject(new Error(`child process exited with code ${code}`))
     })
   })
 }
@@ -237,7 +237,7 @@ if (argv.length > 2) {
         process.exit(1)
       }
       break
-    case 'install': {
+    case 'install': 
       try {
         const pbres = await prebuildInstall([
           '-r',
@@ -261,7 +261,7 @@ if (argv.length > 2) {
         console.error('Building binary failed: ', error)
         process.exit(1)
       }
-    } break
+     break
     case 'build':
       try {
         await execbuild(['build', ...platformargs])

package/dist/lib/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../lib/socket.js"],"names":[],"mappings":"AAqEA;IACE;;OAEG;IACH,kBAFW,OAAO,4BAA4B,EAAE,oBAAoB,GAAC,SAAS,EAa7E;IAVC,0CAA0C;IAE1C,WAFW,OAAO,YAAY,EAAE,MAAM,CAEZ;IAE1B,UAAqB;IACrB,oBAAuB;IAgCzB,qBASC;IAlCD,+BAGC;IAPC,iBAAoB;IACpB,gBAAmB;IAQrB;;OAEG;IAEH,mDAHW,OAAO,SAAS,EAAE,mBAAmB,WAiB/C;CAYF"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../lib/socket.js"],"names":[],"mappings":"AAqEA;IACE;;OAEG;IAEH,kBAHW,OAAO,4BAA4B,EAAE,oBAAoB,GAAC,SAAS,EAc7E;IAVC,0CAA0C;IAE1C,WAFW,OAAO,YAAY,EAAE,MAAM,CAEZ;IAE1B,UAAqB;IACrB,oBAAuB;IAgCzB,qBASC;IAlCD,+BAGC;IAPC,iBAAoB;IACpB,gBAAmB;IAQrB;;OAEG;IAEH,mDAHW,OAAO,SAAS,EAAE,mBAAmB,WAiB/C;CAYF"}

package/eslint.config.js

@@ -0,0 +1,51 @@
+
+import js from "@eslint/js"
+import promise from "eslint-plugin-promise"
+import babelParser from "@babel/eslint-parser"
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
+import globals from "globals";
+
+export default [
+  js.configs.recommended,
+  eslintPluginPrettierRecommended,
+  {
+    plugins: {
+      promise
+    },
+    languageOptions: {
+      globals: {
+        ...globals.node
+
+      },
+      parser: babelParser,
+      ecmaVersion: 2020,
+      parserOptions: {
+        ecmaFeatures: {
+          legacyDecorators: true,
+          jsx: true
+        },
+        requireConfigFile: false,
+      }
+    },
+    ignores: [
+      "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,
+    },
+  },
+  {
+    files: ["test/*.spec.js"],
+    rules: {
+      "no-undef": 0
+    }
+  },
+];

package/lib/socket.js

@@ -71,6 +71,7 @@ export class Http3WebTransportSocket {
   /**
    * @param {import('../../../main/lib/types.js').HttpWebTransportInit|undefined} args
    */
+  // eslint-disable-next-line no-unused-vars
   constructor(args) {
     /** @type {import('node:dgram').Socket} */
     // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.0.11",
+  "version": "1.1.2",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {
@@ -48,15 +48,15 @@
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-syntax-import-attributes": "^7.23.3",
     "@types/node": "^18.15.3",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^7.2.0",
+    "eslint": "^9.3.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-standard": "^4.1.0",
-    "prettier": "^2.4.1",
+    "prettier": "^3.2.5",
     "typescript": "^4.8.4"
   },
   "binary": {

package/src/http3server.cc

@@ -91,8 +91,8 @@ namespace quic
   Http3ServerJS::Http3ServerJS(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Http3ServerJS>(info)
   {
     std::string secret;
-    std::string cert;
-    std::string privkey;
+    std::vector<std::string> cert;
+    std::vector<std::string> privkey;
 
     QuicConfig sconfig;
     if (!info[0].IsUndefined())
@@ -113,7 +113,16 @@ namespace quic
         if (lobj.Has("cert") && !(lobj).Get("cert").IsEmpty())
         {
           Napi::Value certValue = (lobj).Get("cert");
-          cert = certValue.ToString().Utf8Value();
+          if (!certValue.IsArray()) {
+            cert.push_back(certValue.ToString().Utf8Value());
+          } else {
+            Napi::Array  certArray = certValue.As<Napi::Array>();
+            if (certArray.Length() < 1) Napi::Error::New(Env(), "No cert in array for Http3Server").ThrowAsJavaScriptException();
+            for (uint32_t i = 0; i < certArray.Length(); i++) {
+              Napi::Value curval = certArray.Get(i);
+              cert.push_back(curval.ToString().Utf8Value()); 
+            }
+          }
         }
         else
         {
@@ -123,13 +132,23 @@ namespace quic
         if (lobj.Has("privKey") && !(lobj).Get("privKey").IsEmpty())
         {
           Napi::Value keyValue = (lobj).Get("privKey");
-          privkey = keyValue.ToString().Utf8Value();
+          if (!keyValue.IsArray()) {
+            privkey.push_back(keyValue.ToString().Utf8Value());
+          } else {
+            Napi::Array  keyArray = keyValue.As<Napi::Array>();
+            if (keyArray.Length() < 1) Napi::Error::New(Env(), "No key in array for Http3Server").ThrowAsJavaScriptException();
+            for (uint32_t i = 0; i < keyArray.Length(); i++) {
+              Napi::Value curval = keyArray.Get(i);
+              privkey.push_back(curval.ToString().Utf8Value()); 
+            }
+          }
         }
         else
         {
           Napi::Error::New(Env(), "No privKey set for Http3Server").ThrowAsJavaScriptException();
           return;
         }
+        if (privkey.size() != cert.size()) Napi::Error::New(Env(), "Key and cert array length for Http3Server do not match").ThrowAsJavaScriptException();
         if (lobj.Has("maxConnections") && !(lobj).Get("maxConnections").IsEmpty())
         {
           Napi::Value maxconnValue = (lobj).Get("maxConnections");
@@ -176,10 +195,10 @@ namespace quic
       }
       // Callback *callback, int port, std::unique_ptr<ProofSource> proof_source,  const char *secret
 
-      std::stringstream certstream(cert, std::ios_base::in);
+      std::stringstream certstream(cert[0], std::ios_base::in);
       quiche::QuicheReferenceCountedPointer<ProofSource::Chain> chain(new ProofSource::Chain(CertificateView::LoadPemFromStream(&certstream)));
 
-      std::stringstream privkeystream(privkey, std::ios_base::in);
+      std::stringstream privkeystream(privkey[0], std::ios_base::in);
 
       auto certprivkey = CertificatePrivateKey::LoadPemFromStream(&privkeystream);
       if (certprivkey == nullptr)
@@ -194,6 +213,25 @@ namespace quic
         Napi::Error::New(Env(), "LoadPemFromStream cert failed for Http3Server").ThrowAsJavaScriptException();
         return;
       }
+      // add additional certs to proof source
+      for (size_t i = 1; i < cert.size(); i++)
+      {
+        std::stringstream addcertstream(cert[0], std::ios_base::in);
+        quiche::QuicheReferenceCountedPointer<ProofSource::Chain> addchain(new ProofSource::Chain(CertificateView::LoadPemFromStream(&addcertstream)));
+        std::stringstream addprivkeystream(privkey[0], std::ios_base::in);
+        auto addcertprivkey = CertificatePrivateKey::LoadPemFromStream(&privkeystream);
+        if (addcertprivkey == nullptr)
+        {
+          Napi::Error::New(Env(), "LoadPemFromStream addprivKey  failed for Http3Server").ThrowAsJavaScriptException();
+          return;
+        }
+
+        if (!proofsource->AddCertificateChain(addchain, std::move(*addcertprivkey)))
+        {
+          Napi::Error::New(Env(), "AddCertificateChain failed for Http3Server").ThrowAsJavaScriptException();
+          return;
+        }
+      }
 
       server_ = std::make_unique<Http3Server>(this, std::move(proofsource), secret.c_str(), sconfig);
 
@@ -207,7 +245,7 @@ namespace quic
   }
 
   Http3ServerJS::~Http3ServerJS()
-  {  
+  {
   }
 
   void Http3ServerJS::destroy(const Napi::CallbackInfo &info)
@@ -357,7 +395,7 @@ namespace quic
     }
   }*/
 
-  void Http3ServerJS::processNewSession(Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header)
+  void Http3ServerJS::processNewSession(Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header, Napi::Reference<Napi::Value> *userData)
   {
     Napi::HandleScope scope(Env());
 
@@ -378,12 +416,17 @@ namespace quic
       retObj.Set("header", header->Value());
       header->Unref();
     }
+    if (userData)
+    {
+      retObj.Set("userData", userData->Value());
+      userData->Unref();
+    }
     objVal.Get("onHttpWTSessionVisitor")
         .As<Napi::Function>()
         .Call(objVal, {retObj});
   }
 
-  void Http3ServerJS::processNewSessionRequest(WebTransportSession *session, const spdy::Http2HeaderBlock &reqhead, WebTransportRespPromisePtr *promise)
+  void Http3ServerJS::processNewSessionRequest(WebTransportSession *session, const spdy::Http2HeaderBlock &reqhead, WebTransportRespPromisePtr promise)
   {
     Napi::HandleScope scope(Env());
 
@@ -401,10 +444,11 @@ namespace quic
     }
     retObj.Set("header", headObj);
     // delete reqheadcopy; // we own it and must free it!
-
+    
+    WebTransportRespPromisePtr *prompointer = new WebTransportRespPromisePtr(promise);
     // promise
     Napi::External<WebTransportRespPromisePtr> promObj =
-        Napi::External<WebTransportRespPromisePtr>::New(Env(), promise,
+        Napi::External<WebTransportRespPromisePtr>::New(Env(), prompointer,
                                                         [](Napi::Env /*env*/, WebTransportRespPromisePtr *ref)
                                                         {
                                                           delete ref; // we own it and must delete it
@@ -419,6 +463,7 @@ namespace quic
                                                    // does it outlife everything?
                                                  });
     retObj.Set("session", wtsObj);
+    retObj.Set("protocol", "http3:libquiche");
 
     objVal.Get("onSessionRequest")
         .As<Napi::Function>()
@@ -465,7 +510,7 @@ namespace quic
           path = pathValue.ToString().Utf8Value();
         }
         else
-          return Napi::Error::New(Env(), "No status code passed for finishSessionRequest").ThrowAsJavaScriptException();
+          return Napi::Error::New(Env(), "No path passed for finishSessionRequest").ThrowAsJavaScriptException();
         WebTransportSession *session = nullptr;
         if (lobj.Has("session") && !(lobj).Get("session").IsEmpty())
         {
@@ -487,6 +532,7 @@ namespace quic
 
           Http3ServerBackend::WebTransportRespPromisePtr *prom = promise.Data();
           Napi::Reference<Napi::Value> *headerValue = nullptr;
+          Napi::Reference<Napi::Value> *userDataValue = nullptr;
           if (status == 200)
           {
 
@@ -498,7 +544,14 @@ namespace quic
               headerValue = new Napi::Reference<Napi::Value>(Env(), ref);
             }
             else
-              return Napi::Error::New(Env(), "No status code passed for finishSessionRequest").ThrowAsJavaScriptException();
+              return Napi::Error::New(Env(), "No header passed for finishSessionRequest").ThrowAsJavaScriptException();
+            if (lobj.Has("userData") && !(lobj).Get("userData").IsEmpty())
+            {
+              napi_ref ref;
+              napi_status status = napi_create_reference(Env(), lobj.Get("userData"), 1, &ref);
+              NAPI_THROW_IF_FAILED(Env(), status, Reference<Napi::Value>());
+              userDataValue = new Napi::Reference<Napi::Value>(Env(), ref);
+            }
           }
           if (status != 200)
           {
@@ -514,7 +567,7 @@ namespace quic
             wtsession->init(session);
             response->visitor =
                 std::make_unique<Http3WTSession::Visitor>(wtsession);
-            processNewSession(static_cast<Http3WTSession *>(wtsession), path, headerValue);
+            processNewSession(static_cast<Http3WTSession *>(wtsession), path, 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);
-        void processNewSessionRequest(WebTransportSession *session, const spdy::Http2HeaderBlock &reqheadcopy, WebTransportRespPromisePtr *promise);
+        void processNewSession(Http3WTSession *session, const std::string &path, Napi::Reference<Napi::Value> *header, Napi::Reference<Napi::Value> *userData);
+        void processNewSessionRequest(WebTransportSession *session, const spdy::Http2HeaderBlock &reqheadcopy, WebTransportRespPromisePtr promise);
 
     protected:
         std::unique_ptr<Http3Server> server_;

package/src/http3serverbackend.cc

@@ -67,27 +67,28 @@ namespace quic
     }
     std::string path(path_it->second);
 
+    if (jshandlerequesthandler_)
+    {
+      // first step pass header block along, due to thread safety, we need to copy
+      // not necessary anymore
+
+      // second step inform the js side
+      server_->getJS()->processNewSessionRequest(session, request_headers, promise);
+      return promise;
+    } 
+    
     if (paths_.find(path) != paths_.end())
-    { // to do handle our web transport paths
+    { // to do handle our web transport paths, if no handler is present
       std::unique_ptr<WebTransportResponse> response = std::make_unique<WebTransportResponse>();
       Http3WTSession *wtsession = new Http3WTSession();
       wtsession->init(session);
       response->response_headers[":status"] = "200";
       response->visitor =
           std::make_unique<Http3WTSession::Visitor>(wtsession);
-      server_->getJS()->processNewSession(static_cast<Http3WTSession *>(wtsession), path, nullptr);
+      server_->getJS()->processNewSession(static_cast<Http3WTSession *>(wtsession), path, nullptr, nullptr);
       promise->resolve(std::move(response));
       return promise;
     }
-    else if (jshandlerequesthandler_)
-    {
-      // first step pass header block along, due to thread safety, we need to copy
-      // not necessary anymore
-
-      // second step inform the js side
-      server_->getJS()->processNewSessionRequest(session, request_headers, &promise);
-      return promise;
-    }
 
     std::unique_ptr<WebTransportResponse> response = std::make_unique<WebTransportResponse>();
     response->response_headers[":status"] = "404";

package/src/librarymain.cc

@@ -67,6 +67,11 @@ namespace quic
 
   Napi::Object Init(Napi::Env env, Napi::Object exports)
   {
+    #ifdef _MSC_VER
+    // work around clangcl bug
+    napi_value dummy;
+    napi_create_double(env,2.0, &dummy);
+    #endif
     Http3Constructors *constr = new Http3Constructors();
 
     Http3ServerJS::InitExports(env, exports);

package/src/napialarmfactory.h

@@ -134,10 +134,11 @@ namespace quic
         alarmref_.Unref();
         timerset_ = false;
       }
+      auto val =  Napi::Value::From(alarmjs_->Env(), timedelay);
 
       Napi::Value timeoutobj = NapiAlarmJS::FAILSsetTimeoutAlarm_.Call({
           alarmjs_->Value().As<Napi::Object>(),
-          Napi::Value::From(alarmjs_->Env(), timedelay),
+          val,
       });
       alarmref_ = Napi::Reference<Napi::Object>::New(timeoutobj.As<Napi::Object>(), 1);
       timerset_ = true;