beech-api 3.5.7 → 3.5.12

package/README.md

@@ -29,7 +29,7 @@
 
 ## Environment
 
-- [`Node.js`](https://nodejs.org) >= 10.13.0+ (recommended)
+- [`Node.js`](https://nodejs.org) >= 14.19.0+ (recommended)
 - `npm` >= 6.4.1+ or `yarn` >= 1.22.4+
 
 ## Installation

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "beech-api",
-  "version": "3.5.7",
+  "version": "3.5.12",
   "description": "Command line interface for rapid Beech API development",
   "keywords": [
+    "api",
+    "api-framework",
     "beech-api",
     "cli",
-    "api",
-    "nodejs",
-    "api-framework"
+    "nodejs"
   ],
   "license": "MIT",
   "repository": {
@@ -18,6 +18,7 @@
   "authors": "bombkiml",
   "bin": {
     "beech-app": "./packages/cli/bin/beech.js",
+    "beech-service": "./packages/cli/bin/beech-service.js",
     "beech": "./packages/cli/core/generator/index.js"
   },
   "bugs": {
@@ -26,7 +27,7 @@
   "homepage": "https://github.com/bombkiml/beech-api/blob/master/README.md",
   "deprecated": false,
   "engines": {
-    "node": ">=10.13"
+    "node": ">=14.19"
   },
   "dependencies": {
     "app-root-path": "^3.0.0",
@@ -47,6 +48,7 @@
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
     "node-cmd": "^3.0.0",
+    "node-notifier": "^10.0.1",
     "passport": "^0.6.0",
     "passport-facebook": "^3.0.0",
     "passport-google-oauth": "^2.0.0",
@@ -59,6 +61,8 @@
   },
   "devDependencies": {
     "jest": "^28.1.3",
+    "node-dev": "^8.0.0",
+    "nodemon": "^3.0.1",
     "sequelize-cli": "^5.5.1"
   },
   "jest": {

package/packages/cli/beech

@@ -4,8 +4,8 @@
  * The beech api (cli) package generator and server (bash for developer and production build)
  *
  * @author bombkiml
- * @version 3.2
- * @built Apr 17, 2020 at 00:09:19
+ * @version 3.6
+ * @built Aug 14, 2023 at 00:09:19
  *
  */
 (process.argv[2]) ? require('./core/generator/index') : require('./core/index')

package/packages/cli/bin/beech-service.js

@@ -0,0 +1,305 @@
+#!/usr/bin/env node
+const logUpdate = require("log-update");
+const notifier = require("node-notifier");
+const path = require("path");
+const clear = require("cli-clear");
+const express = require("express");
+const _app_ = express();
+const Sequelize = require('sequelize');
+let testSql = {};
+
+class Beech {
+  constructor() {
+    this.embed(process.argv)
+      .then(() => this.init()
+        .then(status => console.log(status))
+        .catch(err => {
+          throw err;
+        })
+      );
+  }
+
+  init() {
+    return new Promise(async (resolve, reject) => {
+      try {
+        if (this.option == "serve") {
+          let turnNoti = true;
+          if (this.argument == "--silent" || this.argument == "-S") {
+            turnNoti = false;
+          }
+          // check project config file exists ?
+          if (this.fs.existsSync(this.configFile)) {
+            const testServ = _app_.listen(this._config_.main_config.app_port, () => {
+              //console.log("Test Started.");
+              testServ.close();
+              // Start real service.
+              this.getStart(turnNoti, (err, res) => {
+                if (err) {
+                  reject("\n Faltal  start service catch.");
+                  return;
+                }
+                // show info
+                console.clear();
+                //console.log(res);
+              });
+
+            });
+          } else {
+            resolve("\n Faltal  The app.conifg.js file is not found.");
+          }
+        } else if (!this.option || this.option == "-h" || this.option == "?" || this.option == "--help") {
+          // help for see avaliable command
+          this.help()
+            .then(help => resolve(help))
+            .catch(err => reject(err));
+        } else {
+          resolve("\n Faltal  commnad it's not available.");
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  filterDbIsTrue(dbConfig, cb) {
+    try {
+      let dbIsTrue = [];
+      dbConfig.filter((e, k) => {
+        if (e.is_connect) {
+          dbIsTrue.push(e);
+        }
+        if (dbConfig.length == k + 1) {
+          cb(null, dbIsTrue);
+        }
+      });
+    } catch (error) {
+      cb(error, null);
+    }
+  }
+
+  initSequelize(val, cb) {
+    try {
+      const sq = new Sequelize({
+        dialect: val.dialect || "mysql",
+        host: val.host,
+        username: val.username,
+        password: val.password,
+        database: val.database,
+        port: val.port,
+        storage: val.storage || ":memory:",
+        protocol: val.protocol || null,
+        logging: val.logging || false,
+        dialectOptions: {
+          socketPath: ((val.dialectOptions) ? ((val.dialectOptions.socketPath) ? val.dialectOptions.socketPath : "") : ""), //Applications/MAMP/tmp/mysql/mysql.sock
+          supportBigNumbers: ((val.dialectOptions) ? ((val.dialectOptions.supportBigNumbers) ? val.dialectOptions.supportBigNumbers : false) : false),
+          bigNumberStrings: ((val.dialectOptions) ? ((val.dialectOptions.bigNumberStrings) ? val.dialectOptions.bigNumberStrings : false) : false),
+          options: ((val.dialectOptions) ? ((val.dialectOptions.options) ? ({ encrypt: false, ...val.dialectOptions.options }) : { encrypt: false }) : { encrypt: false }),
+        },
+        omitNull: val.omitNull || false,
+        native: val.native || false,
+        define: {
+          underscored: ((val.define) ? ((val.define.underscored) ? val.define.underscored : false) : false),
+          freezeTableName: ((val.define) ? ((val.define.freezeTableName === false) ? val.define.freezeTableName : true) : true),
+          charset: ((val.define) ? ((val.define.charset) ? val.define.charset : "utf8") : "utf8"),
+          dialectOptions: {
+            collate: ((val.define) ? ((val.define.dialectOptions) ? ((val.define.dialectOptions.timestamps) ? val.define.dialectOptions.timestamps : "utf8_general_ci") : "utf8_general_ci") : "utf8_general_ci"),
+          },
+          timestamps: ((val.define) ? ((val.define.timestamps) ? val.define.timestamps : false) : false),
+        },
+        sync: {
+          force: ((val.sync) ? ((val.sync.force) ? val.sync.force : false) : false),
+        },
+        pool: {
+          max: ((val.pool) ? ((val.pool.max) ? val.pool.max : 5) : 5),
+          idle: ((val.pool) ? ((val.pool.idle) ? val.pool.idle : 30000) : 30000),
+          acquire: ((val.pool) ? ((val.pool.acquire) ? val.pool.acquire : 60000) : 60000),
+        },
+        isolationLevel: val.isolationLevel || "Transaction.ISOLATION_LEVELS.REPEATABLE_READ",
+        query: {
+          raw: ((val.query) ? ((val.query.raw) ? val.query.raw : true) : true),
+          nest: ((val.query) ? ((val.query.nest) ? val.query.nest : true) : true),
+        }
+      });
+      cb(false, sq);
+    } catch (error) {
+      cb(error, null);
+    }
+  }
+
+  testConnectInProcess = (database_config, dbConnTotal, cb) => {
+    try {
+      let val = database_config.shift();
+      if (val) {
+        this.initSequelize(val, async (err, sq) => {
+          if (err) {
+            console.error(" Failed  Can't to create a Sequelize instance:", val.name, "\n", err);
+            cb(err, null, null);
+          }
+          // Test connection
+          await sq.authenticate()
+            .then(() => {
+              // Database some is true perfectly.
+              if (database_config.length == 0) {
+                if (sq) {
+                  testSql[ val.name ] = sq;
+                  //console.log("DB true, Perfectly.", val.name);
+                  cb(null, true, testSql);
+                }
+              } else {
+                testSql[ val.name ] = sq;
+                this.testConnectInProcess(database_config, dbConnTotal, cb);
+              }
+            })
+            .catch(err => {
+              console.error(" Failed  Unable to connect to the database:", val.name, "\n", err);
+              cb(err, null, null);
+            });
+        });
+      } else if (!dbConnTotal) {
+        // All Database is falsly perfectly.
+        //console.log("DB all false, Perfectly.");
+        cb(null, true, testSql);
+      }
+    } catch (error) {
+      cb(error, null, null);
+    }
+  }
+
+  getStart(turnNoti, cb) {
+    try {
+      clear();
+      logUpdate("Compiling...");
+      // filter for check dabatase only true
+      this.filterDbIsTrue(this._config_.database_config, (err, dbConnectIsTrueOnly) => {
+        if (err) {
+          logUpdate("Config file crash.", err);
+          return;
+        }
+        // leave data to disconnect database
+        let leaveDataForDisconnect = dbConnectIsTrueOnly.slice(0);
+        // check db connect truthy length ?
+        if (dbConnectIsTrueOnly.length > 0) {
+          // Test connect process
+          this.testConnectInProcess(dbConnectIsTrueOnly, dbConnectIsTrueOnly.length, (err, result, dbs) => {
+            if (err) {
+              logUpdate(" Failed  Database connect failed.", err);
+              return;
+            }
+            if (result) {
+              // Disconnect database
+              this.disConnectTestDB(leaveDataForDisconnect, dbs, (err, disResult) => {
+                if (err) {
+                  logUpdate(" Failed  Testing Database connect failed.", err);
+                  return;
+                }
+                if (disResult) {
+                  // Start service
+                  this.serviceDevStart();
+                  // check turn on nofi
+                  if (turnNoti) {
+                    this.notiCompile();
+                  }
+                } else {
+                  cb(err, null);
+                }
+              });
+            }
+          });
+        } else {
+          this.serviceDevStart();
+        }
+      });
+    } catch (error) {
+      cb(error, null);
+    }
+  }
+
+  serviceDevStart() {
+    let firstCount = 0;
+    const command = this.cmd.get(`npx nodemon -q ./node_modules/beech-api/packages/cli/beech`);
+    command.stdout.on('data', (data) => {
+      firstCount++;
+      let leaveData = data.slice(0);
+      if (firstCount == 1) {
+        clear();
+      }
+      // shout out
+      if (data.trim().slice(-1) == ":") {
+        console.log("\n", leaveData.trim());
+      } else {
+        let serviceShoutOut = leaveData.trim().split('- ');
+        if (serviceShoutOut.length > 2) {
+          console.log("  -", serviceShoutOut[ 1 ].trim());
+          console.log("  -", serviceShoutOut[ 2 ].trim());
+        } else {
+          console.log(" ", leaveData.trim());
+        }
+      }
+
+    });
+  }
+
+  notiCompile() {
+    notifier.notify({
+      title: 'Beech API',
+      subtitle: 'Beech service getting started.',
+      message: "Service getting started.",
+      sound: 'Funk',
+      wait: false,
+      icon: path.join(__dirname, "/../../public/icon/beech_128.png"),
+      contentImage: path.join(__dirname, "../../public/icon/beech_128.png"),
+    });
+  }
+
+  disConnectTestDB(dbConfigTruthy, dbs, cb) {
+    try {
+      dbConfigTruthy.map((e, k) => {
+        // Closing database
+        if (dbs[ e.name ].close()) {
+          if (dbConfigTruthy.length == k + 1) {
+            cb(null, dbConfigTruthy);
+          }
+        } else {
+          cb(`Close database failed, ${e.name}`, null);
+        }
+      });
+    } catch (error) {
+      cb(error, null);
+    }
+  }
+
+  help() {
+    return new Promise((resolve, reject) => {
+      try {
+        this.fs.readFile(__dirname + "/../core/generator/_service", "utf8", (err, data) => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(data);
+          }
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  embed(argv) {
+    return new Promise((resolve, reject) => {
+      try {
+        this.fs = require("fs");
+        this.cmd = require('node-cmd');
+        this.argv = argv;
+        this.option = argv[ 2 ];
+        this.argument = argv[ 3 ];
+        this.configFile = path.resolve("./app.config.js");
+        this._config_ = require(this.configFile);
+        resolve(this);
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+}
+
+new Beech();

package/packages/cli/bin/beech.js

@@ -141,23 +141,27 @@ class Beech {
         let tmpBasicHelperFile = __dirname + '/../core/generator/_basic-helpers';
         let pasteBasicHelperFile = helperPath + '/Basic.js';
         let freatureLength = freatureArr.length;
-        freatureArr.map((f, key) => {
-          if (f.split(' ')[ 0 ] == "Add-Ons") {
-            (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech.js add-on init') : this.cmd.get('cd ' + argument + ' && beech add-on init');
-            console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Add-Ons");
-          }
-          if (f.split(' ')[ 0 ] == "Basic") {
-            this.makeFolder(helperPath).then(this.copy.bind(this, tmpBasicHelperFile, pasteBasicHelperFile))
-            console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Basic helper");
-          }
-          if (f.split(' ')[ 0 ] == "Passport") {
-            (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech.js passport init') : this.cmd.get('cd ' + argument + ' && beech passport init');
-            console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Passport JWT, Official strategy Google, Facebook");
-          }
-          if (freatureArr.length == (key + 1)) {
-            resolve(true);
-          }
-        });
+        if (freatureLength) {
+          freatureArr.map((f, key) => {
+            if (f.split(' ')[ 0 ] == "Add-Ons") {
+              (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech.js add-on init') : this.cmd.get('cd ' + argument + ' && beech add-on init');
+              console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Add-Ons");
+            }
+            if (f.split(' ')[ 0 ] == "Basic") {
+              this.makeFolder(helperPath).then(this.copy.bind(this, tmpBasicHelperFile, pasteBasicHelperFile))
+              console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Basic helper");
+            }
+            if (f.split(' ')[ 0 ] == "Passport") {
+              (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech.js passport init') : this.cmd.get('cd ' + argument + ' && beech passport init');
+              console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Passport JWT, Official strategy Google, Facebook");
+            }
+            if (freatureArr.length == (key + 1)) {
+              resolve(true);
+            }
+          });
+        } else {
+          resolve(true);
+        }
       } catch (error) {
         reject(error);
       }

package/packages/cli/core/auth/Passport.js

@@ -154,6 +154,10 @@ module.exports = {
         callbackURL: auth_endpoint + facebook_callbackURL,
         profileFields: allow_permisions_fields
       }, (accessToken, refreshToken, profile, done) => {
+        // Check if the email permission is granted
+        if (!profile.emails || profile.emails.length === 0) {
+          return done(new Error('Email permission not granted.'));
+        }
         // find facebook user
         let faecbookIdField = (passport_config.strategy.facebook.local_profile_fields.facebook_id) ? passport_config.strategy.facebook.local_profile_fields.facebook_id : "facebook_id";
         this.findOrCreate(passport_config, "facebook", passportFields, passportTable, accessToken, refreshToken, profile, faecbookIdField, (err, res, dbFailed) => {

package/packages/cli/core/configure/app.config-sequelize.js

@@ -78,6 +78,11 @@ module.exports = {
           collate: "utf8_general_ci"
         },
       },
+      dialectOptions: { // ssl
+        options: {
+          encrypt: false,
+        }
+      },
       is_connect: false,
     },
   ]

package/packages/cli/core/databases/sequelize.js

@@ -52,6 +52,7 @@ connectInProcess = async (database_config, headDbShow, cb) => {
           socketPath: ((val.dialectOptions) ? ((val.dialectOptions.socketPath) ? val.dialectOptions.socketPath : "") : ""), //Applications/MAMP/tmp/mysql/mysql.sock
           supportBigNumbers: ((val.dialectOptions) ? ((val.dialectOptions.supportBigNumbers) ? val.dialectOptions.supportBigNumbers : false) : false),
           bigNumberStrings: ((val.dialectOptions) ? ((val.dialectOptions.bigNumberStrings) ? val.dialectOptions.bigNumberStrings : false) : false),
+          options: ((val.dialectOptions) ? ((val.dialectOptions.options) ? ({ encrypt: false, ...val.dialectOptions.options }) : { encrypt: false }) : { encrypt: false }),
         },
 
         // disable inserting undefined values as NULL
@@ -95,28 +96,29 @@ connectInProcess = async (database_config, headDbShow, cb) => {
         // isolation level of each transaction
         // defaults to dialect default
         isolationLevel: val.isolationLevel || "Transaction.ISOLATION_LEVELS.REPEATABLE_READ",
-        
+
         // JSON response
         query: {
           raw: ((val.query) ? ((val.query.raw) ? val.query.raw : true) : true),
-          nest : ((val.query) ? ((val.query.nest) ? val.query.nest : true) : true),
+          nest: ((val.query) ? ((val.query.nest) ? val.query.nest : true) : true),
         }
       });
-      // show only one text db connnections
-      if (headDbShow) {
-        console.log('\n Passed  Database is connected at:');
-        headDbShow = false;
-      }
+
       // connection
       await sq.authenticate()
         .then(() => {
+          // show only one text db connnections
+          if (headDbShow) {
+            console.log('\n Passed  Database is connected at:');
+            headDbShow = false;
+          }
           // create database pool
           sql[ val.name ] = sq;
           // checking dialect sql
-          if(val.dialect == "sqlite") {
-            console.log(' - [' + val.dialect + '] ' + val.name + ' -> ' + sq.options.storage + '');
+          if (val.dialect == "sqlite") {
+            console.log('- [' + val.dialect + '] ' + val.name + ' -> ' + sq.options.storage + '');
           } else {
-            console.log(' - [' + val.dialect + '] ' + val.name + ' -> ' + sq.config.database + ':' + sq.config.port + '');
+            console.log('- [' + val.dialect + '] ' + val.name + ' -> ' + sq.config.database + ':' + sq.config.port + '');
           }
           // checking recursive database connection
           if (database_config.length > 0) {

package/packages/cli/core/generator/_package

@@ -4,11 +4,11 @@
   "description": "The project is powered by Beech API framework",
   "main": "index.js",
   "scripts": {
-    "start": "npx run ./node_modules/beech-api/packages/cli/beech",
+    "start": "beech-service serve",
     "test": "node ./node_modules/jest/bin/jest __tests__ -o --watch --config"
   },
   "dependencies": {
-    "beech-api": "^3.5.7"
+    "beech-api": "^3.5.12"
   },
   "devDependencies": {
     "jest": "^25.2.7"

package/packages/cli/core/generator/_service

@@ -0,0 +1,8 @@
+
+Usage:
+  $ beech-service [options] [arguments]
+
+Options:
+  ?|-h, --help          Display this help message.
+  serve                 Start development service.
+  build                 Build production.

package/packages/cli/core/index.js

@@ -77,10 +77,11 @@ walker.on("end", () => {
 init = async (jsfiles) => {
   try {
     await ((pool_base == "basic") ? new Promise((resolve) => resolve(mySqlDbConnect.connect())) : new Promise((resolve) => resolve(SequelizeDbConnect.connect())));
-    await new Promise((resolve) => resolve(httpExpress.expressStart()));
     await new Promise((resolve) => resolve(authPassport.init()));
     await new Promise((resolve) => resolve(fileWalk.fileWalk(jsfiles)));
+    await new Promise((resolve) => resolve(httpExpress.expressStart()));
   } catch (error) {
+    console.log(" Compile failed ", error);
     throw error;
   }
 }

package/packages/cli/core/services/http.express.js

@@ -10,8 +10,10 @@ module.exports = {
       try {
         // Create express server
         const ExpressServer = _app_.listen(_config_.main_config.app_port, async () => {
-          await console.log('\n Passed  Service is started at:\n - Local:   http://' + _config_.main_config.app_host + ':' + ExpressServer.address().port, '\n - Network: ' + _config_.main_config.client_host + '');
-          await this.authentication();
+          console.log(' Passed  Service is started at:');
+          console.log('- Local:   http://' + _config_.main_config.app_host + ':' + ExpressServer.address().port + '');
+          console.log('- Network: ' + _config_.main_config.client_host + '');
+          this.authentication();
           await this.badRequest()
             .then(resolve(ExpressServer))
             .catch(err => {
@@ -62,16 +64,16 @@ module.exports = {
         var Beech = require("../../../lib/beech");
         if (!passport_config.jwt_allow) {
           // jwt is false
-          console.log(" - JWT:     OFF");
+          console.log("- JWT:     OFF");
           return;
         }
         // jwt is true
-        console.log(" - JWT:     ON");
+        console.log("- JWT:     ON");
       } else {
         return;
       }
       // declare authentication endpoint name
-      const auth_endpoint = (passport_config.auth_endpoint) ? (passport_config.auth_endpoint[0] === "/" ? passport_config.auth_endpoint : "/" + passport_config.auth_endpoint) : "/authentication";
+      const auth_endpoint = (passport_config.auth_endpoint) ? (passport_config.auth_endpoint[ 0 ] === "/" ? passport_config.auth_endpoint : "/" + passport_config.auth_endpoint) : "/authentication";
       // authentication endpoints
       _app_.post(auth_endpoint, (req, res, next) => {
         passport.authenticate('local', { session: false }, (err, user, opt) => {
@@ -86,7 +88,7 @@ module.exports = {
             const accessToken = jwt.sign(user, passport_config.secret, {
               expiresIn: passport_config.token_expired
             });
-            if (passport_config.app_secret_allow) {              
+            if (passport_config.app_secret_allow) {
               if (req.body.app_secret) {
                 if (_config_.main_config.app_secret == req.body.app_secret) {
                   res.status(200).json({
@@ -151,7 +153,7 @@ module.exports = {
           ]
         }));
         // google auth callback
-        const googleCallback = (passport_config.strategy.google.callbackURL) ? (passport_config.strategy.google.callbackURL[0] === "/" ? passport_config.strategy.google.callbackURL : "/" + passport_config.strategy.google.callbackURL) : "/google/callback";
+        const googleCallback = (passport_config.strategy.google.callbackURL) ? (passport_config.strategy.google.callbackURL[ 0 ] === "/" ? passport_config.strategy.google.callbackURL : "/" + passport_config.strategy.google.callbackURL) : "/google/callback";
         _app_.get(auth_endpoint + googleCallback, passport.authenticate('google', { failureRedirect: passport_config.strategy.google.failureRedirect, failureMessage: true }), (req, res) => {
           if (typeof req.user.user !== 'undefined') {
             // declare user for sign JWT
@@ -169,7 +171,7 @@ module.exports = {
             });
           } else {
             let condUser = {};
-            condUser[(passport_config.strategy.google.local_profile_fields.google_id) ? passport_config.strategy.google.local_profile_fields.google_id : "google_id"] = req.user.google.id;
+            condUser[ (passport_config.strategy.google.local_profile_fields.google_id) ? passport_config.strategy.google.local_profile_fields.google_id : "google_id" ] = req.user.google.id;
             Beech.findOne([], condUser, (err, result) => {
               if (err) {
                 res.status(500).json({
@@ -179,7 +181,7 @@ module.exports = {
                   error: err
                 });
               } else {
-                let user = JSON.parse(JSON.stringify(result[0]));
+                let user = JSON.parse(JSON.stringify(result[ 0 ]));
                 const accessToken = jwt.sign(user, passport_config.secret, {
                   expiresIn: passport_config.token_expired
                 });
@@ -204,9 +206,9 @@ module.exports = {
        * 
        */
       if (passport_config.strategy.facebook.allow) {
-        _app_.get(auth_endpoint + '/facebook', passport.authenticate('facebook', { scope: ['email', 'pages_show_list'] }));
+        _app_.get(auth_endpoint + '/facebook', passport.authenticate('facebook', { scope: [ 'email', 'public_profile' ] }));
         // facebook callback
-        const facebookCallback = (passport_config.strategy.facebook.callbackURL) ? (passport_config.strategy.facebook.callbackURL[0] === "/" ? passport_config.strategy.facebook.callbackURL : "/" + passport_config.strategy.facebook.callbackURL) : "/facebook/callback";
+        const facebookCallback = (passport_config.strategy.facebook.callbackURL) ? (passport_config.strategy.facebook.callbackURL[ 0 ] === "/" ? passport_config.strategy.facebook.callbackURL : "/" + passport_config.strategy.facebook.callbackURL) : "/facebook/callback";
         _app_.get(auth_endpoint + facebookCallback, passport.authenticate('facebook', { failureRedirect: passport_config.strategy.facebook.failureRedirect, failureMessage: true }), (req, res) => {
           if (typeof req.user.user !== 'undefined') {
             // declare user for sign JWT
@@ -224,7 +226,7 @@ module.exports = {
             });
           } else {
             let condUser = {};
-            condUser[(passport_config.strategy.facebook.local_profile_fields.facebook_id) ? passport_config.strategy.facebook.local_profile_fields.facebook_id : "facebook_id"] = req.user.facebook.id;
+            condUser[ (passport_config.strategy.facebook.local_profile_fields.facebook_id) ? passport_config.strategy.facebook.local_profile_fields.facebook_id : "facebook_id" ] = req.user.facebook.id;
             Beech.findOne([], condUser, (err, result) => {
               if (err) {
                 res.status(500).json({
@@ -234,7 +236,7 @@ module.exports = {
                   error: err
                 });
               } else {
-                let user = JSON.parse(JSON.stringify(result[0]));
+                let user = JSON.parse(JSON.stringify(result[ 0 ]));
                 const accessToken = jwt.sign(user, passport_config.secret, {
                   expiresIn: passport_config.token_expired
                 });

package/packages/package.json

@@ -8,7 +8,8 @@
     "test": "node ./node_modules/jest/bin/jest __tests__ -o --watch --config"
   },
   "dependencies": {
-    "beech-api": "^3.5.5",
+    "beech-api": "^3.5.11",
+    "nodemon": "^3.0.1",
     "sqlite3": "^5.0.11",
     "tedious": "^15.0.1"
   },

package/packages/src-/Add-on.js

@@ -0,0 +1,9 @@
+//const Users = require("@/models/Users");
+
+exports.init = () => {
+
+  //Users.findAll().then(console.log)
+
+  console.log("Add-on is work!")
+
+}

package/packages/src-/endpoints/hello-endpoints.js

@@ -0,0 +1,118 @@
+const Beech = require("../../lib/beech");
+const Users = require("@/models/Users");
+const Users2 = require("@/models/Users-sqlite");
+const User2Sequelize = require("@/models/User2Sequelize");
+const Map_master = require("@/models/Map_master");
+
+exports.init = () => {
+  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
+
+  /@GET/
+  endpoint.get('/hello', Credentials, async (req, res) => {
+    // basic get method
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a GET request.';
+
+    /* await Users.findAll().then(e=> {
+      data.results = e
+    }); */
+
+    let fields = {
+      username: "eiei",
+      password: "xxx",
+      email: "bomb@bomb.com",
+      name: "jubu eiei"
+    }
+
+
+    /* Beech.store(fields, (err, result) => {
+      if(err) {
+        console.log(err);
+      } else {
+        console.log(result);
+      }
+    }); */
+
+    /* await Beech.findOne([], { id: 66 }, (err, result) => {
+      data.result = result
+    }) */
+
+    /* Beech.update({ username: "eiei", name: 'eiei222' }, 69, (err, result) => {
+      console.log(result);
+    }) */
+
+    data.result = await Users2.findAll(); // basic
+    //data.results = await User2Sequelize.findAll(); // sequelize
+    //data.results = await User2Sequelize.findUser2SequelizeById(7) // sequelize
+
+    //data.results = await Map_master.findAll() // sequelize
+
+
+
+
+
+    // @return
+    res.json(data);
+  });
+
+  /@POST/
+  endpoint.post('/hello', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.body.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a POST request.';
+    // @return
+    res.json(data);
+  });
+
+  /@PUT/
+  endpoint.put('/hello/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PUT request at /hello/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@PATCH/
+  endpoint.patch('/hello/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PATCH request at /hello/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@DELETE/
+  endpoint.delete('/hello/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a DELETE request at /hello/' + id;
+    // @return
+    res.json(data);
+  });
+}

package/packages/src-/endpoints/test2-endpoints.js

@@ -0,0 +1,75 @@
+// You can require something 
+
+exports.init = () => {
+  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
+
+  /@GET/
+	endpoint.get('/test2', Credentials, (req, res) => {
+    // basic get method
+		let data = {};
+    data.code = 200;
+    data.message = 'Got a GET request.';
+    // @return
+    res.json(data);
+	});
+
+  /@POST/
+  endpoint.post('/test2', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.body.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a POST request.';
+    // @return
+    res.json(data);
+  });
+
+  /@PUT/
+  endpoint.put('/test2/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PUT request at /test2/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@PATCH/
+  endpoint.patch('/test2/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PATCH request at /test2/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@DELETE/
+  endpoint.delete('/test2/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a DELETE request at /test2/' + id;
+    // @return
+    res.json(data);
+  });
+}

package/packages/src-/endpoints/testSequalize-endpoints.js

@@ -0,0 +1,23 @@
+const Users = require("@/models/Users");
+const Test = require("@/models/Test");
+
+exports.init = () => {
+  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
+
+  /@GET/
+	endpoint.get('/testSequalize', Credentials, async (req, res) => {
+    
+		let data = {};
+    data.code = 200;
+
+    data.results = await Users.getData();
+
+    data.resultTest = await Test.getData();
+
+    // @return
+    res.json(data);
+	});
+
+
+
+}

package/packages/src-/helpers/Test2.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test2.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test3.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test4.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/models/Jubu.js

@@ -0,0 +1,29 @@
+const data = [
+  { "id": 1, "name": "Oggy" },
+  { "id": 2, "name": "Jack" },
+  { "id": 3, "name": "The Cockroaches Gang" }
+];
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    return data;
+  },
+
+  // Example basic function get data from Database (must be return promise)
+  findAll() {
+    return new Promise((resolve, reject) => {
+      try {
+        // call mysql `default_db` connection
+        mysql.default_db.query("SELECT * FROM jubu", (err, results) => {
+          if (err) { reject(err) }
+          resolve(results);
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}

package/packages/src-/models/Jubu2.js

@@ -0,0 +1,20 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const Jubu2 = sql.default_db.define("jubu2", {
+  id: DataTypes.INTEGER,
+  examField1: DataTypes.STRING,
+  examField2: DataTypes.DATE,
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  async getJubu2ById(id) {
+    return await Jubu2.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from Database (must be return promise)
+  async findAll() {
+    return await Jubu2.findAll();
+  }
+
+}

package/packages/src-/models/Map_master.js

@@ -0,0 +1,22 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const Map_master = sql.mysql_first_db.define("map_master", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true    
+  },
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  async findMap_masterById(id) {
+    return await Map_master.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from Database (must be return promise)
+  async findAll() {
+    return await Map_master.findAll();
+  }
+
+}

package/packages/src-/models/Test.js

@@ -0,0 +1,29 @@
+const data = [
+  { "id": 1, "name": "Oggy" },
+  { "id": 2, "name": "Jack" },
+  { "id": 3, "name": "The Cockroaches Gang" }
+];
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    return data;
+  },
+
+  // Example basic function get data from MySQL (must be return promise)
+  findAll() {
+    return new Promise((resolve, reject) => {
+      try {
+        // call mysql `default_db` connection
+        mysql.default_db.query("SELECT * FROM test", (err, results) => {
+          if (err) { reject(err) }
+          resolve(results);
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}

package/packages/src-/models/Test2.js

@@ -0,0 +1,29 @@
+const data = [
+  { "id": 1, "name": "Oggy" },
+  { "id": 2, "name": "Jack" },
+  { "id": 3, "name": "The Cockroaches Gang" }
+];
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    return data;
+  },
+
+  // Example basic function get data from MySQL (must be return promise)
+  findAll() {
+    return new Promise((resolve, reject) => {
+      try {
+        // call mysql `default_db` connection
+        mysql.default_db.query("SELECT * FROM test2", (err, results) => {
+          if (err) { reject(err) }
+          resolve(results);
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}

package/packages/src-/models/User2Sequelize.js

@@ -0,0 +1,23 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const User2Sequelize = sql.mysql_first_db.define("users", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true    
+  },
+  name: DataTypes.STRING,
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  async findUser2SequelizeById(id) {
+    return await User2Sequelize.findOne({ where: { 'id': id } });
+  },
+
+  // Example basic function get all data from Database (must be return promise)
+  async findAll() {
+    return await User2Sequelize.findAll();
+  }
+
+}

package/packages/src-/models/Users-sqlite.js

@@ -0,0 +1,21 @@
+const Users = sql.sqlite_db.define("users", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true    
+  },
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  findUsersById(id) {
+    return Users.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from table users
+  findAll() {
+    return Users.findAll();
+  }
+
+}

package/packages/src-/models/Users.js

@@ -0,0 +1,53 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const Users = sql.mysql_first_db.define('users', {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true
+  },
+  username: DataTypes.STRING,
+  password: {
+    type: DataTypes.STRING,
+    set(value) {
+      // Storing passwords in plaintext in the database is terrible.
+      // Hashing the value with an appropriate cryptographic hash function is better.
+      this.setDataValue('password', hash(value));
+    }
+  },
+  name: DataTypes.STRING,
+});
+
+
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    let user = Users.findAll();
+    //console.log(user);
+    return user;
+  },
+
+  // Example basic function get data from MySQL (must be return promise)
+  findAll() {
+    return new Promise(async (resolve, reject) => {
+      try {
+
+        let raw = await sql.default_db.query("SELECT * FROM users LIMIT 1", { type: QueryTypes.SELECT }); // mysql
+        //let raw = await sql.second_db.query("SELECT * FROM usercon LIMIT 10"); // sqlite
+        // let raw = await this.sql.thirdth_db.query("SELECT TOP 10 * FROM usercon"); // mssql
+        
+        //console.log(sql);
+
+
+        resolve(raw);
+
+
+
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}

package/packages/src-/models/Uuuuuxxx.js

@@ -0,0 +1,23 @@
+const Uuuuuxxx = sql.second_db.define("uuuuuxxx", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true,
+  },
+  examField1: DataTypes.STRING, // asign more DataTypes see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+  examField2: DataTypes.DATE,
+});
+
+module.exports = {
+
+  // Example basic function get one by id
+  findUuuuuxxxById(id) {
+    return Uuuuuxxx.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from table uuuuuxxx
+  findAll() {
+    return Uuuuuxxx.findAll();
+  }
+
+}

package/packages/src-/models/xxx/Uuuuuxxx.js

@@ -0,0 +1,23 @@
+const Uuuuuxxx = sql.second_db.define("uuuuuxxx", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true,
+  },
+  examField1: DataTypes.STRING, // asign more DataTypes see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+  examField2: DataTypes.DATE,
+});
+
+module.exports = {
+
+  // Example basic function get one by id
+  findUuuuuxxxById(id) {
+    return Uuuuuxxx.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from table uuuuuxxx
+  findAll() {
+    return Uuuuuxxx.findAll();
+  }
+
+}