nodefony 6.11.0 → 6.12.0

package/README.md

@@ -134,9 +134,9 @@ You can follow Nodefony build with github actions at **<https://github.com/nodef
 
   To install or update nvm, you can use the install script:
 ```sh
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 # or
-wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 
 $ source ~/.bashrc # or source ~/.bash_profile
 $ nvm ls-remote # show all remote versions  

package/cli/builder/bundles/users-bundle/Entity/sequelize/userEntity.js

@@ -44,7 +44,7 @@ class userEntity extends nodefony.Entity {
         allowNull: false,
         validate: {
           is: {
-            args: /[^\w]|_|-|./g,
+            args: /^[\w-_.]+$/,
             msg: `username allow alphanumeric and ( _ | - | . ) characters`
           }
           /*notIn: {
@@ -100,7 +100,7 @@ class userEntity extends nodefony.Entity {
         allowNull: true,
         validate: {
           is: {
-            args: /[^\w]|_|-|.|'/g,
+            args: /^[\w-_.]*$/,
             msg: `name allow alphanumeric characters`
           }
         }
@@ -110,7 +110,7 @@ class userEntity extends nodefony.Entity {
         allowNull: true,
         validate: {
           is: {
-            args: /[^\w]|_|-|.|''/g,
+            args: /^[\w-_.]*$/,
             msg: `surname allow alphanumeric characters`
           }
         }
@@ -157,7 +157,19 @@ class userEntity extends nodefony.Entity {
   }
 
   registerModel(db) {
-    class MyModel extends Model {}
+    class MyModel extends Model {
+      hasRole(name){
+        for (let role in this.roles) {
+          if (this.roles[role] === name) {
+            return true;
+          }
+        }
+        return false;
+      }
+      isGranted(role){
+        return this.hasRole(role);
+      }
+    }
     MyModel.init(this.getSchema(), {
       sequelize: db,
       modelName: this.name,

package/cli/builder/bundles/users-bundle/Resources/config/webpack.config.js

@@ -44,9 +44,13 @@ module.exports = merge(config, {
   externals: {},
   resolve: {
     extensions: ['.js', '.json', '.jsx', '.css', '.mjs'],
+    alias: {
+      "@modules": path.join(__dirname, "..", "..", "node_modules")
+    },
     fallback: {
       "path": false,
-      "assert": false
+      "assert": false,
+      buffer: require.resolve('buffer/')
     }
   },
   module: {
@@ -122,6 +126,9 @@ module.exports = merge(config, {
     ]
   },
   plugins: [
+    new webpack.ProvidePlugin({
+      Buffer: ['buffer', 'Buffer'],
+    }),
     new MiniCssExtractPlugin({
       filename: "./css/[name].css"
     }),

package/cli/builder/bundles/users-bundle/Resources/swagger/config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  projectName: "Nodefony User",
+  projectName: "Nodefony API",
   logo: "/app/images/app-logo.png",
   urls: [{
     url: "/api/users/documentation",
@@ -9,4 +9,4 @@ module.exports = {
     name: "login"
   }],
   primaryName: "login"
-};
+};

package/cli/builder/bundles/users-bundle/Resources/swagger/swagger.js

@@ -4,7 +4,7 @@ import {
   SwaggerUIStandalonePreset
 } from "swagger-ui-dist";
 
-import "swagger-ui/dist/swagger-ui.css";
+import "@modules/swagger-ui/dist/swagger-ui.css";
 import "./swagger.css";
 
 const configSwagger = process.env.SWAGGER;
@@ -26,6 +26,11 @@ class Swagger {
         // Section 02 - Set logo
         logo[0].children[0].alt = this.config.projectName;
         logo[0].children[0].src = this.config.logo;
+
+        const newDiv = document.createElement("div");
+        const newContent = document.createTextNode(this.config.projectName);
+        newDiv.appendChild(newContent);
+        logo[0].append(newDiv)
       });
     });
   }

package/cli/builder/bundles/users-bundle/package.json

@@ -16,45 +16,46 @@
   ],
   "repository": {},
   "dependencies": {
-    "@babel/core": "7.17.5",
+    "@babel/core": "7.17.7",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
-    "@popperjs/core": "^2.11.2",
-    "@withshepherd/faker": "^5.5.5",
+    "@popperjs/core": "2.11.4",
+    "@withshepherd/faker": "5.5.5",
     "babel-loader": "^8.2.3",
     "babel-register": "^6.26.0",
     "bootstrap": "^5.1.3",
     "clean-webpack-plugin": "^4.0.0",
     "css-hot-loader": "^1.4.4",
-    "css-loader": "6.6.0",
+    "css-loader": "6.7.1",
     "expose-loader": "^3.1.0",
     "font-awesome": "^4.7.0",
-    "graphiql": "1.6.0",
+    "graphiql": "1.7.1",
     "graphql": "16.3.0",
-    "graphql-ws": "5.6.2",
+    "graphql-ws": "5.6.3",
     "html-webpack-plugin": "^5.5.0",
     "imports-loader": "^3.1.1",
     "jquery": "^3.6.0",
-    "mini-css-extract-plugin": "^2.5.3",
-    "mongoose-paginate-v2": "1.6.2",
+    "mini-css-extract-plugin": "2.6.0",
+    "mongoose-paginate-v2": "1.6.3",
     "node-sass": "^7.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "sass-loader": "12.6.0",
     "style-loader": "^3.3.1",
     "svg-inline-loader": "^0.8.2",
-    "swagger-ui": "4.5.2",
-    "swagger-ui-dist": "4.5.2",
+    "swagger-ui": "4.6.2",
+    "swagger-ui-dist": "4.6.2",
     "terser-webpack-plugin": "5.3.1",
-    "webpack": "5.69.1",
+    "webpack": "5.70.0",
     "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
     "@mapbox/node-pre-gyp": "^1.0.8",
-    "node-gyp": "^8.4.1",
-    "sequelize-cli": "^6.4.1"
+    "node-gyp": "9.0.0",
+    "sequelize-cli": "^6.4.1",
+    "stream": "0.0.2"
   },
   "license": "CECILL-B",
   "readmeFilename": "README.md",

package/cli/builder/project/skeletons/README.md

@@ -134,9 +134,9 @@ You can follow Nodefony build with github actions at **<https://github.com/nodef
 
   To install or update nvm, you can use the install script:
 ```sh
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 # or
-wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 
 $ source ~/.bashrc # or source ~/.bash_profile
 $ nvm ls-remote # show all remote versions  

