mqtt-devices-parser 1.0.13 → 1.0.14

package/Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 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

@@ -8,4 +8,7 @@
 
 ## 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mqtt-devices-parser",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "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);
             }
           }
         }
@@ -409,7 +421,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 +460,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);
   }
 }