mqtt-devices-parser 1.0.5 → 1.0.7

package/Changelog.md

@@ -1,17 +1,27 @@
-# 1.0.5
+# Changelog
+
+## 1.0.7
+	- config/index: changes local IP
+	- src/db/firmware: changes query to get latest fw release
+	- src/device/device: adds semver. Checks fw version on "uptime" topic sent. Updates fota_tries field on db
+
+## 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
+## 1.0.4
 	- mqtt: adds retain to project state
 
-# 1.0.3
+## 1.0.3
 	-	fixes config arg
 
-# 1.0.2
+## 1.0.2
 	-	passes config struct por methods
 
-# 1.0.1
+## 1.0.1
 	- adds deploy method
 
-# 1.0.0
+## 1.0.0
 	- Module to parse mqtt messages from devices

package/config/index.js

@@ -3,7 +3,8 @@ module.exports = {
   dev : process.env.dev || "true",
   web:{
     protocol : process.env.HTTP_PROTOCOL  || "http://",
-    domain: process.env.DOMAIN            || '192.168.1.1',
+    domain: process.env.DOMAIN            || '10.168.1.162',
+    port: process.env.WEB_PORT            || 8002,
   },
   mqtt: {
     protocol:process.env.MQTT_PROTOCOL || 'MQTT',

package/models/devices.models.js

@@ -31,6 +31,10 @@ module.exports = (sequelize,DataTypes)=>{
 				key: 'id'
 			}
 		},
+		tech: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
 	},
 	{
 		tableName: 'devices',

package/package.json

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

package/src/db/device.js

@@ -65,6 +65,28 @@ var self = module.exports = {
 	  });
   	},
 
