Merge branch 'master' into disable-unwanted-actions

lib/postProcess.js

@@ -4,9 +4,7 @@ var postProcess = module.exports = { };
 
 var jsonApi = require("..");
 var debug = require("./debugging.js");
-var externalRequest = require("request").defaults({
-  pool: { maxSockets: Infinity }
-});
+var rerouter = require("./rerouter.js");
 var async = require("async");
 postProcess._applySort = require("./postProcessing/sort.js").action;
 postProcess._applyFilter = require("./postProcessing/filter.js").action;
@@ -57,23 +55,14 @@ postProcess._fetchRelatedResources = function(request, mainResource, callback) {
   async.map(resourcesToFetch, function(related, done) {
     debug.include(related);
 
-    externalRequest({
+    rerouter.route({
       method: "GET",
       uri: related,
-      headers: request.safeHeaders
-    }, function(err, externalRes, json) {
-      if (err || !json) return done(null, [ ]);
-
-      try {
-        json = JSON.parse(json);
-      } catch(e) {
-        json = null;
-      }
-
-      if (!json) return done(null, [ ]);
-
-      if (externalRes.statusCode >= 400) {
-        return done(json.errors);
+      originalRequest: request
+    }, function(err, json) {
+      if (err) {
+        debug.include("!!", JSON.stringify(err));
+        return done(err.errors);
       }
 
       var data = json.data;

lib/postProcessing/include.js

@@ -6,9 +6,7 @@ var jsonApi = require("../jsonApi.js");
 var _ = {
   unique: require("lodash.uniq")
 };
-var externalRequest = require("request").defaults({
-  pool: { maxSockets: Infinity }
-});
+var rerouter = require("../rerouter.js");
 var async = require("async");
 var debug = require("../debugging.js");
 
@@ -186,28 +184,14 @@ includePP._fillIncludeTree = function(includeTree, request, callback) {
     var parts = related.as.split("~~");
     debug.include(related);
 
-    externalRequest({
+    rerouter.route({
       method: "GET",
       uri: related.url,
-      headers: request.safeHeaders
-    }, function(err, res, json) {
-      // console.log(err, json)
-      if (err || !json) {
-        return done(null);
-      }
-
-      try {
-        json = JSON.parse(json);
-      } catch(e) {
-        debug.include("!!", JSON.stringify(json));
-        json = null;
-      }
-
-      if (!json) return done(null, [ ]);
-
-      if (res.statusCode >= 400) {
-        debug.include("!!", JSON.stringify(json));
-        return done(json.errors);
+      originalRequest: request
+    }, function(err, json) {
+      if (err) {
+        debug.include("!!", JSON.stringify(err));
+        return done(err.errors);
       }
 
       var data = json.data;

lib/rerouter.js

@@ -0,0 +1,72 @@
+/* @flow weak */
+"use strict";
+var rerouter = module.exports = { };
+
+var router = require("./router.js");
+var jsonApi = require("./jsonApi.js");
+var url = require("qs");
+var _ = {
+  omit: require("lodash.omit")
+};
+
+
+rerouter.route = function(newRequest, callback) {
+  var validRoutes = router._routes[newRequest.method.toLowerCase()];
+
+  var path = rerouter._generateSanePath(newRequest);
+  var route = rerouter._pickFirstMatchingRoute(validRoutes, path);
+
+  var req = {
+    url: newRequest.uri,
+    headers: newRequest.originalRequest.headers,
+    cookies: newRequest.originalRequest.cookies,
+    params: url.parse(newRequest.uri.split("?").pop())
+  };
+  rerouter._extendUrlParamsOntoReq(route, path, req);
+
+  var res = {
+    status: function(httpCode) {
+      res.httpCode = httpCode;
+      return res;
+    },
+    json: function(payload) {
+      var err = null;
+      if (res.httpCode >= 400) {
+        err = payload;
+        payload = undefined;
+      }
+      return callback(err, payload);
+    }
+  };
+  validRoutes[route](req, res, _.omit(newRequest.originalRequest, [ "params", "route" ]));
+};
+
+rerouter._generateSanePath = function(newRequest) {
+  var path = newRequest.uri;
+  if (path.match(/^https?\:\/\//)) {
+    path = path.split("/").slice(3).join("/");
+  }
+  if (jsonApi._apiConfig.base !== "/") {
+    if (path[0] !== "/") path = "/" + path;
+    path = path.split(jsonApi._apiConfig.base);
+    path.shift();
+    path = path.join(jsonApi._apiConfig.base);
+  }
+  path = path.replace(/^\//, "").split("?")[0].replace(/\/$/, "");
+  return path;
+};
+
+rerouter._pickFirstMatchingRoute = function(validRoutes, path) {
+  return Object.keys(validRoutes).filter(function(someRoute) {
+    someRoute = someRoute.replace(/(\:[a-z]+)/g, "[^/]*?");
+    someRoute = new RegExp("^" + someRoute);
+    return someRoute.test(path);
+  }).pop();
+};
+
+rerouter._extendUrlParamsOntoReq = function(route, path, req) {
+  route.split("/").forEach(function(urlPart, i) {
+    if (urlPart[0] !== ":") return;
+    req.params[urlPart.substring(1)] = path.split("/")[i];
+  });
+};

lib/router.js

@@ -88,15 +88,23 @@ router.close = function() {
   server = null;
 };
 
+router._routes = { };
 router.bindRoute = function(config, callback) {
-  app[config.verb](jsonApi._apiConfig.base + config.path, function(req, res) {
+  var path = jsonApi._apiConfig.base + config.path;
+  var verb = config.verb.toLowerCase();
+
+  var routeHandler = function(req, res, extras) {
     var request = router._getParams(req);
+    request = _.assign(request, extras);
     var resourceConfig = jsonApi._resources[request.params.type];
     request.resourceConfig = resourceConfig;
     router.authenticate(request, res, function() {
       return callback(request, resourceConfig, res);
     });
-  });
+  };
+  router._routes[verb] = router._routes[verb] || { };
+  router._routes[verb][config.path] = routeHandler;
+  app[verb](path, routeHandler);
 };
 
 router.authenticate = function(request, res, callback) {

package.json

@@ -24,26 +24,27 @@
     "cookie-parser": "1.4.0",
     "debug": "2.2.0",
     "express": "4.13.3",
-    "flow-bin": "^0.23.1",
     "joi": "6.10.1",
-    "jscpd": "^0.6.1",
     "lodash.assign": "3.2.0",
     "lodash.isequal": "3.0.4",
     "lodash.omit": "3.1.0",
     "lodash.pick": "3.1.0",
     "lodash.uniq": "3.2.2",
     "node-uuid": "1.4.7",
+    "qs": "^6.2.0",
     "request": "2.67.0"
   },
   "devDependencies": {
-    "mocha": "2.2.5",
-    "eslint": "0.24.1",
     "blanket": "1.1.7",
-    "mocha-lcov-reporter": "0.0.2",
     "coveralls": "2.11.2",
-    "plato": "1.5.0",
+    "eslint": "0.24.1",
+    "flow-bin": "^0.23.1",
+    "jscpd": "^0.6.1",
+    "mocha": "2.2.5",
+    "mocha-lcov-reporter": "0.0.2",
     "mocha-performance": "0.1.0",
     "node-inspector": "0.12.5",
+    "plato": "1.5.0",
     "v8-profiler": "5.5.0"
   },
   "scripts": {