Merge pull request #68 from Human-Connection/performance-optimization

Performance optimization

Author: appinteractive

README.md

@@ -81,9 +81,10 @@ Getting up and running is as easy as 1, 2, 3, 4 ... 5.
    We are using [Thumbor](https://github.com/thumbor/thumbor) as a Thumbnail Microservice.
    You can install it locally if you like but this is totally optional.
    
-   - At first you have to [install](http://thumbor.readthedocs.io/en/latest/installing.html) it locally.
-   - After installation start it via the console with `thumbor`
-   - Set the `thumbor.url` in `config/local.json` to `http://localhost:8888` if not defined differently. The `thumbor.key` does not necessarily have to be defined, it just makes the URL more secure.
+   **Install OR use docker**
+   
+   - At first you have to [install](http://thumbor.readthedocs.io/en/latest/installing.html) it locally and start it in the console with `thumbor` **OR** run it with docker `docker run -p 8000:8000 apsl/thumbor`
+   - Set the `thumbor.url` in `config/local.json` to `http://localhost:8888` (with docker `http://localhost:8000`) if not defined differently. The `thumbor.key` does not necessarily have to be defined, it just makes the URL more secure.
    
    > Do not forget to always start it if you choose that setup or otherwise you will not see any pictures at all.
 

server/helper/alter-items.js

@@ -14,7 +14,7 @@ module.exports = func => hook => {
   }
   let items = getItems(hook);
   if (Array.isArray(items)) {
-    items.map(item => func(item, hook));
+    items = items.map(item => func(item, hook));
   } else if (items) {
     items = func(items, hook);
   }

server/helper/get-unique-slug.js

@@ -13,7 +13,8 @@ const getUniqueSlug = (service, slug, count, id) => {
       };
     }
     service.find({
-      query
+      query,
+      _populate: 'skip'
     }).then((result) => {
       if (result.data.length > 0) {
         count = count ? count + 1 : 1;

server/helper/seed-helpers.js

@@ -71,6 +71,10 @@ module.exports = {
     return _.shuffle(ngoLogos).pop();
   },
   randomUnsplashUrl: () => {
+    if (Math.random() < 0.6) {
+      // do not attach images in 60 percent of the cases (faster seeding)
+      return;
+    }
     if (unsplashTopicsTmp.length < 2) {
       unsplashTopicsTmp = _.shuffle(unsplashTopics);
     }

server/hooks/create-slug.js

@@ -16,7 +16,7 @@ module.exports = function (options = { field: null, overwrite: false, unique: tr
       const titleSlug = slug(hook.data[options.field], {
         lower: true
       });
-      if (options.unique) {
+      if (options.unique !== false) {
         getUniqueSlug(hook.service, titleSlug, null, hook.id)
           .then((uniqueSlug) => {
             hook.data.slug = uniqueSlug;

server/hooks/is-single-item.js

@@ -1,6 +1,6 @@
 // Check if the query is for a single item
 module.exports = () => hook => {
-  if (hook && hook.params && hook.params.query && hook.params.query.$limit === 1) {
+  if (hook && hook.params && hook.params.query && (hook.params.query.$limit === 1 || hook.params.query.slug)) {
     return true;
   } else {
     return false;

server/hooks/save-remote-images.js

@@ -1,7 +1,9 @@
 // Use this hook to manipulate incoming or outgoing data.
 // For more information on hooks see: http://docs.feathersjs.com/api/hooks.html
 
-const errors = require('feathers-errors');
+/**
+ * TODO: Refactor and test that hook
+ */
 const { isEmpty } = require('lodash');
 const fs = require('fs');
 const path = require('path');
@@ -29,7 +31,7 @@ function createUploadDirIfNeeded () {
 module.exports = function (options = []) { // eslint-disable-line no-unused-vars
   return function async (hook) {
 
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
 
       let urls = [];
 
@@ -78,8 +80,10 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
                 resolve(hook);
               }
             } catch (err) {
+              loading--;
+              hook.data[field] = null;
               hook.app.error(err);
-              reject(err);
+              // reject(err);
             }
           } else if (validUrl.isUri(hook.data[field])) {
             // hook.app.debug('SAVE REMOTE IMAGES HOOK');
@@ -91,14 +95,20 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
             }, (err, res, body) => {
               if (err) {
                 hook.app.error(err);
-                reject(err);
+                loading--;
+                hook.data[field] = null;
+                return;
+                // reject(err);
               }
               // hook.app.debug(`###got answer for: ${hook.data[field]}`);
               try {
                 const mimeType = res.headers['content-type'];
                 if (mimeType.indexOf('image') !== 0) {
                   hook.app.error('its not an image');
-                  reject(new Error('its not an image'));
+                  loading--;
+                  hook.data[field] = null;
+                  return;
+                  // reject(new Error('its not an image'));
                 }
 
                 const ext = mime.getExtension(mimeType);
@@ -121,7 +131,9 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
                 }
               } catch (err) {
                 hook.app.error(err);
-                reject(err);
+                loading--;
+                hook.data[field] = null;
+                // reject(err);
               }
             });
           } else {
@@ -138,10 +150,11 @@ module.exports = function (options = []) { // eslint-disable-line no-unused-vars
           resolve(hook);
         }
       } catch (err) {
-        // reject(err);
+        // // reject(err);
         if (imgCount) {
           hook.app.error('Thumbnail download failed');
-          throw new errors.Unprocessable('Thumbnail download failed', { errors: err, urls: urls });
+          // throw new errors.Unprocessable('Thumbnail download failed', { errors: err, urls: urls });
+          resolve(hook);
         } else {
           resolve(hook);
         }

server/logger.js

@@ -22,6 +22,6 @@ logger.add(new transports.Console({
       return `${levelColors[info.level]}${date.toLocaleTimeString()} | ${info.level}: ${JSON.stringify(info.message)}\u001b[39m`;
     })
   ),
-  level: env === 'development' ? 'debug' : 'warn'
+  level: env === 'development' || 'test' ? 'debug' : 'warn'
 }));
 module.exports = logger;

server/seeder/development/index.js

@@ -12,7 +12,7 @@ module.exports = function () {
     require('./candos'),
     require('./users-candos'),
     require('./projects'),
-    // require('./follows'),
+    require('./follows'),
     require('./comments'),
     require('./emotions'),
     require('./invites'),

server/seeder/development/users-candos.js

@@ -5,7 +5,7 @@ module.exports = (seederstore) => {
 
   return {
     services: [{
-      count: 80,
+      count: 50,
       path: 'users-candos',
       templates: [
         {
@@ -28,4 +28,4 @@ module.exports = (seederstore) => {
       ]
     }]
   };
-};
+};