nodefony 6.9.1 → 6.10.0

package/cli/builder/bundles/users-bundle/Resources/views/swagger/index.html.twig

@@ -1,36 +1,28 @@
-{% extends '../base.html.twig' %}
+{% extends '../documentation/base.html.twig' %}
 
 {% block title %}{{title|escape}}{% endblock %}
 
 {% block stylesheets %}
   <!-- WEBPACK BUNDLE -->
   <link rel='stylesheet' href='{{CDN("stylesheet")}}/users-bundle/assets/css/swagger.css'/>
-  <link rel="stylesheet" href="/documentation-bundle/assets/css/documentation.css"/>
+   {{ parent() }}
 {% endblock %}
 
 {% block body %}
 
-{% block header %}
-  {{ render( controller("users:users:header" )) }}
-{% endblock %}
-
 <div class="container-fluid">
   <div class="row flex-xl-nowrap">
     {% include '../documentation/navbar.html.twig' %}
-    <main class="col-12 col-md-9 col-xl-8" style="top: 4rem;">
+    <main class="col-12 col-md-9 col-xl-10" style="top:2px">
       <div id="swagger"></div>
     </main>
   </div>
 </div>
 
-{% block footer %}
-  {{ render( controller("users:users:footer" )) }}
 {% endblock %}
 
 {% block javascripts %}
   <!-- WEBPACK BUNDLE -->
   <script src='{{CDN("javascript")}}/users-bundle/assets/js/swagger.js'></script>
-  <script type="text/javascript" src="/documentation-bundle/assets/js/documentation.js"></script>
-{% endblock %}
-
+   {{ parent() }}
 {% endblock %}

package/cli/builder/bundles/users-bundle/controller/api/graphql/graphqlController.js

@@ -39,6 +39,8 @@ class graphqlController extends nodefony.Controller {
     }
   }
 
+  //  provides all functions for each API endpoint
+
   async user(field) {
     return await this.usersService.findOne(field.username);
   }

package/cli/builder/bundles/users-bundle/controller/usersController.js

@@ -56,7 +56,7 @@ class usersController extends nodefony.Controller {
 
   /**
    *    @see Route by Annotaion
-   *    @Method ({ "GET"})
+   *    @Method ({ "GET", "POST"})
    *    @Route ("/lang", name="lang")
    */
   langAction() {

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

@@ -16,44 +16,45 @@
   ],
   "repository": {},
   "dependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/core": "^7.16.7",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.15.8",
-    "@babel/preset-react": "^7.14.5",
-    "@popperjs/core": "^2.10.2",
-    "babel-loader": "^8.2.2",
+    "@babel/preset-env": "^7.16.7",
+    "@babel/preset-react": "^7.16.7",
+    "@popperjs/core": "^2.11.0",
+    "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.4.0",
-    "expose-loader": "^3.0.0",
+    "css-loader": "^6.5.1",
+    "expose-loader": "^3.1.0",
     "faker": "^5.5.3",
     "font-awesome": "^4.7.0",
-    "graphiql": "^1.4.2",
-    "graphql": "^15.6.1",
-    "html-webpack-plugin": "^5.3.2",
-    "imports-loader": "^3.0.0",
+    "graphiql": "^1.5.16",
+    "graphql": "^16.2.0",
+    "graphql-ws": "^5.5.5",
+    "html-webpack-plugin": "^5.5.0",
+    "imports-loader": "^3.1.1",
     "jquery": "^3.6.0",
-    "mini-css-extract-plugin": "^2.4.2",
+    "mini-css-extract-plugin": "^2.4.5",
     "mongoose-paginate-v2": "^1.4.2",
-    "node-sass": "^6.0.1",
+    "node-sass": "^7.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "sass-loader": "^12.1.0",
-    "style-loader": "^3.3.0",
+    "sass-loader": "^12.4.0",
+    "style-loader": "^3.3.1",
     "svg-inline-loader": "^0.8.2",
-    "swagger-ui": "^3.52.3",
-    "swagger-ui-dist": "^3.52.3",
-    "terser-webpack-plugin": "^5.2.4",
-    "webpack": "^5.58.1",
+    "swagger-ui": "^4.1.3",
+    "swagger-ui-dist": "^4.1.3",
+    "terser-webpack-plugin": "^5.3.0",
+    "webpack": "^5.65.0",
     "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.5",
-    "node-gyp": "^8.2.0",
-    "sequelize-cli": "^6.2.0"
+    "@mapbox/node-pre-gyp": "^1.0.8",
+    "node-gyp": "^8.4.1",
+    "sequelize-cli": "^6.3.0"
   },
   "license": "CECILL-B",
   "readmeFilename": "README.md",

