mqtt-devices-parser 1.0.11 → 1.0.13

package/src/db/firmware.js

@@ -3,16 +3,41 @@ var mysql = require('mysql2')
 
 var self = module.exports = {
 
-	getLatestFWVersion : async (modelId,release)=>{
+	getById : async (firmwareId)=>{
+		return new Promise((resolve,reject) => {
+
+		  let query = "";
+			let table = [];
+
+			query = `SELECT * FROM firmwares where id = ?`;
+			table = [firmwareId];
+
+	    query = mysql.format(query,table);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0){
+	        return resolve(rows[0]);
+	      }else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      console.log(err);
+	      return resolve(null);
+	    });
+	  });
+	},
+
+	getLatestVersion : async (modelId,release)=>{
 
 	  return new Promise((resolve,reject) => {
 
 	    let query = "";
 		let table = [];
 
-		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
+		query = `SELECT version,filename,token,id FROM firmwares where model_id = ? and build_release = ? ORDER BY CAST(SUBSTRING_INDEX(version, '.', 1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(version, '.', 2), '.', -1) AS UNSIGNED) DESC,
+		 CAST(SUBSTRING_INDEX(version, '.', -1) AS UNSIGNED) DESC
 		 LIMIT 1`;
 		table = [modelId,release];
 
@@ -39,7 +64,7 @@ var self = module.exports = {
 	    let query = "";
 		let table = [];
 
-		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,
+		query = `SELECT app_version,filename,token,id FROM firmwares where model_id = ? and build_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`;

package/src/db/fota.js

@@ -0,0 +1,219 @@
+const moment = require('moment');
+var mysql = require('mysql2')
+
+var self = module.exports = {
+
+	getEntry : async (deviceId,filter)=>{
+
+	  return new Promise((resolve,reject) => {
+
+	    let query = `SELECT COUNT(*) FROM ?? where 
+	    	device_id = ? and
+	    	target_version = ? and
+	    	target_app_version = ? and
+	    	target_release = ? and
+	    	firmware_id = ?`;
+
+	    let table = [
+	    	"fota",
+	    	deviceId,
+	    	filter.target_version,
+	    	filter.target_app_version,
+	    	filter.target_release,
+	    	filter.firmware_id
+    	];
+	    query = mysql.format(query,table);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0)
+	        return resolve(rows[0]);
+	      else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      return reject(err);
+	    });
+	  });
+	},
+
+	getFirmwareId : async (deviceId)=>{
+
+	  return new Promise((resolve,reject) => {
+
+	    let query = "SELECT firmware_id FROM ?? where device_id = ?";
+	    let table = ["fota",deviceId];
+	    query = mysql.format(query,table);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0)
+	        return resolve(rows[0].firmware_id);
+	      else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      return reject(err);
+	    });
+	  });
+	},
+
+	getUpdatable : async (release)=>{
+
+	  return new Promise((resolve,reject) => {
+
+	    let query = `SELECT d.*,f.firmware_id, f.nAttempts 
+	    	FROM fota as f
+	    	inner join devices as d on d.id = f.device_id 
+	    	where d.status = ? and f.fUpdate = ? and f.nAttempts < ? and f.target_release = ?`;
+	    let table = ['online',1,3,release];
+	    query = mysql.format(query,table);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+		  return resolve(rows);
+	    })
+	    .catch( err => {
+	      console.log(err);
+	      return resolve(null);
+	    });
+	  });
+	},
+
+	update : async(deviceId, obj)=>{
+
+		return new Promise(async (resolve,reject) => {
+
+			obj['updatedAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+
+			let firmwareId = await self.getFirmwareId(deviceId);
+			if(firmwareId == null){
+				obj['createdAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+				obj['device_id'] = deviceId;
+
+		    $.db.insert("fota",obj)
+		    .then (rows => {
+		      return resolve(rows[0]);
+		    })
+		    .catch(error => {
+		      return reject(error);
+		    });
+
+			}else{
+
+				let filter = {
+					device_id : deviceId
+				};
+
+				$.db.update("fota",obj,filter)
+		    .then (rows => {
+		      return resolve(rows[0]);
+		    })
+		    .catch(error => {
+		      return reject(error);
+		    });
+			}
+
+		});
+	},
+
+	getDeviceLastLog : async(deviceId)=>{
+
+		return new Promise((resolve,reject) => {
+
+	    let query = `SELECT * FROM ?? 
+	    	where device_id = ? 
+	    	ORDER BY updatedAt DESC
+	    	LIMIT 1`;
+
+	    let table = [
+	    	"fota",
+	    	deviceId,
+    	];
+	    query = mysql.format(query,table);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0)
+	        return resolve(rows[0]);
+	      else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      return reject(err);
+	    });
+	  });
+	},
+
+	getDeviceLogs : async()=>{
+
+		return new Promise((resolve,reject) => {
+
+	    let query = `SELECT * FROM ?? 
+	    	ORDER BY updatedAt DESC
+	    	LIMIT 20`;
+
+	    let table = [
+	    	"fota",
+    	];
+	    query = mysql.format(query,table);
+
+	    $.db.queryRow(query)
+	    .then( rows => {
+	      if(rows.length > 0)
+	        return resolve(rows);
+	      else
+	        return resolve(null);
+	    })
+	    .catch( err => {
+	      return reject(err);
+	    });
+	  });
+	},
+
+	newLog : async(deviceId, obj)=>{
+
+		return new Promise(async (resolve,reject) => {
+
+			const timestamp = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+			obj['updatedAt'] = timestamp;
+			obj['createdAt'] = timestamp;
+			obj['device_id'] = deviceId;
+
+			$.db.insert("logs_fota",obj)
+			.then (rows => {
+			  return resolve(rows[0]);
+			})
+			.catch(error => {
+			  return reject(error);
+			});
+
+		});
+	},
+
+	updateLog : async(deviceId, obj)=>{
+
+		return new Promise(async (resolve,reject) => {
+
+			const log = await getDeviceLastLog(deviceId);
+
+			if(log?.createdAt != log?.updatedAt)
+
+			obj['updatedAt'] = moment().utc().format('YYYY-MM-DD HH:mm:ss');
+
+			const filter = {
+				id : log.id
+			}
+
+			$.db.update("logs_fota",obj,filter)
+			.then (rows => {
+			  return resolve(rows[0]);
+			})
+			.catch(error => {
+			  return reject(error);
+			});
+
+		});
+	},
+
+}

