beech-api 3.8.0 → 3.9.0-beta.9-rc

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

@@ -27,7 +27,7 @@ connectInProcess = async (database_config, headDbShow, cb) => {
         // check hash ?
         if(val.username && val.password) {
           if(val.username.length < 55 || val.password < 55) {
-            return cb("Error: No Hash access for connect to database.\n", null);
+            return cb("Error: Incorrect Hash access for connect to database.\n", null);
           }
           let accessDb = [];
           [val.username, val.password].map((e, k) => {
@@ -102,7 +102,7 @@ connectInProcess = async (database_config, headDbShow, cb) => {
             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"),
+              collate: ((val.define) ? ((val.define.dialectOptions) ? ((val.define.dialectOptions.collate) ? val.define.dialectOptions.collate : "utf8_general_ci") : "utf8_general_ci") : "utf8_general_ci"),
             },
             timestamps: ((val.define) ? ((val.define.timestamps) ? val.define.timestamps : false) : false),
           },
@@ -125,11 +125,19 @@ connectInProcess = async (database_config, headDbShow, cb) => {
   
           // JSON response
           query: {
-            raw: ((val.query) ? ((val.query.raw) ? val.query.raw : true) : true),
+            raw: ((val.query) ? ((val.query.raw) ? val.query.raw : false) : false),
             nest: ((val.query) ? ((val.query.nest) ? val.query.nest : true) : true),
           }
         });
-  
+
+        // Hook to set `SET NAMES xxx` (ONLY MySQL)
+        await sq.addHook('afterConnect', async (connection) => {
+          if(val.dialect == "mysql") {
+            let charset = ["SET NAMES", ((val.define) ? ((val.define.charset) ? val.define.charset : "utf8") : "utf8")].join(" ");
+            connection.query(charset);
+          }
+        });
+
         // show only one text db connnections
         if (headDbShow) {
           console.log(' Passed  Database is connected at:');
@@ -144,7 +152,7 @@ connectInProcess = async (database_config, headDbShow, cb) => {
           // shuout
           console.log('- [' + val.dialect + '] ' + val.name + ' -> ' + sq.config.database + ':' + sq.config.port + '');
         }
-  
+
         // connection
         await sq.authenticate()
           .then(() => {
@@ -161,7 +169,8 @@ connectInProcess = async (database_config, headDbShow, cb) => {
             }
           })
           .catch(err => {
-            console.error('Unable to connect to the database:', err);
+            console.log("Unable to connect to the database:", err);
+            cb(err, null);
           });
       });
     } else {

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

@@ -2,6 +2,7 @@ const logUpdate = require("log-update");
 const emoji = require('node-emoji')
 const { DeHashIt, M, X } = require(__dirname + "/../helpers/math");
 const Sequelize = require('sequelize');
+const fs = require("fs");
 let testSql = {};
 
 function filterDbIsTrue(dbConfig, cb) {
@@ -17,7 +18,7 @@ function filterDbIsTrue(dbConfig, cb) {
         }
         setTimeout(() => {
           cb(null, dbIsTrue);
-        }, 300);
+        }, 200);
       }
     });
   } catch (error) {
@@ -25,42 +26,44 @@ function filterDbIsTrue(dbConfig, cb) {
   }
 }
 
-function testConnectInProcess (database_config, dbConnTotal, cb) {
+function testConnectInProcess(database_config, dbConnTotal, cb) {
   try {
+    // Recursive test connection
     let val = database_config.shift();
     if (val) {
-      initSequelize(val, async (err, sq) => {
+      initSequelize(val, true, async (err, sq) => {
         if (err) {
-          console.error(" Failed  Can't connect to connection name:", 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) {
+          //console.log(" Failed  Can't connect to connection name:", val.name, "\n", err);
+          return cb(err, null, null);
+        } else {
+          // 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);
+                  return cb(null, true, testSql);
+                }
+              } else {
                 testSql[ val.name ] = sq;
-                //console.log("DB true, Perfectly.", val.name);
-                cb(null, true, testSql);
+                testConnectInProcess(database_config, dbConnTotal, cb);
               }
-            } else {
-              testSql[ val.name ] = sq;
-              testConnectInProcess(database_config, dbConnTotal, cb);
-            }
-          })
-          .catch(err => {
-            console.error(" Failed  Unable to connect to the database:", val.name, "\n", err);
-            cb(err, null, null);
-          });
+            })
+            .catch(err => {
+              console.log(" Failed  Unable to connect to the database:", val.name, "\n", err);
+              return cb(err, null, null);
+            });
+        }
       });
     } else if (!dbConnTotal) {
       // All Database is falsly perfectly.
       //console.log("DB all false, Perfectly.");
-      cb(null, true, testSql);
+      return cb(null, true, testSql);
     }
   } catch (error) {
-    cb(error, null, null);
+    return cb(error, null, null);
   }
 }
 
