beech-api 3.5.12 → 3.7.0

package/index.js

@@ -1,3 +1,2 @@
-module.exports = {
-  User: require('./packages/lib/beech')
-}
+const { Base, Schema, Store, Update } = require("./packages/lib/index");
+module.exports = { Base, Schema, Store, Update };

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "beech-api",
-  "version": "3.5.12",
+  "version": "3.7.0",
   "description": "Command line interface for rapid Beech API development",
   "keywords": [
     "api",
+    "node-api",
     "api-framework",
     "beech-api",
     "cli",
@@ -17,7 +18,7 @@
   },
   "authors": "bombkiml",
   "bin": {
-    "beech-app": "./packages/cli/bin/beech.js",
+    "beech-app": "./packages/cli/bin/beech-app.js",
     "beech-service": "./packages/cli/bin/beech-service.js",
     "beech": "./packages/cli/core/generator/index.js"
   },
@@ -32,10 +33,12 @@
   "dependencies": {
     "app-root-path": "^3.0.0",
     "axios": "^0.26.1",
+    "child-process-promise": "^2.2.1",
     "cli-clear": "^1.0.4",
     "cookie-parser": "1.4.3",
     "cors": "^2.8.1",
-    "express": "4.16.3",
+    "cryptr": "^6.3.0",
+    "express": "4.19.2",
     "express-session": "^1.17.1",
     "express-validator": "2.21.0",
     "fs": "0.0.1-security",
@@ -43,11 +46,12 @@
     "jsonwebtoken": "^8.5.1",
     "log-update": "^4.0.0",
     "md5": "^2.3.0",
+    "method-override": "^3.0.0",
     "mkdirp": "^2.1.6",
     "module-alias": "^2.2.2",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.3",
-    "node-cmd": "^3.0.0",
+    "node-emoji": "^1.11.0",
     "node-notifier": "^10.0.1",
     "passport": "^0.6.0",
     "passport-facebook": "^3.0.0",
@@ -61,8 +65,7 @@
   },
   "devDependencies": {
     "jest": "^28.1.3",
-    "node-dev": "^8.0.0",
-    "nodemon": "^3.0.1",
+    "nodemon": "^3.1.0",
     "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.6
- * @built Aug 14, 2023 at 00:09:19
+ * @version 3.7
+ * @built Apr 19, 2024 at 16:20:09
  *
  */
 (process.argv[2]) ? require('./core/generator/index') : require('./core/index')

package/packages/cli/bin/{beech.js → beech-app.js}

@@ -41,6 +41,8 @@ class Beech {
           let pasteGloablConfigFile = this.argument + '/global.config.js';
           let tmpGitignoreFile = __dirname + '/../core/configure/_gitignore';
           let pasteGitignoreFile = this.argument + '/.gitignore';
+          let tmpBeechConfigFile = __dirname + '/../core/configure/beech.config.js';
+          let pasteBeechConfigFile = this.argument + '/beech.config.js';
           // start log clear screen
           clear();
           logUpdate("Beech CLI v" + require(__dirname + "/../../../package.json").version);
@@ -63,22 +65,27 @@ class Beech {
                   message: "Check the features needed for your project:",
                   choices: [ "Add-Ons", "Basic Helper", "Passport / JWT / Official Strategy Google, Facebook" ],
                 } ]).then(resFreat => {
-                  // init project
-                  this.makeFolder(this.argument)
-                    .then(this.copy.bind(this, tmpPackageFile, pastePackageFile))
-                    .then(this.contentReplace.bind(this, pastePackageFile, { 'application': this.argument }))
-                    .then(this.copy.bind(this, tmpConfigFile, pasteConfigFile))
-                    .then(this.copy.bind(this, tmpJestFile, pasteJestFile))
-                    .then(this.copy.bind(this, tmpJsConfigFile, pasteJsConfigFile))
-                    .then(this.copy.bind(this, tmpDotSequelizercFile, pasteDotSequelizercFile))
-                    .then(this.copy.bind(this, tmpGloablConfigFile, pasteGloablConfigFile))
-                    .then(this.copy.bind(this, tmpGitignoreFile, pasteGitignoreFile))
-                    .then(this.generateKeyConfigFile.bind(this, this.argument))
-                    .then(this.installPackage.bind(this, this.argument, resFreat.freature))
-                    .then(console.log("\n Processing  The Application `" + this.argument + "` is creating...\n"))
-                    .catch((err) => {
-                      throw err;
-                    });
+                  logUpdate(": Initialize...");
+                  setTimeout(() => {
+                    // init project
+                    this.makeFolder(this.argument)
+                      .then(this.copy.bind(this, tmpPackageFile, pastePackageFile))
+                      //.then(this.contentReplace.bind(this, pastePackageFile, { 'application': this.argument }))
+                      .then(this.copy.bind(this, tmpConfigFile, pasteConfigFile))
+                      .then(this.copy.bind(this, tmpJestFile, pasteJestFile))
+                      .then(this.copy.bind(this, tmpJsConfigFile, pasteJsConfigFile))
+                      .then(this.copy.bind(this, tmpDotSequelizercFile, pasteDotSequelizercFile))
+                      .then(this.copy.bind(this, tmpGloablConfigFile, pasteGloablConfigFile))
+                      .then(this.copy.bind(this, tmpGitignoreFile, pasteGitignoreFile))
+                      .then(this.copy.bind(this, tmpBeechConfigFile, pasteBeechConfigFile))
+                      .then(this.contentReplace.bind(this, pastePackageFile, { 'application': this.argument }))
+                      .then(this.generateKeyConfigFile.bind(this, this.argument))
+                      .then(this.installPackage.bind(this, this.argument, resFreat.freature))
+                      .then(console.log("\n Processing   The Application `" + this.argument + "` is creating...\n"))
+                      .catch((err) => {
+                        throw err;
+                      });
+                  }, 2000);
                 });
               });
             } else {
@@ -87,11 +94,62 @@ class Beech {
           } else {
             resolve("\n Warning  Please specify your project name.");
           }
+        } else if (this.option == "update") {
+          // upgrade the beech-api package
+          let isGlobalYarn = "yarn add beech-api";
+          let isGlobalNpm = "npm update beech-api";
+          let processUpdate = null;
+          let lineStdout = "";
+          if (this.argument == '-g' || this.argument == '--global') {
+            isGlobalNpm = "npm update beech-api -g";
+            isGlobalYarn = "yarn global add beech-api";
+          }
+          // prompt select
+          inquirer.prompt([ {
+            type: "list",
+            name: "package",
+            message: "Please pick a package control:",
+            choices: [ "NPM", "Yarn" ],
+          } ]).then(selectedPackage => {
+            logUpdate(": Initialize...");
+            // delay for update package
+            setTimeout(() => {
+              if(selectedPackage.package == "NPM") {
+                processUpdate = this.cmd.get(isGlobalNpm, (err) => {
+                  if (err) { throw err }
+                });
+                // npm install line shoutout
+                processUpdate.stdout.on('data', (npmData) => {
+                  lineStdout += npmData;
+                  if (lineStdout[ lineStdout.length - 1 ] == '\n') {
+                    logUpdate('\n' + lineStdout);
+                  }
+                });
+              } else if(selectedPackage.package == "Yarn") {
+                processUpdate = this.cmd.get(isGlobalYarn, (err) => {
+                  if (err) { throw err }
+                });
+                // yarn install line shoutout
+                processUpdate.stdout.on('data', (yarnData) => {
+                  lineStdout += yarnData;
+                  if (lineStdout[ lineStdout.length - 1 ] == '\n') {
+                    logUpdate('\n' + lineStdout);
+                  }
+                });
+              } else {
+                logUpdate("\n Faltal  Catch update package. Try again...");
+                return;
+              }
+            }, 1000);
+          });
         } else {
-          resolve("\n Faltal  commnad it's not available.");
+          // help for see avaliable command
+          this.help()
+            .then(help => resolve(help))
+            .catch(err => reject(err));
         }
       } catch (error) {
-        reject(error);
+        throw error;
       }
     });
   }
