@fails-components/webtransport 0.1.2 → 0.1.3

package/CMakeLists.txt

@@ -168,7 +168,6 @@ add_library(gquiche STATIC
 #plattform impl
 platform/quiche_platform_impl/quiche_export_impl.h
 platform/quiche_platform_impl/quiche_logging_impl.h
-platform/quiche_platform_impl/quiche_logging_impl.cc
 platform/quiche_platform_impl/quiche_containers_impl.h
 platform/quiche_platform_impl/quiche_client_stats_impl.h
 platform/quiche_platform_impl/quiche_event_loop_impl.h
@@ -225,6 +224,8 @@ third_party/googleurl/url/url_parse_file.cc
 third_party/googleurl/url/url_canon_host.cc
 third_party/googleurl/url/url_canon_ip.cc
 third_party/googleurl/url/url_constants.cc
+third_party/googleurl/url/url_features.cc
+third_party/googleurl/url/url_features.h
 third_party/googleurl/url/url_util.cc
 third_party/googleurl/url/url_util.h
 third_party/googleurl/url/gurl.cc
@@ -257,6 +258,7 @@ 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.h
 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_prefetch_impl.h
+third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_logging_impl.h
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_mutex_impl.cc
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_mutex_impl.h
 third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.cc
@@ -285,6 +287,8 @@ third_party/quiche/quiche/common/quiche_random.h
 third_party/quiche/quiche/common/quiche_text_utils.cc
 third_party/quiche/quiche/common/quiche_text_utils.h
 third_party/quiche/quiche/common/simple_buffer_allocator.cc
+third_party/quiche/quiche/common/structured_headers.h
+third_party/quiche/quiche/common/structured_headers.cc
 third_party/quiche/quiche/http2/adapter/data_source.h
 third_party/quiche/quiche/http2/adapter/event_forwarder.cc
 third_party/quiche/quiche/http2/adapter/event_forwarder.h
@@ -786,6 +790,8 @@ third_party/quiche/quiche/quic/core/quic_stream.h
 third_party/quiche/quiche/quic/core/quic_stream_frame_data_producer.h
 third_party/quiche/quiche/quic/core/quic_stream_id_manager.cc
 third_party/quiche/quiche/quic/core/quic_stream_id_manager.h
+third_party/quiche/quiche/quic/core/quic_stream_priority.cc
+third_party/quiche/quiche/quic/core/quic_stream_priority.h
 third_party/quiche/quiche/quic/core/quic_stream_send_buffer.cc
 third_party/quiche/quiche/quic/core/quic_stream_send_buffer.h
 third_party/quiche/quiche/quic/core/quic_stream_sequencer.cc
@@ -909,6 +915,8 @@ ELSE(WIN32)
     )
 ENDIF(WIN32)
 
