quic: fixup kEndpointClose

Ensure that the QuicSocket is properly destroyed if the QuicEndpoint is destroyed directly rather than through QuicSocket destroy PR-URL: #34283 Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Jul 16, 2020 · e5d963e · e5d963e
1 parent 9f552df
commit e5d963e
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/lib/internal/quic/core.js b/lib/internal/quic/core.js
@@ -1052,7 +1052,6 @@ class QuicSocket extends EventEmitter {
     });
   }
 
-  // Called when a QuicEndpoint closes
   [kEndpointClose](endpoint, error) {
     const state = this[kInternalState];
     state.endpoints.delete(endpoint);
@@ -1064,26 +1063,15 @@ class QuicSocket extends EventEmitter {
       }
     });
 
-    // If there are no more QuicEndpoints, the QuicSocket is no
-    // longer usable.
+    // If there aren't any more endpoints, the QuicSession
+    // is no longer usable and needs to be destroyed.
     if (state.endpoints.size === 0) {
-      for (const session of state.sessions)
-        session.destroy(error);
-
-      if (error) process.nextTick(emit.bind(this, 'error', error));
-      process.nextTick(emit.bind(this, 'close'));
+      if (!this.destroyed)
+        return this.destroy(error);
+      this[kDestroy](error);
     }
   }
 
-  // kDestroy is called to actually free the QuicSocket resources and
-  // cause the error and close events to be emitted.
-  [kDestroy](error) {
-    // The QuicSocket will be destroyed once all QuicEndpoints
-    // are destroyed. See [kEndpointClose].
-    for (const endpoint of this[kInternalState].endpoints)
-      endpoint.destroy(error);
-  }
-
   // kMaybeDestroy is called one or more times after the close() method
   // is called. The QuicSocket will be destroyed if there are no remaining
   // open sessions.
@@ -1463,7 +1451,20 @@ class QuicSocket extends EventEmitter {
     for (const session of state.sessions)
       session.destroy(error);
 
-    this[kDestroy](error);
+    // If there aren't any QuicEndpoints to clean up, skip
+    // directly to the end to emit the error and close events.
+    if (state.endpoints.size === 0)
+      return this[kDestroy](error);
+
+    // Otherwise, the QuicSocket will be destroyed once all
+    // QuicEndpoints are destroyed. See [kEndpointClose].
+    for (const endpoint of state.endpoints)
+      endpoint.destroy(error);
+  }
+
+  [kDestroy](error) {
+    if (error) process.nextTick(emit.bind(this, 'error', error));
+    process.nextTick(emit.bind(this, 'close'));
   }
 
   ref() {