feat: onRes now takes (req, res), instead of (req, resHeaders, resCompat)

Breaks onRes signature

Author: ronag

README.md

@@ -57,7 +57,7 @@ server.on('request', (req, res) => {
   proxy.web(req, res, {
     hostname: 'localhost'
     port: 9000,
-    onRes: (req, resHeaders, res) => helmet(req, res, () => {})
+    onRes: (req, res) => helmet(req, res, () => {})
   }, err => console.error(err, 'proxy error'))
 })
 ```
@@ -69,10 +69,10 @@ server.on('request', (req, res) => {
   proxy.web(req, res, {
     hostname: 'localhost'
     port: 9000,
-    onReq: (req, reqHeaders) => {
-      reqHeaders['x-forwarded-for'] = req.socket.remoteAddress
-      reqHeaders['x-forwarded-proto'] = req.socket.encrypted ? 'https' : 'http'
-      reqHeaders['x-forwarded-host'] = req.headers['host']
+    onReq: (req, headers) => {
+      headers['x-forwarded-for'] = req.socket.remoteAddress
+      headers['x-forwarded-proto'] = req.socket.encrypted ? 'https' : 'http'
+      headers['x-forwarded-host'] = req.headers['host']
     }
   }, err => console.error(err, 'proxy error'))
 })
@@ -102,8 +102,12 @@ server.on('request', (req, res) => {
   - `timeout`: incoming request timeout
   - `proxyTimeout`: proxy request timeout
   - `proxyName`: proxy name used for **Via** header
-  - `onReq(req, reqHeaders)`: called before proxy request
-  - `onRes(req, resHeaders, res)`: called before proxy response
+  - `onReq(req, headers)`: called before proxy request
+    - `req`: `http.IncomingMessage` or `http2.Http2ServerRequest`
+    - `headers`: `http.ClientRequest.headers`
+  - `onRes(req, res)`: called before proxy response
+    - `req`: `http.IncomingMessage` or `http2.Http2ServerRequest`
+    - `res`: `http.ServerResponse` or `http2.Http2ServerResponse`
 
 ### License
 

index.js

@@ -183,40 +183,16 @@ function proxy (req, resOrSocket, options, onRes, onError) {
         } else {
           setupHeaders(proxyRes.headers)
 
+          resOrSocket.statusCode = proxyRes.statusCode
+          for (const key of Object.keys(proxyRes.headers)) {
+            resOrSocket.setHeader(key, proxyRes.headers[key])
+          }
+
           if (onRes) {
-            if (onRes.length === 3) {
-              onRes(req, proxyRes.headers, {
-                setHeader (key, value) {
-                  proxyRes.headers[sanatizeHeaderName(key)] = value
-                },
-                removeHeader (key) {
-                  delete proxyRes.headers[sanatizeHeaderName(key)]
-                },
-                getHeader (key) {
-                  return proxyRes.headers[sanatizeHeaderName(key)]
-                },
-                hasHeader (key) {
-                  return !!proxyRes.headers[sanatizeHeaderName(key)]
-                },
-                get statusCode () {
-                  return proxyRes.statusCode
-                },
-                set statusCode (value) {
-                  proxyRes.statusCode = value
-                },
-                get statusMessage () {
-                  return proxyRes.statusMessage
-                },
-                set statusMessage (value) {
-                  proxyRes.statusMessage = value
-                }
-              })
-            } else {
-              onRes(req, proxyRes.headers)
-            }
+            onRes(req, resOrSocket)
           }
 
-          resOrSocket.writeHead(proxyRes.statusCode, proxyRes.headers)
+          resOrSocket.writeHead(resOrSocket.statusCode)
           proxyRes.on('end', () => {
             resOrSocket.addTrailers(proxyRes.trailers)
           })