fix(Express Router): non proxy routes not working

lib/index.js

@@ -35,10 +35,7 @@ function HttpProxyMiddleware(context, opts) {
     return middleware;
 
     function middleware(req, res, next) {
-        // https://github.com/chimurai/http-proxy-middleware/issues/17
-        req.url = req.originalUrl;
-
-        if (contextMatcher.match(config.context, req.url, req)) {
+        if (shouldProxy(config.context, req)) {
             var activeProxyOptions = prepareProxyRequest(req);
             proxy.web(req, res, activeProxyOptions);
         } else {
@@ -55,20 +52,35 @@ function HttpProxyMiddleware(context, opts) {
     }
 
     function handleUpgrade(req, socket, head) {
-        if (contextMatcher.match(config.context, req.url, req)) {
+        if (shouldProxy(config.context, req)) {
             var activeProxyOptions = prepareProxyRequest(req);
             proxy.ws(req, socket, head, activeProxyOptions);
             logger.info('[HPM] Upgrading to WebSocket');
         }
     }
 
+    /**
+     * Determine wether request should be proxied.
+     *
+     * @private
+     * @return {Boolean}
+     */
+    function shouldProxy(context, req) {
+        var path = (req.originalUrl || req.url);
+        return contextMatcher.match(context, path, req);
+    }
+
     /**
      * Apply option.router and option.pathRewrite
      * Order matters:
           Router uses original path for routing;
           NOT the modified path, after it has been rewritten by pathRewrite
      */
     function prepareProxyRequest(req) {
+        // https://github.com/chimurai/http-proxy-middleware/issues/17
+        // https://github.com/chimurai/http-proxy-middleware/issues/94
+        req.url = (req.originalUrl || req.url);
+
         // store uri before it gets rewritten for logging
         var originalPath = req.url;
         var newProxyOptions = _.cloneDeep(proxyOptions);