+target_compile_options(gquiche PRIVATE -flax-vector-conversions)
+
 
 add_custom_command(
 OUTPUT
@@ -1007,11 +1015,6 @@ endif()
 target_link_libraries(gquiche icu)
 
 
-if(APPLE)
-        target_compile_definitions (gquiche PRIVATE __APPLE_USE_RFC_3542)
-endif()
-
-
 # google quiche build parameters end
 
 #include_directories(${CMAKE_JS_INC})

package/build.js

@@ -1,6 +1,6 @@
 import { arch, argv, env, platform } from 'node:process'
 import { spawn } from 'node:child_process'
-import { rename, mkdtemp, rm, access } 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' }
@@ -105,9 +105,16 @@ const extractthirdparty = async () => {
     try {
       await rm(destdir, { recursive: true, maxRetries: 10 })
     } catch (err) {
-      console.log('destdir does not exist: ', err)
+      console.log('destdir does not exist (only warning, ignore): ', err)
+    }
+    try {
+      await rename(path.join(copath, '/third_party'), destdir)
+    } catch (error) {
+      console.log('rename tmp dir failed:', error)
+      console.log('copy instead start... (can take a while)...')
+      await cp(path.join(copath, '/third_party'), destdir, {recursive: true})
+      console.log('copy instead finished')
     }
-    await rename(path.join(copath, '/third_party'), destdir)
   } catch (error) {
     console.error('failed to get third party code from git', error)
     fatal = true
@@ -289,6 +296,14 @@ if (argv.length > 2) {
         process.exit(1)
       }
       break
+    case 'extract-thirdparty':
+      try {
+        // if we do not succeed, we have to build it ourselves
+        await extractthirdparty()
+      } catch (error) {
+        console.error('Extract third party failed: ', error)
+      }
+      break
     default:
       console.log('unsupported argument ', argv[2])
       break

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

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../lib/session.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../lib/session.js"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../lib/stream.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;GAcG;AAEH;IA6QE;;OAEG;IACH,sBAFW,qBAAqB,GAAG,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,wBAAwB,QAmClH;IAhTD;;;;;;;OAOG;IACH;QANqC,MAAM,EAAhC,mBAAmB;QACE,SAAS,EAA9B,cAAc;QACD,SAAS,EAAtB,MAAM;QACQ,aAAa,EAA3B,OAAO;QACO,QAAQ,EAAtB,OAAO;OAmHjB;IAhHC,8CAAyB;IAEzB,8CAA+B;IAC/B,kBAA+B;IAC/B,uBAAuC;IACvC,kBAA6B;IAC7B,gBAAmB;IAEnB,mCAAmC;IACnC,kBADW,QAAQ,IAAI,CAAC,GAAG,IAAI,CACH;IAC5B,mBAkGkB,IAAI,SAlGA;IAGpB,0CA+BC;IA5BK,uEAAoC;IAclC,kBA4EQ,IAAI,SA5EY;IAQ1B,wBAA0B;IAShC,0CAwDC;IArDK,yEAAoC;IA8ClC,iBAcQ,IAAI,SAdW;IAkBnC;;;OAGG;IACH,yBAHW,OAAO,SAAS,EAAE,qBAAqB,GACrC,IAAI,CA0ChB;IAhBO,oCAA0B;IAkBlC;;;OAGG;IACH,mBAHW,eAAe,GACb,IAAI,CAuBhB;IAED;;OAEG;IACH,oBAFW,gBAAgB,QAY1B;IAED;;OAEG;IACH,oBAFW,gBAAgB,QAe1B;IAED;;OAEG;IACH,4BAFW,wBAAwB,QAoClC;IAzBK,qCAA2B;CAgElC;;;;6CAhUY,OAAO,SAAS,EAAE,8BAA8B;;;;oCAChD,OAAO,SAAS,EAAE,qBAAqB;;;;8BACvC,OAAO,SAAS,EAAE,eAAe;;;;+BACjC,OAAO,SAAS,EAAE,gBAAgB;;;;+BAClC,OAAO,SAAS,EAAE,gBAAgB;;;;uCAClC,OAAO,SAAS,EAAE,wBAAwB;;;;kCAE1C,OAAO,SAAS,EAAE,mBAAmB;;;;6BAErC,OAAO,WAAW,EAAE,cAAc;;;;8CAElC,OAAO,YAAY,EAAE,+BAA+B"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../lib/stream.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;GAcG;AAEH;IAmRE;;OAEG;IACH,sBAFW,qBAAqB,GAAG,eAAe,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,wBAAwB,QAmClH;IAtTD;;;;;;;OAOG;IACH;QANqC,MAAM,EAAhC,mBAAmB;QACE,SAAS,EAA9B,cAAc;QACD,SAAS,EAAtB,MAAM;QACQ,aAAa,EAA3B,OAAO;QACO,QAAQ,EAAtB,OAAO;OAmHjB;IAhHC,8CAAyB;IAEzB,8CAA+B;IAC/B,kBAA+B;IAC/B,uBAAuC;IACvC,kBAA6B;IAC7B,gBAAmB;IAEnB,mCAAmC;IACnC,kBADW,QAAQ,IAAI,CAAC,GAAG,IAAI,CACH;IAC5B,mBAkGkB,IAAI,SAlGA;IAGpB,0CA+BC;IA5BK,uEAAoC;IAclC,kBA4EQ,IAAI,SA5EY;IAQ1B,wBAA0B;IAShC,0CAwDC;IArDK,yEAAoC;IA8ClC,iBAcQ,IAAI,SAdW;IAkBnC;;;OAGG;IACH,yBAHW,OAAO,SAAS,EAAE,qBAAqB,GACrC,IAAI,CAgDhB;IAhBO,oCAA0B;IAkBlC;;;OAGG;IACH,mBAHW,eAAe,GACb,IAAI,CAuBhB;IAED;;OAEG;IACH,oBAFW,gBAAgB,QAY1B;IAED;;OAEG;IACH,oBAFW,gBAAgB,QAe1B;IAED;;OAEG;IACH,4BAFW,wBAAwB,QAoClC;IAzBK,qCAA2B;CAgElC;;;;6CAtUY,OAAO,SAAS,EAAE,8BAA8B;;;;oCAChD,OAAO,SAAS,EAAE,qBAAqB;;;;8BACvC,OAAO,SAAS,EAAE,eAAe;;;;+BACjC,OAAO,SAAS,EAAE,gBAAgB;;;;+BAClC,OAAO,SAAS,EAAE,gBAAgB;;;;uCAClC,OAAO,SAAS,EAAE,wBAAwB;;;;kCAE1C,OAAO,SAAS,EAAE,mBAAmB;;;;6BAErC,OAAO,WAAW,EAAE,cAAc;;;;8CAElC,OAAO,YAAY,EAAE,+BAA+B"}

package/lib/session.js

@@ -295,7 +295,10 @@ export class Http3WTSession {
     this.streamObjs.clear()
 
     if (this.closedResolve)
-      this.closedResolve({ closeCode: args.errorcode, reason: 'closed' })
+      this.closedResolve({
+        closeCode: args.errorcode,
+        reason: args.error ? args.error : 'closed'
+      })
     if (this.closeHook) {
       this.closeHook()
       delete this.closeHook

package/lib/stream.js

@@ -147,26 +147,32 @@ export class Http3WTStream {
   onStreamRecvSignal(args) {
     // console.log('onStreamRecvSignal', args)
     // check if transport is closed
+    let parentcleanup = true
     const parentstate = this.parentobj.state
-    if (parentstate === 'closed' || parentstate === 'failed') return
+    if (parentstate === 'closed' || parentstate === 'failed') {
+      console.log('no parent cleanup as parent was closed or failed')
+      parentcleanup = false
+    }
     switch (args.nettask) {
       case 'resetStream':
         if (this.readable) {
-          this.parentobj.removeReceiveStream(
-            this.readable,
-            this.readableController
-          )
+          if (parentcleanup)
+            this.parentobj.removeReceiveStream(
+              this.readable,
+              this.readableController
+            )
           this.readableclosed = true
           this.readableController.error(args.code || 0)
-        } else console.log('stopSending wihtout readable')
+        } else console.log('stopSending without readable')
         break
 
       case 'stopSending':
         if (this.writable) {
-          this.parentobj.removeSendStream(
-            this.writable,
-            this.writableController
-          )
+          if (parentcleanup)
+            this.parentobj.removeSendStream(
+              this.writable,
+              this.writableController
+            )
 
           this.writableclosed = true
           this.writableController.error(args.code || 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/webtransport",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A component to add webtransport support (server and client) to node.js using libquiche",
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -60,7 +60,7 @@
     "mocha": "^10.1.0",
     "node-forge": "^1.3.1",
     "prettier": "^2.4.1",
-    "typescript": "^4.8.4"
+    "typescript": "4.8.4"
   },
   "binary": {
     "napi_versions": [

package/platform/quiche_platform_impl/quiche_logging_impl.h

@@ -16,138 +16,6 @@
 #ifndef QUICHE_COMMON_PLATFORM_NODE_QUICHE_PLATFORM_IMPL_QUICHE_LOGGING_IMPL_H_
 #define QUICHE_COMMON_PLATFORM_NODE_QUICHE_PLATFORM_IMPL_QUICHE_LOGGING_IMPL_H_
 
-#include <cstdlib>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-#include "absl/base/attributes.h"
-
-namespace quiche {
-
-class DevZeroBuf : public std::streambuf {
-    public:
-        std::streamsize xsputn (const char * s, std::streamsize n) override {
-            return n;
-        }
-        int overflow (int c) override {
-            return 1;
-        }
-};
-
-class DevZeroStream : public std::ostream {
-    public:
-        DevZeroStream() : std::ostream (&buf) {}
-    private:
-        DevZeroBuf buf;
-};
-
-class StdoutLogSink {
- public:
-  constexpr StdoutLogSink(): condition(true) {}
-
-  constexpr StdoutLogSink(bool cond): condition(cond) {}
-
-  constexpr StdoutLogSink(int level): condition(level<=logverbose) {}
-  constexpr StdoutLogSink(const char*, bool cond): condition(cond) {}
-  constexpr StdoutLogSink(int level, bool cond): condition(level<=logverbose && cond) {}
-
-  template<typename T>
-  constexpr StdoutLogSink(T& ptr): condition(ptr) {}
-
-
-  constexpr std::ostream& stream() { return (condition && !nolog) ? std::cout: dump; }
-
-  // This operator has lower precedence than << but higher than ?:, which is
-  // useful for implementing QUICHE_DISREGARD_LOG_STREAM below.
-  void operator&(std::ostream&) {}
-
-
-  protected:
-    bool condition;
-    static DevZeroStream dump;
-    static const int logverbose=1;
-    const bool nolog= true;
-
-};
-
-
-// We need to actually implement LOG(FATAL), otherwise some functions will fail
-// to compile due to the "failed to return value from non-void function" error.
-class FatalLogSink : public StdoutLogSink {
- public:
-  ABSL_ATTRIBUTE_NORETURN ~FatalLogSink() { abort(); }
-};
-
-}  // namespace quiche
-
-#define QUICHE_DVLOG_IMPL(verbose_level) \
-  ::quiche::StdoutLogSink(#verbose_level).stream()
-#define QUICHE_DVLOG_IF_IMPL(verbose_level, condition) \
-  ::quiche::StdoutLogSink(#verbose_level, condition).stream()
-#define QUICHE_DLOG_IMPL(severity) ::quiche::StdoutLogSink(#severity).stream()
-#define QUICHE_DLOG_IF_IMPL(severity, condition) \
-  ::quiche::StdoutLogSink(#severity, condition).stream()
-#define QUICHE_VLOG_IMPL(verbose_level) \
-  ::quiche::StdoutLogSink(#verbose_level).stream()
-#define QUICHE_LOG_FIRST_N_IMPL(severity, n) \
-  ::quiche::StdoutLogSink(#severity, n).stream()
-#define QUICHE_LOG_EVERY_N_SEC_IMPL(severity, seconds) \
-  ::quiche::StdoutLogSink(#severity, seconds).stream()
-#define QUICHE_LOG_IF_IMPL(severity, condition) \
-  ::quiche::StdoutLogSink(#severity, condition).stream()
-
-#define QUICHE_LOG_IMPL(severity) QUICHE_LOG_IMPL_##severity()
-#define QUICHE_LOG_IMPL_FATAL() ::quiche::FatalLogSink().stream()
-#define QUICHE_LOG_IMPL_DFATAL() ::quiche::StdoutLogSink().stream()
-#define QUICHE_LOG_IMPL_ERROR() ::quiche::StdoutLogSink().stream()
-#define QUICHE_LOG_IMPL_WARNING() ::quiche::StdoutLogSink().stream()
-#define QUICHE_LOG_IMPL_INFO() ::quiche::StdoutLogSink().stream()
-
-#define QUICHE_PREDICT_FALSE_IMPL(x) (x)
-#define QUICHE_PREDICT_TRUE_IMPL(x) (x)
-
-#define QUICHE_PLOG_IMPL(severity) ::quiche::StdoutLogSink(#severity)
-
-#define QUICHE_DLOG_INFO_IS_ON_IMPL() false
-#define QUICHE_LOG_INFO_IS_ON_IMPL() false
-#define QUICHE_LOG_WARNING_IS_ON_IMPL() false
-#define QUICHE_LOG_ERROR_IS_ON_IMPL() false
-
-// This is necessary because we sometimes call QUICHE_DCHECK inside constexpr
-// functions, and then write non-constexpr expressions into the resulting log.
-#define QUICHE_DISREGARD_LOG_STREAM(stream) \
-  true ? (void)0 : ::quiche::StdoutLogSink() & (stream)
-
-#define QUICHE_CHECK_IMPL(condition) ::quiche::StdoutLogSink(condition).stream()
-#define QUICHE_CHECK_EQ_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)==(val2)).stream()
-#define QUICHE_CHECK_NE_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)!=(val2)).stream()
-#define QUICHE_CHECK_LE_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)<=(val2)).stream()
-#define QUICHE_CHECK_LT_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)<(val2)).stream()
-#define QUICHE_CHECK_GE_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)>=(val2)).stream()
-#define QUICHE_CHECK_GT_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)>(val2)).stream()
-
-#define QUICHE_DCHECK_IMPL(condition) \
-  QUICHE_DISREGARD_LOG_STREAM(::quiche::StdoutLogSink(condition).stream())
-#define QUICHE_DCHECK_EQ_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)==(val2)).stream()
-#define QUICHE_DCHECK_NE_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)!=(val2)).stream()
-#define QUICHE_DCHECK_LE_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)<=(val2)).stream()
-#define QUICHE_DCHECK_LT_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)<(val2)).stream()
-#define QUICHE_DCHECK_GE_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)>=(val2)).stream()
-#define QUICHE_DCHECK_GT_IMPL(val1, val2) \
-  ::quiche::StdoutLogSink((val1)>(val2)).stream()
-
-#define QUICHE_NOTREACHED_IMPL() QUICHE_DCHECK_IMPL(false)
+#include "third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_logging_impl.h"
 
 #endif  // QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_LOGGING_IMPL_H_

package/platform/quiche_platform_impl/quiche_stack_trace_impl.h

@@ -5,6 +5,7 @@
 #ifndef NET_QUICHE_PLATFORM_IMPL_QUICHE_STACK_TRACE_IMPL_H_
 #define NET_QUICHE_PLATFORM_IMPL_QUICHE_STACK_TRACE_IMPL_H_
 
+#include <string>
 
 #include "third_party/quiche/quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h"
 

package/src/http3client.cc

@@ -183,7 +183,7 @@ namespace quic
 
     void Http3Client::Initialize()
     {
-        priority_ = 3;
+        priority_ = QuicStreamPriority();
         connect_attempted_ = false;
         auto_reconnect_ = false;
         buffer_body_ = true;
@@ -390,8 +390,7 @@ namespace quic
                     SetLatestCreatedStream(stream);
                     if (latest_created_stream_)
                     {
-                        latest_created_stream_->SetPriority(
-                            spdy::SpdyStreamPrecedence(priority_));
+                        latest_created_stream_->SetPriority(priority_);
                     }
                     finish(latest_created_stream_);
                 });
@@ -734,7 +733,15 @@ namespace quic
     {
         QUICHE_DCHECK(initialized_);
         QUICHE_DCHECK(!connected());
-        QuicPacketWriter *writer = new LevelTriggeredPacketWriter(GetLatestFD(), eventloop_->getQuicEventLoop());
+        QuicPacketWriter *writer;
+        if (eventloop_->getQuicEventLoop()->SupportsEdgeTriggered())
+        {
+            writer = new QuicDefaultPacketWriter(GetLatestFD());
+        }
+        else
+        {
+            writer = new LevelTriggeredPacketWriter(GetLatestFD(), eventloop_->getQuicEventLoop());
+        }
         ParsedQuicVersion mutual_version = UnsupportedQuicVersion();
         const bool can_reconnect_with_different_version =
             CanReconnectWithDifferentVersion(&mutual_version);
@@ -931,8 +938,7 @@ namespace quic
                 bool success =
                     event_loop->ArtificiallyNotifyEvent(fd, kSocketEventReadable);
                 QUICHE_DCHECK(success);
-            }
-            if (!event_loop->SupportsEdgeTriggered())
+            } else if (!event_loop->SupportsEdgeTriggered())
             {
                 bool success = event_loop->RearmSocket(fd, kSocketEventReadable);
                 QUICHE_DCHECK(success);

package/src/http3client.h

@@ -245,7 +245,7 @@ namespace quic
 
         void set_auto_reconnect(bool reconnect) { auto_reconnect_ = reconnect; }
 
-        void set_priority(spdy::SpdyPriority priority) { priority_ = priority; }
+        void set_priority(QuicStreamPriority priority) { priority_ = priority; }
 
         void WaitForWriteToFlush();
 
@@ -404,7 +404,7 @@ namespace quic
         // Parsed response trailers (if present), copied from the stream in OnClose.
         spdy::Http2HeaderBlock response_trailers_;
 
-        spdy::SpdyPriority priority_;
+        QuicStreamPriority priority_;
         std::string response_;
         // bytes_read_ and bytes_written_ are updated only when stream_ is released;
         // prefer bytes_read() and bytes_written() member functions.

package/src/http3eventloop.cc

@@ -107,8 +107,10 @@ namespace quic
   void Http3EventLoop::Schedule(std::function<void()> action)
   {
     // QUICHE_DCHECK(!quit_.HasBeenNotified());
-    QuicWriterMutexLock lock(&scheduled_actions_lock_);
-    scheduled_actions_.push_back(std::move(action));
+    {
+      QuicWriterMutexLock lock(&scheduled_actions_lock_);
+      scheduled_actions_.push_back(std::move(action));
+    }
     dynamic_cast<LibeventQuicEventLoop *>(quic_event_loop_.get())->WakeUp();
   }
 
@@ -363,12 +365,11 @@ namespace quic
     if (!checkQw())
       return;
     HandleScope scope(qw_->Env());
-
     Http3Constructors *constr = qw_->Env().GetInstanceData<Http3Constructors>();
     Napi::Object strobj = constr->stream.New({});
     Http3WTStreamJS *strjs = Napi::ObjectWrap<Http3WTStreamJS>::Unwrap(strobj);
     strjs->setObj(stream);
-    strjs->Ref();
+    if (!stream->gone()) strjs->Ref();
     stream->setJS(strjs);
 
     Napi::Object objVal = sessionobj->getJS()->Value();

package/src/http3server.cc

@@ -342,8 +342,7 @@ namespace quic
         bool success =
             event_loop->ArtificiallyNotifyEvent(fd, kSocketEventReadable);
         QUICHE_DCHECK(success);
-      }
-      if (!event_loop->SupportsEdgeTriggered())
+      } else if (!event_loop->SupportsEdgeTriggered())
       {
         bool success = event_loop->RearmSocket(fd, kSocketEventReadable);
         QUICHE_DCHECK(success);

package/src/http3serversession.cc

@@ -225,7 +225,7 @@ namespace quic
       QUICHE_DCHECK_EQ(promised_info.stream_id, promised_stream->id());
       QUIC_DLOG(INFO) << "created server push stream " << promised_stream->id();
 
-      promised_stream->SetPriority(promised_info.precedence);
+      promised_stream->SetPriority(promised_info.priority);
 
       spdy::Http2HeaderBlock request_headers(
           std::move(promised_info.request_headers));

package/src/http3serversession.h

@@ -44,14 +44,14 @@ namespace quic
     public:
       PromisedStreamInfo(spdy::Http2HeaderBlock request_headers,
                          QuicStreamId stream_id,
-                         const spdy::SpdyStreamPrecedence &precedence)
+                         const QuicStreamPriority &priority)
           : request_headers(std::move(request_headers)),
             stream_id(stream_id),
-            precedence(precedence),
+            priority(priority),
             is_cancelled(false) {}
       spdy::Http2HeaderBlock request_headers;
       QuicStreamId stream_id;
-      spdy::SpdyStreamPrecedence precedence;
+      QuicStreamPriority priority;
       bool is_cancelled;
     };
 

package/src/http3wtstreamvisitor.cc

@@ -23,12 +23,20 @@ namespace quic
 
             stream_->chunks_.pop_front();
         }
+        if (!stream_->stop_sending_received_)
+        {
+            stream_->eventloop_->informStreamRecvSignal(stream_, 0, NetworkTask::stopSending);
+        }
+        if (!stream_->stream_was_reset_)
+        {
+            stream_->eventloop_->informStreamRecvSignal(stream_, 0, NetworkTask::resetStream);
+        }
         Http3WTStreamJS *strobj = stream_->getJS();
         if (strobj) {
             stream_->stream_ = nullptr;
             stream_->eventloop_->informUnref(strobj);
         } else {
-            delete stream_->stream_;
+            stream_->stream_ = nullptr;
         }
     }
 
@@ -48,6 +56,7 @@ namespace quic
         // replying with a FIN rather than a RESET_STREAM is more appropriate here.
         stream_->send_fin_ = true;
         OnCanWrite();*/
+        stream_->stream_was_reset_ = true;
         lasterror = error;
         stream_->eventloop_->informStreamRecvSignal(stream_, error, NetworkTask::resetStream); // may be move below
     }
@@ -112,9 +121,8 @@ namespace quic
         if (send_fin_)
         {
             bool success = stream_->SendFin();
-            QUICHE_DCHECK(success);
-            fin_was_sent_ = true;
+            if (success) fin_was_sent_ = true;
         }
     }
 
-}
+}

package/src/http3wtstreamvisitor.h

@@ -34,7 +34,7 @@ namespace quic
         friend Http3WTStreamJS;
 
     public:
-        Http3WTStream(WebTransportStream *stream, Http3EventLoop *eventloop) : stream_(stream), eventloop_(eventloop)
+        Http3WTStream(WebTransportStream *stream, Http3EventLoop *eventloop) : stream_(stream), eventloop_(eventloop), js_(nullptr)
         {
         }
 
@@ -109,6 +109,10 @@ namespace quic
             js_ = js; 
         };
 
+        bool gone() {
+            return !stream_;
+        }
+
     protected:
         // internal functions called by js object
         void startReadingInt()
@@ -211,6 +215,7 @@ namespace quic
         bool stop_sending_received_ = false;
         bool pause_reading_ = false;
         bool can_read_pending_ = false;
+        bool stream_was_reset_ = false;
         std::deque<WChunks> chunks_;
     };
 

package/platform/quiche_platform_impl/quiche_logging_impl.cc

@@ -1,7 +0,0 @@
-#include "quiche_platform_impl/quiche_logging_impl.h"
-
-namespace quiche {
-
-DevZeroStream StdoutLogSink::dump;
-
-}