@vulkano/core 1.4.1 → 1.5.1

package/app.js

@@ -124,66 +124,36 @@ app.config = allConfig;
 app.pkg = appPkg;
 
 // Include all components
-require('./bootstrap/services')();
-require('./database/mongodb')();
-
-const controllers = require('./controllers/controllers')();
-const server = require('./bootstrap/server');
-
-const colors = {
-  reset: '\x1b[0m',
-  bright: '\x1b[1m',
-  dim: '\x1b[2m',
-  underscore: '\x1b[4m',
-  blink: '\x1b[5m',
-  reverse: '\x1b[7m',
-  hidden: '\x1b[8m',
-  fg: {
-    black: '\x1b[30m',
-    red: '\x1b[31m',
-    green: '\x1b[32m',
-    yellow: '\x1b[33m',
-    blue: '\x1b[34m',
-    magenta: '\x1b[35m',
-    cyan: '\x1b[36m',
-    white: '\x1b[37m',
-    crimson: '\x1b[38m' // Scarlet
-  },
-  bg: {
-    black: '\x1b[40m',
-    red: '\x1b[41m',
-    green: '\x1b[42m',
-    yellow: '\x1b[43m',
-    blue: '\x1b[44m',
-    magenta: '\x1b[45m',
-    cyan: '\x1b[46m',
-    white: '\x1b[47m',
-    crimson: '\x1b[48m'
-  }
-};
-
-function startVulkano() {
+const {
+  lineWidth,
+  colors,
+  showCenteredText,
+  showColumn
+} = require('./bootstrap/logger');
 
-  const appName = appPkg.name.toUpperCase().split('-').join(' ');
-  const appVersion = appPkg.version;
-  const author = appPkg.author || pkg.author;
+// Include all components
+const loadDatabase = require('./database/mongodb');
+const loadServices = require('./bootstrap/services');
+const loadControllers = require('./controllers/controllers');
+const loadServer = require('./bootstrap/server');
 
-  const lineWidth = 38;
+async function startVulkano() {
 
-  const showCenteredText = (text) => {
+  // Load Services
+  loadServices();
 
-    const colSize = (lineWidth / 2) - 3;
-    const textLength = (text || '').length;
-    const textLeftSize = Math.trunc(textLength / 2);
-    const textRightSize = textLength - textLeftSize;
+  // Load Database
+  await loadDatabase();
 
-    const textPaddingLeft = ''.padStart( colSize - textLeftSize, ' ');
-    const textPaddingRight = ''.padEnd( colSize - textRightSize, ' ');
-    const textCentered = `${textPaddingLeft}${text}${textPaddingRight}`;
+  // Load Controllers
+  const controllers = loadControllers();
 
-    return textCentered;
+  // Server
+  const server = loadServer();
 
-  };
+  const appName = appPkg.name.toUpperCase().split('-').join(' ');
+  const appVersion = appPkg.version;
+  const author = appPkg.author || pkg.author;
 
   const cutLine = '-'.padEnd(lineWidth, '-');
 
@@ -230,8 +200,7 @@ function startVulkano() {
 
       const {
         sockets,
-        settings: configSettings,
-        redis
+        settings: configSettings
       } = app.config || {};
 
       const {
@@ -242,11 +211,6 @@ function startVulkano() {
         connection
       } = database || {};
 
-      const showColumn = (text, titleLength) => {
-        const txt = `${text.padEnd( 16 - titleLength, ' ')}`;
-        return txt;
-      };
-
       const connectionToShow = connection && process.env.MONGO_URI ? 'MONGO_URI' : connection;
 
       const serverConfig = [];
@@ -254,7 +218,7 @@ function startVulkano() {
       const nodeVersion = process.version.match(/^v(\d+\.\d+\.\d+)/)[1];
       const portText = String(app.vulkano.get('port') || 8000);
       const socketText = sockets.enabled ? 'YES' : 'NO';
-      const redisText = redis && redis.enabled ? 'YES' : 'NO';
+      const adapterText = sockets.enabled ? String(sockets.adapter || 'memory').toUpperCase() : 'NO';
 
       serverConfig.push(` PORT: ${colors.fg.green}${showColumn(portText, 7)}${colors.reset}`);
       serverConfig.push(' | ');
@@ -278,7 +242,7 @@ function startVulkano() {
       console.log(startUpConfig.join(''));
 
       const dbConfig = [];
-      dbConfig.push(' REDIS: ', `${colors.fg.green}${showColumn(redisText, 8)}${colors.reset}`);
+      dbConfig.push(' ADAPTER: ', `${colors.fg.green}${showColumn(adapterText, 10)}${colors.reset}`);
       dbConfig.push(' | ');
       dbConfig.push(' DB: ', connection ? `${colors.fg.green}${connectionToShow}${colors.reset}` : `${colors.fg.blue}NO DATABASE${colors.reset}`);
       console.log(dbConfig.join(''));

package/bootstrap/express.js

@@ -7,8 +7,7 @@ module.exports = function getExpressConfiguration() {
     cors,
     jwt,
     settings,
-    sockets,
-    redis,
+    sockets: rawSockets,
     cookies,
     // Folder express config files
     express: expressServerConfig
@@ -64,14 +63,49 @@ module.exports = function getExpressConfiguration() {
     frameguard: null
   };
 
+  // --------
+  // Sockets
+  // --------
+
+  // Default config
+  const defaultConfig = {
+    enabled: false,
+    adapter: 'memory',
+    adapters: {
+      mongodb: {
+        enabled: false
+      },
+      redis: {
+        enabled: false
+      }
+    }
+  };
+
+  // Check Sockets configuration config/sockets/config.js
+  const {
+    config: socketsConfig
+  } = rawSockets || {};
+
+  // Merge config
+  const sockets = {
+    ...(defaultConfig || {}),
+    ...(socketsConfig || {}),
+    ...(rawSockets || {}),
+    config: {
+      ...(socketsConfig.config || {})
+    }
+  };
+
+  // Set the new values
+  app.config.sockets = { ...sockets };
+
   // Merge all express configuration: config/file.js, config/express/file.js, config/settings.js
   const expressConfig = merge.all([
     {
       cookies,
       jwt,
       cors,
-      sockets,
-      redis
+      sockets
     },
     expressDefaultConfig || {},
     expressServerConfig || {},

package/bootstrap/logger.js

@@ -0,0 +1,59 @@
+const logger = {
+
+  lineWidth: 39,
+
+  colors: {
+    reset: '\x1b[0m',
+    bright: '\x1b[1m',
+    dim: '\x1b[2m',
+    underscore: '\x1b[4m',
+    blink: '\x1b[5m',
+    reverse: '\x1b[7m',
+    hidden: '\x1b[8m',
+    fg: {
+      black: '\x1b[30m',
+      red: '\x1b[31m',
+      green: '\x1b[32m',
+      yellow: '\x1b[33m',
+      blue: '\x1b[34m',
+      magenta: '\x1b[35m',
+      cyan: '\x1b[36m',
+      white: '\x1b[37m',
+      crimson: '\x1b[38m' // Scarlet
+    },
+    bg: {
+      black: '\x1b[40m',
+      red: '\x1b[41m',
+      green: '\x1b[42m',
+      yellow: '\x1b[43m',
+      blue: '\x1b[44m',
+      magenta: '\x1b[45m',
+      cyan: '\x1b[46m',
+      white: '\x1b[47m',
+      crimson: '\x1b[48m'
+    }
+  },
+
+  showCenteredText(text) {
+
+    const colSize = (logger.lineWidth / 2) - 3;
+    const textLength = (text || '').length;
+    const textLeftSize = Math.trunc(textLength / 2);
+    const textRightSize = textLength - textLeftSize;
+
+    const textPaddingLeft = ''.padStart( colSize - textLeftSize, ' ');
+    const textPaddingRight = ''.padEnd( colSize - textRightSize, ' ');
+    const textCentered = `${textPaddingLeft}${text}${textPaddingRight}`;
+
+    return textCentered;
+
+  },
+
+  showColumn(text, titleLength) {
+    const txt = `${text.padEnd( 17 - titleLength, ' ')}`;
+    return txt;
+  }
+
+};
+
+module.exports = logger;