Merge branch 'master' into master

Author: lovelgw

package.json

@@ -51,35 +51,35 @@
   },
   "homepage": "https://github.com/chimurai/http-proxy-middleware#readme",
   "devDependencies": {
-    "@commitlint/cli": "^12.1.4",
-    "@commitlint/config-conventional": "^12.1.4",
-    "@types/express": "4.17.7",
-    "@types/is-glob": "^4.0.1",
-    "@types/jest": "^26.0.23",
-    "@types/micromatch": "^4.0.1",
-    "@types/node": "^15.6.2",
+    "@commitlint/cli": "^13.1.0",
+    "@commitlint/config-conventional": "^13.1.0",
+    "@types/express": "^4.17.13",
+    "@types/is-glob": "^4.0.2",
+    "@types/jest": "^27.0.1",
+    "@types/micromatch": "^4.0.2",
+    "@types/node": "^16.6.1",
     "@types/supertest": "^2.0.11",
-    "@types/ws": "^7.4.4",
-    "@typescript-eslint/eslint-plugin": "^4.26.0",
-    "@typescript-eslint/parser": "^4.26.0",
+    "@types/ws": "^7.4.7",
+    "@typescript-eslint/eslint-plugin": "^4.29.1",
+    "@typescript-eslint/parser": "^4.29.1",
     "body-parser": "^1.19.0",
-    "browser-sync": "^2.26.14",
+    "browser-sync": "^2.27.5",
     "connect": "^3.7.0",
-    "eslint": "^7.27.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
     "express": "^4.17.1",
     "get-port": "^5.1.1",
-    "husky": "^6.0.0",
-    "jest": "^27.0.3",
-    "lint-staged": "^11.0.0",
-    "mockttp": "^1.2.2",
-    "open": "^8.2.0",
-    "prettier": "^2.3.0",
-    "supertest": "^6.1.3",
-    "ts-jest": "^27.0.2",
-    "typescript": "^4.3.2",
-    "ws": "^7.4.6"
+    "husky": "^7.0.1",
+    "jest": "^27.0.6",
+    "lint-staged": "^11.1.2",
+    "mockttp": "^2.2.2",
+    "open": "^8.2.1",
+    "prettier": "^2.3.2",
+    "supertest": "^6.1.5",
+    "ts-jest": "^27.0.4",
+    "typescript": "^4.3.5",
+    "ws": "^8.1.0"
   },
   "dependencies": {
     "@types/http-proxy": "^1.17.6",

src/_handlers.ts

@@ -79,7 +79,7 @@ function defaultErrorHandler(err, req: express.Request, res: express.Response) {
     }
   }
 
-  res.end(`Error occured while trying to proxy: ${host}${req.url}`);
+  res.end(`Error occurred while trying to proxy: ${host}${req.url}`);
 }
 
 function logClose(req, socket, head) {

test/e2e/websocket.spec.ts

@@ -25,7 +25,8 @@ describe('E2E WebSocket proxy', () => {
     wss = new WebSocketServer({ port: WS_SERVER_PORT });
 
     wss.on('connection', (websocket) => {
-      websocket.on('message', (message) => {
+      websocket.on('message', (data, isBinary) => {
+        const message = isBinary ? data : data.toString();
         websocket.send(message); // echo received message
       });
     });
@@ -66,7 +67,8 @@ describe('E2E WebSocket proxy', () => {
     });
 
     it('should proxy to path', (done) => {
-      ws.on('message', (message) => {
+      ws.on('message', (data, isBinary) => {
+        const message = isBinary ? data : data.toString();
         expect(message).toBe('foobar');
         done();
       });
@@ -84,7 +86,8 @@ describe('E2E WebSocket proxy', () => {
     });
 
     it('should proxy to path', (done) => {
-      ws.on('message', (message) => {
+      ws.on('message', (data, isBinary) => {
+        const message = isBinary ? data : data.toString();
         expect(message).toBe('foobar');
         done();
       });
@@ -109,7 +112,8 @@ describe('E2E WebSocket proxy', () => {
     });
 
     it('should proxy to path', (done) => {
-      ws.on('message', (message) => {
+      ws.on('message', (data, isBinary) => {
+        const message = isBinary ? data : data.toString();
         expect(message).toBe('foobar');
         done();
       });
@@ -136,7 +140,8 @@ describe('E2E WebSocket proxy', () => {
     });
 
     it('should proxy to path', (done) => {
-      ws.on('message', (message) => {
+      ws.on('message', (data, isBinary) => {
+        const message = isBinary ? data : data.toString();
         expect(message).toBe('foobar');
         done();
       });

test/unit/handlers.spec.ts

@@ -119,7 +119,7 @@ describe('default proxy error handler', () => {
 
   it('should end the response and return error message', () => {
     proxyError(mockError, mockReq, mockRes, proxyOptions);
-    expect(errorMessage).toBe('Error occured while trying to proxy: localhost:3000/api');
+    expect(errorMessage).toBe('Error occurred while trying to proxy: localhost:3000/api');
   });
 
   it('should not set the http status code to: 500 if headers have already been sent', () => {
@@ -131,7 +131,7 @@ describe('default proxy error handler', () => {
   it('should end the response and return error message', () => {
     mockRes.headersSent = true;
     proxyError(mockError, mockReq, mockRes, proxyOptions);
-    expect(errorMessage).toBe('Error occured while trying to proxy: localhost:3000/api');
+    expect(errorMessage).toBe('Error occurred while trying to proxy: localhost:3000/api');
   });
 
   it('should re-throw error from http-proxy when target is missing', () => {