@bee.js/node 0.0.35 → 0.0.39

package/index.js

@@ -1,15 +1,15 @@
-module.exports = {
-    load: require('./lib/beeHive/load'),
-    create: require('./lib/beeHive/create'),
-    start: require('./lib/beeHive/start'),
-    routes: require('./lib/beeHive/routes'),
-    route: require('./lib/WEB/route'),
-    freeRoute: require('./lib/WEB/freeRoute'),
-    request: require('./beeRequest'),
-    hive: require('./beehive'),
-    tools: require('./tools/beeTools'),
-    security: require('./security'),
-    services: require('./services'),
-    //scheduler: require('./security'), //TODO
-    status: (req, res)=>res.status(200).send(`${global.configs.name || 'Bee.js'} running version: ${global.configs.version}`)
+module.exports = {
+    load: require('./lib/beeHive/load'),
+    create: require('./lib/beeHive/create'),
+    start: require('./lib/beeHive/start'),
+    routes: require('./lib/beeHive/routes'),
+    route: require('./lib/WEB/route'),
+    freeRoute: require('./lib/WEB/freeRoute'),
+    request: require('./beeRequest'),
+    hive: require('./beehive'),
+    tools: require('./tools/beeTools'),
+    security: require('./security'),
+    services: require('./services'),
+    //scheduler: require('./security'), //TODO
+    status: (req, res)=>res.status(200).send(`${global.configs.name || 'Bee.js'} running version: ${global.configs.version}`)
 }

package/lib/DBA/beeDBA.js

@@ -1,119 +1,119 @@
-const beeORM  = require('../ORM/beeORM')
-const beeHive = require('../../beehive')
-
-const fieldType = {
-    mysql : function(field) {
-        let type = field.type.split(' ')[0].trim()
-
-        switch (type) {
-            case 'integer': 
-            case 'int': 
-                type = 'int'
-            break
-            case 'decimal':
-                type = `decimal(${(field.length || 10.1).toString().replace('.',',')})`
-            break
-
-            case 'string':
-            case 'varchar': 
-                type = `varchar(${field.length || 45})`
-            break
-            case 'guid': 
-                type     = `binary(16)`
-                field.ai = false
-            break
-            case 'char': 
-                type = `char(${field.length || 5})`
-            break
-        }
-        return type 
-                + (!field.null   ? ' NOT NULL' : '') 
-                + (field.ai      ? ' AUTO_INCREMENT' : '')
-                + (field.default !== undefined ? ` DEFAULT ${field.default}` : '') 
-                + (field.default !== undefined && field.onUpdate ? ` ON UPDATE ${field.default}` : '')
-    }
-}
-
-module.exports.actions = {
-    mysql : {
-        MODEL_STATEMENT_EXECUTE : async function(req, res) {
-            let hive = beeHive()
-            let data = await hive.dbExec(req.body.statement_execute)
-            
-            res.status(200).send({data: data})
-        },
-
-        MODEL_CREATE_DB : function(req, res) {
-            let configsDB = global.configs.databases.default
-            let models    = global.models
-            let SQL       = ['','']
-
-            //TODO create db with user permissions
-            
-            Object
-            .keys(models)
-            .map((model)=> {
-                if(!req.body.models[model]._checked) return
-
-                SQL[0] += this.MODEL_CREATE_TABLE(models[model], configsDB)
-                SQL[1] += models[model].relations
-                            ? this.MODEL_CREATE_CONSTRAINT(models[model], configsDB)
-                            : ''
-            })
-    
-            res.status(200).send({data: SQL.join("")})
-        },
-    
-        MODEL_CREATE_TABLE : function(model, configsDB) {
-            let q   = beeORM.quote
-            let SQL = ''
-            
-            
-            SQL = `CREATE TABLE IF NOT EXISTS ${q(model.table)} (`
-            
-            for(let field in model.schema)
-                SQL += `\n        ${q(field)} ${fieldType[configsDB.drive](model.schema[field])},` // TODO criar funcao para relacionamentos.
-            
-            SQL = SQL.slice(0, SQL.length - 1)
-
-            if(model.indexes) {
-                if(model.indexes.keys)
-                    SQL += `,\n        PRIMARY KEY (${q(model.indexes.keys)})`
-            
-                //TODO fazer uniques e cia. colocar em funcao.
-            }
-
-            SQL += `\n) ENGINE=${configsDB.engine} DEFAULT CHARSET=${configsDB.charset};\n\n`
-    
-            return SQL
-        },
-    
-        MODEL_CREATE_CONSTRAINT : function(model, configsDB) {
-            let q   = beeORM.quote
-            let SQL = '\n\n\n\n'
-    
-            SQL += `----- Constraints for table ${q(model.table)} -----\n\n`
-            SQL += `ALTER TABLE ${q(model.table)}\n`
-            
-            for(let field in model.relations)
-                SQL += `    ADD CONSTRAINT ${q('FK_'+model.relations[field].split('.')[0])} 
-                        FOREIGN KEY ${q(field)} 
-                        REFERENCES ${model.relations[field].split('.')[0]}(${q('FK_'+model.relations[field].split('.')[0])}) 
-                        ON DELETE CASCATE ON UPDATE CASCATE;
-                       \n\n`
-            
-                //SQL += `-- COMMIT; \n\n`
-    
-            return SQL
-        }
-    },
-
-    mssql : {
-        // TODO next version
-    },
-
-    mongoDB : {
-        // TODO next version
-    }
-    
-}
+const beeORM  = require('../ORM/beeORM')
+const beeHive = require('../../beehive')
+
+const fieldType = {
+    mysql : function(field) {
+        let type = field.type.split(' ')[0].trim()
+
+        switch (type) {
+            case 'integer': 
+            case 'int': 
+                type = 'int'
+            break
+            case 'decimal':
+                type = `decimal(${(field.length || 10.1).toString().replace('.',',')})`
+            break
+
+            case 'string':
+            case 'varchar': 
+                type = `varchar(${field.length || 45})`
+            break
+            case 'guid': 
+                type     = `binary(16)`
+                field.ai = false
+            break
+            case 'char': 
+                type = `char(${field.length || 5})`
+            break
+        }
+        return type 
+                + (!field.null   ? ' NOT NULL' : '') 
+                + (field.ai      ? ' AUTO_INCREMENT' : '')
+                + (field.default !== undefined ? ` DEFAULT ${field.default}` : '') 
+                + (field.default !== undefined && field.onUpdate ? ` ON UPDATE ${field.default}` : '')
+    }
+}
+
+module.exports.actions = {
+    mysql : {
+        MODEL_STATEMENT_EXECUTE : async function(req, res) {
+            let hive = beeHive()
+            let data = await hive.dbExec(req.body.statement_execute)
+            
+            res.status(200).send({data: data})
+        },
+
+        MODEL_CREATE_DB : function(req, res) {
+            let configsDB = global.configs.databases.default
+            let models    = global.models
+            let SQL       = ['','']
+
+            //TODO create db with user permissions
+            
+            Object
+            .keys(models)
+            .map((model)=> {
+                if(!req.body.models[model]._checked) return
+
+                SQL[0] += this.MODEL_CREATE_TABLE(models[model], configsDB)
+                SQL[1] += models[model].relations
+                            ? this.MODEL_CREATE_CONSTRAINT(models[model], configsDB)
+                            : ''
+            })
+    
+            res.status(200).send({data: SQL.join("")})
+        },
+    
+        MODEL_CREATE_TABLE : function(model, configsDB) {
+            let q   = beeORM.quote
+            let SQL = ''
+            
+            
+            SQL = `CREATE TABLE IF NOT EXISTS ${q(model.table)} (`
+            
+            for(let field in model.schema)
+                SQL += `\n        ${q(field)} ${fieldType[configsDB.drive](model.schema[field])},` // TODO criar funcao para relacionamentos.
+            
+            SQL = SQL.slice(0, SQL.length - 1)
+
+            if(model.indexes) {
+                if(model.indexes.keys)
+                    SQL += `,\n        PRIMARY KEY (${q(model.indexes.keys)})`
+            
+                //TODO fazer uniques e cia. colocar em funcao.
+            }
+
+            SQL += `\n) ENGINE=${configsDB.engine} DEFAULT CHARSET=${configsDB.charset};\n\n`
+    
+            return SQL
+        },
+    
+        MODEL_CREATE_CONSTRAINT : function(model, configsDB) {
+            let q   = beeORM.quote
+            let SQL = '\n\n\n\n'
+    
+            SQL += `----- Constraints for table ${q(model.table)} -----\n\n`
+            SQL += `ALTER TABLE ${q(model.table)}\n`
+            
+            for(let field in model.relations)
+                SQL += `    ADD CONSTRAINT ${q('FK_'+model.relations[field].split('.')[0])} 
+                        FOREIGN KEY ${q(field)} 
+                        REFERENCES ${model.relations[field].split('.')[0]}(${q('FK_'+model.relations[field].split('.')[0])}) 
+                        ON DELETE CASCATE ON UPDATE CASCATE;
+                       \n\n`
+            
+                //SQL += `-- COMMIT; \n\n`
+    
+            return SQL
+        }
+    },
+
+    mssql : {
+        // TODO next version
+    },
+
+    mongoDB : {
+        // TODO next version
+    }
+    
+}

package/lib/DEV/beeDEV.js

@@ -1,42 +1,42 @@
-const log    = require('../beeHive/log')
-const beeDBA = require('../DBA/beeDBA')
-const glob   = require('glob')
-const fs     = require('fs')
-
-module.exports = async function(req, res, next) {
-    if(!global.configs.dev) return res.send(null)
-
-    res.header("Access-Control-Allow-Origin", "*")
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")
-
-    var result = {}
-
-    switch(req.params.action) {
-        case 'MODEL_STATEMENT_EXECUTE':  
-          result = await beeDBA.actions[global.configs.databases.default.type || 'mysql'][req.params.action](req, res, next) 
-        break
-
-        case 'MODEL_CREATE_DB':
-          result = beeDBA.actions[global.configs.databases.default.type || 'mysql'][req.params.action](req, res, next) 
-        break
-
-        case 'PATHS':
-          return glob("**/*", {}, 
-            function (err, files) { 
-              res.send({ data: files }) 
-            })
-        
-        case 'PATH_DATA':
-          return fs.readFile(`${require.main.path}/${req.body.path}`, 
-            function (err, data) { 
-              res.send({ data: { path_data: Buffer.from(data).toString(), path: req.body.path } })
-            })
-
-        default:
-            result = {...global.configs, env : process.env}
-            log('# Started a remote connection.')
-        break
-    }
-
-    res.send(result)
+const log    = require('../beeHive/log')
+const beeDBA = require('../DBA/beeDBA')
+const glob   = require('glob')
+const fs     = require('fs')
+
+module.exports = async function(req, res, next) {
+    if(!global.configs.dev) return res.send(null)
+
+    res.header("Access-Control-Allow-Origin", "*")
+    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept")
+
+    var result = {}
+
+    switch(req.params.action) {
+        case 'MODEL_STATEMENT_EXECUTE':  
+          result = await beeDBA.actions[global.configs.databases.default.type || 'mysql'][req.params.action](req, res, next) 
+        break
+
+        case 'MODEL_CREATE_DB':
+          result = beeDBA.actions[global.configs.databases.default.type || 'mysql'][req.params.action](req, res, next) 
+        break
+
+        case 'PATHS':
+          return glob("**/*", {}, 
+            function (err, files) { 
+              res.send({ data: files }) 
+            })
+        
+        case 'PATH_DATA':
+          return fs.readFile(`${require.main.path}/${req.body.path}`, 
+            function (err, data) { 
+              res.send({ data: { path_data: Buffer.from(data).toString(), path: req.body.path } })
+            })
+
+        default:
+            result = {...global.configs, env : process.env}
+            log('# Started a remote connection.')
+        break
+    }
+
+    res.send(result)
 }

package/lib/JWT/beeJWT.js

@@ -1,69 +1,73 @@
-const crypto = require('crypto')
-const log    = require('../beeHive/log')
-
-module.exports = function token(_payload = null, header = {}) {
-
-    if(_payload) {
-
-        let { jwt, ...payload } = _payload
-
-        if(!global.configs.jwt && !global.configs.jwt.secret) return log("ERROR: no jwt.secret defined in configs.")
-
-        let secret = global.configs.jwt.secret
-        let iat    = new Date().getTime()
-        let exp    = new Date().getTime() + 60 * 1000
-        
-        header = {...header,
-                    typ: header.typ || "JWT",
-                    alg: header.alg || "HS256"
-                }
-
-        payload = {...payload,
-                        iat: iat,
-                        exp: exp,
-                 }
-
-        header = JSON.stringify(header)
-        header = (new Buffer.from(header)).toString('base64')
-
-        payload = JSON.stringify(payload)
-        payload = (new Buffer.from(payload)).toString('base64')
-
-        let signature = crypto
-                        .createHmac("sha256", secret)
-                        .update(`${header}.${payload}`)
-                        .digest("base64")
-
-        this.data.jwt = this.data.jwt ? [this.data.jwt] : this.data.jwt
-
-        this.data.jwt = !this.data.jwt 
-                            ? `${header}.${payload}.${signature}`
-                            : this.data.jwt.concat(`${header}.${payload}.${signature}`)
-
-        this.counters.jwt = (this.counters.jwt||0) + 1
-
-        log("JWT created: " + this.data.jwt)
-
-        return this
-    }
-
-    return {...this,
-        verify: function(token) {
-
-            let secret  = global.configs.jwt.secret
-            let array   = token.split(".")
-            let header  = array[0]
-            let payload = array[1]
-
-            let signature = crypto
-                            .createHmac("sha256", secret)
-                            .update(`${header}.${payload}`)
-                            .digest("base64")
-
-            return token === `${header}.${payload}.${signature}`
-                    ? (new Buffer.from(payload, 'base64')).toString("ascii")
-                    : false
-        }
-
-    }
+const crypto = require('crypto')
+const log    = require('../beeHive/log')
+
+module.exports = function token(_payload = null, header = {}) {
+
+    if(_payload) {
+
+        let { jwt, ...payload } = _payload
+
+        if(!global.configs.jwt && !global.configs.jwt.secret) return log("ERROR: no jwt.secret defined in configs.")
+
+        let secret = global.configs.jwt.secret
+        let iat    = new Date().getTime()
+        let exp    = new Date().getTime() + 60 * 1000
+        
+        header = {...header,
+                    typ: header.typ || "JWT",
+                    alg: header.alg || "HS256"
+                }
+
+        payload = {...payload,
+                        iat: iat,
+                        exp: exp,
+                 }
+
+        header = JSON.stringify(header)
+        header = (new Buffer.from(header)).toString('base64')
+
+        payload = JSON.stringify(payload)
+        payload = (new Buffer.from(payload)).toString('base64')
+
+        let signature = crypto
+                        .createHmac("sha256", secret)
+                        .update(`${header}.${payload}`)
+                        .digest("base64")
+
+        let token = `${header}.${payload}.${signature}`
+
+        this.data.jwt = this.data.jwt && typeof this.data.jwt !== "object" 
+                        ? [this.data.jwt] 
+                        : this.data.jwt
+
+        this.data.jwt = !this.data.jwt 
+                            ? token
+                            : this.data.jwt.concat(token)
+
+        this.counters.jwt = (this.counters.jwt||0) + 1
+
+        log("JWT created: " + this.data.jwt)
+
+        return this
+    }
+
+    return {...this,
+        verify: function(token) {
+
+            let secret  = global.configs.jwt.secret
+            let array   = token.split(".")
+            let header  = array[0]
+            let payload = array[1]
+
+            let signature = crypto
+                            .createHmac("sha256", secret)
+                            .update(`${header}.${payload}`)
+                            .digest("base64")
+
+            return token === `${header}.${payload}.${signature}`
+                    ? (new Buffer.from(payload, 'base64')).toString("ascii")
+                    : false
+        }
+
+    }
 }