package/src/device/Readme.md

@@ -10,14 +10,49 @@ Only messages with MACRO_UID_PREFIX in topic will be parsed.
 MACRO_UID_PREFIX allows the module to discover the device uid.
 If uid doesn't exist in db it will add it.
 After that, it will associate the project if the project exists in db.
-If the device already exists it will verify the project and update it in case of need
+If the device already exists it will verify the project and update it in case of needed
 
-:project/:device/status
-Updates the device status
+## Fota
+Add a new firmware to model
 
-:project/:device/model
+Every 5min for release = "dev" and every hour for release = "prod"
+devices will be updated if needed
+
+### Available topics
+
+:project/:device/status - send it on boot with retain
+Updates the device status (online/offline)
+
+:project/:device/model - send it on boot with retain
 Updates the model if the model already exists in db
 
+:project/:device/version - send it on boot with retain
+// If version mismatch, updates fota table with success
+
+:project/:device/app_version - send it on boot with retain
+// If version mismatch, updates fota table with success
+
+:project/:device/tech - send it on boot with retain
+// Radio technology
+
+:project/:device/fw/fota/update/status - send if fota fails
+// Receives fota error and updates fota table
+
+// can be changed - Likely will be deprecated
+:project/:device/fw - send it periodically
+// JSON struct, stores value of keys:
+	- heapFree
+	- uptime
+	- rssi
+
+// Under development
+// If sensor is created stores info
+:project/:device/sensor/:sensor 
+// JSON struct, stores value of keys:
+	- value
+
+### Set instruction
+Any instruction ended with /set will be added to a json file on settings table
 
 ## New Project