@belmonddev/catch-request-express-middleware 3.3.5 → 5.0.0

package/dist/incoming.d.ts

@@ -0,0 +1,3 @@
+import { IncomingRequestCallback, ExpressReqExtended, ExpressResExtended } from './types.js';
+export declare const catchExpressIncomingRequest: (req: ExpressReqExtended, res: ExpressResExtended, incomingRequestCb: IncomingRequestCallback) => void;
+//# sourceMappingURL=incoming.d.ts.map

package/dist/incoming.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"incoming.d.ts","sourceRoot":"","sources":["../src/incoming.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAgDpB,eAAO,MAAM,2BAA2B,GACtC,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,mBAAmB,uBAAuB,KACzC,IAqCF,CAAC"}

package/dist/incoming.js

@@ -0,0 +1,76 @@
+import { override, getHeaderValue } from './utils.js';
+const callResponseCb = (responseCb, res) => {
+    const response = {
+        headers: res.getHeaders(),
+        statusCode: res.statusCode,
+        statusMessage: res.statusMessage,
+        body: res.bodyWritten || '',
+    };
+    responseCb(response);
+};
+const callIncomingRequestsCbs = (req, res, incomingRequestsCb, body) => {
+    const responseCb = incomingRequestsCb({
+        requestDirection: 'incoming',
+        originalRequest: req,
+        headers: req.headers,
+        protocol: req.protocol,
+        method: req.method,
+        host: req.headers.host,
+        search: req._parsedUrl.search,
+        pathname: req._parsedUrl.pathname,
+        query: req.query,
+        body,
+    });
+    if (responseCb) {
+        req.socket.setMaxListeners(100);
+        if (req.socketClosed) {
+            callResponseCb(responseCb, res);
+        }
+        else {
+            res.on('timeout', () => {
+                res.statusCode = 408;
+                res.end();
+            });
+            req.socket.on('close', () => {
+                callResponseCb(responseCb, res);
+            });
+        }
+    }
+};
+export const catchExpressIncomingRequest = (req, res, incomingRequestCb) => {
+    let writeCount = 0;
+    let firstData = '';
+    res.bodyWritten = '';
+    override(req.socket, 'write', (_result, data) => {
+        writeCount++;
+        if (writeCount === 1) {
+            firstData = data;
+        }
+        else if (writeCount === 2) {
+            res.bodyWritten = data.toString();
+            if (!res.bodyWritten.length) {
+                res.bodyWritten = firstData.split('\r\n\r\n')?.[1];
+            }
+            req.socketClosed = true;
+        }
+    });
+    if (req.body !== undefined) {
+        callIncomingRequestsCbs(req, res, incomingRequestCb, req.body);
+    }
+    else {
+        const contentLength = getHeaderValue(req.headers, 'content-length');
+        if (contentLength) {
+            let body = '';
+            req.on('data', function (data) {
+                body += data;
+            });
+            req.on('end', function () {
+                callIncomingRequestsCbs(req, res, incomingRequestCb, body);
+            });
+        }
+        else {
+            callIncomingRequestsCbs(req, res, incomingRequestCb, '');
+        }
+    }
+};
+//# sourceMappingURL=incoming.js.map

