- ensure first match in path-rewriter.

- use lodash util functions iso custom functions

Author: chimurai

index.js

@@ -1,3 +1,4 @@
+var _              = require('lodash');
 var httpProxy      = require('http-proxy');
 var handlers       = require('./lib/handlers');
 var contextMatcher = require('./lib/context-matcher');
@@ -36,7 +37,7 @@ var httpProxyMiddleware = function (context, opts) {
     }
 
     // Custom listener for the `proxyRes` event on `proxy`.
-    if (isFunction(proxyOptions.onProxyRes)) {
+    if (_.isFunction(proxyOptions.onProxyRes)) {
         proxy.on('proxyRes', proxyOptions.onProxyRes);
     }
 
@@ -92,7 +93,7 @@ var httpProxyMiddleware = function (context, opts) {
     }
 
     function getProxyErrorHandler () {
-        if (isFunction(proxyOptions.onError)) {
+        if (_.isFunction(proxyOptions.onError)) {
             return proxyOptions.onError;   // custom error listener
         }
 
@@ -104,10 +105,6 @@ var httpProxyMiddleware = function (context, opts) {
         console.log('[HPM] Proxy error:', err.code, targetUri);
     }
 
-    function isFunction (v) {
-        return (v && typeof v === 'function');
-    }
-
 };
 
 module.exports = httpProxyMiddleware;

lib/path-rewriter.js

@@ -1,3 +1,5 @@
+var _ = require('lodash');
+
 module.exports = {
     create : createPathRewriter
 }
@@ -18,9 +20,10 @@ function createPathRewriter (config) {
     function rewritePath (path) {
         var result = path;
 
-        rules.forEach(function (rule) {
+        _.forEach(rules,function (rule) {
             if (rule.regex.test(path)) {
                 result = result.replace(rule.regex, rule.value);
+                return false;
             }
         });
 
@@ -31,24 +34,20 @@ function createPathRewriter (config) {
 function parsePathRewriteRules (config) {
     var rules = [];
 
-    if (isObject(config) === false) {
+    if (_.isPlainObject(config) === false) {
         throw new Error('[HPM] Invalid pathRewrite config. Expecting an object literal with pathRewrite configuration');
     } else {
-        for (var key in config) {
-            if (config.hasOwnProperty(key)) {
-                rules.push({
-                    regex : new RegExp(key),
-                    value : config[key]
-                });
-
-                console.log('[HPM] Proxy rewrite rule created: "' + key + '" -> "' + config[key] + '"');
-            }
-        }
+
+        _.forIn(config, function (value, key) {
+            rules.push({
+                regex : new RegExp(key),
+                value : config[key]
+            });
+            console.log('[HPM] Proxy rewrite rule created: "' + key + '" -> "' + config[key] + '"');
+        });
+
     }
 
     return rules;
 }
 
-function isObject (val) {
-    return Object.prototype.toString.call(val) === '[object Object]' && typeof val === 'object';
-}

test/path-rewriter.spec.js

@@ -8,10 +8,12 @@ describe('Path rewriting', function () {
     describe('Configuration and usage', function () {
         beforeEach(function () {
             var config = {
-                '^/api/old' : '/api/new',
-                '^/remove' : '',
-                'invalid' : 'path/new',
-                '/valid' : '/path/new'
+                '^/api/old'           : '/api/new',
+                '^/remove'            : '',
+                'invalid'             : 'path/new',
+                '/valid'              : '/path/new',
+                '/some/specific/path' : '/awe/some/specific/path',
+                '/some'               : '/awe/some'
             };
             rewriter = pathRewriter.create(config);
         });
@@ -41,6 +43,12 @@ describe('Path rewriting', function () {
             result = rewriter('/valid/foo/bar.json');
             expect(result).to.equal('/path/new/foo/bar.json');
         });
+
+        it('should return first match when similar paths are configured', function () {
+            result = rewriter('/some/specific/path/bar.json');
+            expect(result).to.equal('/awe/some/specific/path/bar.json');
+        });
+
     });
 
     describe('Invalid configuration', function () {

test/proxy-table.spec.js

@@ -105,18 +105,20 @@ describe('Proxy Table', function () {
 
             config = {
                 target : 'http://localhost:6000',
-                changeOrigin : true                 // other options should be return, such as changeOrigin
+                changeOrigin : true                 // other options should be returned, such as changeOrigin
             }
 
             configProxyTable = {
                 target : 'http://localhost:6000',
-                changeOrigin : true,                // other options should be return, such as changeOrigin
+                changeOrigin : true,                // other options should be returned, such as changeOrigin
                 proxyTable : {
                     'alpha.localhost'     : 'http://localhost:6001',
                     'beta.localhost'      : 'http://localhost:6002',
                     'gamma.localhost/api' : 'http://localhost:6003',
                     'gamma.localhost'     : 'http://localhost:6004',
-                    '/rest'               : 'http://localhost:6005'
+                    '/rest'               : 'http://localhost:6005',
+                    '/some/specific/path' : 'http://localhost:6006',
+                    '/some'               : 'http://localhost:6007'
                 }
             }
         });
@@ -195,6 +197,15 @@ describe('Proxy Table', function () {
             });
         });
 
+        describe('matching order of proxyTable config', function () {
+            it('should return first matching target when similar paths are configured', function () {
+                req.url = '/some/specific/path';
+                result = ProxyTable.createProxyOptions(req, configProxyTable);
+                expect(result.target).to.equal('http://localhost:6006');
+                expect(result.changeOrigin).to.be.true;
+            });
+        });
+
     });
 
 });