http-proxy-middleware 0.17.2-beta → 0.18.0

package/lib/path-rewriter.js

@@ -1,72 +1,73 @@
-var _      = require('lodash');
-var logger = require('./logger').getInstance();
+var _ = require('lodash')
+var logger = require('./logger').getInstance()
+var ERRORS = require('./errors')
 
 module.exports = {
-    create: createPathRewriter
-};
+  create: createPathRewriter
+}
 
 /**
  * Create rewrite function, to cache parsed rewrite rules.
  *
- * @returns {function} Function to rewrite paths; This function should accept `path` (request.url) as parameter
+ * @param {Object} rewriteConfig
+ * @return {Function} Function to rewrite paths; This function should accept `path` (request.url) as parameter
  */
-function createPathRewriter(rewriteConfig) {
-    var rulesCache;
+function createPathRewriter (rewriteConfig) {
+  var rulesCache
 
-    if (!isValidRewriteConfig(rewriteConfig)) {
-        return;
-    }
+  if (!isValidRewriteConfig(rewriteConfig)) {
+    return
+  }
 
-    if (_.isFunction(rewriteConfig)) {
-        var customRewriteFn = rewriteConfig;
-        return customRewriteFn;
-    } else {
-        rulesCache = parsePathRewriteRules(rewriteConfig);
-        return rewritePath;
-    }
+  if (_.isFunction(rewriteConfig)) {
+    var customRewriteFn = rewriteConfig
+    return customRewriteFn
+  } else {
+    rulesCache = parsePathRewriteRules(rewriteConfig)
+    return rewritePath
+  }
 
-    function rewritePath(path) {
-        var result = path;
+  function rewritePath (path) {
+    var result = path
 
-        _.forEach(rulesCache, function(rule) {
-            if (rule.regex.test(path)) {
-                result = result.replace(rule.regex, rule.value);
-                logger.debug('[HPM] Rewriting path from "%s" to "%s"', path, result);
-                return false;
-            }
-        });
+    _.forEach(rulesCache, function (rule) {
+      if (rule.regex.test(path)) {
+        result = result.replace(rule.regex, rule.value)
+        logger.debug('[HPM] Rewriting path from "%s" to "%s"', path, result)
+        return false
+      }
+    })
 
-        return result;
-    }
+    return result
+  }
 }
 
-function isValidRewriteConfig(rewriteConfig) {
-    if (_.isFunction(rewriteConfig)) {
-        return true;
-    } else if (!_.isEmpty(rewriteConfig) && _.isPlainObject(rewriteConfig)) {
-        return true;
-    } else if (_.isUndefined(rewriteConfig) ||
+function isValidRewriteConfig (rewriteConfig) {
+  if (_.isFunction(rewriteConfig)) {
+    return true
+  } else if (!_.isEmpty(rewriteConfig) && _.isPlainObject(rewriteConfig)) {
+    return true
+  } else if (_.isUndefined(rewriteConfig) ||
                _.isNull(rewriteConfig) ||
                _.isEqual(rewriteConfig, {})) {
-        return false;
-    } else {
-        throw new Error('[HPM] Invalid pathRewrite config. Expecting object with pathRewrite config or a rewrite function');
-    }
+    return false
+  } else {
+    throw new Error(ERRORS.ERR_PATH_REWRITER_CONFIG)
+  }
 }
 
-function parsePathRewriteRules(rewriteConfig) {
-    var rules = [];
+function parsePathRewriteRules (rewriteConfig) {
+  var rules = []
 
-    if (_.isPlainObject(rewriteConfig)) {
-        _.forIn(rewriteConfig, function(value, key) {
-            rules.push({
-                regex: new RegExp(key),
-                value: rewriteConfig[key]
-            });
-            logger.info('[HPM] Proxy rewrite rule created: "%s" ~> "%s"', key, rewriteConfig[key]);
-        });
-    }
+  if (_.isPlainObject(rewriteConfig)) {
+    _.forIn(rewriteConfig, function (value, key) {
+      rules.push({
+        regex: new RegExp(key),
+        value: rewriteConfig[key]
+      })
+      logger.info('[HPM] Proxy rewrite rule created: "%s" ~> "%s"', key, rewriteConfig[key])
+    })
+  }
 
-    return rules;
+  return rules
 }
-

package/lib/router.js

@@ -1,53 +1,49 @@
-var _      = require('lodash');
-var logger = require('./logger.js').getInstance();
+var _ = require('lodash')
+var logger = require('./logger.js').getInstance()
 
 module.exports = {
-    getTarget: getTarget
-};
-
-function getTarget(req, config) {
-    var newTarget;
-    var router = config.router;
-
-    if (_.isPlainObject(router)) {
-        newTarget = getTargetFromProxyTable(req, router);
-    } else if (_.isFunction(router)) {
-        newTarget = router(req);
-    }
-
-    return newTarget;
+  getTarget: getTarget
 }
 
-function getTargetFromProxyTable(req, table) {
-    var result;
-    var host = req.headers.host;
-    var path = req.url;
-
-    var hostAndPath = host + path;
+function getTarget (req, config) {
+  var newTarget
+  var router = config.router
 
-    _.forIn(table, function(value, key) {
-        if (containsPath(key)) {
+  if (_.isPlainObject(router)) {
+    newTarget = getTargetFromProxyTable(req, router)
+  } else if (_.isFunction(router)) {
+    newTarget = router(req)
+  }
 
-            if (hostAndPath.indexOf(key) > -1) {    // match 'localhost:3000/api'
-                result = table[key];
-                logger.debug('[HPM] Router table match: "%s"', key);
-                return false;
-            }
-        } else {
-
-            if (key === host) {                     // match 'localhost:3000'
-                result = table[key];
-                logger.debug('[HPM] Router table match: "%s"', host);
-                return false;
-            }
-
-        }
+  return newTarget
+}
 
-    });
+function getTargetFromProxyTable (req, table) {
+  var result
+  var host = req.headers.host
+  var path = req.url
+
+  var hostAndPath = host + path
+
+  _.forIn(table, function (value, key) {
+    if (containsPath(key)) {
+      if (hostAndPath.indexOf(key) > -1) { // match 'localhost:3000/api'
+        result = table[key]
+        logger.debug('[HPM] Router table match: "%s"', key)
+        return false
+      }
+    } else {
+      if (key === host) { // match 'localhost:3000'
+        result = table[key]
+        logger.debug('[HPM] Router table match: "%s"', host)
+        return false
+      }
+    }
+  })
 
-    return result;
+  return result
 }
 
-function containsPath(v) {
-    return v.indexOf('/') > -1;
+function containsPath (v) {
+  return v.indexOf('/') > -1
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-proxy-middleware",
-  "version": "0.17.2-beta",
+  "version": "0.18.0",
   "description": "The one-liner node.js proxy middleware for connect, express and browser-sync",
   "main": "index.js",
   "files": [
@@ -9,9 +9,11 @@
   ],
   "scripts": {
     "clean": "rm -rf coverage",
-    "test": "mocha --recursive --colors --reporter spec",
+    "lint": "standard --verbose | snazzy --colors",
+    "test": "npm run lint && mocha --recursive --colors --reporter spec",
     "cover": "npm run clean && istanbul cover ./node_modules/mocha/bin/_mocha -- --recursive",
-    "coveralls": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- --recursive --reporter spec && istanbul-coveralls && npm run clean"
+    "coveralls": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- --recursive --reporter spec && istanbul-coveralls && npm run clean",
+    "commitmsg": "commitlint -e $GIT_PARAMS"
   },
   "repository": {
     "type": "git",
@@ -39,22 +41,40 @@
   },
   "homepage": "https://github.com/chimurai/http-proxy-middleware",
   "devDependencies": {
-    "browser-sync": "^2.14.0",
-    "chai": "^3.5.0",
-    "connect": "^3.4.1",
-    "coveralls": "^2.11.12",
-    "express": "^4.14.0",
-    "istanbul": "^0.4.4",
+    "@commitlint/cli": "^6.1.3",
+    "@commitlint/config-conventional": "^6.1.3",
+    "browser-sync": "^2.23.6",
+    "chai": "^4.1.2",
+    "connect": "^3.6.6",
+    "coveralls": "^3.0.0",
+    "express": "^4.16.3",
+    "husky": "^0.14.3",
+    "istanbul": "^0.4.5",
     "istanbul-coveralls": "^1.0.3",
-    "mocha": "^3.0.2",
-    "mocha-lcov-reporter": "1.2.0",
-    "opn": "^4.0.2",
-    "ws": "^1.1.1"
+    "mocha": "^5.0.4",
+    "mocha-lcov-reporter": "1.3.0",
+    "opn": "^5.2.0",
+    "snazzy": "^7.1.1",
+    "standard": "^11.0.0",
+    "ws": "^5.0.0"
   },
   "dependencies": {
-    "http-proxy": "^1.14.0",
-    "is-glob": "^2.0.1",
-    "lodash": "^4.14.2",
-    "micromatch": "^2.3.11"
+    "http-proxy": "^1.16.2",
+    "is-glob": "^4.0.0",
+    "lodash": "^4.17.5",
+    "micromatch": "^3.1.9"
+  },
+  "engines": {
+    "node": ">=4.0.0"
+  },
+  "standard": {
+    "env": [
+      "mocha"
+    ]
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
   }
 }