@fails-components/webtransport-transport-http3-quiche 1.5.2 → 1.6.0

package/CMakeLists.txt

@@ -437,8 +437,6 @@ third_party/quiche/quiche/quic/core/crypto/chacha_base_decrypter.cc
 third_party/quiche/quiche/quic/core/crypto/chacha_base_decrypter.h
 third_party/quiche/quiche/quic/core/crypto/chacha_base_encrypter.cc
 third_party/quiche/quiche/quic/core/crypto/chacha_base_encrypter.h
-third_party/quiche/quiche/quic/core/crypto/channel_id.cc
-third_party/quiche/quiche/quic/core/crypto/channel_id.h
 third_party/quiche/quiche/quic/core/crypto/client_proof_source.cc
 third_party/quiche/quiche/quic/core/crypto/client_proof_source.h
 third_party/quiche/quiche/quic/core/crypto/crypto_framer.cc
@@ -831,17 +829,12 @@ third_party/quiche/quiche/quic/platform/api/quic_stack_trace.h
 third_party/quiche/quiche/quic/platform/api/quic_thread.h
 third_party/quiche/quiche/quic/tools/quic_simple_crypto_server_stream_helper.cc
 third_party/quiche/quiche/quic/tools/quic_simple_crypto_server_stream_helper.h
+third_party/quiche/quiche/web_transport/stream_helpers.h
 third_party/quiche/quiche/web_transport/web_transport_headers.cc
 third_party/quiche/quiche/web_transport/web_transport_headers.h
 third_party/quiche/quiche/web_transport/web_transport_priority_scheduler.cc
 third_party/quiche/quiche/web_transport/web_transport_priority_scheduler.h
 )
-# workaround gquiche problem
-target_precompile_headers(
-    gquiche
-    PRIVATE
-        <cstdint>
-)
 
 IF(APPLE OR WIN32)
 target_sources(gquiche PRIVATE third_party/googleurl/url/url_idna_ascii_only.cc)

package/dist/lib/serversocket.d.ts

@@ -1,10 +1,15 @@
 export class Http3WebTransportServerSocket extends Http3WebTransportSocket {
+    /**
+     * @param {import('../../../main/lib/types.js').Http3QuicheServerWebTransportInit|undefined} args
+     */
+    constructor(args: import('../../../main/lib/types.js').Http3QuicheServerWebTransportInit | undefined);
     port: number;
     host: string;
     /** @type {import('../../../main/lib/session.js').HttpServer} */
     jsobj: import('../../../main/lib/session.js').HttpServer;
     /** @type {import('node:dns').LookupAddress|undefined} */
     address: import('node:dns').LookupAddress | undefined;
+    socketOptions: {};
     init(): void;
     stopServer(): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"serversocket.d.ts","sourceRoot":"","sources":["../../lib/serversocket.js"],"names":[],"mappings":"AAQA;IAQI,aAAwB;IACxB,aAAqC;IACrC,gEAAgE;IAEhE,OAFW,OAAO,8BAA8B,EAAE,UAAU,CAEtC;IAEtB,yDAAyD;IACzD,SADW,OAAO,UAAU,EAAE,aAAa,GAAC,SAAS,CAC7B;IAG1B,aA6CC;IAED,mBAKC;CACF"}
+{"version":3,"file":"serversocket.d.ts","sourceRoot":"","sources":["../../lib/serversocket.js"],"names":[],"mappings":"AAQA;IACE;;OAEG;IACH,kBAFW,OAAO,4BAA4B,EAAE,iCAAiC,GAAC,SAAS,EAgB1F;IAVC,aAAwB;IACxB,aAAqC;IACrC,gEAAgE;IAEhE,OAFW,OAAO,8BAA8B,EAAE,UAAU,CAEtC;IAEtB,yDAAyD;IACzD,SADW,OAAO,UAAU,EAAE,aAAa,GAAC,SAAS,CAC7B;IAExB,kBAAwD;IAG1D,aAiDC;IAED,mBAKC;CACF"}

package/lib/serversocket.js

@@ -8,7 +8,7 @@ const log = logger(`webtransport:Http3WebTransportServerSocket(${process.pid})`)
 
 export class Http3WebTransportServerSocket extends Http3WebTransportSocket {
   /**
-   * @param {import('../../../main/lib/types.js').HttpWebTransportInit|undefined} args
+   * @param {import('../../../main/lib/types.js').Http3QuicheServerWebTransportInit|undefined} args
    */
   constructor(args) {
     super(args)
@@ -22,6 +22,8 @@ export class Http3WebTransportServerSocket extends Http3WebTransportSocket {
 
     /** @type {import('node:dns').LookupAddress|undefined} */
     this.address = undefined
+
+    this.socketOptions = args?.quicheNodeSocketOptions ?? {}
   }
 
   init() {
@@ -29,7 +31,11 @@ export class Http3WebTransportServerSocket extends Http3WebTransportSocket {
       .then((result) => {
         this.address = result
         this.socketInt = createSocket({
-          type: result.family === 4 ? 'udp4' : 'udp6'
+          ...{
+            type: result.family === 4 ? 'udp4' : 'udp6',
+            reuseAddr: true
+          },
+          ...this.socketOptions
         })
 
         this.socketInt.on('listening', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {
@@ -38,7 +38,7 @@
   "dependencies": {
     "@types/debug": "^4.1.7",
     "bindings": "^1.5.0",
-    "cmake-js": "^7.2.1",
+    "cmake-js": "^8.0.0",
     "debug": "^4.3.4",
     "node-addon-api": "^7.0.0",
     "prebuild-install": "^7.1.1"

package/src/http3wtstreamvisitor.cc

@@ -4,6 +4,7 @@
 
 #include "src/http3wtstreamvisitor.h"
 #include "src/http3server.h"
+#include "quiche/web_transport/stream_helpers.h"
 
 namespace quic
 {
@@ -140,7 +141,7 @@ namespace quic
         {
             auto cur = chunks_.front();
             absl::Status status = 
-                WriteIntoStream(*stream_, absl::string_view(cur.buffer, cur.len));
+                webtransport::WriteIntoStream(*stream_, absl::string_view(cur.buffer, cur.len));
             QUIC_DVLOG(1) << "Attempted writing on WebTransport bidirectional stream "
                           << ", success: " << status;
             if (!status.ok())
@@ -155,7 +156,7 @@ namespace quic
 
         if (send_fin_)
         {
-            absl::Status status = SendFinOnStream(*stream_);
+            absl::Status status = webtransport::SendFinOnStream(*stream_);
             if (status.ok()) {
                 fin_was_sent_ = true;
                 getJS()->processStreamNetworkFinish(NetworkTask::streamFinal);