mqtt-devices-parser 1.0.13 → 1.0.15

package/Changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.0.15
+	src/device/device: fixes fota for sniffer model
+	changes DB tables:
+	 - adds level to modelPermissions
+	 - adds project_id to model
+	 - adds projectPermissions table
+	 - deletes file modelPermissions.js
+
+## 1.0.14
+	Fixes check FOTA mechanism and response
+	
 ## 1.0.13
 	adds 2 new tables to db:
 	Adds 5 new columns to devices

package/Release.md

@@ -3,9 +3,13 @@
 ## Before release
 
   increases version on package.json
+  run npm install
   edit changelog
   commit and push to repo
 
 ## Releasing
 
+	launch release on git:
+		>> gh release create ${tag}
+
   npm publish

package/models/fota.models.js

@@ -4,6 +4,9 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.INTEGER,
 			unique: true,
 		},
+		model_id: {
+			type: DataTypes.INTEGER,
+		},
 		target_version: {
 			type: DataTypes.STRING,
 		},

package/models/modelPermissions.models.js

@@ -14,6 +14,9 @@ module.exports = (sequelize,DataTypes)=>{
 				model: 'models',
 				key: 'id'
 			}
+		},
+		level: {
+			type: DataTypes.INTEGER,
 		}
 	},
 	{

package/models/models.models.js

@@ -16,6 +16,10 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
+		project_id: {
+			type: DataTypes.INTEGER,
+			allowNull: false	
+		},
 		fw_enabled: {
 			type: DataTypes.BOOLEAN,
 			defaultValue: false

package/models/{modelPermissions.js → projectPermissions.models.js}

@@ -1,6 +1,6 @@
 
 module.exports = (sequelize,DataTypes)=>{
-	return sequelize.define("modelPermissions", {
+	return sequelize.define("projectPermissions", {
 		client_id: {
 			type: DataTypes.INTEGER,
 			references: {
@@ -8,16 +8,19 @@ module.exports = (sequelize,DataTypes)=>{
 				key: 'id'
 			}
 		},
-		model_id: {
+		project_id: {
 			type: DataTypes.INTEGER,
 			references: {
-				model: 'models',
+				model: 'projects',
 				key: 'id'
 			}
+		},
+		level: {
+			type: DataTypes.INTEGER,
 		}
 	},
 	{
-		tableName: 'modelPermissions',
+		tableName: 'projectPermissions',
 		freezeTableName: true
 	})
 }

package/package.json

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

package/src/db/fota.js

@@ -7,7 +7,7 @@ var self = module.exports = {
 
 	  return new Promise((resolve,reject) => {
 
-	    let query = `SELECT COUNT(*) FROM ?? where 
+	    let query = `SELECT * FROM ?? where 
 	    	device_id = ? and
 	    	target_version = ? and
 	    	target_app_version = ? and
@@ -91,13 +91,13 @@ var self = module.exports = {
 				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);
-		    });
+			    $.db.insert("fota",obj)
+			    .then (rows => {
+			      return resolve(rows[0]);
+			    })
+			    .catch(error => {
+			      return reject(error);
+			    });
 
 			}else{
 
@@ -106,18 +106,18 @@ var self = module.exports = {
 				};
 
 				$.db.update("fota",obj,filter)
-		    .then (rows => {
-		      return resolve(rows[0]);
-		    })
-		    .catch(error => {
-		      return reject(error);
-		    });
+			    .then (rows => {
+			      return resolve(rows[0]);
+			    })
+			    .catch(error => {
+			      return reject(error);
+			    });
 			}
 
 		});
 	},
 
-	getDeviceLastLog : async(deviceId)=>{
+	getFotaLastLog : async(deviceId)=>{
 
 		return new Promise((resolve,reject) => {
 
@@ -127,7 +127,7 @@ var self = module.exports = {
 	    	LIMIT 1`;
 
 	    let table = [
-	    	"fota",
+	    	"logs_fota",
 	    	deviceId,
     	];
 	    query = mysql.format(query,table);
@@ -195,7 +195,7 @@ var self = module.exports = {
 
 		return new Promise(async (resolve,reject) => {
 
-			const log = await getDeviceLastLog(deviceId);
+			const log = await self.getFotaLastLog(deviceId);
 
 			if(log?.createdAt != log?.updatedAt)
 

package/src/device/device.js

@@ -314,12 +314,15 @@ var self = module.exports = {
 
     for (const model of models) {
       
+      console.log("model:",model?.name);
       if(!model?.id)
         continue;
 
       try{
         const latestVersion = await $.db_firmware.getLatestVersion(model.id,release);
         const latestAppVersion = await $.db_firmware.getLatestAppVersion(model.id,release);
+        console.log("latestVersion:",latestVersion?.version);
+        console.log("latestAppVersion:",latestAppVersion?.app_version);
 
         const devices = await $.db_device.listByModel(model.id);
 
@@ -356,12 +359,21 @@ var self = module.exports = {
             };
           }
           if(obj != null){
-            try{
-              let res = await $.db_fota.getEntry(device.id,obj);
-              if(res == null)
-                $.db_fota.update(device.id,obj);
-            }catch(error){
-              console.error(error)
+            try {
+
+              let res = await $.db_fota.getEntry(device.id, obj);
+
+              if (res == null) {
+                try {
+                  console.log("add fota entry for device:", device.uid);
+                  await $.db_fota.update(device.id, obj);
+                } catch (err) {
+                  console.error("Error updating FOTA entry:", err);
+                }
+              }
+              
+            } catch (error) {
+              console.error("Error getting or processing FOTA entry:", error);
             }
           }
         }
@@ -389,19 +401,22 @@ var self = module.exports = {
           const model_name = model?.name;
           let topic = "";
           if(model_name == "sniffer"){
-            resolve();
-            // !! This cannot be handled on this way
 
             // get sniffer info associated to device
-            const sniffer = await $.db_data.getAssociatedToDevice("sniffer",device.id);
-            if(sniffer == null) return;
+            const associatedDevice = await $.db_device.getAssociatedDevice(device.id);
+            if(associatedDevice == null) return;
+
             // get device_uid from devices table
-            const gw = await $.db_device.getById(sniffer?.id)
+            const gw = await $.db_device.getById(associatedDevice)
             if(gw == null) return;
-            let mqtt_prefix = `${project_name}/${gw.uid}`;
-            if (semver.gt(sniffer.version, "2.0.1"))
+
+            const gwProject = await $.db_project.getById(gw?.project_id);
+            const gwProjectName = project?.name;
+
+            let mqtt_prefix = `${gwProjectName}/${gw?.uid}`;
+            if (semver.gt(gw.app_version, "1.0.5"))
               topic = mqtt_prefix+`/app/sniffer/${sniffer.uid}/fota/update/set`;
-            else
+            else // deprecate it as soon as all gws are updated
               topic = mqtt_prefix+`/app/sniffer/fota/update/set`;
           }
           else{
@@ -409,7 +424,7 @@ var self = module.exports = {
             topic = mqtt_prefix+"/fw/fota/update/set";
           }
           let link = `${$.config.web.protocol}${$.config.web.domain}${$.config.web.fw_path}${firmware?.filename}/download?token=${firmware?.token}`;
-          console.log(`Requesting firmware update of ${device.uid} to ${firmware?.filename}`);
+          console.log(`Requesting firmware update for ${device.uid} to ${firmware?.filename}`);
           $.mqtt_client.publish(topic,`{"url":"${link}"}`,{qos:1,retain:false});
 
           let obj = {
@@ -448,14 +463,14 @@ var self = module.exports = {
     object = {
       success : 1,
     }
-    await $.db_fota.updateLog(deviceId,obj);
+    await $.db_fota.updateLog(deviceId,object);
   },
 
   handleFotaError : async (deviceId, error) => {
     let object = {
       error : error,
     }
-    await $.db_fota.updateLog(deviceId,obj);
+    await $.db_fota.updateLog(deviceId,object);
   }
 }