package/dist/incoming.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"incoming.js","sourceRoot":"","sources":["../src/incoming.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,5 @@
+import { IncomingRequestCallback, OutgoingRequestCallback, CatchRequestMiddleware } from './types.js';
+export { getHeaderValue } from './utils.js';
+declare const catchRequestExpressMiddleware: (incomingRequestCb?: IncomingRequestCallback | null, outgoingRequestCb?: OutgoingRequestCallback | null) => CatchRequestMiddleware;
+export default catchRequestExpressMiddleware;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EAIvB,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,QAAA,MAAM,6BAA6B,GACjC,oBAAmB,uBAAuB,GAAG,IAAW,EACxD,oBAAmB,uBAAuB,GAAG,IAAW,KACvD,sBAeF,CAAC;AAEF,eAAe,6BAA6B,CAAC"}

package/dist/index.js

@@ -0,0 +1,19 @@
+import http from 'http';
+import https from 'https';
+import { overrideHttpModule } from './outgoing.js';
+import { catchExpressIncomingRequest } from './incoming.js';
+export { getHeaderValue } from './utils.js';
+const catchRequestExpressMiddleware = (incomingRequestCb = null, outgoingRequestCb = null) => {
+    if (outgoingRequestCb) {
+        overrideHttpModule(http, outgoingRequestCb);
+        overrideHttpModule(https, outgoingRequestCb);
+    }
+    return (req, res, next) => {
+        if (incomingRequestCb) {
+            catchExpressIncomingRequest(req, res, incomingRequestCb);
+        }
+        next();
+    };
+};
+export default catchRequestExpressMiddleware;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAU1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,6BAA6B,GAAG,CACpC,oBAAoD,IAAI,EACxD,oBAAoD,IAAI,EAChC,EAAE;IAC1B,IAAI,iBAAiB,EAAE,CAAC;QACtB,kBAAkB,CAAC,IAA6B,EAAE,iBAAiB,CAAC,CAAC;QACrE,kBAAkB,CAAC,KAA8B,EAAE,iBAAiB,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;QAC/D,IAAI,iBAAiB,EAAE,CAAC;YACtB,2BAA2B,CACzB,GAAyB,EACzB,GAAyB,EACzB,iBAAiB,CAClB,CAAC;QACJ,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,6BAA6B,CAAC"}

package/dist/outgoing.d.ts

@@ -0,0 +1,3 @@
+import { OutgoingRequestCallback, HttpModule } from './types.js';
+export declare const overrideHttpModule: (httpModule: HttpModule, outgoingRequestCb: OutgoingRequestCallback) => void;
+//# sourceMappingURL=outgoing.d.ts.map

package/dist/outgoing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"outgoing.d.ts","sourceRoot":"","sources":["../src/outgoing.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,uBAAuB,EACvB,UAAU,EAGX,MAAM,YAAY,CAAC;AAoCpB,eAAO,MAAM,kBAAkB,GAC7B,YAAY,UAAU,EACtB,mBAAmB,uBAAuB,KACzC,IAqGF,CAAC"}

package/dist/outgoing.js

@@ -0,0 +1,111 @@
+import { override, getHeaderValue, tryDecompress } from './utils.js';
+const catchHttpResponse = (reqObject, responseCb) => {
+    override(reqObject, 'emit', (result, eventName, response) => {
+        const chunks = [];
+        switch (eventName) {
+            case 'response': {
+                const res = response;
+                res.on('data', (d) => {
+                    chunks.push(d);
+                });
+                res.on('end', () => {
+                    const responseObj = {
+                        headers: res.headers,
+                        statusCode: res.statusCode ?? null,
+                        statusMessage: res.statusMessage ?? null,
+                    };
+                    const buffer = Buffer.concat(chunks);
+                    const stringBody = tryDecompress(buffer).toString('utf8');
+                    const capturedResponse = { ...responseObj, body: stringBody };
+                    responseCb(capturedResponse);
+                });
+            }
+        }
+    });
+};
+export const overrideHttpModule = (httpModule, outgoingRequestCb) => {
+    override(httpModule, 'request', async (reqObject, urlOrRequest, request) => {
+        const opts = (typeof urlOrRequest === 'string' ? request : urlOrRequest);
+        const contentLength = getHeaderValue(opts.headers, 'content-length');
+        const requestHasBody = !!contentLength;
+        const [pathname, search] = opts.path.split('?');
+        const query = search
+            ? Object.fromEntries(new URLSearchParams(search).entries())
+            : {};
+        const capturedRequest = {
+            requestDirection: 'outgoing',
+            originalRequest: opts,
+            headers: opts.headers,
+            protocol: reqObject.protocol?.replace(':', ''),
+            method: opts.method,
+            host: reqObject.host,
+            search: search ? `?${search}` : null,
+            pathname,
+            query,
+            body: {},
+        };
+        let responseCb;
+        if (requestHasBody) {
+            let requestBody = '';
+            override(reqObject, 'write', (_result, data) => {
+                const body = data.toString();
+                requestBody += body;
+            });
+            override(reqObject, 'end', async () => {
+                responseCb = await outgoingRequestCb({
+                    ...capturedRequest,
+                    body: requestBody,
+                });
+                if (responseCb) {
+                    catchHttpResponse(reqObject, responseCb);
+                }
+            });
+        }
+        else {
+            responseCb = await outgoingRequestCb({ ...capturedRequest, body: {} });
+            if (responseCb) {
+                catchHttpResponse(reqObject, responseCb);
+            }
+        }
+        reqObject.on('error', (err) => {
+            if (responseCb) {
+                let errorBody;
+                if (err && typeof err === 'object') {
+                    const errObj = err;
+                    if (errObj.name === 'AggregateError' && Array.isArray(errObj.errors)) {
+                        errorBody = JSON.stringify({
+                            name: errObj.name,
+                            message: errObj.message,
+                            stack: errObj.stack,
+                            errors: errObj.errors.map((e) => ({
+                                name: e?.name,
+                                message: e?.message,
+                                code: e?.code,
+                                stack: e?.stack,
+                            })),
+                        });
+                    }
+                    else {
+                        errorBody = JSON.stringify({
+                            name: errObj.name,
+                            message: errObj.message,
+                            code: errObj.code,
+                            stack: errObj.stack,
+                        });
+                    }
+                }
+                else {
+                    errorBody = JSON.stringify({ message: String(err) });
+                }
+                const response = {
+                    headers: {},
+                    statusCode: null,
+                    statusMessage: null,
+                    body: errorBody,
+                };
+                responseCb(response);
+            }
+        });
+    });
+};
+//# sourceMappingURL=outgoing.js.map

package/dist/outgoing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outgoing.js","sourceRoot":"","sources":["../src/outgoing.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -0,0 +1,52 @@
+import http, { IncomingHttpHeaders } from 'http';
+import { Request, Response, NextFunction } from 'express';
+export interface CapturedRequest {
+    requestDirection: 'incoming' | 'outgoing';
+    originalRequest: Request | Record<string, string>;
+    headers: IncomingHttpHeaders | Record<string, string>;
+    protocol: string | undefined;
+    method: string | undefined;
+    host: string | undefined;
+    search: string | null;
+    pathname: string;
+    query: Record<string, string>;
+    body: string | Record<string, unknown>;
+}
+export interface CapturedResponse {
+    headers: Record<string, unknown>;
+    statusCode: number | null;
+    statusMessage: string | null;
+    body: string;
+}
+export type ResponseCallback = (response: CapturedResponse) => void;
+export type IncomingRequestCallback = (request: CapturedRequest) => ResponseCallback | null | undefined;
+export type OutgoingRequestCallback = (request: CapturedRequest) => Promise<ResponseCallback | null | undefined>;
+export type OverrideFn<T> = (result: T, ...args: unknown[]) => void;
+export type CatchRequestMiddleware = (req: Request, res: Response, next: NextFunction) => void;
+export interface HttpModule {
+    request: typeof http.request;
+}
+export interface RequestOptions {
+    headers: Record<string, string>;
+    path: string;
+    method: string;
+}
+export interface ReqObject {
+    protocol?: string;
+    host?: string;
+    emit: (...args: unknown[]) => boolean;
+    write: (data: unknown) => boolean;
+    end: (...args: unknown[]) => void;
+    on: (event: string, listener: (...args: unknown[]) => void) => void;
+}
+export interface ExpressReqExtended extends Request {
+    _parsedUrl: {
+        search: string | null;
+        pathname: string;
+    };
+    socketClosed?: boolean;
+}
+export interface ExpressResExtended extends Response {
+    bodyWritten?: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/dist/utils.d.ts

@@ -0,0 +1,6 @@
+import { IncomingHttpHeaders } from 'http';
+import type { OverrideFn } from './types.js';
+export declare const override: <T>(module: Record<string, unknown>, attr: string, fn: OverrideFn<T>) => void;
+export declare const getHeaderValue: (headers: IncomingHttpHeaders | Record<string, string> | null | undefined, key: string) => string | string[] | undefined;
+export declare function tryDecompress(buffer: Buffer): Buffer;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,QAAQ,GAAI,CAAC,EACxB,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,MAAM,EACZ,IAAI,UAAU,CAAC,CAAC,CAAC,KAChB,IAUF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,EACxE,KAAK,MAAM,KACV,MAAM,GAAG,MAAM,EAAE,GAAG,SACoD,CAAC;AAE5E,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAiBpD"}

package/dist/utils.js

@@ -0,0 +1,33 @@
+import zlib from 'zlib';
+export const override = (module, attr, fn) => {
+    const original = module[attr];
+    function wrapper(...args) {
+        const result = original.apply(this, args);
+        fn.apply(this, [result, ...args]);
+        return result;
+    }
+    module[attr] = wrapper;
+};
+export const getHeaderValue = (headers, key) => Object.entries(headers || {}).find(([k]) => k.toLowerCase() === key)?.[1];
+export function tryDecompress(buffer) {
+    if (zlib.brotliDecompressSync) {
+        try {
+            return zlib.brotliDecompressSync(buffer);
+        }
+        catch {
+            try {
+                return zlib.gunzipSync(buffer);
+            }
+            catch {
+                try {
+                    return zlib.inflateSync(buffer);
+                }
+                catch {
+                    return buffer;
+                }
+            }
+        }
+    }
+    return buffer;
+}
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAA+B,EAC/B,IAAY,EACZ,EAAiB,EACX,EAAE;IACR,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAA8B,CAAC;IAE3D,SAAS,OAAO,CAAgB,GAAG,IAAe;QAChD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1C,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,OAAwE,EACxE,GAAW,EACoB,EAAE,CACjC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE5E,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC;gBACH,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC;oBACH,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAClC,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,MAAM,CAAC;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,10 +1,26 @@
 {
   "name": "@belmonddev/catch-request-express-middleware",
-  "version": "3.3.5",
-  "main": "index.js",
+  "version": "5.0.0",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "author": "David Escalera",
   "license": "ISC",
   "description": "",
   "type": "module",
-  "dependencies": {}
+  "dependencies": {},
+  "scripts": {
+    "build": "tsc -p tsconfig.build.json",
+    "dev": "tsc -p tsconfig.build.json -w",
+    "test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest",
+    "test:coverage": "NODE_OPTIONS=\"--experimental-vm-modules\" jest --coverage",
+    "prepublishOnly": "npm run build"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.21",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^20.0.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.1",
+    "typescript": "^5.0.0"
+  }
 }

package/tsconfig.build.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true
+  },
+  "exclude": ["node_modules", "**/*.test.ts"]
+}