package/cli/builder/project/skeletons/package.json.skeleton

@@ -34,17 +34,17 @@
     "node": ">=12"
   },
   "dependencies": {
-    "mongoose": "6.1.10",
+    "mongoose": "6.2.7",
     "nodefony": "^{{version}}",
-    "pm2": "^5.1.2",
+    "pm2": "5.2.0",
     "pm2-logrotate": "^2.7.0",
-    "sequelize": "6.15.0",
-    "webpack": "5.68.0",
+    "sequelize": "6.17.0",
+    "webpack": "5.70.0",
     "webpack-dev-server": "4.7.4"
   },
   "devDependencies": {
     "@mapbox/node-pre-gyp": "^1.0.8",
-    "node-gyp": "^8.4.1"
+    "node-gyp": "9.0.0"
   },
   "author": "{{authorFullName}} <{{authorMail}}>",
   "readmeFilename": "README.md",

package/cli/builder/react/reactBuilder.js

@@ -146,7 +146,7 @@ class React extends nodefony.builders.sandbox {
     let gitP, cwd, gitS, gitC;
     try {
       cwd = path.resolve(this.response.path);
-      gitP = require('simple-git/promise');
+      gitP = require('simple-git');
       gitS = gitP(cwd);
       gitC = gitP(this.location);
     } catch (e) {
@@ -183,7 +183,7 @@ class React extends nodefony.builders.sandbox {
     let gitP, cwd, git;
     try {
       cwd = path.resolve(this.response.path);
-      gitP = require('simple-git/promise');
+      gitP = require('simple-git');
       git = gitP(cwd);
     } catch (e) {
       throw e;

package/cli/builder/skeletons/package.json

@@ -18,33 +18,33 @@
   "repository": {},
   "dependencies": {
 {% if addons.workbox %}
-    "workbox-webpack-plugin": "^6.4.2",
+    "workbox-webpack-plugin": "6.5.1",
 {% endif %}
 {% if addons.bootstrap %}
-    "@popperjs/core": "^2.11.2",
+    "@popperjs/core": "2.11.4",
     "bootstrap": "^5.1.3",
     "jquery": "^3.6.0",
     "font-awesome": "^4.7.0",
 {% endif %}
 {% if addons.webpack %}
-    "@babel/core": "^7.16.12",
+    "@babel/core": "7.17.7",
     "@babel/preset-env": "^7.16.11",
     "babel-loader": "^8.2.3",
     "clean-webpack-plugin": "^4.0.0",
     "css-hot-loader": "^1.4.4",
-    "css-loader": "6.6.0",
+    "css-loader": "6.7.1",
     "expose-loader": "^3.1.0",
-    "favicons": "^6.2.2",
+    "favicons": "6.2.2",
     "favicons-webpack-plugin": "^5.0.2",
     "html-webpack-plugin": "^5.5.0",
     "imports-loader": "^3.1.1",
-    "mini-css-extract-plugin": "^2.5.3",
+    "mini-css-extract-plugin": "2.6.0",
     "node-sass": "^7.0.1",
-    "sass-loader": "^12.4.0",
+    "sass-loader": "12.6.0",
     "sitemap-webpack-plugin": "^1.1.1",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "5.3.1",
-    "webpack": "5.68.0",
+    "webpack": "5.70.0",
     "webpack-merge": "^5.8.0"
 {% endif %}
   },
@@ -53,7 +53,7 @@
     "webpack-dev-server": "4.7.4",
 {% endif %}
     "@mapbox/node-pre-gyp": "^1.0.8",
-    "node-gyp": "^8.4.1"
+    "node-gyp": "9.0.0"
   },
   "license": "",
   "readmeFilename": "README.md",

package/cli/builder/vue/vueBuilder.js

@@ -147,7 +147,9 @@ class Vue extends nodefony.builders.sandbox {
           stdio: "inherit"
         }, (code) => {
           if (code === 1) {
-            return reject(new Error("install Vue cli new error : " + code));
+            this.log( new Error(`install Vue cli new error : ${code} ${args}`) ,"ERROR")
+            //return reject(new Error("install Vue cli new error : " + code));
+            return resolve(cmd);
           }
           return resolve(cmd);
         });

package/cli/start.js

@@ -492,7 +492,7 @@ module.exports = class cliStart extends nodefony.cliKernel {
     let gitP, cwd, git;
     try {
       cwd = path.resolve(project.location, project.name);
-      gitP = require('simple-git/promise');
+      gitP = require('simple-git');
       git = gitP(cwd);
     } catch (e) {
       throw e;

package/cli.es6

@@ -2,7 +2,10 @@ const Table = require('cli-table3');
 const asciify = require('asciify');
 //const inquirer = require('inquirer');
 //const commander = require('commander');
-const { program, command } = require('commander');
+const {
+  program,
+  command
+} = require('commander');
 const spawn = require('child_process').spawn;
 const spawnSync = require('child_process').spawnSync;
 const moment = require("moment");
@@ -222,7 +225,20 @@ class CLI extends nodefony.Service {
   }
 
   idle() {
-    return this.idle = setInterval(() => {}, 0);
+    let resolve = null
+    let reject = null
+    const promise = new Promise((res, rej) => {
+      resolve = res
+      reject = rej
+    })
+    return function () {
+      return {
+        resolve,
+        promise,
+        reject
+      }
+    }()
+    //return this.idleId = setInterval(() => {}, 0);
   }
 
   checkVersion(version = null) {
@@ -440,13 +456,13 @@ class CLI extends nodefony.Service {
     return false;
   }
 
-  displayTable(datas, options= defaultTableCli, syslog=null) {
-    if( !datas || ! datas.length){
-      return new Table(nodefony.extend({}, defaultTableCli, options ));
+  displayTable(datas, options = defaultTableCli, syslog = null) {
+    if (!datas || !datas.length) {
+      return new Table(nodefony.extend({}, defaultTableCli, options));
     }
     let table = null;
     try {
-      table = new Table(nodefony.extend({}, defaultTableCli, options ));
+      table = new Table(nodefony.extend({}, defaultTableCli, options));
       if (datas) {
         for (let i = 0; i < datas.length; i++) {
           table.push(datas[i]);

package/kernel/security/user.es6

@@ -39,6 +39,19 @@ class User {
     return this.roles;
   }
 
+  hasRole(name){
+    for (let role in this.roles) {
+      if (this.roles[role] === name) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  isGranted(role){
+    return this.hasRole(role);
+  }
+
   getPassword() {
     return this.password;
   }
@@ -90,4 +103,4 @@ class User {
 }
 
 nodefony.User = User;
-module.exports = User;
+module.exports = User;

package/kernel/services/cron/cronService.es6

@@ -1,6 +1,7 @@
 const cron = require('node-cron');
 const defaultOptions = {
   scheduled: true,
+  recoverMissedExecutions: false,
   timezone: "Europe/Paris"
 };
 
@@ -17,13 +18,13 @@ class Cron extends nodefony.Service {
     this.cronTab = {};
   }
 
-  showTasks() {
-
+  getTasks() {
+    return this.cron.getTasks()
   }
 
   getTask(name) {
     if (!name) {
-      return this.cronTab;
+      throw new Error(`Task : ${name} not exist in cron tab`);
     }
     if (name in this.cronTab) {
       return this.cronTab[name];
@@ -56,38 +57,15 @@ class Cron extends nodefony.Service {
     if (name in this.cronTab) {
       throw new Error(`Task name  : ${name} already exist in cron tab`);
     }
-
     try {
+      options.name = name ;
       this.cronTab[name] = this.cron.schedule(param, callback, options);
-      const status = this.getStatus( name );
-      switch(status){
-        case "scheduled":
-          this.log(`Start Task : ${name}  status : ${status}`,"INFO", "CRONTAB");
-        break;
-        default:
-          this.log(`Create Task : ${name} Start task to begin ! `,"INFO", "CRONTAB");
-      }
       return this.cronTab[name];
     } catch (e) {
       throw e;
     }
   }
 
-  getStatus(name){
-    if (!name) {
-      throw new Error("Cron getStatus bad parameters name ");
-    }
-    if (name in this.cronTab) {
-      try {
-        return this.cronTab[name].getStatus();
-      } catch (e) {
-        throw e;
-      }
-    }
-    throw new Error(`Cron getStatus name: ${name} not found in cron tab !`);
-  }
-
-
   startTask(name) {
     if (!name) {
       throw new Error("Cron startTask bad parameters name ");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodefony",
-  "version": "6.11.0",
+  "version": "6.12.0",
   "main": "autoloader.es6",
   "description": "Nodefony Framework Core",
   "contributors": [],
@@ -32,23 +32,23 @@
     "nodefony": "bin/nodefony"
   },
   "dependencies": {
-    "@babel/core": "7.17.5",
-    "@babel/parser": "7.17.3",
+    "@babel/core": "7.17.7",
+    "@babel/parser": "7.17.7",
     "@babel/preset-env": "^7.16.10",
-    "@nodefony/documentation-bundle": "6.11.0",
-    "@nodefony/elastic-bundle": "6.11.0",
-    "@nodefony/framework-bundle": "6.11.0",
-    "@nodefony/http-bundle": "6.11.0",
-    "@nodefony/mail-bundle": "6.11.0",
-    "@nodefony/mongoose-bundle": "6.11.0",
-    "@nodefony/monitoring-bundle": "6.11.0",
-    "@nodefony/realtime-bundle": "6.11.0",
-    "@nodefony/redis-bundle": "6.11.0",
-    "@nodefony/security-bundle": "6.11.0",
-    "@nodefony/sequelize-bundle": "6.11.0",
-    "@nodefony/unittests-bundle": "6.11.0",
-    "@vue/cli": "5.0.1",
-    "@vue/cli-service-global": "^4.5.15",
+    "@nodefony/documentation-bundle": "6.12.0",
+    "@nodefony/elastic-bundle": "6.12.0",
+    "@nodefony/framework-bundle": "6.12.0",
+    "@nodefony/http-bundle": "6.12.0",
+    "@nodefony/mail-bundle": "6.12.0",
+    "@nodefony/mongoose-bundle": "6.12.0",
+    "@nodefony/monitoring-bundle": "6.12.0",
+    "@nodefony/realtime-bundle": "6.12.0",
+    "@nodefony/redis-bundle": "6.12.0",
+    "@nodefony/security-bundle": "6.12.0",
+    "@nodefony/sequelize-bundle": "6.12.0",
+    "@nodefony/unittests-bundle": "6.12.0",
+    "@vue/cli": "5.0.3",
+    "@vue/cli-service-global": "4.5.16",
     "asciify": "^1.3.5",
     "bluebird": "^3.7.2",
     "chai": "4.3.6",
@@ -56,11 +56,11 @@
     "cli-color": "^2.0.1",
     "cli-table3": "^0.6.1",
     "clui": "^0.3.6",
-    "commander": "9.0.0",
+    "commander": "9.1.0",
     "core-js": "3.21.1",
     "create-react-app": "^5.0.0",
     "graphql": "16.3.0",
-    "inquirer": "^8.2.0",
+    "inquirer": "8.2.1",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "lodash.isregexp": "^4.0.1",
@@ -69,19 +69,19 @@
     "moment": "^2.29.1",
     "node-cron": "^3.0.0",
     "node-emoji": "^1.11.0",
-    "npm": "8.5.2",
+    "npm": "8.5.5",
     "pm2": "5.2.0",
     "promise": "^8.1.0",
     "request": "^2.88.2",
     "semver": "^7.3.5",
     "shelljs": "^0.8.5",
     "shortid": "^2.2.16",
-    "simple-git": "3.2.6",
+    "simple-git": "3.3.0",
     "spdx": "^0.5.2",
     "terser-webpack-plugin": "5.3.1",
     "twig": "^1.15.4",
     "uuid": "^8.3.2",
-    "webpack": "5.69.1",
+    "webpack": "5.70.0",
     "xml2js": "^0.4.23",
     "yarn": "^1.22.17"
   },

package/syslog/syslog.es6

@@ -673,6 +673,9 @@ class Syslog extends nodefony.Events {
   }
 
   static wrapper(pdu) {
+    if (!pdu) {
+      throw new Error('Syslog pdu not defined')
+    }
     const date = new Date(pdu.timeStamp);
     switch (pdu.severity) {
     case 0: