nodefony 7.0.0-beta.2 → 7.0.0-beta.21

package/cli/builder/skeletons/config/nodefony/mongoose-bundle.js

@@ -8,19 +8,45 @@
  *       By default nodefony create connector name nodefony
  *       for manage Sessions / Users
  */
-module.exports = {
-  mongoose: {
-    debug: false,
-    connectors: {
-      nodefony: {
-        host: "localhost",
-        port: 27017,
-        dbname: "nodefony",
-        settings: {
-          user: "",
-          pass: ""
-        }
+
+let connectors = {}
+const vault = async () => {
+  const serviceVault = kernel.get("vault");
+  return await serviceVault.getSecret({
+      path: "nodefony/data/database/mongo/connector/nodefony"
+    })
+    .then((secret) => {
+      return secret.data.data
+    })
+    .catch(e => {
+      throw e
+    })
+}
+
+switch (kernel.appEnvironment.environment) {
+  case "production":
+  case "development":
+  default:
+    connectors.nodefony = {
+      host: "localhost",
+      port: 27017,
+      dbname: "nodefony",
+      //credentials: vault,
+      settings: {
+        user: "nodefony",
+        pass: "nodefony",
+        maxPoolSize: 50,
+        useNewUrlParser: true,
+        serverSelectionTimeoutMS: 5000,
+        socketTimeoutMS: 5000,
+        connectTimeoutMS: 5000
       }
     }
+}
+
+module.exports = {
+  mongoose: {
+    debug: true,
+    connectors: connectors
   }
 };

package/cli/builder/skeletons/config/nodefony/monitoring-bundle.js

@@ -4,12 +4,31 @@
  *    see MONITORING BUNDLE config for more options
  *
  */
-
 module.exports = {
   debugBar: true,
   forceDebugBarProd: false,
   profiler: {
     active: false,
     storage: "orm"
-  }
+  },
+  // entry point swagger Multi URL
+  swagger:{
+    projectName: "NODEFONY",
+    logo: "/app/images/app-logo.png",
+    urls: [{
+      url: "/api/users/documentation",
+      name: "users"
+    }, {
+      url: "/api/jwt/documentation",
+      name: "login"
+    }],
+    primaryName: "users"
+  },
+
+  // entry point graphigl monitoring only 1 URL (use merge in graphgl controller )
+  graphigl:{
+    projectName: "Nodefony Graphql Api",
+    logo: "/app/images/app-logo.png",
+    url:"/api/graphql"
+  },
 };

package/cli/builder/skeletons/config/nodefony/sequelize-bundle.js

@@ -10,23 +10,22 @@
  *       By default nodefony create  connector name nodefony ( driver sqlite )
  *       for manage Sessions / Users
  *
- *       For mysql/mariadb create database nodefony before :
+ *       Strategy  sync or migrate Create Structure Database
  *
- *       $ nodefony sequelize:create:database [force]  => Create database
+ *       Strategy sync
+ *       $ nodefony sequelize:sync      => Create Structure tables from Entity
  *
- *       Synchronize entities :
- *       $ nodefony sequelize:sync [force]    => Create tables index ...
+ *       Strategy  migrate
+ *        $ nodefony sequelize:migrate   => Create Structure tables from migrate files
  *
- *       Here create new databases connectors
- *       and use for sync connectors :
- *       nodefony sequelize:sync
  *
- *        connectors: {
- *         nodefony: {
+ *    connectors: {
+ *        nodefony: {
  *           driver: "mysql",
  *           dbname: 'nodefony',
  *           username: 'nodefony',
  *           password: 'nodefony',
+ *           credentials: vault,
  *           options: {
  *             dialect: "mysql",
  *             host: "localhost",
@@ -38,10 +37,120 @@
  *               acquire:60000
  *             }
  *           }
- *         }
- *
+ *        },
+ *        myconnector:{
+ *          dbname: 'nodefony',
+ *          username: 'postgres',
+ *          password: 'nodefony',
+ *          options: {
+ *            dialect: "postgres",
+ *            host: "localhost",
+ *            port: "5432",
+ *            pool: {
+ *              max: 30,
+ *              min: 0,
+ *              idle: 10000,
+ *              acquire: 60000
+ *            },
+ *            retry: {
+ *              match: [
+ *                Sequelize.ConnectionError,
+ *                Sequelize.ConnectionTimedOutError,
+ *                Sequelize.ConnectionRefusedError,
+ *                Sequelize.TimeoutError,
+ *                /Deadlock/i
+ *              ],
+ *              max: Infinit
+ *            }
+ *          }
+ *        }
  */
+let Transaction, Sequelize
+if (nodefony.Sequelize) {
+  Transaction = nodefony.Sequelize.Transaction
+  Sequelize = nodefony.Sequelize.Sequelize
+}
+
+const vault = async () => {
+  const serviceVault = kernel.get("vault");
+  return await serviceVault.getSecret({
+      path: "nodefony/data/database/postgresql/connector/nodefony"
+    })
+    .then((secret) => {
+      return secret.data.data
+    })
+    .catch(e => {
+      throw e
+    })
+}
+
+const connectors = {}
+switch (kernel.appEnvironment.environment) {
+  case "production":
+  case "development":
+  default:
+    connectors.nodefony = {
+      driver: 'sqlite',
+      dbname: path.resolve("app", "Resources", "databases", "nodefony.db"),
+      options: {
+        dialect: "sqlite",
+        //isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+        retry: {
+          match: [
+            //Sequelize.ConnectionError,
+            //Sequelize.ConnectionTimedOutError,
+            //Sequelize.TimeoutError,
+            /Deadlock/i,
+            'SQLITE_BUSY'
+          ],
+          max: Infinity
+        },
+        pool: {
+          max: 5,
+          min: 0,
+          idle: 10000
+        }
+      }
+    }
+    /*connectors.nodefony = {
+      driver: "postgres",
+      dbname: 'nodefony',
+      username: 'postgres',
+      password: 'nodefony',
+      //credentials: vault,
+      options: {
+        dialect: "postgres",
+        host: "localhost",
+        port: "5432",
+        //isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE,
+        retry: {
+          match: [
+            //Sequelize.ConnectionError,
+            //Sequelize.ConnectionTimedOutError,
+            //Sequelize.TimeoutError,
+            /Deadlock/i
+          ],
+          max: 5
+        },
+        pool: {
+          max: 20,
+          min: 0,
+          idle: 10000,
+          acquire: 60000
+        }
+      }
+    }*/
+}
+
 module.exports = {
   debug: false,
-  connectors: {}
-};
+  strategy: "migrate", // sync || migrate || none  when nodefony build  or  nodefony install
+  connectors: connectors,
+  migrations: {
+    storage: "sequelize", // sequelize || memory || json
+    path: path.resolve(kernel.path, "migrations", "sequelize"),
+    seedeersPath: path.resolve(kernel.path, "migrations", "seedeers"),
+    storageSeedeers:"json",
+    options: {}
+  }
+}

package/cli/builder/skeletons/package.json.twig

@@ -0,0 +1,57 @@
+{
+  "name": "{{packageName}}",
+  "version": "1.0.0",
+  "description": "{{name}} description",
+  "author": "{{authorName}} <{{authorEmail}}>",
+{% if packageName == "app" %}
+  "main": "appKernel.js",
+{% else %}
+  "main": "{{name}}Bundle.js",
+{% endif %}
+  "scripts": {},
+  "private": true,
+  "keywords": [
+    "nodefony",
+    "javascript",
+    "{{name}}"
+  ],
+  "repository": {},
+  "dependencies": {},
+  "devDependencies": {
+{% if addons.workbox %}
+    "workbox-webpack-plugin": "7.0.0",
+{% endif %}
+{% if addons.bootstrap %}
+    "@popperjs/core": "2.11.8",
+    "bootstrap": "5.3.2",
+    "jquery": "3.7.1",
+    "font-awesome": "^4.7.0",
+{% endif %}
+{% if addons.webpack %}
+    "@babel/core": "7.23.0",
+    "@babel/preset-env": "7.22.20",
+    "babel-loader": "9.1.3",
+    "clean-webpack-plugin": "^4.0.0",
+    "css-hot-loader": "^1.4.4",
+    "css-loader": "6.8.1",
+    "expose-loader": "4.1.0",
+    "favicons": "7.1.4",
+    "favicons-webpack-plugin": "6.0.1",
+    "html-webpack-plugin": "5.5.3",
+    "imports-loader": "4.0.1",
+    "mini-css-extract-plugin": "2.7.6",
+    "sass": "1.69.2",
+    "sass-loader": "13.3.2",
+    "sitemap-webpack-plugin": "^1.1.1",
+    "style-loader": "3.3.3",
+    "terser-webpack-plugin": "5.3.9",
+    "webpack": "5.88.2",
+    "webpack-dev-server": "4.15.1",
+    "webpack-merge": "5.9.0", 
+{% endif %}
+    "@mapbox/node-pre-gyp": "1.0.11",
+    "node-gyp": "9.4.0"
+  },
+  "license": "",
+  "readmeFilename": "README.md"
+}

package/cli/builder/skeletons/unittest/testFile.js

@@ -1,47 +1,46 @@
-/*
- *   MODEFONY FRAMEWORK UNIT TEST
- *
- *   MOCHA STYLE
- *
- *   In the global context you can find :
- *
- *	nodefony : namespace to get library
- *	kernel :   instance of kernel who launch the test
- *
- *
- *
- */
-const assert = require('assert');
+ /*
+  *   MODEFONY FRAMEWORK UNIT TEST
+  *
+  *   MOCHA STYLE
+  *
+  *   In the global context you can find :
+  *
+  *	nodefony : namespace to get library
+  *	kernel :   instance of kernel who launch the test
+  *
+  *
+  *
+  */
+ const assert = require('assert');
+ const https = require('node:https');
 
-describe("BUNDLE {{testName}}", () => {
-  beforeEach(() => {
-    const requestClient = kernel.get("requestClient");
-    const httpsServer = kernel.get("httpsServer");
-    const certificats = httpsServer.getCertificats();
-    const defaultOptions = {
-      method: 'GET',
-      timeout: 5000,
-      agentOptions: {
-        cert: certificats.cert,
-        key: certificats.key,
-        ca: certificats.ca
-      }
-    };
-    const myurl = `https://${kernel.settings.system.domain}:${kernel.settings.system.httpsPort}`;
-    global.request = requestClient.create(myurl, defaultOptions);
-  });
+ describe("BUNDLE {{testName}}", () => {
+   beforeEach(() => {
+     const fetchService = kernel.get("fetch");
+     const httpsServer = kernel.get("httpsServer");
+     const certificats = httpsServer.getCertificats();
+     const httpsAgent = new https.Agent({
+ 	      keepAlive: true,
+         cert: certificats.cert,
+         key: certificats.key,
+         ca: certificats.ca
+       });
+     const defaultOptions = {
+       method: 'GET',
+       agent: httpsAgent
+     };
+     global.url = `https://${kernel.settings.system.domain}:${kernel.settings.system.httpsPort}`;
+     global.fetch = fetchService.fetch
+     global.options = defaultOptions
+   });
 
-  describe('ROUTE', () => {
-
-    it("ROUTE {{routeName}} ", async () => {
-      let options = {
-        timeout: 1500
-      };
-      let result = await global.request.http("{{routeName}}", options);
-      assert.equal(result.json.statusCode, 200);
-      assert.equal(result.json.headers.server, "nodefony");
-    });
-
-  });
-
-});
+   describe('REQUEST ', () => {
+     it("FETCH REQUEST {{routeName}}", async () => {
+       let response = await global.fetch(`${global.url}/{{routeName}}`, global.options)
+       assert.equal(response.status, 200);
+       assert.equal(response.headers.get("server"), "nodefony");
+       let html = await response.text()
+       assert(html);
+     });
+   });
+ });

package/cli/builder/vue/skeletons/vue.config.js

@@ -1,20 +1,54 @@
 // vue.config.js
+const {
+  defineConfig
+} = require('@vue/cli-service')
+const webpack = require('webpack');
 const path = require('path');
-const package = require(path.resolve("package.json"));
-const packageVue = require(path.resolve("node_modules","vue","package.json"));
+const Package = require(path.resolve("package.json"));
+const packageVue = require(path.resolve("node_modules", "vue", "package.json"));
 const outputDir = path.resolve("Resources", "public");
 const indexPath = path.resolve("Resources", "views", 'index.html.twig');
 const publicPath = "/{{bundleName}}";
 const template = path.resolve('public', 'index.html');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const title = package.name;
+const {
+  CleanWebpackPlugin
+} = require('clean-webpack-plugin');
+const title = Package.name;
+const nodeModule = path.resolve(process.cwd(), "node_modules");
 
-process.env.VUE_APP_VERSION = package.version;
+{% if addons.vuetify %}
+const vuetifyDir = path.dirname(require.resolve("vuetify"));
+const packageVuetify = require(path.resolve(vuetifyDir, "..", "package.json"));
+{% endif %}
+
+process.env.VUE_APP_VERSION = Package.version;
 process.env.VUE_APP_VUE_VERSION = packageVue.version;
 process.env.VUE_APP_DEBUG = process.env.DEBUG_MODE;
 process.env.VUE_APP_NODE_ENV = process.env.NODE_ENV;
+{% if addons.vuetify %}
+process.env.VUE_APP_VUETIFY_VERSION = packageVuetify.version;
+{% endif %}
+try {
+  process.env.VUE_APP_DOMAIN = kernel.domain;
+  process.env.VUE_APP_HTTP_PORT = kernel.httpPort;
+  process.env.VUE_APP_HTTPS_PORT = kernel.httpsPort;
+} catch (e) {}
+
+
+let dev = true;
+let debug = false
+let watch = false
 
-module.exports = {
+try {
+  if (kernel.environment !== "dev") {
+    dev = false;
+  } else {
+    watch = true;
+  }
+  debug = kernel.debug ? "*" : false;
+} catch (e) {}
+
+module.exports = defineConfig({
   lintOnSave: false,
   publicPath: publicPath,
   outputDir: outputDir,
@@ -26,14 +60,47 @@ module.exports = {
       .tap(args => {
         args[0].title = title;
         args[0].template = template;
+        args[0].chunks = ['app'];
         return args;
       });
   },
+
   configureWebpack: {
+    cache: true,
     devtool: process.env.NODE_ENV === "development" ? "source-map" : false,
+    watchOptions: {
+      aggregateTimeout: 2000,
+      ignored: /node_modules|assets|Resources|dist|tmp|public/,
+      followSymlinks: false
+    },
+    performance: {
+      hints: false,
+      maxEntrypointSize: 11000000,
+      maxAssetSize: 11000000
+    },
+    optimization: {
+      runtimeChunk: true,
+      removeAvailableModules: false,
+      removeEmptyChunks: false,
+      splitChunks: false,
+    },
     output:{
-      hotUpdateChunkFilename:'hot/[id].[hash].hot-update.js',
-      hotUpdateMainFilename: 'hot/[hash].hot-update.json'
+      hotUpdateChunkFilename: 'hot/[id].[fullhash].hot-update.js',
+      hotUpdateMainFilename: 'hot/[runtime].[fullhash].hot-update.json'
+    },
+    resolve: {
+      alias: {
+        "@bundles": path.join(__dirname, ".."),
+        "@app": path.join(__dirname, "..", "..", "..", "app"),
+        "vue": path.resolve(`./node_modules/vue`),
+        "vue-router": path.resolve(`./node_modules/vue-router`)
+      },
+      extensions: ['.js', '.json', '.css', '.mjs'],
+      fallback: {
+        "path": false,
+        "assert": false
+      },
+      modules: [nodeModule]
     },
     plugins: [
       new CleanWebpackPlugin({
@@ -45,11 +112,18 @@ module.exports = {
         protectWebpackAssets:true,
         cleanAfterEveryBuildPatterns:[],
         dangerouslyAllowCleanPatternsOutsideProject: true
-      })
+      }),
+      new webpack.DefinePlugin({
+        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+        'process.env.NODE_DEBUG': JSON.stringify(debug)
+      }),
     ]
   }{% if addons.vuetify %},
+  pluginOptions: {
+    vuetify: {}
+  },
   transpileDependencies: [
     "vuetify"
   ]
   {% endif %}
-};
+})