[minor] Pass the request object to server.handleUpgrade() callback

Fixes #1813

Author: lpinca

doc/ws.md

@@ -154,7 +154,7 @@ emitted independently.
 
 ### Event: 'connection'
 
-- `socket` {WebSocket}
+- `websocket` {WebSocket}
 - `request` {http.IncomingMessage}
 
 Emitted when the handshake is complete. `request` is the http GET request sent
@@ -211,8 +211,10 @@ when the HTTP server is passed via the `server` option, this method is called
 automatically. When operating in "noServer" mode, this method must be called
 manually.
 
-If the upgrade is successful, the `callback` is called with a `WebSocket` object
-as parameter.
+If the upgrade is successful, the `callback` is called with two arguments:
+
+- `websocket` {WebSocket} A `WebSocket` object.
+- `request` {http.IncomingMessage} The client HTTP GET request.
 
 ### server.shouldHandle(request)
 

lib/websocket-server.js

@@ -83,13 +83,13 @@ class WebSocketServer extends EventEmitter {
     }
 
     if (this._server) {
+      const emitConnection = this.emit.bind(this, 'connection');
+
       this._removeListeners = addListeners(this._server, {
         listening: this.emit.bind(this, 'listening'),
         error: this.emit.bind(this, 'error'),
         upgrade: (req, socket, head) => {
-          this.handleUpgrade(req, socket, head, (ws) => {
-            this.emit('connection', ws, req);
-          });
+          this.handleUpgrade(req, socket, head, emitConnection);
         }
       });
     }
@@ -327,7 +327,7 @@ class WebSocketServer extends EventEmitter {
       ws.on('close', () => this.clients.delete(ws));
     }
 
-    cb(ws);
+    cb(ws, req);
   }
 }