fix: issue when response status was not propageted for http proxy han…

…dler
FireBlinkLTD · Nov 11, 2023 · c351814 · c351814
1 parent b28b30b
commit c351814
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/src/handlers/HttpProxyHandler.ts b/src/handlers/HttpProxyHandler.ts
@@ -44,18 +44,20 @@ export class HttpProxyHandler {
 
     this.logInfo(`[${requestId}] [HttpProxyHandler] Processing HTTP/HTTPS proxy request with method ${method} to ${target}${url}`);
 
+    const requestHeadersToSend = RequestUtils.prepareProxyHeaders(
+      req.headers,
+      this.configuration.proxyRequestHeaders,
+      this.upstream.proxyRequestHeaders,
+      // istanbul ignore next
+      proxyConfiguration?.proxyRequestHeaders,
+    );
+
+    const isKeepAliveRequest = req.headers.connection.toLowerCase() === 'keep-alive';
     const options: RequestOptions = {
       method,
       host,
       port,
-
-      headers: RequestUtils.prepareProxyHeaders(
-        req.headers,
-        this.configuration.proxyRequestHeaders,
-        this.upstream.proxyRequestHeaders,
-        // istanbul ignore next
-        proxyConfiguration?.proxyRequestHeaders,
-      ),
+      headers: requestHeadersToSend,
       path: RequestUtils.concatPath(initialPath, url),
       timeout: this.configuration.proxyRequestTimeout,
     };
@@ -70,6 +72,13 @@ export class HttpProxyHandler {
       });
 
       client.on('response', (response: IncomingMessage) => {
+        if (isKeepAliveRequest) {
+          client.setTimeout(0);
+        }
+
+        // map status code
+        res.statusCode = response.statusCode;
+
         const headersToSet = RequestUtils.prepareProxyHeaders(
           response.headers,
           this.configuration.responseHeaders,

diff --git a/test/HttpProxy.success.suite.ts b/test/HttpProxy.success.suite.ts
@@ -61,6 +61,24 @@ export class HttpProxySuccessSuite {
     deepEqual(result.data, testData);
   }
 
+  @test()
+  async echoRequestWithKeepAliveConnection(): Promise<void> {
+    await this.initProxy();
+
+    const testData = [];
+    for (let i = 0; i < 1000 * 1000; i++) {
+      testData.push('Iteration - ' + i);
+    }
+
+    const result = await axios.post(`${this.proxyUrl}/echo`, testData, {
+      maxBodyLength: 50 * 1024 * 1024, // 50 mb
+      headers: {
+        'Connection': 'keep-alive'
+      }
+    });
+    deepEqual(result.data, testData);
+  }
+
   @test()
   async customPath(): Promise<void> {
     await this.after();