@vulkano/core 1.5.5 → 1.7.0

package/bootstrap/express.js

@@ -41,7 +41,9 @@ module.exports = function getExpressConfiguration() {
     port: ENV_NODE_PORT || ENV_PORT || expressUserPort || expressSettingsPort || 8000,
     cors: {},
     cookies: {},
+    csp: {},
     jwt: {},
+    permissionPolicy: {},
     sockets: {},
     redis: {},
     multer: {

package/bootstrap/server.js

@@ -232,6 +232,69 @@ module.exports = function loadServer() {
         });
       }
 
+      // ---------------
+      // Content Security Policy  - File: app/config/express/csp.js
+      // ---------------
+      const {
+        enabled: cspEnabled,
+        report: cspReportTo,
+        rules: cspRules
+      } = expressConfig.csp || {};
+
+      if (cspEnabled) {
+
+        if (!Array.isArray(cspRules)) {
+          console.error('Vulkano Error: ', 'The Content Security Policy Rules must be an array');
+          return;
+        }
+
+        if (cspRules.length > 0) {
+
+          vulkano.use( (req, res, next) => {
+
+            if (cspReportTo) {
+              res.setHeader('Report-To', JSON.stringify(cspReportTo));
+            }
+
+            res.setHeader('Content-Security-Policy', cspRules.join('; '));
+
+            next();
+
+          });
+
+        }
+
+      }
+
+      // ---------------
+      // Permission Policy  - File: app/config/express/permissionPolicy.js
+      // ---------------
+      const {
+        enabled: ppEnabled,
+        permissions: ppPermissions
+      } = expressConfig.permissionPolicy || {};
+
+      if (ppEnabled) {
+
+        if (!Array.isArray(ppPermissions)) {
+          console.error('Vulkano Error: ', 'The Permission Policy values must be an array');
+          return;
+        }
+
+        if (ppPermissions.length > 0) {
+
+          vulkano.use( (req, res, next) => {
+
+            res.setHeader('Permissions-Policy', ppPermissions.join(', '));
+
+            next();
+
+          });
+
+        }
+
+      }
+
       // ---------------
       // VIEWS
       // ---------------
@@ -333,6 +396,7 @@ module.exports = function loadServer() {
       let pathToRoute;
       let handler;
 
+      // Routes from convention (controller name & method = route)
       Object.keys(routes).forEach((route) => {
 
         const parts = route.split(' ');
@@ -358,45 +422,66 @@ module.exports = function loadServer() {
 
       });
 
+      // Routes from config/routes.js
       Object.keys(this.routes || {}).forEach((i) => {
 
-        const fullPath = this.routes[i].split('.');
+        const current = this.routes[i];
+        const parts = i.split(' ');
+        let pathToRun = parts.pop();
 
-        const [
-          moduleToRun,
-          controllerToRun,
-          actionToRun
-        ] = fullPath;
-
-        let module;
-        let controller;
-        let action;
-
-        if (actionToRun) { // Has folder
-          module = moduleToRun;
-          controller = controllerToRun;
-          action = actionToRun;
-        } else {
-          module = null;
-          controller = moduleToRun;
-          action = controllerToRun;
-        }
+        // Capture the HTTP Method
+        let option = (parts[0] !== undefined) ? String(parts[0]).toLowerCase() : 'get';
 
-        const parts = i.split(' ');
-        const pathToRun = parts.pop();
-        let option = (parts[0] !== undefined) ? parts[0].toLowerCase() : 'get';
         if (option !== 'get' && option !== 'post' && option !== 'put' && option !== 'delete') {
           option = 'get';
         }
 
+        if (!String(pathToRun).startsWith('/')) {
+          pathToRun = `/${pathToRun}`;
+        }
+
         let toExecute = null;
 
-        try {
-          toExecute = module
-            ? (AllControllers[module][controller][action])
-            : AllControllers[controller][action];
-        } catch (e) {
-          toExecute = null;
+        if (typeof current === 'function') {
+
+          toExecute = current;
+
+        } else {
+
+          const fullPath = this.routes[i].split('.');
+
+          const [
+            moduleToRun,
+            controllerToRun,
+            actionToRun
+          ] = fullPath;
+
+          let module;
+          let controller;
+          let action;
+
+          if (actionToRun) { // Has folder
+            module = moduleToRun;
+            controller = controllerToRun;
+            action = actionToRun;
+          } else {
+            module = null;
+            controller = moduleToRun;
+            action = controllerToRun;
+          }
+
+          try {
+            toExecute = module
+              ? (AllControllers[module][controller][action])
+              : AllControllers[controller][action];
+          } catch (e) {
+            toExecute = null;
+          }
+
+          if (!toExecute) {
+            console.error('\x1b[31mError:', 'Controller not found in', (module) ? `${module}.${controller}.${action}` : `${controller}.${action}`, '\x1b[0m');
+          }
+
         }
 
         if (toExecute) {
@@ -405,8 +490,6 @@ module.exports = function loadServer() {
           } else {
             vulkano[option](pathToRun || '/', middleware, toExecute);
           }
-        } else {
-          console.error('\x1b[31mError:', 'Controller not found in', (module) ? `${module}.${controller}.${action}` : `${controller}.${action}`, '\x1b[0m');
         }
 
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vulkano/core",
-  "version": "1.5.5",
+  "version": "1.7.0",
   "description": "A MVC framework using Express 4",
   "license": "MIT",
   "author": "Vulkano Team",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@socket.io/mongo-adapter": "^0.3.2",
     "@socket.io/redis-adapter": "^8.3.0",
-    "axios": "^1.6.8",
+    "axios": "^1.7.2",
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",
@@ -46,7 +46,7 @@
     "fs": "^0.0.1-security",
     "fs-extra": "^11.2.0",
     "helmet": "^7.1.0",
-    "i18next": "^23.11.4",
+    "i18next": "^23.11.5",
     "include-all": "^4.0.3",
     "jwt-simple": "^0.5.6",
     "moment": "^2.30.1",
@@ -55,11 +55,11 @@
     "mongoose-paginate": "^5.0.3",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
-    "nodemon": "^3.1.0",
+    "nodemon": "^3.1.3",
     "nunjucks": "^3.2.4",
     "path": "^0.12.7",
     "promise.prototype.finally": "^3.1.8",
-    "redis": "^4.6.13",
+    "redis": "^4.6.14",
     "socket.io": "^4.7.5",
     "socket.io-adapter": "^2.5.4",
     "socket.io-client": "4.7.5",
@@ -67,18 +67,18 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.5",
-    "@babel/eslint-parser": "^7.24.5",
+    "@babel/core": "^7.24.7",
+    "@babel/eslint-parser": "^7.24.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-jsx": "^7.24.1",
-    "@babel/preset-env": "^7.24.5",
-    "@babel/preset-react": "^7.24.1",
+    "@babel/plugin-syntax-jsx": "^7.24.7",
+    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-react": "^7.24.7",
     "@babel/preset-stage-1": "^7.8.3",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-react": "^7.34.2",
     "eslint-plugin-react-hooks": "^4.6.2"
   }
 }