chore(package.json): bump to httpxy 0.5.0 (#1183)

Author: chimurai

package.json

@@ -97,7 +97,7 @@
   },
   "dependencies": {
     "debug": "^4.3.6",
-    "httpxy": "^0.2.2",
+    "httpxy": "^0.5.0",
     "is-glob": "^4.0.3",
     "is-plain-object": "^5.0.0",
     "micromatch": "^4.0.8"

src/http-proxy-middleware.ts

@@ -137,8 +137,9 @@ export class HttpProxyMiddleware<
   private handleUpgrade = async (req: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
     try {
       if (this.shouldProxy(this.proxyOptions.pathFilter, req)) {
-        const activeProxyOptions = await this.prepareProxyRequest(req);
-        await this.proxy.ws(req, socket, activeProxyOptions, head);
+        const proxiedReq = req as TReq;
+        const activeProxyOptions = await this.prepareProxyRequest(proxiedReq);
+        await this.proxy.ws(proxiedReq, socket, activeProxyOptions, head);
         debug('server upgrade event received. Proxying WebSocket');
       }
     } catch (err) {

test/e2e/router.spec.ts

@@ -34,13 +34,13 @@ describe('E2E router', () => {
 
     await targetServerA
       .forAnyRequest()
-      .thenCallback(({ protocol }) => ({ body: protocol === 'https' ? 'A' : 'NOT HTTPS A' }));
+      .thenCallback(({ protocol }) => ({ body: protocol === 'https' ? 'HTTPS A' : 'HTTP A' }));
     await targetServerB
       .forAnyRequest()
-      .thenCallback(({ protocol }) => ({ body: protocol === 'https' ? 'B' : 'NOT HTTPS B' }));
+      .thenCallback(({ protocol }) => ({ body: protocol === 'https' ? 'HTTPS B' : 'HTTP B' }));
     await targetServerC
       .forAnyRequest()
-      .thenCallback(({ protocol }) => ({ body: protocol === 'https' ? 'C' : 'NOT HTTPS C' }));
+      .thenCallback(({ protocol }) => ({ body: protocol === 'https' ? 'HTTPS C' : 'HTTP C' }));
 
     await targetServerA.start(targetPortA);
     await targetServerB.start(targetPortB);
@@ -68,7 +68,7 @@ describe('E2E router', () => {
 
       const agent = request(app);
       const response = await agent.get('/api').expect(200);
-      expect(response.text).toBe('C');
+      expect(response.text).toBe('HTTPS C');
     });
 
     it('should work with an object', async () => {
@@ -84,7 +84,7 @@ describe('E2E router', () => {
       );
       const agent = request(app);
       const response = await agent.get('/api').expect(200);
-      expect(response.text).toBe('C');
+      expect(response.text).toBe('HTTPS C');
     });
 
     it('should work with an async callback', async () => {
@@ -103,7 +103,7 @@ describe('E2E router', () => {
 
       const agent = request(app);
       const response = await agent.get('/api').expect(200);
-      expect(response.text).toBe('C');
+      expect(response.text).toBe('HTTPS C');
     });
 
     it('should handle promise rejection in router', async () => {
@@ -127,7 +127,7 @@ describe('E2E router', () => {
       expect(response.text).toBe('An error thrown in the router');
     });
 
-    it('missing a : will cause it to use http', async () => {
+    it('missing a ":" in protocol will cause it to use https', async () => {
       const app = createApp(
         createProxyMiddleware({
           target: `https://localhost:${targetPortA}`,
@@ -143,7 +143,7 @@ describe('E2E router', () => {
 
       const agent = request(app);
       const response = await agent.get('/api').expect(200);
-      expect(response.text).toBe('NOT HTTPS C');
+      expect(response.text).toBe('HTTPS C');
     });
   });
 
@@ -171,25 +171,25 @@ describe('E2E router', () => {
     it('should proxy to option.target', async () => {
       const response = await agent.get('/api').expect(200);
 
-      expect(response.text).toBe('A');
+      expect(response.text).toBe('HTTPS A');
     });
 
     it('should proxy when host is "alpha.localhost"', async () => {
       const response = await agent.get('/api').set('host', 'alpha.localhost:6000').expect(200);
 
-      expect(response.text).toBe('A');
+      expect(response.text).toBe('HTTPS A');
     });
 
     it('should proxy when host is "beta.localhost"', async () => {
       const response = await agent.get('/api').set('host', 'beta.localhost:6000').expect(200);
 
-      expect(response.text).toBe('B');
+      expect(response.text).toBe('HTTPS B');
     });
 
     it('should proxy with host & path config: "localhost:6000/api"', async () => {
       const response = await agent.get('/api').set('host', 'localhost:6000').expect(200);
 
-      expect(response.text).toBe('C');
+      expect(response.text).toBe('HTTPS C');
     });
   });
 });

yarn.lock

@@ -2566,10 +2566,10 @@ https-proxy-agent@^7.0.6:
     agent-base "^7.1.2"
     debug "4"
 
-httpxy@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/httpxy/-/httpxy-0.2.2.tgz#1603165cfd12087f2039c4a8532ce61eab5d84e5"
-  integrity sha512-QnS6mAOqvdmfctFaD/Kp5cwRMcaUhEmIyw2rjVYnhJb8EuAyd/79biT/50HUTKvq/PwoXYTP6J3d9TUxzHFZwA==
+httpxy@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/httpxy/-/httpxy-0.5.0.tgz#a9c53543760dee498611827a464e56e14639c0d0"
+  integrity sha512-qwX7QX/rK2visT10/b7bSeZWQOMlSm3svTD0pZpU+vJjNUP0YHtNv4c3z+MO+MSnGuRFWJFdCZiV+7F7dXIOzg==
 
 husky@9.1.7:
   version "9.1.7"