@vulkano/core 0.6.0 → 0.8.0

package/app.js

@@ -1,8 +1,13 @@
+/* eslint-disable import/no-dynamic-require */
+
 /**
  * Bootstrap.js
  *
  */
 
+// Start Time for logs
+global.START_TIME = new Date();
+
 const dotenv = require('dotenv');
 const path = require('path');
 const moment = require('moment');
@@ -16,19 +21,34 @@ global.app = {};
 global._ = _;
 global.Promise = Promise;
 
+const rootProject = path.resolve(process.cwd());
+
+// Set the ABS_PATH
 if (!global.ABS_PATH) {
-  global.ABS_PATH = path.resolve(__dirname, './');
+  global.ABS_PATH = path.resolve(rootProject, './');
 }
 
+// Set the APP_PATH
 if (!global.APP_PATH) {
-  global.APP_PATH = path.join(__dirname, './');
+  global.APP_PATH = path.resolve(rootProject, './app');
+  if (!fs.existsSync(APP_PATH)) {
+    global.APP_PATH = path.resolve(rootProject, './');
+  }
+}
+
+if (!fs.existsSync(APP_PATH)) {
+  console.log('the global var APP_PATH or directory not found', APP_PATH);
+  global.APP_PATH = path.resolve(__dirname, './');
 }
 
 if (!global.PUBLIC_PATH) {
-  global.PUBLIC_PATH = path.join(__dirname, './');
+  global.PUBLIC_PATH = path.resolve(rootProject, './public');
+  if (!fs.existsSync(PUBLIC_PATH)) {
+    global.PUBLIC_PATH = path.resolve(rootProject, './');
+  }
 }
 
-global.CORE_PATH = path.join(__dirname, './');
+global.CORE_PATH = __dirname;
 
 if (!fs.existsSync(APP_PATH)) {
   console.log('the global var APP_PATH or directory not found', APP_PATH);
@@ -50,7 +70,9 @@ const config = require('include-all')({
   optional: true
 });
 
+//
 // Get package.json information
+//
 const pkg = require(`${CORE_PATH}/package.json`);
 const appPkg = require(`${ABS_PATH}/package.json`);
 
@@ -246,6 +268,6 @@ function startVulkano() {
 
   });
 
-};
+}
 
 module.exports = startVulkano;

package/bootstrap/server.js

@@ -12,7 +12,6 @@ const multer = require('multer');
 const helmet = require('helmet');
 const timeout = require('connect-timeout');
 const useragent = require('express-useragent');
-const webp = require('webp-middleware');
 const cookieParser = require('cookie-parser');
 const merge = require('deepmerge');
 const { createClient } = require('redis');
@@ -150,9 +149,9 @@ module.exports = {
     // COOKIES - File: app/config/express/cookies.js
     // ---------------
     if (expressConfig.cookies && expressConfig.cookies.enabled) {
-      const cookiesSecretKey = expressConfig.cookies && expressConfig.cookies.secret ? expressConfig.cookies.secret : '';
+      const cookiesSecretKey = process.env.COOKIES_SECRET_KEY || expressConfig.cookies.key || expressConfig.cookies.secret || '';
       if (!cookiesSecretKey) {
-        console.log('Warning: Please set cookie secret key in the file config/express/cookie.js');
+        console.log(' \x1b[33mWARNING\x1b[0m: Set the secret key in the config/express/cookie.js file or COOKIES_SECRET_KEY in the .env file.');
       }
       server.use(cookieParser(cookiesSecretKey));
     }
@@ -177,19 +176,6 @@ module.exports = {
     // ---------------
     server.use(responses);
 
-    // ---------------
-    // WEBP MIDDLEWARE - File: app/config/express/webp.js
-    // ---------------
-    if (expressConfig.webp && expressConfig.webp.enabled) {
-      const cacheDir = expressConfig.webp.folder || `${PUBLIC_PATH}/webp-cache`;
-      const webpConfig = {
-        quality: expressConfig.webp.quality || 80,
-        preset: expressConfig.webp.preset || 'photo',
-        cacheDir: expressConfig.webp.cacheDir || cacheDir
-      };
-      server.use(webp(PUBLIC_PATH, webpConfig));
-    }
-
     // ---------------
     // PUBLIC PATH - File: app/config/settings.js
     // ---------------
@@ -265,6 +251,12 @@ module.exports = {
     // ---------------
     if (expressConfig.jwt && expressConfig.jwt.enabled) {
 
+      const jwtSecretKey = process.env.JWT_SECRET_KEY || expressConfig.jwt.key || expressConfig.jwt.secret || '';
+      if (!jwtSecretKey) {
+        console.log(' \x1b[41mERROR\x1b[0m: Can not get key in config/express/jwt.js file or JWT_SECRET_KEY in .env file');
+        return;
+      }
+
       // JWT (secret key)
       server.use(expressConfig.jwt.path || '*', jwtMiddleware.init().unless({
         path: expressConfig.jwt.ignore || []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vulkano/core",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "A MVC framework using Express 4",
   "license": "MIT",
   "author": "Vulkano Team",
@@ -60,9 +60,9 @@
     "promise.prototype.finally": "^3.1.8",
     "redis": "^4.6.13",
     "socket.io": "^4.7.5",
+    "socket.io-adapter": "^2.5.4",
     "socket.io-client": "4.7.5",
     "underscore": "^1.13.6",
-    "webp-middleware": "^0.4.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {