http-proxy-middleware 3.0.1 → 3.0.3

package/dist/get-plugins.js

@@ -4,8 +4,8 @@ exports.getPlugins = getPlugins;
 const default_1 = require("./plugins/default");
 function getPlugins(options) {
     // don't load default errorResponsePlugin if user has specified their own
-    const maybeErrorResponsePlugin = !!options.on?.error ? [] : [default_1.errorResponsePlugin];
-    const defaultPlugins = !!options.ejectPlugins
+    const maybeErrorResponsePlugin = options.on?.error ? [] : [default_1.errorResponsePlugin];
+    const defaultPlugins = options.ejectPlugins
         ? [] // no default plugins when ejecting
         : [default_1.debugProxyErrorsPlugin, default_1.proxyEventsPlugin, default_1.loggerPlugin, ...maybeErrorResponsePlugin];
     const userPlugins = options.plugins ?? [];

package/dist/http-proxy-middleware.d.ts

@@ -5,6 +5,7 @@ export declare class HttpProxyMiddleware<TReq, TRes> {
     private proxyOptions;
     private proxy;
     private pathRewriter;
+    private logger;
     constructor(options: Options<TReq, TRes>);
     middleware: RequestHandler;
     private registerPlugins;

package/dist/http-proxy-middleware.js

@@ -9,6 +9,7 @@ const PathRewriter = require("./path-rewriter");
 const Router = require("./router");
 const debug_1 = require("./debug");
 const function_1 = require("./utils/function");
+const logger_1 = require("./logger");
 class HttpProxyMiddleware {
     constructor(options) {
         this.wsInternalSubscribed = false;
@@ -22,11 +23,11 @@ class HttpProxyMiddleware {
                     this.proxy.web(req, res, activeProxyOptions);
                 }
                 catch (err) {
-                    next && next(err);
+                    next?.(err);
                 }
             }
             else {
-                next && next();
+                next?.();
             }
             /**
              * Get the server object to subscribe to server events;
@@ -69,7 +70,14 @@ class HttpProxyMiddleware {
          * Determine whether request should be proxied.
          */
         this.shouldProxy = (pathFilter, req) => {
-            return (0, path_filter_1.matchPathFilter)(pathFilter, req.url, req);
+            try {
+                return (0, path_filter_1.matchPathFilter)(pathFilter, req.url, req);
+            }
+            catch (err) {
+                (0, debug_1.Debug)('Error: matchPathFilter() called with request url: ', `"${req.url}"`);
+                this.logger.error(err);
+                return false;
+            }
         };
         /**
          * Apply option.router and option.pathRewrite
@@ -122,6 +130,7 @@ class HttpProxyMiddleware {
         };
         (0, configuration_1.verifyConfig)(options);
         this.proxyOptions = options;
+        this.logger = (0, logger_1.getLogger)(options);
         (0, debug_1.Debug)(`create proxy server`);
         this.proxy = httpProxy.createProxyServer({});
         this.registerPlugins(this.proxy, this.proxyOptions);

package/dist/logger.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-empty-function */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLogger = getLogger;
 /**

package/dist/path-rewriter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPathRewriter = createPathRewriter;
-const isPlainObj = require("is-plain-obj");
+const is_plain_object_1 = require("is-plain-object");
 const errors_1 = require("./errors");
 const debug_1 = require("./debug");
 const debug = debug_1.Debug.extend('path-rewriter');
@@ -40,7 +40,7 @@ function isValidRewriteConfig(rewriteConfig) {
     if (typeof rewriteConfig === 'function') {
         return true;
     }
-    else if (isPlainObj(rewriteConfig)) {
+    else if ((0, is_plain_object_1.isPlainObject)(rewriteConfig)) {
         return Object.keys(rewriteConfig).length !== 0;
     }
     else if (rewriteConfig === undefined || rewriteConfig === null) {
@@ -52,7 +52,7 @@ function isValidRewriteConfig(rewriteConfig) {
 }
 function parsePathRewriteRules(rewriteConfig) {
     const rules = [];
-    if (isPlainObj(rewriteConfig)) {
+    if ((0, is_plain_object_1.isPlainObject)(rewriteConfig)) {
         for (const [key, value] of Object.entries(rewriteConfig)) {
             rules.push({
                 regex: new RegExp(key),

package/dist/plugins/default/logger-plugin.js

@@ -26,15 +26,25 @@ const loggerPlugin = (proxyServer, options) => {
         // Next.js doesn't have req.baseUrl
         const originalUrl = req.originalUrl ?? `${req.baseUrl || ''}${req.url}`;
         // construct targetUrl
-        const port = (0, logger_plugin_1.getPort)(proxyRes.req?.agent?.sockets);
-        const obj = {
-            protocol: proxyRes.req.protocol,
-            host: proxyRes.req.host,
-            pathname: proxyRes.req.path,
-        };
-        const target = new url_1.URL(`${obj.protocol}//${obj.host}${obj.pathname}`);
-        if (port) {
-            target.port = port;
+        let target;
+        try {
+            const port = (0, logger_plugin_1.getPort)(proxyRes.req?.agent?.sockets);
+            const obj = {
+                protocol: proxyRes.req.protocol,
+                host: proxyRes.req.host,
+                pathname: proxyRes.req.path,
+            };
+            target = new url_1.URL(`${obj.protocol}//${obj.host}${obj.pathname}`);
+            if (port) {
+                target.port = port;
+            }
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        }
+        catch (err) {
+            // nock issue (https://github.com/chimurai/http-proxy-middleware/issues/1035)
+            // fallback to old implementation (less correct - without port)
+            target = new url_1.URL(options.target);
+            target.pathname = proxyRes.req.path;
         }
         const targetUrl = target.toString();
         const exchange = `[HPM] ${req.method} ${originalUrl} -> ${targetUrl} [${proxyRes.statusCode}]`;

package/dist/router.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTarget = getTarget;
-const isPlainObj = require("is-plain-obj");
+const is_plain_object_1 = require("is-plain-object");
 const debug_1 = require("./debug");
 const debug = debug_1.Debug.extend('router');
 async function getTarget(req, config) {
     let newTarget;
     const router = config.router;
-    if (isPlainObj(router)) {
+    if ((0, is_plain_object_1.isPlainObject)(router)) {
         newTarget = getTargetFromProxyTable(req, router);
     }
     else if (typeof router === 'function') {

package/dist/utils/function.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionName = getFunctionName;
 function getFunctionName(fn) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "http-proxy-middleware",
   "type": "commonjs",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "The one-liner node.js proxy middleware for connect, express, next.js and more",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "install:all": "yarn && (cd examples && yarn)",
     "lint": "yarn prettier && yarn eslint",
     "lint:fix": "yarn prettier:fix && yarn eslint:fix",
-    "eslint": "eslint '{src,test}/**/*.ts' --cache",
+    "eslint": "eslint '{src,test,examples}/**/*.{js,ts}' --cache",
     "eslint:fix": "yarn eslint --fix",
     "prettier": "prettier --list-different \"**/*.{js,ts,md,yml,json,html}\"",
     "prettier:fix": "prettier --write \"**/*.{js,ts,md,yml,json,html}\"",
@@ -58,7 +58,10 @@
   "devDependencies": {
     "@commitlint/cli": "19.4.1",
     "@commitlint/config-conventional": "19.4.1",
+    "@eslint/js": "9.9.1",
     "@types/debug": "4.1.12",
+    "@types/eslint": "9.6.1",
+    "@types/eslint__js": "8.42.3",
     "@types/express": "4.17.21",
     "@types/is-glob": "4.0.4",
     "@types/jest": "29.5.12",
@@ -66,14 +69,13 @@
     "@types/node": "22.5.1",
     "@types/supertest": "6.0.2",
     "@types/ws": "8.5.12",
-    "@typescript-eslint/eslint-plugin": "7.16.0",
-    "@typescript-eslint/parser": "7.16.0",
     "body-parser": "1.20.2",
-    "eslint": "8.57.0",
+    "eslint": "9.9.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "express": "4.19.2",
     "get-port": "5.1.1",
+    "globals": "15.9.0",
     "husky": "9.1.5",
     "jest": "29.7.0",
     "lint-staged": "15.2.9",
@@ -83,6 +85,7 @@
     "supertest": "7.0.0",
     "ts-jest": "29.2.5",
     "typescript": "5.5.4",
+    "typescript-eslint": "8.3.0",
     "ws": "8.18.0"
   },
   "dependencies": {
@@ -90,7 +93,7 @@
     "debug": "^4.3.6",
     "http-proxy": "^1.18.1",
     "is-glob": "^4.0.3",
-    "is-plain-obj": "^3.0.0",
+    "is-plain-object": "^5.0.0",
     "micromatch": "^4.0.8"
   },
   "engines": {