mqtt-devices-parser 1.0.4 → 1.0.6

package/Changelog.md

@@ -1,3 +1,9 @@
+# 1.0.6
+	- device: updates project if mismatch
+	
+# 1.0.5
+	- db: adds mqtt user passed on mqtt struct and grants admin privileges
+
 # 1.0.4
 	- mqtt: adds retain to project state
 

package/Readme.md

@@ -33,3 +33,7 @@
 
 The default configuration uses ./config/index.js file\
 In your program set the same struct and pass it as argument on the module init call.
+
+An mqtt account will be created using the following settings
+mqtt.user - mqtt user login
+mqtt.pwd - mqtt pwd login

package/index.js

@@ -92,12 +92,13 @@ var self = module.exports = {
       await $.models.dropTableIndexes();
       await $.models.sync();
 
-      let user = await $.models.insertUser("admin","admin",5); // ads user
-      //console.log(user);
+      // adds user for mqtt with admin credentials
+      let user = await $.models.insertUser($.config.mqtt.user,$.config.mqtt.pwd,5);
       let user_id = user.dataValues.id;
       await $.models.insertUser("device","device",3);
       await $.models.insertUser("client","client_pwd",3);
-      await $.models.insertClient("admin","admin",user_id); // ads client with credentials admin@admin
+      // adds client with credentials admin@admin
+      await $.models.insertClient("admin","admin",user_id); // dashboard login
     }
 
     // project tables

package/package.json

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

package/src/device/device.js

@@ -62,11 +62,11 @@ var self = module.exports = {
         .catch( (err) => {});
       }
 
-      if(device?.project_id == null){
-        let res = await $.db_project.getByName(project_name);
-        let project_id = res?.id;
-        if(project_id != null) $.db_device.updateProject(uid,project_id);
-      }
+      // update project id if needed
+      let res = await $.db_project.getByName(project_name);
+      let project_id = res?.id;
+      if(project_id != null && project_id != device?.project_id) 
+        $.db_device.updateProject(uid,project_id);
 
       if(topic.endsWith("status")){
         if(payload == "online" || payload == "offline")