From 22b4ab7aaad2ac1f78ec13902e7f110e247bda54 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Tue, 15 May 2018 15:59:41 +0200
Subject: [PATCH] socket: don't emit premature 'close'

---
 doc/api/net.md |  5 +----
 lib/net.js     | 36 +++++++++++++++++-------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/doc/api/net.md b/doc/api/net.md
index 21d14fc7068bc5..82a158d0a0968e 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -407,10 +407,7 @@ endpoint, depending on what it [`connect()`][`socket.connect()`] to.
 added: v0.1.90
 -->
 
-* `hadError` {boolean} `true` if the socket had a transmission error.
-
-Emitted once the socket is fully closed. The argument `hadError` is a boolean
-which says if the socket was closed due to a transmission error.
+Emitted once the socket is fully closed.
 
 ### Event: 'connect'
 <!-- YAML
diff --git a/lib/net.js b/lib/net.js
index 5537c472fe05e3..4042f418b010d1 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -249,8 +249,6 @@ function Socket(options) {
 
   // Prevent the "no-half-open enforcer" from being inherited from `Duplex`.
   options.allowHalfOpen = true;
-  // For backwards compat do not emit close on destroy.
-  options.emitClose = false;
   stream.Duplex.call(this, options);
 
   // Default to *not* allowing half open sockets.
@@ -583,33 +581,33 @@ Socket.prototype._destroy = function(exception, cb) {
     clearTimeout(s[kTimeout]);
   }
 
-  debug('close');
+  const onClosed = () => {
+    cb(exception);
+
+    if (this._server) {
+      COUNTER_NET_SERVER_CONNECTION_CLOSE(this);
+      debug('has server');
+      this._server._connections--;
+      if (this._server._emitCloseIfDrained) {
+        this._server._emitCloseIfDrained();
+      }
+    }
+  };
+
   if (this._handle) {
+    debug('close');
     if (this !== process.stderr)
       debug('close handle');
-    var isException = exception ? true : false;
     // `bytesRead` and `kBytesWritten` should be accessible after `.destroy()`
     this[kBytesRead] = this._handle.bytesRead;
     this[kBytesWritten] = this._handle.bytesWritten;
 
-    this._handle.close(() => {
-      debug('emit close');
-      this.emit('close', isException);
-    });
+    this._handle.close(onClosed);
     this._handle.onread = noop;
     this._handle = null;
     this._sockname = null;
-  }
-
-  cb(exception);
-
-  if (this._server) {
-    COUNTER_NET_SERVER_CONNECTION_CLOSE(this);
-    debug('has server');
-    this._server._connections--;
-    if (this._server._emitCloseIfDrained) {
-      this._server._emitCloseIfDrained();
-    }
+  } else {
+    onClosed();
   }
 };