From 9f552df5b4892530e3c8cabc31705b265c317304 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 9 Jul 2020 13:52:15 -0700
Subject: [PATCH] quic: fix endpointClose error handling, document

PR-URL: https://github.com/nodejs/node/pull/34283
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 doc/api/quic.md                          | 15 +++++++++++++++
 lib/internal/quic/core.js                |  9 +++++++--
 test/parallel/test-quic-client-server.js |  2 ++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/doc/api/quic.md b/doc/api/quic.md
index d16b0a853e19fa..46f521789ef799 100644
--- a/doc/api/quic.md
+++ b/doc/api/quic.md
@@ -1354,6 +1354,21 @@ Emitted after the `QuicSocket` has been destroyed and is no longer usable.
 
 The `'close'` event will not be emitted multiple times.
 
+#### Event: `'endpointClose'`
+<!-- YAML
+added: REPLACEME
+-->
+
+Emitted after a `QuicEndpoint` associated witht the `QuicSocket` closes and
+has been destroyed. The handler will be invoked with two arguments:
+
+* `endpoint` {QuicEndpoint} The `QuicEndpoint` that has been destroyed.
+* `error` {Error} An `Error` object if the `QuicEndpoint` was destroyed because
+  of an error.
+
+When all of the `QuicEndpoint` instances associated with a `QuicSocket` have
+closed, the `QuicEndpoint` will also automatically close.
+
 #### Event: `'error'`
 <!-- YAML
 added: REPLACEME
diff --git a/lib/internal/quic/core.js b/lib/internal/quic/core.js
index 3aebecd47c8370..d76478ff52b31e 100644
--- a/lib/internal/quic/core.js
+++ b/lib/internal/quic/core.js
@@ -1056,12 +1056,17 @@ class QuicSocket extends EventEmitter {
   [kEndpointClose](endpoint, error) {
     const state = this[kInternalState];
     state.endpoints.delete(endpoint);
-    process.nextTick(emit.bind(this, 'endpointClose', endpoint, error));
+    process.nextTick(() => {
+      try {
+        this.emit('endpointClose', endpoint, error);
+      } catch (error) {
+        this.destroy(error);
+      }
+    });
 
     // If there are no more QuicEndpoints, the QuicSocket is no
     // longer usable.
     if (state.endpoints.size === 0) {
-      // Ensure that there are absolutely no additional sessions
       for (const session of state.sessions)
         session.destroy(error);
 
diff --git a/test/parallel/test-quic-client-server.js b/test/parallel/test-quic-client-server.js
index 06b045cd783fa5..6243e4d0cc0bb0 100644
--- a/test/parallel/test-quic-client-server.js
+++ b/test/parallel/test-quic-client-server.js
@@ -222,6 +222,8 @@ server.on('ready', common.mustCall(() => {
   client = createQuicSocket({ client: { key, cert, ca, alpn: kALPN }
   });
 
+  client.on('endpointClose', common.mustCall());
+
   client.on('close', common.mustCall(() => {
     debug('Client closing. Duration', client.duration);
     debug('  Bound duration',