beech-api 3.8.0 → 3.9.75

package/packages/lib/src/guard.js

@@ -1,61 +1,61 @@
-const md5 = require("md5");
-const secret = require("./salt").salt;
-const { findPassportPk } = require("../../cli/core/helpers/poolEntity");
-
-async function Guard(usr, pws, fields = [], fieldCondArr = {}, cb) {
-  try {
-    const passport_config = require(appRoot + "/passport.config.js");
-    let stm = '';
-    let cond = '1=1';
-    let passportTable = await [passport_config.model.table || "users"];
-    let passportUsernameField = passport_config.model.username_field || "username";
-    let passportPasswordField = passport_config.model.password_field || "password";
-    const pool = await eval("sql." + passport_config.model.name);
-    let expectFields = await (fields) ? fields : (passport_config.model.fields.length) ? passport_config.model.fields : [];
-    await findPassportPk(pool_base, pool, passportTable, expectFields, async (err, passportFields) => {
-      if(err) {
-        cb(err, null);
-      } else {
-        cond += ` AND ${passportUsernameField} = ? AND ${passportPasswordField} = ?`
-        let dynReplacement = [];
-        // Check for generate more condition
-        if(fieldCondArr) {
-          Object.keys(fieldCondArr).forEach(key => {
-            cond += ` AND ${key} = ?`;
-            dynReplacement.push(fieldCondArr[key]);
-          });
-        }
-        // check base pool
-        if (pool_base == "basic") {
-          // pool base is MySQL
-          stm += 'SELECT ?? FROM ?? WHERE ' + cond + ' LIMIT 1;';
-          await pool.query(stm, [passportFields, passportTable, usr, md5(pws + secret), ...dynReplacement], (err, row) => {
-            if(err) {
-              cb(err, null);
-            } else {
-              cb(null, row);
-            }
-          });
-        } else if (pool_base == "sequelize") {
-          // pool base is Sequelize
-          try {
-            stm += `SELECT ${passportFields} FROM ${passportTable} WHERE ` + cond;
-            let result = await pool.query(stm, {
-              replacements: [usr, md5(pws + secret), ...dynReplacement],
-              type: QueryTypes.SELECT
-            });
-            return cb(null, result);
-          } catch (error) {
-            return cb((error.errors) ? error.errors[0] : error, null);
-          }
-        } else {
-          return cb({ error: "The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'" }, null);
-        }
-      }
-    });
-  } catch (error) {
-    cb(error, null);
-  }
-}
-
+const md5 = require("md5");
+const secret = require("./salt").salt;
+const { findPassportPk } = require("../../cli/core/helpers/poolEntity");
+
+async function Guard(usr, pws, fields = [], fieldCondArr = {}, cb) {
+  try {
+    const passport_config = require(appRoot + "/passport.config.js");
+    let stm = '';
+    let cond = '1=1';
+    let passportTable = await [passport_config.model.table || "users"];
+    let passportUsernameField = passport_config.model.username_field || "username";
+    let passportPasswordField = passport_config.model.password_field || "password";
+    const pool = await eval("sql." + passport_config.model.name);
+    let expectFields = await (fields) ? fields : (passport_config.model.fields.length) ? passport_config.model.fields : [];
+    await findPassportPk(pool_base, pool, passportTable, expectFields, async (err, passportFields) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        cond += ` AND ${passportUsernameField} = ? AND ${passportPasswordField} = ?`
+        let dynReplacement = [];
+        // Check for generate more condition
+        if(fieldCondArr) {
+          Object.keys(fieldCondArr).forEach(key => {
+            cond += ` AND ${key} = ?`;
+            dynReplacement.push(fieldCondArr[key]);
+          });
+        }
+        // check base pool
+        if (pool_base == "basic") {
+          // pool base is MySQL
+          stm += 'SELECT ?? FROM ?? WHERE ' + cond + ' LIMIT 1;';
+          await pool.query(stm, [passportFields, passportTable, usr, md5(pws + secret), ...dynReplacement], (err, row) => {
+            if(err) {
+              cb(err, null);
+            } else {
+              cb(null, row);
+            }
+          });
+        } else if (pool_base == "sequelize") {
+          // pool base is Sequelize
+          try {
+            stm += `SELECT ${passportFields} FROM ${passportTable} WHERE ` + cond;
+            let result = await pool.query(stm, {
+              replacements: [usr, md5(pws + secret), ...dynReplacement],
+              type: QueryTypes.SELECT
+            });
+            return cb(null, result);
+          } catch (error) {
+            return cb((error.errors) ? error.errors[0] : error, null);
+          }
+        } else {
+          return cb({ error: "The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'" }, null);
+        }
+      }
+    });
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
 module.exports = { Guard };

