@fails-components/webtransport-transport-http3-quiche 1.4.1 → 1.4.2

package/CMakeLists.txt

@@ -495,6 +495,8 @@ third_party/quiche/quiche/quic/core/frames/quic_connection_close_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_connection_close_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_crypto_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_crypto_frame.h
+third_party/quiche/quiche/quic/core/frames/quic_datagram_frame.cc
+third_party/quiche/quiche/quic/core/frames/quic_datagram_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_goaway_frame.cc
@@ -506,8 +508,6 @@ third_party/quiche/quiche/quic/core/frames/quic_immediate_ack_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_inlined_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_max_streams_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_max_streams_frame.h
-third_party/quiche/quiche/quic/core/frames/quic_message_frame.cc
-third_party/quiche/quiche/quic/core/frames/quic_message_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_mtu_discovery_frame.h
 third_party/quiche/quiche/quic/core/frames/quic_new_connection_id_frame.cc
 third_party/quiche/quiche/quic/core/frames/quic_new_connection_id_frame.h

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

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../lib/socket.js"],"names":[],"mappings":"AAkFA;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"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../lib/socket.js"],"names":[],"mappings":"AA4FA;IACE;;OAEG;IAEH,kBAHW,OAAO,4BAA4B,EAAE,oBAAoB,GAAC,SAAS,EAc7E;IAVC,0CAA0C;IAE1C,WAFW,OAAO,YAAY,EAAE,MAAM,CAEZ;IAE1B,UAAqB;IACrB,oBAAuB;IA+BzB,qBAQC;IAhCD,+BAGC;IAPC,iBAAoB;IACpB,gBAAmB;IAQrB;;OAEG;IAEH,mDAHW,OAAO,SAAS,EAAE,mBAAmB,WAgB/C;CAWF"}

package/lib/socket.js

@@ -7,7 +7,17 @@ globalThis.FAILSsetTimeoutAlarm = (
   /** @type {{ fireJS: () => void; }} */ alarm,
   /** @type {number} */ delay
 ) => {
-  return setTimeout(alarm.fireJS.bind(alarm), delay)
+  if (delay < 1) {
+    return { immediate: setImmediate(alarm.fireJS.bind(alarm)) }
+  }
+  return { timeout: setTimeout(alarm.fireJS.bind(alarm), delay) }
+}
+
+globalThis.FAILSclearTimeoutAlarm = (
+  /** @type {{ timeout: string | number | NodeJS.Timeout | undefined; immediate: NodeJS.Immediate | undefined; }} */ obj
+) => {
+  if (obj.timeout) clearTimeout(obj.timeout)
+  if (obj.immediate) clearImmediate(obj.immediate)
 }
 
 function convertToPem(/** @type {ArrayBuffer} */ cert) {
@@ -117,7 +127,6 @@ export class Http3WebTransportSocket {
       address,
       this.packetSendCB
     )
-    // @ts-ignore
     const blocked = this.socketInt.getSendQueueCount() > 0
     this.blocked = this.blocked || blocked
     return blocked
@@ -126,7 +135,6 @@ export class Http3WebTransportSocket {
   packetSendCB() {
     if (
       !this.closed &&
-      // @ts-ignore
       this.socketInt.getSendQueueCount() === 0 &&
       this.blocked
     ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport-transport-http3-quiche",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "A component to add webtransport support (server and client) to node.js, transport using libquiche",
   "exports": {
     ".": {
@@ -8,7 +8,7 @@
     }
   },
   "engines": {
-    "node": ">=16.5"
+    "node": ">=20"
   },
   "type": "module",
   "types": "./dist/lib/index.d.ts",

package/src/napialarmfactory.cc

@@ -14,7 +14,7 @@
 namespace quic
 {
   Napi::FunctionReference NapiAlarmJS::FAILSsetTimeoutAlarm_;
-  Napi::FunctionReference NapiAlarmJS::clearTimeout_;
+  Napi::FunctionReference NapiAlarmJS::FAILSclearTimeoutAlarm_;
 
   void NapiAlarmJS::fireJS(const Napi::CallbackInfo &info)
   {

package/src/napialarmfactory.h

@@ -57,9 +57,9 @@ namespace quic
         FAILSsetTimeoutAlarm_ = Napi::Persistent(Env().Global().Get("FAILSsetTimeoutAlarm").As<Napi::Function>());
         FAILSsetTimeoutAlarm_.SuppressDestruct();
       }
-      if (clearTimeout_.IsEmpty()) {
-        clearTimeout_ = Napi::Persistent(Env().Global().Get("clearTimeout").As<Napi::Function>());
-        clearTimeout_.SuppressDestruct();
+      if (FAILSclearTimeoutAlarm_.IsEmpty()) {
+        FAILSclearTimeoutAlarm_ = Napi::Persistent(Env().Global().Get("FAILSclearTimeoutAlarm").As<Napi::Function>());
+        FAILSclearTimeoutAlarm_.SuppressDestruct();
       }
     }
 
@@ -86,7 +86,7 @@ namespace quic
   protected:
     NapiAlarm* alarm_; // unowned
     static Napi::FunctionReference FAILSsetTimeoutAlarm_;
-    static Napi::FunctionReference clearTimeout_;
+    static Napi::FunctionReference FAILSclearTimeoutAlarm_;
   };
 
   class NapiAlarm : public QuicAlarm
@@ -103,7 +103,7 @@ namespace quic
     {
       if (timerset_)
       {
-        NapiAlarmJS::clearTimeout_.Call({alarmref_.Value()});
+        NapiAlarmJS::FAILSclearTimeoutAlarm_.Call({alarmref_.Value()});
         alarmref_.Unref();
         timerset_ = false;
       }
@@ -148,7 +148,7 @@ namespace quic
     {
       if (timerset_)
       {
-        NapiAlarmJS::clearTimeout_.Call({alarmref_.Value()});
+        NapiAlarmJS::FAILSclearTimeoutAlarm_.Call({alarmref_.Value()});
         alarmref_.Unref();
         timerset_ = false;
       }