package/index.js

@@ -1,220 +0,0 @@
-import http from 'http';
-import https from 'https';
-import zlib from 'zlib';
-
-const override = (module, attr, fn) => {
-  let original = module[attr];
-
-  function wrapper(...args) {
-    const result = original.apply(this, args);
-    fn.apply(this, [result, ...args]);
-    return result;
-  }
-
-  module[attr] = wrapper;
-};
-
-export const getHeaderValue = (headers, key) =>
-  Object.entries(headers || {}).find(([k]) => k.toLowerCase() === key)?.[1];
-
-function tryDecompress(buffer) {
-  if (zlib.brotliDecompressSync) {
-    try {
-      return zlib.brotliDecompressSync(buffer);
-    } catch {
-      try {
-        return zlib.gunzipSync(buffer);
-      } catch {
-        try {
-          return zlib.inflateSync(buffer);
-        } catch {
-          return buffer;
-        }
-      }
-    }
-  }
-}
-
-const catchHttpResponse = (reqObject, responseCb) => {
-  override(reqObject, 'emit', (result, eventName, response) => {
-    const chunks = [];
-    switch (eventName) {
-      case 'response': {
-        response.on('data', (d) => {
-          chunks.push(d);
-        });
-
-        response.on('end', () => {
-          const responseObj = {
-            headers: response.headers,
-            statusCode: response.statusCode,
-            statusMessage: response.statusMessage,
-          };
-          const buffer = Buffer.concat(chunks);
-          const stringBody = tryDecompress(buffer).toString('utf8');
-          const request = { ...responseObj, body: stringBody };
-          responseCb(request);
-        });
-      }
-    }
-  });
-};
-
-const overrideHttpModule = (httpModule, outgoingRequestCb) => {
-  override(httpModule, 'request', async (reqObject, urlOrRequest, request) => {
-    // node-fetch v3+ will return the 2nd arg as url, so correctly identify the request object
-    request = typeof urlOrRequest === 'string' ? request : urlOrRequest;
-
-    const contentLength = getHeaderValue(request.headers, 'content-length');
-    const requestHasBody = !!contentLength;
-
-    const [pathname, search] = request.path.split('?');
-    const query = search
-      ? Object.fromEntries(new URLSearchParams(search).entries())
-      : {};
-
-    // add values not included in node-fetch v3+
-    request = {
-      requestDirection: 'outgoing',
-      originalRequest: request,
-      headers: request.headers,
-      protocol: reqObject.protocol?.replace(':', ''),
-      method: request.method,
-      host: reqObject.host,
-      search: search ? `?${search}` : null,
-      pathname,
-      query,
-    };
-
-    let responseCb;
-    if (requestHasBody) {
-      let requestBody = '';
-      override(reqObject, 'write', (result, data) => {
-        const body = data.toString();
-        requestBody += body;
-      });
-
-      override(reqObject, 'end', async () => {
-        responseCb = await outgoingRequestCb({
-          ...request,
-          body: requestBody,
-        });
-
-        if (responseCb) {
-          catchHttpResponse(reqObject, responseCb);
-        }
-      });
-    } else {
-      responseCb = await outgoingRequestCb({ ...request, body: {} });
-      if (responseCb) {
-        catchHttpResponse(reqObject, responseCb);
-      }
-    }
-
-    reqObject.on('error', (err) => {
-      if (responseCb) {
-        const response = {
-          headers: {},
-          statusCode: null,
-          statusMessage: null,
-          body: err.toString(),
-        };
-        responseCb(response);
-      }
-    });
-  });
-};
-
-const callResponseCb = (responseCb, res) => {
-  const response = {
-    headers: res.getHeaders(),
-    statusCode: res.statusCode,
-    statusMessage: res.statusMessage,
-    body: res.bodyWritten,
-  };
-  responseCb(response);
-};
-
-const callIncomingRequestsCbs = (req, res, incomingRequestsCb, body) => {
-  const responseCb = incomingRequestsCb({
-    requestDirection: 'incoming',
-    originalRequest: req,
-    headers: req.headers,
-    protocol: req.protocol,
-    method: req.method,
-    host: req.headers.host,
-    search: req._parsedUrl.search,
-    pathname: req._parsedUrl.pathname,
-    query: req.query,
-    body,
-  });
-
-  if (responseCb) {
-    req.socket.setMaxListeners(100);
-    if (req.socketClosed) {
-      callResponseCb(responseCb, res);
-    } else {
-      res.on('timeout', () => {
-        res.statusCode = 408;
-        res.end();
-      });
-      req.socket.on('close', () => {
-        callResponseCb(responseCb, res);
-      });
-    }
-  }
-};
-
-const catchExpressIncomingRequest = (req, res, incomingRequestCb) => {
-  // we override write method ASAP cause otherwise if the request finishes too fast the response callback is not called
-  let writeCount = 0;
-  let firstData = '';
-  res.bodyWritten = '';
-  override(req.socket, 'write', (result, data) => {
-    writeCount++;
-    if (writeCount === 1) {
-      firstData = data;
-    } else if (writeCount === 2) {
-      res.bodyWritten = data.toString();
-      if (!res.bodyWritten.length) {
-        res.bodyWritten = firstData.split('\r\n\r\n')?.[1];
-      }
-      req.socketClosed = true;
-    }
-  });
-
-  if (req.body !== undefined) {
-    callIncomingRequestsCbs(req, res, incomingRequestCb, req.body);
-  } else {
-    const contentLength = getHeaderValue(req.headers, 'content-length');
-    if (contentLength) {
-      let body = '';
-      req.on('data', function (data) {
-        body += data;
-      });
-      req.on('end', function () {
-        callIncomingRequestsCbs(req, res, incomingRequestCb, body);
-      });
-    } else {
-      callIncomingRequestsCbs(req, res, incomingRequestCb, '');
-    }
-  }
-};
-
-const catchRequestExpressMiddleware = (
-  incomingRequestCb = null,
-  outgoingRequestCb = null
-) => {
-  if (outgoingRequestCb) {
-    overrideHttpModule(http, outgoingRequestCb);
-    overrideHttpModule(https, outgoingRequestCb);
-  }
-  return (req, res, next) => {
-    if (incomingRequestCb) {
-      catchExpressIncomingRequest(req, res, incomingRequestCb);
-    }
-    next();
-  };
-};
-
-export default catchRequestExpressMiddleware;