mqtt-devices-parser 1.0.1 → 1.0.2

package/Changelog.md

@@ -1,5 +1,8 @@
+# 1.0.2
+	-	passes config struct por methods
+
 # 1.0.1
 	- adds deploy method
-	
+
 # 1.0.0
 	- Module to parse mqtt messages from devices

package/index.js

@@ -32,11 +32,11 @@ var self = module.exports = {
       if(_projects != null)
         projects = _projects;
 
-      await $.models.init();
+      await $.models.init(_config);
       await $.models.connect();
 
       //auth.init();
-      await $.device.init(projects);
+      await $.device.init(_config,projects);
 
       console.log("mqtt connecting..")
       mqtt_connect();
@@ -173,5 +173,3 @@ function mqtt_connect(){
     console.log(error)
   })
 }
-
-

package/models/models.js

@@ -6,24 +6,22 @@ var mysql = require('mysql2');
 var sequelize;
 
 //var modelsPath = './models/';
-var config = require('../config');
 
 var self = module.exports = {
 
-   init : async ()=>{
-
-      return new Promise((resolve,reject) => {
-         sequelize = new Sequelize(
-            config.mysqldb.name,
-            config.mysqldb.user,
-            config.mysqldb.pwd,
-            {
-               host: config.mysqldb.host,
-               dialect: 'mysql'
-            },
-         );
-         return resolve(sequelize);
-      })
+  init : async (config)=>{
+
+    return new Promise((resolve,reject) => {
+       sequelize = new Sequelize({
+          database: config.mysqldb.name,
+          username: config.mysqldb.user,
+          password: config.mysqldb.pwd,
+          host: config.mysqldb.host,
+          port: config.mysqldb.port,
+          dialect: 'mysql',
+       });
+       return resolve(sequelize);
+     })
    },
 
    connect : async ()=>{
@@ -223,4 +221,3 @@ var self = module.exports = {
    }
 
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mqtt-devices-parser",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/db/db.js

@@ -1,10 +1,9 @@
-var config = require('../../config');
 var mysql = require('mysql2');
 
 var pool;
 
 var self = module.exports = {
-  connect : (cb)=>{
+  connect : (config,cb)=>{
     pool      =    mysql.createPool({
       connectionLimit : config.mysqldb.conn_limit,
       host     : config.mysqldb.host,
@@ -312,4 +311,3 @@ var self = module.exports = {
     });
   }
 }
-

package/src/device/device.js

@@ -4,10 +4,10 @@ const logs_table = "sensor_logs";
 
 var self = module.exports = {
 
-  init : async (projects)=>{
+  init : async (config,projects)=>{
 
     return new Promise(async (resolve,reject) => {
-      $.db.connect(()=>{
+      $.db.connect(config,()=>{
         console.log("MYSQL is connected");
 
         projects.map( async (name,counter)=>{
@@ -94,4 +94,3 @@ var self = module.exports = {
   },
 
 }
-

package/src/unitTest/device.test.js

@@ -55,7 +55,7 @@ let client = {
 };
 
 async function setup(){
-  await $.models.init();
+  await $.models.init($.config);
   await $.models.connect();
 }
 
@@ -70,7 +70,7 @@ async function test1(){
       projects.push(project);
     });
 
-  await $.device.init(projects);
+  await $.device.init($.config,projects);
 
   topics.forEach((topic,counter)=>{
 
@@ -87,4 +87,3 @@ async function test1(){
 
 setup();
 test1();
-