package/cli/builder/microService/skeletons/config/pm2.config.js

@@ -3,7 +3,7 @@ const package = require(path.resolve("package.json"));
 const env = process.env.NODE_ENV;
 const logName = `${package.name}.log`;
 
-let cpu = require('os').cpus().length;
+let cpu = 2 // require('os').cpus().length;
 let exec_mode = "cluster";
 let watch = false;
 let autorestart =true ;

package/cli/builder/microService/skeletons/config/webpack/webpack.config.dev.js

@@ -1,13 +1,8 @@
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = {
   mode: 'development',
   devtool: 'source-map',
   plugins: [
-    new MiniCssExtractPlugin({
-      fallback: "style-loader",
-      filename: "./css/[name].css",
-      allChunks: true
-    })
+    
   ]
 };

package/cli/builder/microService/skeletons/config/webpack/webpack.config.prod.js

@@ -1,5 +1,4 @@
 const TerserPlugin = require('terser-webpack-plugin');
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = {
   mode: 'production',
@@ -19,11 +18,7 @@ module.exports = {
     ]
   },
   plugins: [
-    new MiniCssExtractPlugin({
-      fallback: "style-loader",
-      filename: "./css/[name].min.css",
-      allChunks: true
-    })
+
   ]
 
 

package/cli/builder/microService/skeletons/config/webpack.config.js

@@ -1,9 +1,8 @@
 const webpack = require('webpack');
 const path = require('path');
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const htmlPlugin = require('html-webpack-plugin');
 const { merge } = require('webpack-merge');