package/packages/lib/src/salt.js

@@ -1,3 +1,3 @@
-module.exports = {
-  salt: ["?p9E1oXV8My9akelVzsf3"],
-};
+module.exports = {
+  salt: ["?p9E1oXV8My9akelVzsf3"],
+};

package/packages/lib/src/schema.js

@@ -1,93 +1,96 @@
-const { Transaction } = require("sequelize");
-let isolationLevel = { isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE };
-function Schema(Sequelize) {
-  return {
-    define: (table, schemaProps = {}, elementProps = {}) => {
-      try {
-        let Project = Sequelize.define(table, schemaProps, elementProps);
-        return Object.assign(Project, {
-          query: (
-            rawSql,
-            props = {
-              model: Project,
-              mapToModel: false,
-            }
-          ) => {
-            return new Promise((resolve) => {
-              if (props.mapToModel) {
-                let data = Sequelize.query(rawSql, props);
-                let results = [];
-                mapDataToModel(data, props.model, results, (err, r) => {
-                  if (err) {
-                    resolve([]);
-                  } else {
-                    resolve(r);
-                  }
-                });
-              } else {
-                resolve(Sequelize.query(rawSql, props));
-              }
-            });
-          },
-          Sequelize,
-          /**
-           * Transaction
-           * 
-           * @param object DEFAULT isolationLevel SERIALIZABLE
-           * @param cb Object
-           * 
-           * @returns Object
-           */
-          transaction: async (object, cb = null) => {
-            if(typeof object == "function") {
-              const t = await Sequelize.transaction(isolationLevel);
-              object(t);
-            } else if(cb) {
-              const t = await Sequelize.transaction(object = isolationLevel);
-              cb(t);
-            } else {
-              return await Sequelize.transaction(object = isolationLevel);
-            }
-          },
-        });
-      } catch (error) {
-        let errTurnOffDbDefine = JSON.stringify(error.toString()).match(/'define'/);
-        let errTurnOffDbOption = JSON.stringify(error.toString()).match(/'options'/);
-        if(errTurnOffDbDefine || errTurnOffDbOption) {
-          console.log(`\n Failed  Database connection name is CLOSED.\n`, error);
-        } else {
-          console.log("\n Failed ", error);
-        }
-      }
-    },
-  };
-}
-
-mapDataToModel = async (data, modelsArr = [], results = [], cb) => {
-  let dataArr = await data;
-  var models = modelsArr.length ? modelsArr.slice() : modelsArr;
-  let row = dataArr.shift();
-  let buildModelData = [];
-  recursiveBuildModels(models, row, buildModelData, (builed, e) => {
-    if (builed) {
-      results.push({ ...e });
-      if (dataArr.length > 0) {
-        mapDataToModel(dataArr, modelsArr, results, cb);
-      } else {
-        cb(null, results);
-      }
-    }
-  });
-};
-
-recursiveBuildModels = (models, row, data = [], cb) => {
-  let model = models.length ? models.shift() : models;
-  data.push(model.build(row).dataValues);
-  if (models.length > 0) {
-    recursiveBuildModels(models, row, data, cb);
-  } else {
-    cb(true, { ...Object.assign(...data) });
-  }
-};
-
-module.exports = { Schema };
+const { Transaction } = require("sequelize");
+let isolationLevel = { isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE };
+function Schema(Sequelize) {
+  return {
+    define: (table, schemaProps = {}, elementProps = {}) => {
+      try {
+        let Project = Sequelize.define(table, schemaProps, elementProps);
+        //Sequelize.options.charset = "utf8";
+        //Sequelize.options.define.charset = "utf8";
+        //Sequelize.options.define.dialectOptions.collate = "utf8_unicode_ci";
+        return Object.assign(Project, {
+          query: (
+            rawSql = "",
+            props = {
+              model: Project,
+              mapToModel: false,
+            }
+          ) => {
+            return new Promise((resolve) => {
+              if (props.mapToModel) {
+                let data = Sequelize.query(rawSql, props);
+                let results = [];
+                mapDataToModel(data, props.model, results, (err, r) => {
+                  if (err) {
+                    resolve([]);
+                  } else {
+                    resolve(r);
+                  }
+                });
+              } else {
+                resolve(Sequelize.query(rawSql, props));
+              }
+            });
+          },
+          Sequelize,
+          /**
+           * Transaction
+           * 
+           * @param object DEFAULT isolationLevel SERIALIZABLE
+           * @param cb Object
+           * 
+           * @returns Object
+           */
+          transaction: async (object, cb = null) => {
+            if(typeof object == "function") {
+              const t = await Sequelize.transaction(isolationLevel);
+              object(t);
+            } else if(cb) {
+              const t = await Sequelize.transaction(object = isolationLevel);
+              cb(t);
+            } else {
+              return await Sequelize.transaction(object = isolationLevel);
+            }
+          },
+        });
+      } catch (error) {
+        let errTurnOffDbDefine = JSON.stringify(error.toString()).match(/'define'/);
+        let errTurnOffDbOption = JSON.stringify(error.toString()).match(/'options'/);
+        if(errTurnOffDbDefine || errTurnOffDbOption) {
+          console.log(`\n Failed  Database connection name is CLOSED.\n`, error);
+        } else {
+          console.log("\n Failed ", error);
+        }
+      }
+    },
+  };
+}
+
+mapDataToModel = async (data, modelsArr = [], results = [], cb) => {
+  let dataArr = await data;
+  var models = modelsArr.length ? modelsArr.slice() : modelsArr;
+  let row = dataArr.shift();
+  let buildModelData = [];
+  recursiveBuildModels(models, row, buildModelData, (builed, e) => {
+    if (builed) {
+      results.push({ ...e });
+      if (dataArr.length > 0) {
+        mapDataToModel(dataArr, modelsArr, results, cb);
+      } else {
+        cb(null, results);
+      }
+    }
+  });
+};
+
+recursiveBuildModels = (models, row, data = [], cb) => {
+  let model = models.length ? models.shift() : models;
+  data.push(model.build(row).dataValues);
+  if (models.length > 0) {
+    recursiveBuildModels(models, row, data, cb);
+  } else {
+    cb(true, { ...Object.assign(...data) });
+  }
+};
+
+module.exports = { Schema };

package/packages/lib/src/specificExpress.js

@@ -1,7 +1,7 @@
-const { rateLimit } = require("../../cli/core/middleware/express/rateLimit");
-const { slowDown } = require("../../cli/core/middleware/express/slowDown");
-const { duplicateRequest } = require("../../cli/core/middleware/express/duplicateRequest");
-let specificExpress = () => {
-  return { rateLimit, slowDown, duplicateRequest };
-};
-module.exports = { specificExpress };
+const { rateLimit } = require("../../cli/core/middleware/express/rateLimit");
+const { slowDown } = require("../../cli/core/middleware/express/slowDown");
+const { duplicateRequest } = require("../../cli/core/middleware/express/duplicateRequest");
+let specificExpress = () => {
+  return { rateLimit, slowDown, duplicateRequest };
+};
+module.exports = { specificExpress };