Refactoring day1

node_modules/mongodb/lib/cmap/connection.js

@@ -4,7 +4,6 @@ const EventEmitter = require('events');
 const MessageStream = require('./message_stream');
 const MongoError = require('../core/error').MongoError;
 const MongoNetworkError = require('../core/error').MongoNetworkError;
-const MongoNetworkTimeoutError = require('../core/error').MongoNetworkTimeoutError;
 const MongoWriteConcernError = require('../core/error').MongoWriteConcernError;
 const CommandResult = require('../core/connection/command_result');
 const StreamDescription = require('./stream_description').StreamDescription;
@@ -78,14 +77,10 @@ class Connection extends EventEmitter {
       stream.destroy();
       this.closed = true;
       this[kQueue].forEach(op =>
-        op.cb(
-          new MongoNetworkTimeoutError(`connection ${this.id} to ${this.address} timed out`, {
-            beforeHandshake: this[kIsMaster] == null
-          })
-        )
+        op.cb(new MongoNetworkError(`connection ${this.id} to ${this.address} timed out`))
       );
-
       this[kQueue].clear();
+
       this.emit('close');
     });
 
@@ -223,7 +218,6 @@ function messageHandler(conn) {
     }
 
     const operationDescription = conn[kQueue].get(message.responseTo);
-    const callback = operationDescription.cb;
 
     // SERVER-45775: For exhaust responses we should be able to use the same requestId to
     // track response, however the server currently synthetically produces remote requests
@@ -232,7 +226,10 @@ function messageHandler(conn) {
     if (message.moreToCome) {
       // requeue the callback for next synthetic request
       conn[kQueue].set(message.requestId, operationDescription);
-    } else if (operationDescription.socketTimeoutOverride) {
+    }
+
+    const callback = operationDescription.cb;
+    if (operationDescription.socketTimeoutOverride) {
       conn[kStream].setTimeout(conn.socketTimeout);
     }