-const precss = require('precss');
-const autoprefixer = require('autoprefixer');
 
 let conf = null;
 if (process.env.NODE_ENV === "development") {
@@ -19,7 +18,8 @@ module.exports = merge(conf, {
    * See: http://webpack.github.io/docs/configuration.html#entry
    */
   entry: {
-    App: path.resolve(__dirname, "..", "src", "browser", "index.js")
+    app: path.resolve(__dirname, "..", "src", "browser", "index.js"),
+    socket: path.resolve(__dirname, "..", "src", "browser", "socketio.js")
   },
   target: 'web',
   //watch: true,
@@ -39,7 +39,7 @@ module.exports = merge(conf, {
      *
      * See: http://webpack.github.io/docs/configuration.html#resolve-extensions
      */
-    extensions: ['.js', '.es6'],
+    extensions: ['.js'],
 
     // An array of directory names to be resolved to the current directory
     modules: ["node_modules"]
@@ -52,52 +52,58 @@ module.exports = merge(conf, {
   module: {
     rules: [{
       // BABEL TRANSCODE
-      test: new RegExp("\\.es6$|\\.js$|\\.es7$"),
+      test: new RegExp("\.js$"),
       exclude: new RegExp("node_modules"),
       use: [{
         loader: 'babel-loader',
         options: {
           presets: ['@babel/preset-env']
         }
-       }]
+      }]
      }, {
-      test: /\.(sa|sc|c)ss$/,
-      use: [
+       test: /\.(sa|sc|c)ss$/,
+       use: [
+         //'css-hot-loader',
          MiniCssExtractPlugin.loader,
-        {
-          loader: "css-loader",
-          options: {
-            sourceMap: true
-          }
-         }, {
-          loader: 'resolve-url-loader',
-          options: {}
-         }, {
-           loader: 'postcss-loader', // Run post css actions
+         {
+           loader: "css-loader",
            options: {
-             postcssOptions: {
-               plugins: [autoprefixer({}), precss({})]
-             }
+             sourceMap: true
            }
          }, {
-          loader: "sass-loader",
-          options: {
-            sourceMap: true
-          }
+           loader: "sass-loader",
+           options: {
+             sourceMap: true
+           }
          }
        ]
      }, {
-      test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
-      use: [{
-        loader: 'file-loader',
-        options: {
-          name: '[name].[ext]',
-          outputPath: 'fonts/', // where the fonts will go
-        }
-       }]
-     }]
+       test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+       type: 'asset/inline'
+     },{
+        test: /\.html$/,
+        loader: 'html-loader'
+      }]
   },
   plugins: [
+    new MiniCssExtractPlugin({
+      filename: "./css/[name].css"
+    }),
+    new htmlPlugin({
+      filename: path.resolve("dist", "index.ejs"),
+      template: path.resolve("src", "templates", "base.html"),
+      title: conf.name,
+      //cache: !dev,
+      chunks: ['app'],
+      templateParameters: conf
+    }),
+    new htmlPlugin({
+      filename: path.resolve("dist", "socketio.ejs"),
+      template: path.resolve("src", "templates", "socket.html"),
+      title: conf.name,
+      chunks: ['socket'],
+      templateParameters: conf
+    }),
     new webpack.DefinePlugin({
       'process.env': {
         'NODE_ENV': JSON.stringify(process.env.NODE_ENV),

package/cli/builder/microService/skeletons/package.json

@@ -15,11 +15,11 @@
   "scripts": {
     "nodefony": "nodefony",
     "pm2": "pm2",
-    "install": "env-cmd -e webpack_prod webpack --env production --config config/webpack.config.js; env-cmd -e webpack_dev webpack --env development --config config/webpack.config.js",
+    "install": "env-cmd -e webpack_prod webpack --env production --config config/webpack.config.js",
     "start": "node ./bin/cli",
     "dev": "env-cmd -e development pm2 start config/pm2.config.js --only {{name}} --env development --no-daemon",
     "dev_debug": "env-cmd -e development_debug pm2 start config/pm2.config.js --only {{name}} --env development --no-daemon",
-    "prod": "env-cmd -e production pm2 start config/pm2.config.js --env production",
+    "prod": "env-cmd -e webpack_prod webpack --env production --config config/webpack.config.js;env-cmd -e production pm2 start config/pm2.config.js --env production",
     "examples": "env-cmd -e development pm2 start config/pm2.config.js --only examples --env development --no-daemon",
     "stop": "pm2 stop {{name}}",
     "restart": "pm2 restart {{name}}",
@@ -28,7 +28,7 @@
     "monit": "pm2 monit",
     "status": "pm2 status",
     "kill": "pm2 kill",
-    "webpack": "env-cmd -e webpack_prod webpack --env.production --config config/webpack.config.js; env-cmd -e webpack_dev webpack --env.development --verbose --config config/webpack.config.js",
+    "webpack": "env-cmd -e webpack_prod webpack --env production --stats verbose --config config/webpack.config.js",
     "ssl": "./bin/generateCertificates.sh",
     "test": "env-cmd -e test mocha  --require @babel/register --recursive ./tests"
   },
@@ -39,32 +39,37 @@
     "microservice"
   ],
   "dependencies": {
+    "ejs": "^3.1.6",
     "env-cmd": "^10.1.0",
     "hello_world": "./src/n-api",
-    "markdown-it": "^12.0.2",
+    "markdown-it": "^12.2.0",
     "nodefony": "^{{version}}",
-    "pm2": "^4.5.0",
+    "nodefony-client": "^6.0.0-beta.18",
+    "pm2": "^5.1.2",
     "pm2-logrotate": "^2.7.0",
-    "socket.io": "^2.3.0",
-    "socket.io-client": "^2.3.1"
+    "serve-static": "^1.14.1",
+    "socket.io": "^4.3.1",
+    "socket.io-client": "^4.3.2 "
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.12.3",
-    "@babel/preset-env": "^7.12.1",
-    "@babel/register": "^7.12.1",
-    "babel-loader": "^8.1.0",
-    "chai": "^4.2.0",
-    "mini-css-extract-plugin": "^1.2.1",
-    "mocha": "^8.2.0",
-    "node-gyp": "^7.1.2",
-    "node-pre-gyp": "^0.15.0",
-    "open": "^7.3.0",
-    "sass-loader": "^10.0.4",
+    "@babel/cli": "^7.15.7",
+    "@babel/core": "^7.15.8",
+    "@babel/preset-env": "^7.15.8",
+    "@babel/register": "^7.15.3",
+    "@mapbox/node-pre-gyp": "^1.0.6",
+    "babel-loader": "^8.2.3",
+    "chai": "^4.3.4",
+    "html-loader": "^3.0.0",
+    "html-webpack-plugin": "^5.5.0",
+    "mini-css-extract-plugin": "^2.4.3",
+    "mocha": "^9.1.3",
+    "node-gyp": "^8.3.0",
+    "open": "^8.4.0",
+    "sass-loader": "^12.2.0",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "^5.3.1",
-    "webpack-cli": "^4.1.0",
-    "webpack-merge": "^5.2.0"
+    "webpack": "^5.60.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-merge": "^5.8.0"
   },
   "license": "ISC"
 }

package/cli/builder/microService/skeletons/src/browser/index.css

@@ -1,3 +1,3 @@
 body {
-  background-color: blue;
+  background-color: white;
 }

package/cli/builder/microService/skeletons/src/browser/index.js

@@ -1,5 +1,4 @@
-const nodefony = require("nodefony");
-const io = require('socket.io-client');
+const nodefony = require("nodefony-client");
 
 import "./index.css";
 /*
@@ -11,7 +10,6 @@ class App extends nodefony.Service {
     this.initSyslog();
     this.log("INIT APP CLIENT");
     this.log(`Nodefony Client version : ${nodefony.version}`);
-    this.io = io();
   }
 }
 

package/cli/builder/microService/skeletons/src/browser/socketio.js

@@ -0,0 +1,46 @@
+const nodefony = require("nodefony-client");
+import { io } from "socket.io-client";
+
+import "./index.css";
+/*
+ *	Class
+ */
+class App extends nodefony.Service {
+  constructor() {
+    super("App");
+    this.initSyslog();
+    this.log("INIT APP CLIENT");
+    this.log(`Nodefony Client version : ${nodefony.version}`);
+    this.init()
+  }
+
+  init(){
+    const socket = io('/',{
+      transports: [ 'websocket' ],
+      forceNew: true
+    });
+
+    socket.on("connect_error", function(e){
+      console.error(e);
+    });
+
+    socket.on('connect', function(){
+      console.log("connect", socket.connected);
+      setTimeout(()=>{
+        socket.emit("microservice", "send after 5 s");
+      }, 5000);
+
+    });
+
+    socket.on('microservice', function(data){
+      console.log(data);
+    });
+
+    socket.on('disconnect', function(){
+      console.log("disconnect");
+    });
+  }
+
+}
+
+export default new App();

package/cli/builder/microService/skeletons/src/node/examples/index.js

@@ -1,6 +1,7 @@
 const nodefony = require("nodefony");
 const path = require("path");
 const config = require(path.resolve("config", "config.js"));
+const ejs = require('ejs');
 
 // examples services
 const Server = require(path.resolve("src", "node", "services", "servers", "http.js"));
@@ -46,8 +47,11 @@ class Service extends nodefony.Service {
     // add in service container
     this.set("http", http);
     http.on("request", async (request, response) => {
-      response.statusCode = 200;
-      response.setHeader('Content-Type', 'text/html');
+      //response.statusCode = 200;
+      //response.setHeader('Content-Type', 'text/html');
+      response.writeHead(200, {
+        'Content-Type': 'text/html;charset=utf-8'
+      })
       http.log(` ${response.statusCode} url : http://${http.settings.hostname}:${http.settings.port}/`);
       response.end(await this.renderHtml());
     });
@@ -83,57 +87,13 @@ class Service extends nodefony.Service {
   }
 
   async renderHtml() {
-    return `<!DOCTYPE html>
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Nodefony Microservice</title>
-  <style>
-    body { font: 13px Helvetica, Arial; }
-  </style>
-</head>
-<body>
-  <p align="center">
-    <img src="https://github.com/nodefony/nodefony-core/raw/master/src/nodefony/bundles/framework-bundle/Resources/public/images/nodefony-logo.png"><br>
-  </p>
-  <h1 align="center">NODEFONY V6 Micro Service</h1>
-  <h2 align="center">Socket Io <h2>
-
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.3.0/socket.io.dev.js"></script>
-  <script
-  src="https://code.jquery.com/jquery-3.4.1.min.js"
-  integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
-  crossorigin="anonymous"></script>
-
-  <script>
-    var socket = io('/',{
-      transports: [ 'websocket' ],
-      forceNew: true
-    });
-
-    socket.on("connect_error", function(e){
-      console.error(e);
-    });
-
-    socket.on('connect', function(){
-      console.log("connect", socket.connected);
-      setTimeout(()=>{
-        socket.emit("microservice", "send after 5 s");
-      }, 5000);
-
-    });
-
-    socket.on('microservice', function(data){
-      console.log(data);
-    });
-
-    socket.on('disconnect', function(){
-      console.log("disconnect");
+    const filename = path.resolve("dist", "socketio.ejs")
+    const res = await ejs.renderFile(filename, {
+      body: ""
+    }, {
+      async: true
     });
-  </script>
-</body>
-</html>
-    `;
+    return res;
   }
 
   terminate(code){

package/cli/builder/microService/skeletons/src/node/index.js

@@ -3,6 +3,7 @@ const path = require("path");
 const Server = require(path.resolve("src", "node", "services", "servers", "http.js"));
 const ServerSecure = require(path.resolve("src", "node", "services", "servers", "https.js"));
 const Markdown = require(path.resolve("src", "node", "services", "markdown", "markdown.js"));
+const ejs = require('ejs');
 
 class Service extends nodefony.Service {
 
@@ -31,8 +32,11 @@ class Service extends nodefony.Service {
     this.set("http", http);
     await http.start();
     http.on("request", async (request, response) => {
-      response.statusCode = 200;
-      response.setHeader('Content-Type', 'text/html');
+      //response.statusCode = 200;
+      //response.setHeader('Content-Type', 'text/html');
+      response.writeHead(200, {
+        'Content-Type': 'text/html;charset=utf-8'
+      })
       http.log(` ${response.statusCode} url : http://${http.settings.hostname}:${http.settings.port}/`);
       response.end(await this.renderHtml());
     });
@@ -45,8 +49,11 @@ class Service extends nodefony.Service {
     this.set("https", https);
     await https.start();
     https.on("request", async (request, response) => {
-      response.statusCode = 200;
-      response.setHeader('Content-Type', 'text/html');
+      //response.statusCode = 200;
+      //response.setHeader('Content-Type', 'text/html');
+      response.writeHead(200, {
+        'Content-Type': 'text/html;charset=utf-8'
+      })
       https.log(` ${response.statusCode} url : https://${https.settings.hostname}:${https.settings.port}/`);
       response.end(await this.renderHtml());
     });
@@ -56,20 +63,13 @@ class Service extends nodefony.Service {
   async renderHtml() {
     const readme = path.resolve("README.md");
     const md = await this.markdown.fileToMarkdown(readme);
-    return `<!DOCTYPE html>
-<html lang="fr">
-<head>
-  <meta charset="utf-8">
-  <title>Nodefony Microservice</title>
-  <style>
-    body { font: 13px Helvetica, Arial; }
-  </style>
-</head>
-<body>
-  ${md}
-</body>
-</html>
-    `;
+    const filename = path.resolve("dist", "index.ejs")
+    const res = await ejs.renderFile(filename, {
+      body: md
+    }, {
+      async: true
+    });
+    return res;
   }
 
   getMarkdown() {

package/cli/builder/microService/skeletons/src/node/services/servers/http.js

@@ -2,6 +2,12 @@ const nodefony = require("nodefony");
 const http = require('http');
 const path = require("path");
 
+const serveStatic = require('serve-static');
+const dist = path.resolve("dist");
+const serve = serveStatic(dist, {
+  index: false
+});
+
 class Server extends nodefony.Service {
   constructor(service) {
     super("HTTP Server", service.container);
@@ -17,7 +23,9 @@ class Server extends nodefony.Service {
     return new Promise((resolve, reject) => {
       this.log("Starting Server HTTP", "INFO");
       this.server = http.createServer((req, res) => {
-        return this.fire("request", req, res);
+        return serve(req, res, () => {
+          return this.fire("request", req, res);
+        });
       });
 
       this.server.listen(this.settings.port, this.settings.hostname, () => {

package/cli/builder/microService/skeletons/src/node/services/servers/https.js

@@ -1,5 +1,11 @@
 const nodefony = require("nodefony");
 const https = require('https');
+const serveStatic = require('serve-static');
+const dist = path.resolve("dist");
+const serve = serveStatic(dist, {
+  index: false
+});
+
 
 class Server extends nodefony.Service {
   constructor(service){
@@ -16,7 +22,9 @@ class Server extends nodefony.Service {
     return new Promise((resolve, reject) => {
       this.log("Starting Server HTTPS", "INFO");
       this.server = https.createServer(this.settings.certificates, (req, res) => {
-        return this.fire("request", req, res);
+        return serve(req, res, () => {
+          return this.fire("request", req, res);
+        });
       });
 
       this.server.listen(this.settings.port, this.settings.hostname, () => {