beech-api 3.4.12 → 3.5.12

package/packages/lib/beech.js

@@ -4,52 +4,94 @@ const md5 = require("md5");
 const secret = require("./salt").salt;
 
 module.exports = {
-  findOne(table, fieldCondArr, cb) {
+  async findOne(fields, fieldCondArr, cb) {
     try {
+      let stm = '';
       let cond = '1';
-      let passportFields = (passport_config.model.fields.length) ? passport_config.model.fields : ["id", "name", "email"];
+      let table = await [passport_config.model.table || "users"];
+      let passportFields = await (fields[0]) ? fields : (passport_config.model.fields.length) ? passport_config.model.fields : ["id", "name", "email"];
+      const pool = await eval("sql." + passport_config.model.name);
       // Generate condition
-      Object.keys(fieldCondArr).forEach(key => {
+      await Object.keys(fieldCondArr).forEach(key => {
         cond += ' AND ' + key + '=' + fieldCondArr[key]
       });
-      // raw SQL
-      let sql = 'SELECT ?? FROM ?? WHERE ' + cond;
-      const pool = eval("mysql." + passport_config.model.name);
-      pool.query(sql, [passportFields, table], (err, row) => {
-        cb(err, row);
-      });
+      // check base pool
+      if (pool_base == "basic") {
+        // pool base is MySQL
+        stm += 'SELECT ?? FROM ?? WHERE ' + cond;
+        await pool.query(stm, [passportFields, table], (err, row) => {
+          cb(err, row);
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        try {
+          stm += `SELECT ${passportFields} FROM ${table} WHERE ` + cond;
+          let result = await pool.query(stm, {
+            type: QueryTypes.SELECT
+          });
+          return cb(null, result);
+        } catch (error) {
+          return cb(error, null);
+        }
+      } else {
+        return cb({ error: "Base pool SQL error." }, null);
+      }
     } catch (error) {
       cb(error, null);
     }
   },
-  store(fields, cb) {
+  async store(fields, cb) {
     try {
+      let stm = '';
       let keys = [];
-      let values = [passport_config.model.table || "users"];
       let escaped = [];
-      let passwordField = String(passport_config.model.password_field || "password");
+      let values = await [passport_config.model.table || "users"];
+      let passwordField = await String(passport_config.model.password_field || "password");
+      const pool = await eval("sql." + passport_config.model.name);
       // asign password hash
       fields[passwordField] = md5(fields[passwordField] + secret);
       // sql generate
-      Object.keys(fields).forEach(key => {
+      await Object.keys(fields).forEach(key => {
         keys.push(key);
         values.push(fields[key]);
         escaped.push('?');
       });
-      let sql = 'INSERT INTO ?? (' + keys.join() + ') VALUES (' + escaped.join() + ')';
-      const pool = eval("mysql." + passport_config.model.name);
-      pool.query(sql, values, (err, result) => {
-        cb(err, result);
-      });
+      // check base pool
+      if (pool_base == "basic") {
+        // pool base is MySQL
+        stm += 'INSERT INTO ?? (' + keys.join() + ') VALUES (' + escaped.join() + ')';
+        await pool.query(stm, values, (err, result) => {
+          cb(err, result);
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        try {
+          stm += `INSERT INTO ${values.shift()} (` + keys.join() + ') VALUES (' + escaped.join() + ')';
+          let result = await pool.query(stm, {
+            replacements: values,
+            type: QueryTypes.INSERT
+          });
+          return cb(null, {
+            insertId: result[0],
+            affectedRows: result[1]
+          });
+        } catch (error) {
+          return cb(error, null);
+        }
+      } else {
+        return cb({ error: "Base pool SQL error." }, null);
+      }
     } catch (error) {
       cb(error, null);
     }
   },
-  update(someFields, id, cb) {
+  async update(someFields, id, cb) {
     try {
+      let stm = '';
       let keys = [];
-      let values = [passport_config.model.table || "users"];
-      let passwordField = String(passport_config.model.password_field || "password");
+      let values = await [passport_config.model.table || "users"];
+      let passwordField = await String(passport_config.model.password_field || "password");
+      const pool = await eval("sql." + passport_config.model.name);
       // check password body for asign hash
       if (someFields[passwordField]) {
         someFields[passwordField] = md5(someFields[passwordField] + secret);
@@ -60,11 +102,33 @@ module.exports = {
         values.push(someFields[key]);
       });
       values.push(id);
-      let sql = 'UPDATE ?? SET ' + keys.join() + ' WHERE id = ?';
-      const pool = eval("mysql." + passport_config.model.name);
-      pool.query(sql, values, (err, result) => {
-        cb(err, result);
-      });
+      // check base pool
+      if (pool_base == "basic") {
+        // pool base is MySQL
+        stm += 'UPDATE ?? SET ' + keys.join() + ' WHERE id = ?';
+        await pool.query(stm, values, (err, result) => {
+          cb(err, result);
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        try {
+          stm += `UPDATE ${values.shift()} SET ` + keys.join() + ' WHERE id = ?';
+          console.log(stm, values);
+          let result = await pool.query(stm, {
+            replacements: values,
+            type: QueryTypes.UPDATE
+          });
+          return cb(null, {
+            updateId: parseInt(id),
+            affectedRows: result[1]
+          });
+        } catch (error) {
+          return cb(error, null);
+        }
+      } else {
+        return cb({ error: "Base pool SQL error." }, null);
+      }
+
     } catch (error) {
       cb(error, null);
     }

package/packages/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "application",
+  "version": "0.1.0",
+  "description": "The project is powered by Beech API framework",
+  "main": "index.js",
+  "scripts": {
+    "start": "npx run ./node_modules/beech-api/packages/cli/beech",
+    "test": "node ./node_modules/jest/bin/jest __tests__ -o --watch --config"
+  },
+  "dependencies": {
+    "beech-api": "^3.5.11",
+    "nodemon": "^3.0.1",
+    "sqlite3": "^5.0.11",
+    "tedious": "^15.0.1"
+  },
+  "devDependencies": {
+    "jest": "^25.2.7",
+    "sequelize-cli": "^5.5.1"
+  }
+}

package/packages/src-/Add-on.js

@@ -0,0 +1,9 @@
+//const Users = require("@/models/Users");
+
+exports.init = () => {
+
+  //Users.findAll().then(console.log)
+
+  console.log("Add-on is work!")
+
+}

package/packages/src-/endpoints/hello-endpoints.js

@@ -0,0 +1,118 @@
+const Beech = require("../../lib/beech");
+const Users = require("@/models/Users");
+const Users2 = require("@/models/Users-sqlite");
+const User2Sequelize = require("@/models/User2Sequelize");
+const Map_master = require("@/models/Map_master");
+
+exports.init = () => {
+  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
+
+  /@GET/
+  endpoint.get('/hello', Credentials, async (req, res) => {
+    // basic get method
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a GET request.';
+
+    /* await Users.findAll().then(e=> {
+      data.results = e
+    }); */
+
+    let fields = {
+      username: "eiei",
+      password: "xxx",
+      email: "bomb@bomb.com",
+      name: "jubu eiei"
+    }
+
+
+    /* Beech.store(fields, (err, result) => {
+      if(err) {
+        console.log(err);
+      } else {
+        console.log(result);
+      }
+    }); */
+
+    /* await Beech.findOne([], { id: 66 }, (err, result) => {
+      data.result = result
+    }) */
+
+    /* Beech.update({ username: "eiei", name: 'eiei222' }, 69, (err, result) => {
+      console.log(result);
+    }) */
+
+    data.result = await Users2.findAll(); // basic
+    //data.results = await User2Sequelize.findAll(); // sequelize
+    //data.results = await User2Sequelize.findUser2SequelizeById(7) // sequelize
+
+    //data.results = await Map_master.findAll() // sequelize
+
+
+
+
+
+    // @return
+    res.json(data);
+  });
+
+  /@POST/
+  endpoint.post('/hello', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.body.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a POST request.';
+    // @return
+    res.json(data);
+  });
+
+  /@PUT/
+  endpoint.put('/hello/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PUT request at /hello/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@PATCH/
+  endpoint.patch('/hello/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PATCH request at /hello/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@DELETE/
+  endpoint.delete('/hello/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a DELETE request at /hello/' + id;
+    // @return
+    res.json(data);
+  });
+}

package/packages/src-/endpoints/test2-endpoints.js

@@ -0,0 +1,75 @@
+// You can require something 
+
+exports.init = () => {
+  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
+
+  /@GET/
+	endpoint.get('/test2', Credentials, (req, res) => {
+    // basic get method
+		let data = {};
+    data.code = 200;
+    data.message = 'Got a GET request.';
+    // @return
+    res.json(data);
+	});
+
+  /@POST/
+  endpoint.post('/test2', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.body.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a POST request.';
+    // @return
+    res.json(data);
+  });
+
+  /@PUT/
+  endpoint.put('/test2/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PUT request at /test2/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@PATCH/
+  endpoint.patch('/test2/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a PATCH request at /test2/' + id;
+    // @return
+    res.json(data);
+  });
+
+  /@DELETE/
+  endpoint.delete('/test2/:id', Credentials, (req, res) => {
+    /**
+     * @param Integer id
+     *
+     * @return json
+     */
+    let id = req.params.id;
+    let data = {};
+    data.code = 200;
+    data.message = 'Got a DELETE request at /test2/' + id;
+    // @return
+    res.json(data);
+  });
+}

package/packages/src-/endpoints/testSequalize-endpoints.js

@@ -0,0 +1,23 @@
+const Users = require("@/models/Users");
+const Test = require("@/models/Test");
+
+exports.init = () => {
+  // Initiate with basic request currently support GET, POST, PUT, PATCH and DELETE
+
+  /@GET/
+	endpoint.get('/testSequalize', Credentials, async (req, res) => {
+    
+		let data = {};
+    data.code = 200;
+
+    data.results = await Users.getData();
+
+    data.resultTest = await Test.getData();
+
+    // @return
+    res.json(data);
+	});
+
+
+
+}

package/packages/src-/helpers/my/Test.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test2.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test3.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/helpers/my/Test4.js

@@ -0,0 +1,11 @@
+module.exports = {
+
+  // textUpperCase(text) {
+  //   return text.toUpperCase();
+  // },
+  
+  // textTrim(text) {
+  //   return text.trim();
+  // },
+
+};

package/packages/src-/models/Jubu.js

@@ -0,0 +1,29 @@
+const data = [
+  { "id": 1, "name": "Oggy" },
+  { "id": 2, "name": "Jack" },
+  { "id": 3, "name": "The Cockroaches Gang" }
+];
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    return data;
+  },
+
+  // Example basic function get data from Database (must be return promise)
+  findAll() {
+    return new Promise((resolve, reject) => {
+      try {
+        // call mysql `default_db` connection
+        mysql.default_db.query("SELECT * FROM jubu", (err, results) => {
+          if (err) { reject(err) }
+          resolve(results);
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}

package/packages/src-/models/Jubu2.js

@@ -0,0 +1,20 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const Jubu2 = sql.default_db.define("jubu2", {
+  id: DataTypes.INTEGER,
+  examField1: DataTypes.STRING,
+  examField2: DataTypes.DATE,
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  async getJubu2ById(id) {
+    return await Jubu2.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from Database (must be return promise)
+  async findAll() {
+    return await Jubu2.findAll();
+  }
+
+}

package/packages/src-/models/Map_master.js

@@ -0,0 +1,22 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const Map_master = sql.mysql_first_db.define("map_master", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true    
+  },
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  async findMap_masterById(id) {
+    return await Map_master.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from Database (must be return promise)
+  async findAll() {
+    return await Map_master.findAll();
+  }
+
+}

package/packages/{cli/core/generator/models → src-/models/Test.js}

@@ -16,7 +16,7 @@ module.exports = {
     return new Promise((resolve, reject) => {
       try {
         // call mysql `default_db` connection
-        mysql.default_db.query("SELECT * FROM {{modelName}}", (err, results) => {
+        mysql.default_db.query("SELECT * FROM test", (err, results) => {
           if (err) { reject(err) }
           resolve(results);
         });

package/packages/src-/models/Test2.js

@@ -0,0 +1,29 @@
+const data = [
+  { "id": 1, "name": "Oggy" },
+  { "id": 2, "name": "Jack" },
+  { "id": 3, "name": "The Cockroaches Gang" }
+];
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    return data;
+  },
+
+  // Example basic function get data from MySQL (must be return promise)
+  findAll() {
+    return new Promise((resolve, reject) => {
+      try {
+        // call mysql `default_db` connection
+        mysql.default_db.query("SELECT * FROM test2", (err, results) => {
+          if (err) { reject(err) }
+          resolve(results);
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}

package/packages/src-/models/User2Sequelize.js

@@ -0,0 +1,23 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const User2Sequelize = sql.mysql_first_db.define("users", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true    
+  },
+  name: DataTypes.STRING,
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  async findUser2SequelizeById(id) {
+    return await User2Sequelize.findOne({ where: { 'id': id } });
+  },
+
+  // Example basic function get all data from Database (must be return promise)
+  async findAll() {
+    return await User2Sequelize.findAll();
+  }
+
+}

package/packages/src-/models/Users-sqlite.js

@@ -0,0 +1,21 @@
+const Users = sql.sqlite_db.define("users", {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true    
+  },
+});
+
+module.exports = {
+
+  // Example basic function get one constant data
+  findUsersById(id) {
+    return Users.findOne({ where: { id: id } });
+  },
+
+  // Example basic function get all data from table users
+  findAll() {
+    return Users.findAll();
+  }
+
+}

package/packages/src-/models/Users.js

@@ -0,0 +1,53 @@
+// You can asign datatype see more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
+const Users = sql.mysql_first_db.define('users', {
+  id: {
+    type: DataTypes.INTEGER,
+    autoIncrement: true,
+    primaryKey: true
+  },
+  username: DataTypes.STRING,
+  password: {
+    type: DataTypes.STRING,
+    set(value) {
+      // Storing passwords in plaintext in the database is terrible.
+      // Hashing the value with an appropriate cryptographic hash function is better.
+      this.setDataValue('password', hash(value));
+    }
+  },
+  name: DataTypes.STRING,
+});
+
+
+
+module.exports = {
+
+  // Example basic function get constant data
+  getData() {
+    let user = Users.findAll();
+    //console.log(user);
+    return user;
+  },
+
+  // Example basic function get data from MySQL (must be return promise)
+  findAll() {
+    return new Promise(async (resolve, reject) => {
+      try {
+
+        let raw = await sql.default_db.query("SELECT * FROM users LIMIT 1", { type: QueryTypes.SELECT }); // mysql
+        //let raw = await sql.second_db.query("SELECT * FROM usercon LIMIT 10"); // sqlite
+        // let raw = await this.sql.thirdth_db.query("SELECT TOP 10 * FROM usercon"); // mssql
+        
+        //console.log(sql);
+
+
+        resolve(raw);
+
+
+
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+}