amphora 8.4.2-dev.1 → 8.4.2-dev.9.0

package/.eslintrc

@@ -51,6 +51,7 @@
     "no-trailing-spaces": 2,
     "no-underscore-dangle": 0,
     "no-unneeded-ternary": 1,
+    "one-var": 2,
     "quotes": [2, "single", "avoid-escape"],
     "semi": [2, "always"],
     "keyword-spacing": 2,

package/lib/render.js

@@ -123,10 +123,16 @@ function renderPage(uri, req, res, hrStart) {
   locals.query = req.query;
   locals.extension = extension;
 
+  log('INFO', '====INSIDE RENDER PAGE', { url: _.get(res, 'locals.url'), hostname: req.hostname });
+
   // look up page alias' component instance
   return getDBObject(uri)
-    .then(formDataFromLayout(locals, uri))
+    .then(() => {
+      log('INFO', '====getdboject RESPONSE', { uri });
+      return formDataFromLayout(locals, uri)
+    })
     .then(data => {
+      log('INFO', '====formDataFromLayout RESPONSE', { data });
       logTime(hrStart, uri);
       return data;
     })

package/lib/responses.js

@@ -364,6 +364,7 @@ function explicitError(err, res) {
  */
 function handleError(res) {
   return function (err) {
+    log('INFO', '====handleError function RESPONSE', { res, err });
     if (err.status && err.name !== 'NotFoundError') {
       // If we're in this block, the error has a defined `status` property and
       // the error should be directed out immediately
@@ -445,54 +446,6 @@ function expectJSON(fn, res) {
   }).catch(handleError(res));
 }
 
-/**
- * Checks the page size requested to make sure it's a Number and within the maximum.
- * Returns the default or 0 if there's no default or size is not a Number.
- * @param {Object} req
- * @returns {number}
- */
-function checkPageSize(req) {
-  // Casts value to a number > 0 or undefined.
-  const toInt = (n) => Math.floor(Math.abs(Number(n))) || undefined;
-
-  const sizeDefault = toInt(process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE);
-  const sizeParam = toInt(req.query.size);
-  const sizeMax = toInt(process.env.CLAY_STORAGE_MAX_PAGE_SIZE);
-
-  console.log(
-    `env.default ${
-      process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE
-    }, type ${typeof process.env
-      .CLAY_STORAGE_DEFAULT_PAGE_SIZE}, resolved default ${sizeDefault}, type ${typeof sizeDefault}, resolvedMax ${sizeMax}, query param ${sizeParam}`
-  );
-
-  const size = sizeParam || sizeDefault;
-
-  if (size) {
-    return Math.min(sizeMax, size) || size;
-  }
-
-  return sizeMax;
-}
-
-/**
- * Checks whether the previous value for a page request matches up with the uri,
- * ie. all the ids returned should contain the request uri.
- * @param {Object} req
- * @param {Object} res
- * @returns {string|undefined}
- */
-function checkPrevious(req, res) {
-  const prefix = req.uri;
-  const previous = req.query.prev;
-
-  if (previous && prefix && !previous.includes(prefix)) {
-    return handleError(res)(Error('Client: Invalid previous'));
-  }
-
-  return previous;
-}
-
 /**
  * List all things in the db
  * @param {object} [options]
@@ -506,9 +459,7 @@ function list(options) {
     let list,
       listOptions = _.assign({
         prefix: req.uri,
-        values: false,
-        previous: checkPrevious(req, res),
-        size: checkPageSize(req)
+        values: false
       }, options);
 
     list = db.list(listOptions);
@@ -528,7 +479,7 @@ function listWithoutVersions() {
       return [filter({wantStrings: true}, function (str) {
         return str.indexOf('@') === -1;
       })];
-    },
+    }
   };
 
   return list(options);
@@ -653,5 +604,3 @@ module.exports.deleteRouteFromDB = deleteRouteFromDB;
 // For testing
 module.exports.setLog = mock => log = mock;
 module.exports.setDb = mock => db = mock;
-module.exports.checkPrevious = checkPrevious;
-module.exports.checkPageSize = checkPageSize;

package/lib/responses.test.js

@@ -314,124 +314,6 @@ describe(_.startCase(filename), function () {
     });
   });
 
-  describe('checkPageSize', function () {
-    const fn = lib[this.title];
-
-    afterEach(function () {
-      delete process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE;
-      delete process.env.CLAY_STORAGE_MAX_PAGE_SIZE;
-    });
-
-    it('falls back to default if there is no size param', function () {
-      const req = {
-        query: {},
-        uri: 'domain.com/_components/component/instances',
-      };
-
-      const res = createMockRes();
-
-      process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE = '10';
-
-      expect(fn(req, res)).to.equal(10);
-    });
-
-    it('returns max when max is defined and size > max', function () {
-      const req = {
-        query: { size: '300' },
-        uri: 'domain.com/_components/component/instances',
-      };
-
-      const res = createMockRes();
-
-      process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE = '10';
-      process.env.CLAY_STORAGE_MAX_PAGE_SIZE = '100';
-
-      expect(fn(req, res)).to.equal(100);
-    });
-
-    it('returns valid size that is smaller than max', function () {
-      const req = {
-        query: { size: '42' },
-        uri: 'domain.com/_components/component/instances',
-      };
-
-      const res = createMockRes();
-
-      process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE = '10';
-      process.env.CLAY_STORAGE_MAX_PAGE_SIZE = '100';
-
-      expect(fn(req, res)).to.equal(42);
-    });
-
-    it('returns default for an invalid size query param', function () {
-      const req = {
-        query: { size: 'string' },
-        uri: 'domain.com/_components/component/instances',
-      };
-
-      const res = createMockRes();
-
-      process.env.CLAY_STORAGE_DEFAULT_PAGE_SIZE = '10';
-      process.env.CLAY_STORAGE_MAX_PAGE_SIZE = '100';
-
-      expect(fn(req, res)).to.equal(10);
-    });
-
-    it('returns max when no size or default', function () {
-      const req = {
-        query: {},
-        uri: 'domain.com/_components/component/instances',
-      };
-
-      const res = createMockRes();
-
-      process.env.CLAY_STORAGE_MAX_PAGE_SIZE = '100';
-
-      expect(fn(req, res)).to.equal(100);
-    });
-  });
-
-  describe('checkPrevious', function () {
-    const fn = lib[this.title];
-
-    it('returns valid previous query param value', function () {
-      const req = {
-        query: {
-          prev: 'domain.com/_components/component/instances/aaa',
-        },
-        uri: 'domain.com/_components/component/instances',
-      };
-      const res = createMockRes();
-
-      expect(fn(req, res)).to.equal(
-        'domain.com/_components/component/instances/aaa'
-      );
-    });
-
-    it('throws and responds with 400 for an invalid previous value', function () {
-      const req = {
-        query: {
-          prev: 'random value',
-        },
-        uri: 'domain.com/_components/component/instances',
-      };
-      const res = createMockRes();
-
-      expectStatus(res, 400);
-      fn(req, res);
-    });
-
-    it('returns undefined if no previous value', function () {
-      const req = {
-        query: {},
-        uri: 'domain.com/_components/component/instances',
-      };
-      const res = createMockRes();
-
-      expect(fn(req, res)).to.equal(undefined);
-    });
-  });
-
   describe('list', function () {
     const fn = lib[this.title];
 

package/lib/routes.js

@@ -62,23 +62,28 @@ function addUri(req, res, next) {
  * @param {express.Router} router
  */
 function addControllerRoutes(router) {
-  // load all controller routers
-  _.each(reservedRoutes, routeName => {
-    let pathRouter,
-      filename = routeName + '.js',
-      controller = files.tryRequire([__dirname, routesPath, filename].join(path.sep));
+  try {
+    // load all controller routers
+    _.each(reservedRoutes, routeName => {
+      log('info', 'SETTING RESERVED ROUTES', { reservedRouteName: routeName });
+      let pathRouter,
+        filename = routeName + '.js',
+        controller = files.tryRequire([__dirname, routesPath, filename].join(path.sep));
 
-    // we're okay with an error occurring here because it means we're missing something important in a route
-    pathRouter = express.Router();
+      // we're okay with an error occurring here because it means we're missing something important in a route
+      pathRouter = express.Router();
 
-    // assume json or text for anything in request bodies
-    pathRouter.use(require('body-parser').json({ strict: true, type: 'application/json', limit: '50mb' }));
-    pathRouter.use(require('body-parser').text({ type: 'text/*' }));
+      // assume json or text for anything in request bodies
+      pathRouter.use(require('body-parser').json({ strict: true, type: 'application/json', limit: '50mb' }));
+      pathRouter.use(require('body-parser').text({ type: 'text/*' }));
 
-    controller(pathRouter);
+      controller(pathRouter);
 
-    router.use(`/${routeName}`, pathRouter);
-  });
+      router.use(`/${routeName}`, pathRouter);
+    });
+  } catch (error) {
+    log('error', 'CATCH CONTROLLER ROUTES', { error });
+  }
 }
 
 /**
@@ -122,6 +127,7 @@ function addCORS(site) {
 }
 
 function setRoutes(controller, router, site) {
+  log('info', 'SET ROUTES: ', { site });
   if (_.isFunction(controller.legacyController)) {
     controller.legacyController(router, render, site);
   }

package/lib/setup.js

@@ -42,6 +42,8 @@ module.exports = function (options = {}) {
       eventBus = false
     } = options, router;
 
+    log('info', 'Testing logs setup line 45');
+
   if (sessionStore) {
     log('warn', 'Support for sessionStore will be dropped in Amphora v8');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amphora",
-  "version": "8.4.2-dev.1",
+  "version": "8.4.2-dev.9.0",
   "description": "An API mixin for Express that saves, publishes and composes data with the key-value store of your choice.",
   "main": "index.js",
   "scripts": {