mqtt-devices-parser 1.0.29 → 1.0.31

package/Changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.31
+	fix: handleFotaSuccess, make it public
+	
+## 1.0.30
+	fix: tests, recover "settings" parsing, deal with new call addMqttMsgLog
+	doc: update Release
+	fix: handle ER_DUP_ENTRY race condition in fota.update() (#14)
+	perf(src/device/device): clean and parse mqtt payload
+
 ## 1.0.29
 	fix(models/sensors): allow null model_id
 	fix: synching mqtt topics
@@ -11,7 +20,7 @@
 	doc(device): recover readme add test.md file
 	fix(models/variants): remove unique true from column name
 	ci: fix vulnerabilities
-	
+
 ## 1.0.27
 	feat(db): adds variants table
 	

package/Release.md

@@ -2,8 +2,9 @@
 
 ## Before release
 
+  run npm test
   increases version on package.json
-  run npm install
+  run npm install (check vulnerabilities)
   edit changelog
   commit and push to repo
 

package/package.json

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

package/src/db/fota.js

@@ -96,7 +96,14 @@ var self = module.exports = {
 			      return resolve(rows[0]);
 			    })
 			    .catch(error => {
-			      return reject(error);
+			      if(error.code === 'ER_DUP_ENTRY'){
+			        let filter = { device_id : deviceId };
+			        $.db.update("fota",obj,filter)
+			        .then(rows => { return resolve(rows[0]); })
+			        .catch(err => { return reject(err); });
+			      }else{
+			        return reject(error);
+			      }
 			    });
 
 			}else{

package/src/device/device.js

@@ -335,7 +335,6 @@ var self = module.exports = {
 
       $.db_device.updateLocalTopic(dbTopic.id,payload)
       .then(()=>{
-        // set as not synched
         if(isDeepStrictEqual(payload, dbTopic?.remoteData))
           $.db_device.setSynchedTopic(dbTopic.id,true);
         else
@@ -371,6 +370,24 @@ var self = module.exports = {
     }
   },
 
+  handleFotaSuccess: async (deviceId)=>{
+    let object = {
+      "nAttempts" : 0,
+      "fUpdate" : 0,
+    }
+    $.db_fota.update(deviceId,object);
+    object = {
+      success : 1,
+    }
+    $.db_fota.updateLog(deviceId,object);
+  },
+
+  handleFotaError: async (deviceId, error)=>{
+    let object = {
+      error : error,
+    }
+    $.db_fota.updateLog(deviceId,object);
+  }
 }
 
 async function parseLwm2mMessage(client, project_name, device, topic, payload, action){
@@ -420,6 +437,7 @@ async function parseMqttMessage(client, project_name, device, topic, payload, re
 
   try{
     payload = JSON.parse(payload);
+    payload = cleanAndParse(payload);
   }catch(error){}
 
   let word = $.parser.getFirstWord(topic);
@@ -480,14 +498,14 @@ async function parseMqttMessage(client, project_name, device, topic, payload, re
       if (payload != null && payload != device?.version) {
         $.db_device.addLog(device.id,"version",payload);
         $.db_device.update(device.id, "version", payload);
-        handleFotaSuccess(device.id);
+        self.handleFotaSuccess(device.id);
       }
       break;
     case "app_version":
       if (payload != null && payload != device?.app_version) {
         $.db_device.addLog(device.id,"app_version",payload);
         $.db_device.update(device.id, "app_version", payload);
-        handleFotaSuccess(device.id);
+        self.handleFotaSuccess(device.id);
       }
       break;
     case "fw":
@@ -515,7 +533,6 @@ async function parseMqttMessage(client, project_name, device, topic, payload, re
       }
       break;
     case "settings": // deprecated
-      break;
       if(topic.endsWith("/set")){
         updateLocalSettings(device,topic,payload);
       }else{
@@ -707,23 +724,18 @@ async function synchSettings(device,key){
   */
 }
 
-function handleFotaSuccess (deviceId){
-  let object = {
-    "nAttempts" : 0,
-    "fUpdate" : 0,
-  }
-  $.db_fota.update(deviceId,object);
-  object = {
-    success : 1,
-  }
-  $.db_fota.updateLog(deviceId,object);
-}
-
-function handleFotaError (deviceId, error){
-  let object = {
-    error : error,
+function cleanAndParse(payload) {
+  if (typeof payload === 'string') {
+    let cleaned = payload.trim();
+    if (cleaned.startsWith('"') && cleaned.endsWith('"')) {
+      cleaned = cleaned.slice(1, -1);
+    }
+    cleaned = cleaned.replace(/\\"/g, '"');
+    try {
+      return JSON.parse(cleaned);
+    } catch (e) {
+      return payload; // fallback: return original if still invalid
+    }
   }
-  $.db_fota.updateLog(deviceId,object);
-}
-
-
+  return payload;
+}

package/src/device/device.test.js

@@ -29,7 +29,8 @@ global.$ = {
     updateLocalTopic: jest.fn(),
     setSynchedTopic: jest.fn(),
     updateRemoteTopic: jest.fn(),
-    getAssociatedDevice: jest.fn()
+    getAssociatedDevice: jest.fn(),
+    addMqttMsgLog: jest.fn()
   },
   db_model: {
     getByName: jest.fn(),