+  	updateTech : async(uid,tech)=>{
+		return new Promise((resolve,reject) => {
+
+		    let obj = {
+		      tech : tech,
+		      updatedAt : moment().utc().format('YYYY-MM-DD HH:mm:ss')
+		    };
+
+		    let filter = {
+		      uid : uid,
+		    };
+
+		    $.db.update("devices",obj,filter)
+		    .then (rows => {
+		      return resolve(rows);
+		    })
+		    .catch(error => {
+		      return reject(error);
+			});
+	  });
+  	},
+
   	updateProject : async(uid,project_id)=>{
 		return new Promise((resolve,reject) => {
 

package/src/db/firmware.js

@@ -10,27 +10,19 @@ var self = module.exports = {
 	    let query = "";
 		let table = [];
 
-		if(release == "stable"){
-			query = `SELECT fw_version,filename,token FROM firmwares where model_id = ? and fw_release = ? ORDER BY CAST(SUBSTRING_INDEX(fw_version, '.', 1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(fw_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(fw_version, '.', -1) AS UNSIGNED) DESC
-			 LIMIT 1`;
-			table = [modelId,release];
-		}else{
-			query = `SELECT fw_version,filename,token FROM firmwares where model_id = ? ORDER BY CAST(SUBSTRING_INDEX(fw_version, '.', 1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(fw_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(fw_version, '.', -1) AS UNSIGNED) DESC
-			 LIMIT 1`;
-			table = [modelId];
-		}
+		query = `SELECT fw_version,filename,token FROM firmwares where model_id = ? and fw_release = ? ORDER BY CAST(SUBSTRING_INDEX(fw_version, '.', 1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(fw_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(fw_version, '.', -1) AS UNSIGNED) DESC
+		 LIMIT 1`;
+		table = [modelId,release];
 
 	    query = mysql.format(query,table);
 
 	    $.db.queryRow(query)
 	    .then( rows => {
-	      if(rows.length > 0)
+	      if(rows.length > 0){
 	        return resolve(rows[0]);
-	      else
+	      }else
 	        return resolve(null);
 	    })
 	    .catch( err => {
@@ -47,19 +39,11 @@ var self = module.exports = {
 	    let query = "";
 		let table = [];
 
-		if(release == "stable"){
-			query = `SELECT app_version,filename,token FROM firmwares where model_id = ? and fw_release = ? ORDER BY CAST(SUBSTRING_INDEX(app_version, '.', 1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(app_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(app_version, '.', -1) AS UNSIGNED) DESC
-			 LIMIT 1`;
-			table = [modelId,release];
-		}else{
-			query = `SELECT app_version,filename,token FROM firmwares where model_id = ? ORDER BY CAST(SUBSTRING_INDEX(app_version, '.', 1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(app_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
-			 CAST(SUBSTRING_INDEX(app_version, '.', -1) AS UNSIGNED) DESC
-			 LIMIT 1`;
-			table = [modelId];
-		}
+		query = `SELECT app_version,filename,token FROM firmwares where model_id = ? and fw_release = ? ORDER BY CAST(SUBSTRING_INDEX(app_version, '.', 1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(app_version, '.', 2), '.', -1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(app_version, '.', -1) AS UNSIGNED) DESC
+		 LIMIT 1`;
+		table = [modelId,release];
 
 	    query = mysql.format(query,table);
 

package/src/device/device.js

@@ -1,6 +1,7 @@
 
 var project = [];
 const logs_table = "sensor_logs";
+const semver = require('semver');
 
 var self = module.exports = {
 
@@ -62,11 +63,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")
@@ -76,13 +77,59 @@ var self = module.exports = {
         let res = await $.db_model.getByName(payload);
         let model_id = res?.id;
 
-        if(model_id != null) $.db_device.updateModel(uid,model_id);
+        if(model_id != null){
+          let res = await $.db_device.updateModel(uid,model_id);
+        } 
+      }else if(topic.endsWith("tech")){
+        await $.db_device.updateTech(uid,payload);
+      }else if(topic.endsWith("fw_version")){
+        let fw_version = await $.db.getFieldFromDeviceId(project_name,device.id,"fw_version");
+        if(fw_version == payload)
+          await $.db_data.update(project_name,device.id,"fota_tries",1); // ! 0 is not working..
+      }else if(topic.endsWith("app_version")){
+        let app_version = await $.db.getFieldFromDeviceId(project_name,device.id,"app_version");
+        if(app_version != payload)
+          await $.db_data.update(project_name,device.id,"fota_tries",1); // ! 0 is not working..
+      }else if(topic.endsWith("uptime")){ // !! maybe this topic should be change for something ending in fota
+        // check fw version
+        // get current fw and app version
+        let release = await $.db.getFieldFromDeviceId(project_name,device.id,"fw_release");
+        if(release == null || release == "critical"){
+          // don't update
+          return;
+        }
+        let fota_tries = await $.db.getFieldFromDeviceId(project_name,device.id,"fota_tries");
+        if(fota_tries > 3)
+          return;
+
+        let fw_version = await $.db.getFieldFromDeviceId(project_name,device.id,"fw_version");
+        let app_version = await $.db.getFieldFromDeviceId(project_name,device.id,"app_version");
+        let new_firmware = await $.db_firmware.getLatestFWVersion(device.model_id,release);
+        let new_app = await $.db_firmware.getLatestAppVersion(device.model_id,release);
+        if(new_firmware == null || new_app == null)
+          return;
+
+        let mqtt_prefix = `${project_name}/${uid}`;
+        let link = `${$.config.web.protocol}${$.config.web.domain}:${$.config.web.port}${$.config.web.fw_path}${new_firmware.filename}/download?token=${new_firmware.token}`;
+
+        if(new_firmware != null && semver.lt(fw_version, new_firmware.fw_version)) {
+          console.log(`updating firmware of ${uid} to ${new_firmware.fw_version}`);
+          client.publish(mqtt_prefix+"/fw/fota/update/set",`{"url":"${link}"}`,{qos:2,retain:false});
+          await $.db_data.update(project_name,device.id,"fota_tries",++fota_tries);
+        }else{
+          if(new_app != null && semver.lt(app_version, new_app.app_version)) {
+            console.log(`updating firmware of ${uid} to ${new_app.app_version}`);
+            client.publish(mqtt_prefix+"/fw/fota/update/set",`{"url":"${link}"}`,{qos:2,retain:false});
+            await $.db_data.update(project_name,device.id,"fota_tries",++fota_tries);
+          }
+        }
+        
       }
 
       if(device.project_id != null && device.model_id != null){
         let res = await $.db_sensor.getByRef(topic)
         if(res != null){
-          $.db_sensor.insert(logs_table,device.id,res.id,payload);
+          await $.db_sensor.insert(logs_table,device.id,res.id,payload);
         }
       }