@@ -88,33 +91,69 @@ function logit(msg, next = false) {
   }
 }
 
-function initSequelize(val, cb) {
+function initSequelize(val, testConn = true, cb) {
   try {
     const promise = new Promise((resolve) => {
       // check hash ?
       if(val.username && val.password) {
         if(val.username.length < 55 || val.password < 55) {
-          return cb("ERROR: No Hash access for connect to database.\n", null);
+          return cb("ERR: Incorrect Hash access for connect to database, Please Hashing your access by command `beech hash:<your_access>`\n", null);
         }
         let accessDb = [];
-        [val.username, val.password].map((e, k) => {
-          DeHashIt(e.toString(), null, (17).toString().slice(0,-1).length, (err, d) => {
-            if(!err) {
-              accessDb.push(d.split("sh,")[1].split(M(X).toString().slice(0,2)+M(X).toString())[0].slice(0,-1));
+        [val.username, val.password].map(async (e, k) => {
+          await DeHashIt(e.toString(), null, (17).toString().slice(0,-1).length, async (err, d) => {
+            if(err) {
+              cb("ERR: Hash access error,", err);
+              throw err;
+            }
+            accessDb.push(d.split("sh,")[1].split(M(X).toString().slice(0,2)+M(X).toString())[0].slice(0,-1));
+            // Finally username & password
+            if(k+1==2) {
+              // Last push dialect connection
+              accessDb.push(val.dialect);
+              // resolve it
+              resolve(accessDb);
             }
           });
-          if(k+1==2) {
-            resolve(accessDb);
-          }
         });
       } else {
         resolve([null, null]);
       }
     });
     Promise.all([promise]).then(final => {
-      // stdout pre-flight connection
-      logit(`- [${val.dialect}] ${val.name}`);
-      logit(emoji.get('heavy_multiplication_x') + `  [${val.dialect}] ${val.name}`);
+      /**
+       * The final callback variable : [['hashed', 'hashed', 'dialect']]
+       * 
+       * final[0][0] : username hashed
+       * final[0][1] : password hashed
+       * final[0][2] : dialect
+       * 
+       */
+
+      // Check test connection for stdout pre-flight
+      if(testConn) {
+        // stdout pre-flight connection
+        logit(`- [${val.dialect}] ${val.name}`);
+        logit(emoji.get('heavy_multiplication_x') + `  [${val.dialect}] ${val.name}`);
+      }
+      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) {
+            if(pool_base == "basic") {
+              if(final[0][2] != "mysql") {
+                return cb(`The Basic pool engine not support with: ${val.dialect}, Please use Sequelize engine.`, null);
+              }
+            }
+          }
+        }
+      });
       // create connection
       const sq = new Sequelize({
         dialect: val.dialect || "mysql",
@@ -157,7 +196,10 @@ function initSequelize(val, cb) {
           nest: ((val.query) ? ((val.query.nest) ? val.query.nest : true) : true),
         }
       });
-      logit(emoji.get('heavy_check_mark') + `  [${val.dialect}] ${val.name}`, true);
+      // Check test connection for stdout pre-flight (mark)
+      if(testConn) {
+        logit(emoji.get('heavy_check_mark') + `  [${val.dialect}] ${val.name}`, true);
+      }
       cb(false, sq);
     }).catch(err => {
       console.log(` Warning  Connection name \`${val.name}\``, err);
@@ -167,4 +209,48 @@ function initSequelize(val, cb) {
   }
 }
 
-module.exports = { filterDbIsTrue, testConnectInProcess, disConnectTestDB }
+function connectForGenerateModel(dbConnectName, tableName, databaseConfig, cb) {
+  /**
+   * Callback
+   * 
+   * err String : Error message
+   * tableSchema Object : Schema of table
+   * tableName String : table name
+   * 
+   */
+  const connectionChoose = databaseConfig.filter((e) => e.name == dbConnectName)[0];
+  initSequelize(connectionChoose, false, async (err, sq) => {
+    if (err) {
+      cb(err, null, null);
+    }
+    // Connection
+    await sq.authenticate()
+      .then(() => {
+        getTableSchema(sq, tableName, (errSchema, tableSchema) => {
+          if(errSchema) {
+            cb(errSchema, null, null);
+          } else {
+            // Closing database
+            sq.close();
+            // Callback
+            cb(null, tableSchema, tableName);
+          }
+        });
+      })
+      .catch(err => {
+        cb(err, null, null);
+      });
+  });
+}
+
+async function getTableSchema(sq, tableName, cb) {
+  try {
+    const queryInterface = sq.getQueryInterface();
+    const schema = await queryInterface.describeTable(tableName);
+    cb(null, schema);
+  } catch (error) {
+    cb("Fetching table schema " + error, null);
+  }
+}
+
+module.exports = { filterDbIsTrue, testConnectInProcess, disConnectTestDB, connectForGenerateModel }

package/packages/cli/core/generator/_models

@@ -1,29 +1,6 @@
 const { Schema } = require("beech-api");
 // {{modelNameUppercase}} structure
-const {{modelNameUppercase}} = Schema(sql.{{dbSelected}}).define("{{modelName}}", {
-  {{modelName}}_id: {
-    field: "id",
-    type: DataTypes.INTEGER,
-    autoIncrement: true,
-    primaryKey: true,
-  },
-  examField1: DataTypes.STRING,
-  examField3: DataTypes.DATE,
-  examField4: {
-    type: DataTypes.STRING,
-    allowNull: false,
-    // set(value) {
-    //   this.setDataValue("examField4", md5(value));
-    // },
-  },
-  createdAt: DataTypes.DATE,
-  updatedAt: DataTypes.DATE,
-  // Asign more DataTypes, Learn more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
-});
+{{modelStructure}}
+// Asign more DataTypes, Learn more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
 
-// Example basic function Get one data by id
-function exampleFindOne{{modelNameUppercase}}ById(id) {
-  return {{modelNameUppercase}}.findOne({ where: { id: id } });
-}
-
-module.exports = { {{modelNameUppercase}}, exampleFindOne{{modelNameUppercase}}ById };
+module.exports = { {{modelNameUppercase}} };

package/packages/cli/core/generator/_models_basic

@@ -1,14 +1,5 @@
 module.exports = {
 
-  // Example basic function return exam data
-  getData() {
-    return [
-      { "id": 1, "name": "Oggy" },
-      { "id": 2, "name": "Jack" },
-      { "id": 3, "name": "The Cockroaches Gang" }
-    ];
-  },
-
   // Example basic function get data from table {{modelName}}
   findAll() {
     return new Promise((resolve, reject) => {

package/packages/cli/core/generator/_package

@@ -5,17 +5,16 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "prod": "set NODE_ENV=production&& npm start",
-    "production": "set NODE_ENV=production&& npm start",
-    "dev": "set NODE_ENV=development&& npm start",
-    "development": "set NODE_ENV=development&& npm start",
-    "start": "beech-service serve",
+    "predev": "node ./node_modules/beech-api/packages/cli/core/test/check-node.js",
+    "prebuild": "node ./node_modules/beech-api/packages/cli/core/test/check-node.js",
+    "build": "set NODE_ENV=production&& beech-service build",
+    "dev": "beech-service serve",
     "test": "node ./node_modules/jest/bin/jest __tests__ -o --watch --config"
   },
   "dependencies": {
-    "beech-api": "~3.8.0"
+    "beech-api": "^3.9.0"
   },
   "devDependencies": {
-    "jest": "^28.1.3"
+    "jest": "^29.7.0"
   }
 }

package/packages/cli/core/generator/_scheduler

@@ -1,5 +1,5 @@
+const CronJob = require("cron").CronJob;
 //const Users = require("@/models/Users");
-//const CronJob = require("cron").CronJob;
 
 exports.init = () => {
 
@@ -8,15 +8,25 @@ exports.init = () => {
    *
    */
 
-  //Users.findAll().then(console.log)
+  // const getUsers = async () => {
+  //   try {
+  //     const users = await Users.findAll();
+  //     console.log(users);
+  //   } catch (error) {
+  //     console.error(error);
+  //   }
+  // };
 
   /**
-   * Job schedule: seccod minute hour dayOfMonth month dayOfWeek
+   * Job schedule: seconds minutes hours dayOfMonth month dayOfWeek
    * Learn more: https://github.com/kelektiv/node-cron
    * 
    */
-  //new CronJob("0 0 0 * * *", () => {
-    //Run job.
-  //}, null, true, "Asia/Bangkok");
+  new CronJob("0 0 0 * * *", () => {
+    // Run job.
+
+    // getUsers();
+
+  }, null, true, "Asia/Bangkok");
 
 };