FIX: Make server request and websocket connection methods accessible/overrideable in parent.

Author: Jon-Biz

server/services/attachHttp/index.js

@@ -15,6 +15,7 @@ function attachHttpServer (server, onListening) {
   httpServer.on('listening', onListening)
 
   const onHttpRequest = (req, res, opts = {}) => {
+    if (res.headersSent) return
     opts.trustProxy = opts.trustProxy || server._trustProxy
 
     let params
@@ -53,12 +54,8 @@ function attachHttpServer (server, onListening) {
     })
   }
 
-  const onRequest = (req, res) => {
-    if (res.headersSent) return
-    if (onHttpRequest) onHttpRequest(req, res)
-  }
-
-  const setRequest = () => httpServer.on('request', onRequest)
+  server.onHttpRequest = onHttpRequest
+  const setRequest = () => httpServer.on('request', (...args) => server.onHttpRequest(...args))
 
   // Add default http request handler on next tick to give user the chance to add
   // their own handler first. Handle requests untouched by user's handler.

server/services/attachWS/index.js

@@ -51,7 +51,7 @@ function setupWebSocketServer (server) {
     socket.onCloseBound = () => onWebSocketClose(socket)
     socket.on('close', socket.onCloseBound)
   }
-
+  server.onWebSocketConnection = onWebSocketConnection
   const onWebSocketRequest = (socket, opts, params) => {
     try {
       params = parseWebSocketRequest(socket, opts, params)
@@ -266,7 +266,7 @@ function setupWebSocketServer (server) {
     // Note: socket.upgradeReq was removed in [email protected], so re-add it.
     // https://github.com/websockets/ws/pull/1099
     socket.upgradeReq = req
-    onWebSocketConnection(socket)
+    server.onWebSocketConnection(socket)
   }
 
   ws.address = () => server.http.address()