beech-api 3.5.12 → 3.7.0

package/packages/cli/core/generator/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 const logUpdate = require("log-update");
 const inquirer = require('inquirer');
+const walk = require("walk");
 
 class Generator {
   constructor() {
@@ -36,45 +37,134 @@ class Generator {
               this.make()
                 .then(make => resolve(make))
                 .catch(err => reject(err));
-            } else if (this.special.length > 10) {
-              if (this.special.substring(0, 10) == '--require=') {
-                // check space
-                if (this.extra) {
-                  resolve("\n Warning  Please remove a space(s) in special text `" + this.special + " " + this.extra + "...`");
-                  return;
-                }
-                let myRequire = this.special.substring(10);
-                myRequire = myRequire.split(',');
+            } else if (this.special == '--require' || this.special == '-R') {
+              // walking model files
+              const walkModelPromise = new Promise((resolve) => {
+                let walker = walk.walk("./src/models", { followLinks: false });
+                let modelFiles = [];
+                walker.on("file", (root, stat, next) => {
+                  let subFolderModel = root.split("src/models\\")[1];
+                  modelFiles.push((subFolderModel ? subFolderModel + "/" : "") + stat.name.split('.')[0]);
+                  next();
+                });
+                walker.on("end", () => {
+                  if(modelFiles.length) {
+                    inquirer.prompt([ {
+                      type: "checkbox",
+                      name: "selectModel",
+                      message: "Please select Models:",
+                      choices: modelFiles.map(e => e.replace(/\\/g, "/")),
+                    } ]).then(selected => {
+                      resolve(selected.selectModel);
+                    });
+                  } else {
+                    // model file not found, Only create endpoint
+                    resolve();
+                  }
+                });
+              });
+              Promise.all([walkModelPromise]).then((modelSelected) => {
+                let myModel = modelSelected[0];
                 // check require model exists
-                this.isModelFound(myRequire)
-                  .then(notExistsModel => {
-                    if (notExistsModel == true) {
-                      // generate & require
-                      if (!this.special) {
-                        resolve("\n Warning  Please specify require file(s).");
-                      } else {
-                        // declare require model file
-                        let rqr = myRequire.map(data => {
-                          let modelName = data.split('/');
-                          modelName = modelName.pop();
-                          modelName = modelName.charAt(0).toUpperCase() + modelName.slice(1);
-                          return `const ${modelName} = require(\"@/models/${data.substring(0, data.lastIndexOf('/') + 1) + modelName}\");\n`;
+                const modelExistsPromise = new Promise((resolve, reject) => {
+                  this.isModelFound(myModel)
+                    .then(existsModel => {
+                      // check exists model
+                      if (existsModel == false) {
+                        inquirer.prompt([ {
+                          type: "confirm",
+                          name: "confirmModelNF",
+                          message: "Model is not found, Do you only create Endpoint ?:",
+                        } ]).then(confirm => {
+                          if(confirm.confirmModelNF) {
+                            resolve([true, []]);
+                          } else {
+                            resolve([false, []]);
+                          }
                         });
-                        // make with require model file
-                        this.make(rqr)
-                          .then(make => resolve(make))
-                          .catch(err => reject(err));
+                      } else {
+                        resolve([true, myModel]);
                       }
-                    } else {
-                      resolve("\n Warning  The model `" + notExistsModel + "` it's not found.");
-                      return;
-                    }
-                  })
-                  .catch(err => { throw err });
-              } else {
-                resolve("\n Faltal  commnad it's not available.");
-              }
-            } else if (this.special == '--model') {
+                    })
+                    .catch(err => reject(err));
+                });
+                // promise all check choose model(s)
+                Promise.all([modelExistsPromise]).then((modelRes) => {
+                  // Say Yes, Making...
+                  if(modelRes[0][0]) {
+                    const poolBasePromise = new Promise((resolve) => {
+                      // Check global config for prepare tmp endpoint
+                      this.fs.readFile("./global.config.js", 'utf8', (err, data) => {
+                        if (err) {
+                          console.log("\n Faltal  Can't read `global.config.js` file.\n", err);
+                          return; // break;
+                        } else {
+                          let buffer = Buffer.from(data);
+                          let buf2str = buffer.toString();
+                          let buf2json = JSON.parse(JSON.stringify(buf2str));
+                          let pool_base = /global.pool_base\s+=\s+(?:"|')([^"]+)(?:"|')(?:\r|\n|$|;|\r)/i.exec(buf2json);
+                          if (pool_base) {
+                            let myRequire = modelRes[0][1];
+                            if (pool_base[ 1 ] == "basic") {
+                              if(myRequire.length) {
+                                // declare basic require model file
+                                let rqr = "";
+                                myRequire.map((data, key) => {
+                                  let modelName = data.split('/');
+                                  let modelFolder = "";
+                                  modelName = modelName.pop();
+                                  modelName = modelName.charAt(0).toUpperCase() + modelName.slice(1);
+                                  modelFolder = data.substring(0, data.lastIndexOf('/') + 1).replace(/\\/g, "/");
+                                  rqr += `const ${modelName} = require(\"@/models/${modelFolder + modelName}\");\n`;
+                                  if(myRequire.length == key+1) {
+                                    resolve([[rqr], myRequire]);
+                                  }
+                                });
+                              } else {
+                                resolve([[]]);
+                              }
+                            } else if (pool_base[ 1 ] == "sequelize") {
+                              // check null require resolve it
+                              if(myRequire.length) {
+                                // declare basic require model file
+                                let rqr = "";
+                                myRequire.map((data, key) => {
+                                  let modelName = data.split('/');
+                                  let modelFolder = "";
+                                  modelName = modelName.pop();
+                                  modelName = modelName.charAt(0).toUpperCase() + modelName.slice(1);
+                                  modelFolder = data.substring(0, data.lastIndexOf('/') + 1).replace(/\\/g, "/");
+                                  rqr += `const { ${modelName}, exampleFindOne${modelName}ById } = require(\"@/models/${modelFolder + modelName}\");\n`;
+                                  if(myRequire.length == key+1) {
+                                    resolve([[rqr], myRequire]);
+                                  }
+                                });
+                              } else {
+                                resolve([[]]);
+                              }
+                            } else {
+                              console.log("\n Faltal  The pool_base in `global.config.js` file does not match the specific.");
+                            }
+                          } else {
+                            console.log("\n Faltal  The pool_base in `global.config.js` file is not found.");
+                          }
+                        }
+                      });
+                    });
+                    // Final promise for make
+                    Promise.all([poolBasePromise]).then((rqrRes) => {
+                      // make with require model file
+                      this.make(rqrRes[0])
+                        .then(make => resolve(make))
+                        .catch(err => reject(err));
+                    });
+                  } else {
+                    // Say No, Nothing...
+                    resolve(": Say no.");
+                  }
+                });
+              });
+            } else if (this.special == '--model' || this.special == '-M') {
               this.makeModel()
                 .then(make => resolve(make))
                 .catch(err => reject(err));
@@ -94,10 +184,26 @@ class Generator {
           } else {
             resolve("\n Warning  Using `passport init` for initiate passport-jwt.");
           }
-        } else if (this.option == "key:generate") {
+        } else if (this.option == "key:generate" || this.option == "key:gen") {
           this.generateKeyConfigFile()
             .then(resGenKey => resolve(resGenKey))
             .catch(err => reject(err));
+        } else if (this.option && this.option.slice(0, 5) == 'hash:') {
+          if(this.option.length > 5) {
+            const { HashIt, Z } = require(__dirname + "/../helpers/math");
+            Z((err, ak) => {
+              if(err) {
+                logUpdate(err);
+              } else {
+                let txt = this.option.split(":");
+                HashIt(txt, ak, null, (5).toString().length, (hashed) => {
+                  logUpdate(hashed);
+                });
+              }
+            });
+          } else {
+            resolve("\n Info.  No text to hash.");
+          }
         } else if (this.option == "add-on") {
           if (this.argument == "init") {
             this.makeAddOnInit()
@@ -107,7 +213,10 @@ class Generator {
             resolve("\n Warning  Using `add-on init` for initiate add-on.");
           }
         } 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);
@@ -118,7 +227,8 @@ class Generator {
   make(rq = null) {
     return new Promise((resolve, reject) => {
       try {
-        let tmpEndpointsPath = __dirname + '/_endpoints';
+        // prepare data
+        let tmpEndpointsPath = __dirname;
         let tmpSpecPath = __dirname + '/_spec';
         let endpointsPath = './src/endpoints/';
         let testPath = './__tests__/unit/endpoints/';
@@ -127,42 +237,129 @@ class Generator {
         arg = arg.split('/');
         let endpoints = arg.pop();
         let subFolder = arg.join('/');
-        // endpoints
+        // endpoints file
         let fullEndpoints = endpointsPath + subFolder.concat('/') + endpoints.concat('-endpoints.js');
         let routeEndpoints = ((arg.length > 0) ? '/' : '') + subFolder.concat('/') + endpoints;
-        // test
+        // test file
         let fullTest = testPath + subFolder + '/' + endpoints.concat('-endpoints.spec.js');
+
+        // Check exists endpoint file
         if (!this.fs.existsSync(fullEndpoints)) {
-          // prepare state require file if `rq` not exists
-          let rqFile = '// You can require something \n';
-          // check exists requrie files
-          if (rq) {
-            rqFile = '';
-            // make require multiples line
-            rq.map((data) => {
-              rqFile += data;
-            })
-          }
-          // generater endpoint
-          this.makeFolder(endpointsPath + subFolder)
-            .then(this.copy.bind(this, tmpEndpointsPath, fullEndpoints))
-            .then(this.contentReplace.bind(this, fullEndpoints, {
-              'endpoint': routeEndpoints,
-              'endpointName': endpoints,
-              'rq': rqFile
-            }))
-            // generater test
-            .then(this.makeFolder.bind(this, testPath + subFolder))
-            .then(this.copy.bind(this, tmpSpecPath, fullTest))
-            .then(this.contentReplace.bind(this, fullTest, {
-              'endpoint': routeEndpoints,
-              'endpointName': endpoints
-            }))
-            .then(logUpdate("\n Processing  The endpoint `" + endpoints + "` it's generating..."))
-            .then(generated => logUpdate(generated))
-            .catch(err => {
-              throw err;
+          // STEP 0 : Check global config for prepare tmp endpoint
+          const promise0 = new Promise((resolve) => {
+            this.fs.readFile("./global.config.js", 'utf8', (err, data) => {
+              if (err) {
+                console.log("\n Faltal  Can't read `global.config.js` file.", err);
+                resolve([false, null, null]);
+              } else {
+                let buffer = Buffer.from(data);
+                let buf2str = buffer.toString();
+                let buf2json = JSON.parse(JSON.stringify(buf2str));
+                let pool_base = /global.pool_base\s+=\s+(?:"|')([^"]+)(?:"|')(?:\r|\n|$|;|\r)/i.exec(buf2json);
+                if (pool_base) {
+                  if (pool_base[ 1 ] == "basic") {
+                    resolve([true, tmpEndpointsPath += '/_endpoints_basic', pool_base[ 1 ]]);
+                  } else if (pool_base[ 1 ] == "sequelize") {
+                    resolve([true, tmpEndpointsPath += '/_endpoints', pool_base[ 1 ]]);
+                  } else {
+                    console.log("\n Faltal  The pool_base in `global.config.js` file does not match the specific.");
+                    resolve([false, null, null]);
+                  }
+                } else {
+                  console.log("\n Faltal  The pool_base in `global.config.js` file is not found.");
+                  resolve([false, null, null]);
+                }
+              }
             });
+          });
+
+          // STEP 1 : format Model for base use [Users, Xxx, ...]
+          const promise1 = new Promise((resolve) => {
+            if(rq) {
+              if(rq[1]) {
+                let finalUseModel = [];
+                rq[1].map((data, key) => {
+                  let lastModel = data.split("/");
+                  finalUseModel.push(lastModel.pop());
+                  if(rq[1].length == key+1) {
+                    resolve(finalUseModel);
+                  }
+                });
+              } else {
+                resolve([]);
+              }
+            } else {
+              resolve([]);
+            }
+          });
+
+          // STEP 2 : Format Require model file
+          const promise2 = new Promise((resolve) => {
+            // prepare state require file if `rq[0]` not exists
+            let requireFile = '// You can require something \n';
+            // check exists requrie files
+            if(rq) {
+              if (rq[0].length) {
+                requireFile = '';
+                // make require multiples line
+                rq[0].map((data, key) => {
+                  requireFile += data;
+                  if(rq[0].length == key+1) {
+                    //setTimeout(() => {
+                      resolve(requireFile);
+                    //}, 2000);
+                  }
+                })
+              } else {
+                resolve(requireFile);
+              }
+            } else {
+              resolve(requireFile);
+            }
+          });
+          // promise all generate endpoint with require(s)
+          Promise.all([promise0, promise1, promise2]).then((rqFileRes) => {
+            /**
+             * @return
+             * 
+             * rqFileRes[0] : Array[0 = global file true, 1 = tmp endpoint file, 2 = pool_base type ]
+             * rqFileRes[1] : Array[Users, ...] array tables
+             * rqFileRes[2] : Text require file
+             * 
+             */
+            // check global file exists.
+            if(rqFileRes[0][0]) {
+              logUpdate(": Initialize...");
+              // check for remove / slash from route endpoint
+              if(rqFileRes[0][2] == 'sequelize') {
+                routeEndpoints = routeEndpoints.replace(/\\|\//g,'');
+              }
+              // timeout generate endpoint and replace content
+              setTimeout(() => {
+                // generater endpoint
+                this.makeFolder(endpointsPath + subFolder)
+                  .then(this.copy.bind(this, tmpEndpointsPath, fullEndpoints))
+                  .then(this.contentReplace.bind(this, fullEndpoints, {
+                    'endpoint': routeEndpoints,
+                    'endpointName': endpoints,
+                    'rq': rqFileRes[2],
+                    'tables': rqFileRes[1],
+                  }))
+                  // generater test
+                  .then(this.makeFolder.bind(this, testPath + subFolder))
+                  .then(this.copy.bind(this, tmpSpecPath, fullTest))
+                  .then(this.contentReplace.bind(this, fullTest, {
+                    'endpoint': routeEndpoints,
+                    'endpointName': endpoints
+                  }))
+                  .then(logUpdate("\n Processing   The endpoint `" + endpoints + "` it's generating..."))
+                  .then(generated => logUpdate(generated))
+                  .catch(err => {
+                    throw err;
+                  });
+              }, 2000);
+            }
+          });
         } else {
           resolve("\n Warning  The endpoint `" + endpoints + "` it's duplicated.");
         }
@@ -175,16 +372,22 @@ class Generator {
   isModelFound(modelArr) {
     return new Promise((resolve, reject) => {
       try {
-        let n = 1;
-        modelArr.map((data) => {
-          if (!this.fs.existsSync('./src/models/' + data.concat('.js'))) {
-            resolve(data);
-          }
-          if (modelArr.length == n) {
-            resolve(true);
+        if(modelArr !== undefined) {
+          if(modelArr.length) {
+            modelArr.map((data, key) => {
+              if (!this.fs.existsSync('./src/models/' + data.concat('.js'))) {
+                resolve(data);
+              }
+              if (modelArr.length == key+1) {
+                resolve(true);
+              }
+            });
+          } else {
+            resolve(false);
           }
-          n++;
-        })
+        } else {
+          resolve(false);
+        }
       } catch (error) {
         reject(error);
       }
@@ -199,7 +402,7 @@ class Generator {
         // read global.config.js file for check pool_base for generate model file
         this.fs.readFile("./global.config.js", 'utf8', (err, data) => {
           if (err) {
-            throw err;
+            resolve("\n Faltal  Can't read `global.config.js` file.", err);
           } else {
             let buffer = Buffer.from(data);
             let buf2str = buffer.toString();
@@ -209,7 +412,7 @@ class Generator {
               // read app.config.js file for get db connect name
               this.fs.readFile("./app.config.js", 'utf8', (appErr, appData) => {
                 if (appErr) {
-                  throw appErr;
+                  resolve("\n Faltal  Can't read `app.config.js` file.", appErr);
                 } else {
                   let appBuffer = Buffer.from(appData);
                   let appBuf2str = appBuffer.toString();
@@ -224,7 +427,7 @@ class Generator {
                   } ]).then(dbSelected => {
                     // check pool_base
                     if (pool_base[ 1 ] == "basic") {
-                      tmpModelsPath += '/_basic-models';
+                      tmpModelsPath += '/_models_basic';
                       this.generateModel(tmpModelsPath, dbSelected.selectDbConnect)
                         .then(console.log)
                         .catch(console.log);
@@ -234,13 +437,13 @@ class Generator {
                         .then(console.log)
                         .catch(console.log);
                     } else {
-                      resolve("\n Faltal  The pool_base does not match the specific.");
+                      resolve("\n Faltal  The pool_base in `global.config.js` file does not match the specific.");
                     }
                   });
                 }
               });
             } else {
-              resolve("\n Faltal  The pool_base not found.");
+              resolve("\n Faltal  The pool_base in `global.config.js` file is not found.");
             }
           }
         });
@@ -386,7 +589,7 @@ class Generator {
     return new Promise((resolve, reject) => {
       try {
         if (!this.fs.existsSync(to)) {
-          if (this.fs.createReadStream(path).pipe(this.fs.createWriteStream(to))) {
+          if (this.fs.ReadStream(path).pipe(this.fs.createWriteStream(to))) {
             resolve(to);
           } else {
             throw err;
@@ -407,6 +610,7 @@ class Generator {
         let endpointName = textCondition.endpointName;
         let rq = textCondition.rq;
         let modelName = textCondition.modelName;
+        let tables = textCondition.tables;
         // delay for generator
         setTimeout(() => {
           this.fs.readFile(pathFile, 'utf8', (err, data) => {
@@ -418,14 +622,17 @@ class Generator {
               text = text.replace(new RegExp('{{endpointName}}', 'g'), endpointName);
               text = text.replace(new RegExp('{{requireSomething}}', 'g'), rq);
               text = text.replace(new RegExp('{{modelName}}', 'g'), modelName);
-              // writing the file
-              this.fs.writeFile(pathFile, text, 'utf8', (err) => {
-                if (err) {
-                  throw err;
-                } else {
-                  resolve("\n Passed  The endpoint `" + endpointName + "` it's generated.");
-                }
-              });
+              text = text.replace(new RegExp('{{tables}}', 'g'), tables ? tables : "// You can use Base([Tables, ...])");
+              setTimeout(() => {
+                // writing the file
+                this.fs.writeFile(pathFile, text, 'utf8', (err) => {
+                  if (err) {
+                    throw err;
+                  } else {
+                    resolve("\n Passed  The endpoint `" + endpointName + "` it's generated.");
+                  }
+                });
+              }, 1000);
             }
           })
         }, 1000);
@@ -473,7 +680,7 @@ class Generator {
     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;
@@ -499,7 +706,7 @@ class Generator {
             let buf2str = buffer.toString();
             let buf2json = JSON.parse(JSON.stringify(buf2str));
             let buf2eval = eval(buf2json);
-            let oldSecret = buf2eval.main_config.app_secret;
+            let oldSecret = buf2eval.main_config.app_key;
             // generate new key secret
             this.appKeyGenerator(8).then(newAppSecret => {
               // content replace

package/packages/cli/core/helpers/math.js

@@ -0,0 +1,55 @@
+const secret = require("../../../lib/src/salt").salt;
+const Cryptr = require("cryptr");
+const md5 = require("md5");
+const fs = require("fs");
+const appRoot = require("app-root-path");
+
+function Rand(length) {
+  let result = "";
+  const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789".concat(Math.floor(Math.random() * 1000000000));
+  const charactersLength = characters.length;
+  let counter = 0;
+  while (counter < length) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    counter += 1;
+  }
+  return result;
+}
+
+function HashIt(txt, app_key, iteration = 10000, len = 10, cb) {
+  const crypIt = new Cryptr(secret.toString().concat(app_key.toString()), { encoding: "base64url", pbkdf2Iterations: iteration, saltLength: len, });
+  cb(crypIt.encrypt(txt.concat(md5(secret).toString().slice(0,len+1))));
+}
+
+function getAppKey(cb) {
+  // chcek app.config file for Dev. || Prd.
+  if(fs.existsSync(appRoot + "/app.config.js")) {
+    cb(null, require(appRoot + "/app.config.js").main_config.app_key);
+  } else {
+    fs.readFile("./app.config.js", 'utf8', (err, e) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        cb(null, eval(e).main_config.app_key);
+      }
+    });
+  }
+}
+
+function DeHashIt(txtHashed, iteration = 10000, len = 10, cb) {
+  try {
+    getAppKey((err, app_key) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        const crypIt = new Cryptr(secret.toString().concat(app_key.toString()), { encoding: "base64url", pbkdf2Iterations: iteration, saltLength: len, });
+        let decryped = crypIt.decrypt(txtHashed);
+        cb(false, decryped.concat(md5(secret).toString()));
+      }
+    });
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+module.exports = { Rand, HashIt, DeHashIt, X:secret, M:md5, Z:getAppKey };

package/packages/cli/core/helpers/poolEntity.js

@@ -0,0 +1,31 @@
+function findPassportPk(pool_base, pool, passportTable, passportConfigField, cb) {
+  try {
+    if(passportConfigField.length) {
+      cb(null, passportConfigField);
+    } else {
+      if(pool_base == "basic") {
+        // pool base is Basic
+        pool.query("SHOW KEYS FROM " + passportTable + " WHERE Key_name = 'PRIMARY'", (err, pk) => {
+          if(err) {
+            throw "Authentication table: " + err;
+          } else {
+            cb(null, [pk[0].Column_name]);
+          }
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        pool.query("SHOW KEYS FROM " + passportTable + " WHERE Key_name = 'PRIMARY'", { type: QueryTypes.SELECT }).then((pk) => {
+          cb(null, [pk[0].Column_name]);
+        }).catch((err) => {
+          throw "Authentication table: " + err;
+        });
+      } else {
+        throw "The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'";
+      }
+    }
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+module.exports = { findPassportPk }