http-proxy-middleware 1.2.0-beta.2 → 1.2.0

package/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
-## next
+## [v1.2.0](https://github.com/chimurai/http-proxy-middleware/releases/tag/v1.2.0)
 
-- feat(handler): response interceptor
+- feat(handler): response interceptor ([#520](https://github.com/chimurai/http-proxy-middleware/pull/520))
+- fix(log error): handle undefined target when websocket errors ([#527](https://github.com/chimurai/http-proxy-middleware/pull/527))
+
+## [v1.1.2](https://github.com/chimurai/http-proxy-middleware/releases/tag/v1.1.2)
+
+- fix(log error): handle optional target ([#523](https://github.com/chimurai/http-proxy-middleware/pull/523))
 
 ## [v1.1.1](https://github.com/chimurai/http-proxy-middleware/releases/tag/v1.1.1)
 

package/README.md

@@ -1,10 +1,10 @@
 # http-proxy-middleware
 
-[![Build Status](https://img.shields.io/travis/chimurai/http-proxy-middleware/master.svg?style=flat-square)](https://travis-ci.org/chimurai/http-proxy-middleware)
+[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/chimurai/http-proxy-middleware/Test/master?style=flat-square)](https://github.com/chimurai/http-proxy-middleware/actions?query=branch%3Amaster)
 [![Coveralls](https://img.shields.io/coveralls/chimurai/http-proxy-middleware.svg?style=flat-square)](https://coveralls.io/r/chimurai/http-proxy-middleware)
 [![dependency Status](https://img.shields.io/david/chimurai/http-proxy-middleware.svg?style=flat-square)](https://david-dm.org/chimurai/http-proxy-middleware#info=dependencies)
 [![dependency Status](https://snyk.io/test/npm/http-proxy-middleware/badge.svg?style=flat-square)](https://snyk.io/test/npm/http-proxy-middleware)
-[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
+[![npm](https://img.shields.io/npm/v/http-proxy-middleware?color=%23CC3534&style=flat-square)](https://www.npmjs.com/package/http-proxy-middleware)
 
 Node.js proxying made simple. Configure proxy middleware with ease for [connect](https://github.com/senchalabs/connect), [express](https://github.com/strongloop/express), [browser-sync](https://github.com/BrowserSync/browser-sync) and [many more](#compatible-servers).
 
@@ -299,7 +299,7 @@ Subscribe to [http-proxy events](https://github.com/nodejitsu/node-http-proxy#li
 - **option.onError**: function, subscribe to http-proxy's `error` event for custom error handling.
 
   ```javascript
-  function onError(err, req, res) {
+  function onError(err, req, res, target) {
     res.writeHead(500, {
       'Content-Type': 'text/plain',
     });
@@ -488,7 +488,7 @@ Intercept responses from upstream with `responseInterceptor`. (Make sure to set
 
 Responses which are compressed with `brotli`, `gzip` and `deflate` will be decompressed automatically. The response will be returned as `buffer` ([docs](https://nodejs.org/api/buffer.html)) which you can manipulate.
 
-With `buffer`, response manipulation is not limited to text responses (html/css/js, etc...); image manipulation will be possible too. ([example](https://github.com/chimurai/http-proxy-middleware/blob/master/response-interceptor/recipes/response-interceptor.md#manipulate-image-response))
+With `buffer`, response manipulation is not limited to text responses (html/css/js, etc...); image manipulation will be possible too. ([example](https://github.com/chimurai/http-proxy-middleware/blob/master/recipes/response-interceptor.md#manipulate-image-response))
 
 NOTE: `responseInterceptor` disables streaming of target's response.
 
@@ -513,7 +513,7 @@ const proxy = createProxyMiddleware({
 });
 ```
 
-Check out [interception recipes](https://github.com/chimurai/http-proxy-middleware/blob/master/response-interceptor/recipes/response-interceptor.md#readme) for more examples.
+Check out [interception recipes](https://github.com/chimurai/http-proxy-middleware/blob/master/recipes/response-interceptor.md#readme) for more examples.
 
 ## Working examples
 
@@ -523,7 +523,7 @@ View and play around with [working examples](https://github.com/chimurai/http-pr
 - express ([example source](https://github.com/chimurai/http-proxy-middleware/tree/master/examples/express/index.js))
 - connect ([example source](https://github.com/chimurai/http-proxy-middleware/tree/master/examples/connect/index.js))
 - WebSocket ([example source](https://github.com/chimurai/http-proxy-middleware/tree/master/examples/websocket/index.js))
-- Response Manipulation ([example source](https://github.com/chimurai/http-proxy-middleware/blob/master/response-interceptor/examples/response-interceptor/index.js))
+- Response Manipulation ([example source](https://github.com/chimurai/http-proxy-middleware/blob/master/examples/response-interceptor/index.js))
 
 ## Recipes
 

package/dist/handlers/response-interceptor.js

@@ -22,7 +22,7 @@ function responseInterceptor(interceptor) {
     return function proxyRes(proxyRes, req, res) {
         return __awaiter(this, void 0, void 0, function* () {
             const originalProxyRes = proxyRes;
-            let buffer = Buffer.from('', 'utf-8');
+            let buffer = Buffer.from('', 'utf8');
             // decompress proxy response
             const _proxyRes = decompress(proxyRes, proxyRes.headers['content-encoding']);
             // concat data stream
@@ -33,7 +33,7 @@ function responseInterceptor(interceptor) {
                 // call interceptor with intercepted response (buffer)
                 const interceptedBuffer = Buffer.from(yield interceptor(buffer, originalProxyRes, req, res));
                 // set correct content-length (with double byte character support)
-                res.setHeader('content-length', Buffer.byteLength(interceptedBuffer, 'utf-8'));
+                res.setHeader('content-length', Buffer.byteLength(interceptedBuffer, 'utf8'));
                 res.write(interceptedBuffer);
                 res.end();
             }));

package/dist/http-proxy-middleware.js

@@ -135,12 +135,14 @@ class HttpProxyMiddleware {
                 }
             }
         });
-        this.logError = (err, req, res) => {
-            const hostname = (req.headers && req.headers.host) || req.hostname || req.host; // (websocket) || (node0.10 || node 4/5)
-            const target = this.proxyOptions.target.host || this.proxyOptions.target;
-            const errorMessage = '[HPM] Error occurred while trying to proxy request %s from %s to %s (%s) (%s)';
+        this.logError = (err, req, res, target) => {
+            var _a;
+            const hostname = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a.host) || req.hostname || req.host; // (websocket) || (node0.10 || node 4/5)
+            const requestHref = `${hostname}${req.url}`;
+            const targetHref = `${target === null || target === void 0 ? void 0 : target.href}`; // target is undefined when websocket errors
+            const errorMessage = '[HPM] Error occurred while proxying request %s to %s [%s] (%s)';
             const errReference = 'https://nodejs.org/api/errors.html#errors_common_system_errors'; // link to Node Common Systems Errors page
-            this.logger.error(errorMessage, req.url, hostname, target, err.code || err, errReference);
+            this.logger.error(errorMessage, requestHref, targetHref, err.code || err, errReference);
         };
         this.config = config_factory_1.createConfig(context, opts);
         this.proxyOptions = this.config.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-proxy-middleware",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0",
   "description": "The one-liner node.js proxy middleware for connect, express and browser-sync",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",