@@ -138,13 +196,13 @@ class Beech {
     return new Promise((resolve, reject) => {
       try {
         let helperPath = argument + '/src/helpers/';
-        let tmpBasicHelperFile = __dirname + '/../core/generator/_basic-helpers';
+        let tmpBasicHelperFile = __dirname + '/../core/generator/_helpers_basic';
         let pasteBasicHelperFile = helperPath + '/Basic.js';
         let freatureLength = freatureArr.length;
         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');
+              (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech-app.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") {
@@ -152,7 +210,7 @@ class Beech {
               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');
+              (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech-app.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)) {
@@ -246,7 +304,7 @@ class Beech {
     return new Promise((resolve, reject) => {
       try {
         let md5 = require("md5");
-        let secret = require(__dirname + "/../../lib/salt").salt;
+        let secret = require(__dirname + "/../../lib/src/salt").salt;
         let result = '';
         let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
         let charactersLength = characters.length;
@@ -272,17 +330,17 @@ class Beech {
             let buf2str = buffer.toString();
             let buf2json = JSON.parse(JSON.stringify(buf2str));
             let buf2eval = eval(buf2json);
-            let oldSecret = buf2eval.main_config.app_secret;
-            // generate new key secret
-            this.appKeyGenerator(8).then(newAppSecret => {
+            let oldKey = buf2eval.main_config.app_key;
+            // generate new key
+            this.appKeyGenerator(8).then(newAppKey => {
               // content replace
-              let text = data.replace(new RegExp(oldSecret, 'g'), newAppSecret);
+              let text = data.replace(new RegExp(oldKey, 'g'), newAppKey);
               // writing the file
               this.fs.writeFile(pjName + "/app.config.js", text, 'utf8', (err) => {
                 if (err) {
                   throw err;
                 } else {
-                  resolve("\n Passed  App secret it's new generated.");
+                  resolve("\n Passed  App key it's new generated.");
                 }
               });
             });
@@ -297,7 +355,7 @@ class Beech {
   help() {
     return new Promise((resolve, reject) => {
       try {
-        this.fs.readFile(__dirname + "/../core/generator/_create", "utf8", (err, data) => {
+        this.fs.readFile(__dirname + "/../core/generator/_help_create", "utf8", (err, data) => {
           if (err) {
             reject(err);
           } else {

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

@@ -2,11 +2,8 @@
 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() {
@@ -29,21 +26,18 @@ class Beech {
           }
           // 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();
+            let testServ = require("http").createServer(_app_);
+            testServ.listen(this._config_.main_config.app_port, async () => {
+              await 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);
-              });
-
-            });
+              await this.serviceDevStart(this.argument);
+              // check turn on nofi
+              if (turnNoti) {
+                this.notiCompile();
+              }
+            }).on('error', (err) => {
+              console.log("\n Faltal ", err);
+            })
           } else {
             resolve("\n Faltal  The app.conifg.js file is not found.");
           }
@@ -52,8 +46,13 @@ class Beech {
           this.help()
             .then(help => resolve(help))
             .catch(err => reject(err));
+        } else if (this.option == "build") {
+          resolve("\n Notic.  The commnad it's not supported, Please wait for next version.");
         } else {
-          resolve("\n Faltal  commnad it's not available.");
+          // help for see avaliable command
+          this.help()
+            .then(help => resolve(help))
+            .catch(err => reject(err));
         }
       } catch (error) {
         reject(error);
@@ -61,181 +60,27 @@ class Beech {
     });
   }
 
-  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);
+  serviceDevStart(argument) {
+    logUpdate("Compiling...");
+    let promise = null;
+    // check Dev. run service
+    const spawnData = new Promise((resolve) => {
+      if(argument == "-D" || argument == "--dev") {
+        promise = this.spawn('npx', ['nodemon', '-q', './cli/beech']); // For Dev.
+      } else {
+        promise = this.spawn('npx', ['nodemon', '-q', './node_modules/beech-api/packages/cli/beech']); // For Prd.
       }
-    } 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();
-        }
+      resolve(promise.childProcess);
+    });
+    Promise.all([spawnData]).then((childProcess) => {
+      childProcess[0].stdout.on('data', (data) => {
+        console.log(data.toString().slice(0, -1));
       });
-    } 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());
+      childProcess[0].stderr.on('data', (data) => {
+        if(data.toString().slice(0, 8) != "Ignoring" && data.toString().match(/\[SEQUELIZE0006\]/g) != "[SEQUELIZE0006]") {
+          console.log(data.toString());
         }
-      }
-
+      });
     });
   }
 
@@ -251,27 +96,10 @@ class Beech {
     });
   }
 
-  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) => {
+        this.fs.readFile(__dirname + "/../core/generator/_help_service", "utf8", (err, data) => {
           if (err) {
             reject(err);
           } else {
@@ -288,10 +116,10 @@ class Beech {
     return new Promise((resolve, reject) => {
       try {
         this.fs = require("fs");
-        this.cmd = require('node-cmd');
+        this.spawn = require('child-process-promise').spawn;
         this.argv = argv;
-        this.option = argv[ 2 ];
-        this.argument = argv[ 3 ];
+        this.option = argv[ 2 ]; // serve|build
+        this.argument = argv[ 3 ]; // --silent -S | --dev -D
         this.configFile = path.resolve("./app.config.js");
         this._config_ = require(this.configFile);
         resolve(this);
@@ -302,4 +130,4 @@ class Beech {
   }
 }
 
-new Beech();
+new Beech();