beech-api 3.5.7 → 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,13 +1,14 @@
 {
   "name": "beech-api",
-  "version": "3.5.7",
+  "version": "3.7.0",
   "description": "Command line interface for rapid Beech API development",
   "keywords": [
+    "api",
+    "node-api",
+    "api-framework",
     "beech-api",
     "cli",
-    "api",
-    "nodejs",
-    "api-framework"
+    "nodejs"
   ],
   "license": "MIT",
   "repository": {
@@ -17,7 +18,8 @@
   },
   "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"
   },
   "bugs": {
@@ -26,15 +28,17 @@
   "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",
     "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",
@@ -42,11 +46,13 @@
     "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",
     "passport-google-oauth": "^2.0.0",
@@ -59,6 +65,7 @@
   },
   "devDependencies": {
     "jest": "^28.1.3",
+    "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.2
- * @built Apr 17, 2020 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,26 +196,30 @@ 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;
-        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-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") {
+              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-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)) {
+              resolve(true);
+            }
+          });
+        } else {
+          resolve(true);
+        }
       } catch (error) {
         reject(error);
       }
@@ -242,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;
@@ -268,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.");
                 }
               });
             });
@@ -293,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

@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+const logUpdate = require("log-update");
+const notifier = require("node-notifier");
+const path = require("path");
+const express = require("express");
+const _app_ = express();
+
+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)) {
+            let testServ = require("http").createServer(_app_);
+            testServ.listen(this._config_.main_config.app_port, async () => {
+              await testServ.close();
+              // Start real service.
+              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.");
+          }
+        } 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 if (this.option == "build") {
+          resolve("\n Notic.  The commnad it's not supported, Please wait for next version.");
+        } else {
+          // help for see avaliable command
+          this.help()
+            .then(help => resolve(help))
+            .catch(err => reject(err));
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  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.
+      }
+      resolve(promise.childProcess);
+    });
+    Promise.all([spawnData]).then((childProcess) => {
+      childProcess[0].stdout.on('data', (data) => {
+        console.log(data.toString().slice(0, -1));
+      });
+      childProcess[0].stderr.on('data', (data) => {
+        if(data.toString().slice(0, 8) != "Ignoring" && data.toString().match(/\[SEQUELIZE0006\]/g) != "[SEQUELIZE0006]") {
+          console.log(data.toString());
+        }
+      });
+    });
+  }
+
+  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"),
+    });
+  }
+
+  help() {
+    return new Promise((resolve, reject) => {
+      try {
+        this.fs.readFile(__dirname + "/../core/generator/_help_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.spawn = require('child-process-promise').spawn;
+        this.argv = argv;
+        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);
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+}
+
+new Beech();

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

@@ -7,50 +7,91 @@ module.exports = {
       // error check
       if (err) {
         console.log(err, info);
-        return next(err);
+        return res.status(401).json({
+          code: 401,
+          error: "UNAUTHORIZED",
+          message: {
+            name: "WrongTokenError",
+            message: "token error."
+          },
+          /* dev: { err, info } */ // for dev info
+        });
       }
       // anything token check
       if (!user) {
-        if (info.name == 'TokenExpiredError') {
-          return res.status(401).json({
-            code: 401,
-            status: 'error',
-            error: 'TOKEN_EXPIRED',
-            message: info
-          });
-        }
-        if (info.name == 'Error') {
-          return res.status(401).json({
-            code: 401,
-            status: 'error',
-            error: 'NO_AUTH_TOKEN',
-            message: {
-              name: 'NoTokenError',
-              message: 'No auth token'
-            }
-          });
-        }
-        if (info.name == 'SyntaxError') {
-          return res.status(401).json({
-            code: 401,
-            status: 'error',
-            error: 'PAYLOAD_SYNTAX_ERROR',
-            message: {
-              name: 'SyntaxError',
-              message: 'Unexpected token < in JSON at position 0'
-            }
-          });
+        if(info) {
+          if (info.name == 'TokenExpiredError') {
+            return res.status(401).json({
+              code: 401,
+              status: 'TOKEN_EXPIRED',
+              message: info
+            });
+          }
+          if (info.name == 'Error') {
+            return res.status(401).json({
+              code: 401,
+              status: 'NO_AUTH_TOKEN',
+              message: {
+                name: 'NoTokenError',
+                message: 'No auth token'
+              }
+            });
+          }
+          if (info.name == 'SyntaxError') {
+            return res.status(401).json({
+              code: 401,
+              status: 'PAYLOAD_SYNTAX_ERROR',
+              message: {
+                name: 'SyntaxError',
+                message: 'Unexpected token < in JSON at position 0'
+              }
+            });
+          }
         }
         return res.status(401).json({
           code: 401,
-          status: 'error',
-          error: 'UNAUTHORIZED_USER',
+          status: 'UNAUTHORIZED_USER',
           message: info
         });
       }
-      // Forward user information to the next middleware
-      req.user = user;
-      next();
+      // Check application key allow
+      const p1 = new Promise((resolve) => {
+        if (_passport_config_.app_key_allow) {
+          if (req.headers.app_key) {
+            if (_config_.main_config.app_key == req.headers.app_key) {
+              resolve(true);
+            } else {
+              res.status(401).json({
+                code: 401,
+                status: "BAD_REQUEST",
+                message: "Unauthorized with wrong key."
+              });
+            }
+          } else {
+            res.status(422).json({
+              code: 422,
+              status: "BAD_ENTIRY",
+              message: "Unprocessable Entity."
+            });
+          }
+        } else {
+          resolve(true);
+        }
+      });
+      Promise.all([p1]).then((passed) => {
+        if(passed) {
+          // Forward user information to the next middleware
+          req.user = user;
+          next();
+        } else {
+          // When wrong all case above.
+          res.status(401).json({
+            code: 401,
+            status: "ERR_UNAUTHORIZED_ENTIRY",
+            message: "Unauthorized with wrong key."
+          });
+        }
+      });
     })(req, res, next);
   }
 }