quic: fixes and refactors

lib/internal/quic/core.js

@@ -640,6 +640,10 @@ class QuicSocket extends EventEmitter {
       return;
     this.#state = kSocketClosing;
 
+    // Otherwise, gracefully close each QuicSession, with
+    // [kMaybeDestroy]() being called after each closes.
+    const maybeDestroy = this[kMaybeDestroy].bind(this);
+
     // If there are no sessions, call [kMaybeDestroy]()
     // immediately to destroy the QuicSocket
     if (this.#sessions.size === 0) {
@@ -648,9 +652,6 @@ class QuicSocket extends EventEmitter {
       return;
     }
 
-    // Otherwise, gracefully close each QuicSession, with
-    // [kMaybeDestroy]() being called after each closes.
-    const maybeDestroy = this[kMaybeDestroy].bind(this);
     for (const session of this.#sessions)
       session.close(maybeDestroy);
   }
@@ -1444,8 +1445,8 @@ class QuicStream extends Duplex {
     const handle = this[kHandle];
     if (handle !== undefined) {
       this[kHandle] = undefined;
-      handle[owner_symbol] = undefined;
       handle.destroy();
+      handle[owner_symbol] = undefined;
     }
     callback(error);
   }

lib/internal/stream_base_commons.js

@@ -92,20 +92,21 @@ function onWriteComplete(status) {
     this.callback(null);
 }
 
-function createWriteWrap(handle) {
+function createWriteWrap(handle, callback) {
   const req = new WriteWrap();
 
   req.handle = handle;
   req.oncomplete = onWriteComplete;
   req.async = false;
   req.bytes = 0;
   req.buffer = null;
+  req.callback = callback;
 
   return req;
 }
 
 function writevGeneric(self, data, cb) {
-  const req = createWriteWrap(self[kHandle]);
+  const req = createWriteWrap(self[kHandle], cb);
   const allBuffers = data.allBuffers;
   var chunks;
   var i;
@@ -126,29 +127,26 @@ function writevGeneric(self, data, cb) {
   // Retain chunks
   if (err === 0) req._chunks = chunks;
 
-  afterWriteDispatched(self, req, err, cb);
+  afterWriteDispatched(self, req, err);
   return req;
 }
 
 function writeGeneric(self, data, encoding, cb) {
-  const req = createWriteWrap(self[kHandle]);
+  const req = createWriteWrap(self[kHandle], cb);
   const err = handleWriteReq(req, data, encoding);
-
-  afterWriteDispatched(self, req, err, cb);
+  afterWriteDispatched(self, req, err);
   return req;
 }
 
-function afterWriteDispatched(self, req, err, cb) {
+function afterWriteDispatched(self, req, err) {
   req.bytes = streamBaseState[kBytesWritten];
   req.async = !!streamBaseState[kLastWriteWasAsync];
 
   if (err !== 0)
     return self.destroy(errnoException(err, 'write', req.error), cb);
 
-  if (!req.async) {
-    cb();
-  } else {
-    req.callback = cb;
+  if (!req.async && typeof req.callback === 'function') {
+    req.callback();
   }
 }
 

src/node_quic_buffer.h

@@ -187,6 +187,19 @@ class QuicBuffer : public MemoryRetainer {
     CHECK_EQ(length_, 0);
   }
 
+  inline uint64_t Copy(
+      uv_buf_t* bufs,
+      size_t nbufs) {
+    uint64_t total = 0;
+    for (size_t n = 0; n < nbufs; n++) {
+      MallocedBuffer<uint8_t> data(bufs[n].len);
+      memcpy(data.data, bufs[n].base, bufs[n].len);
+      total += bufs[n].len;
+      Push(std::move(data));
+    }
+    return total;
+  }
+
   // Push one or more uv_buf_t instances into the buffer.
   // the done_cb callback will be invoked when the last
   // uv_buf_t in the bufs array is consumed and popped out