mqtt-devices-parser 1.0.25 → 1.0.27

package/Changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.0.27
+	feat(db): adds variants table
+	
+## 1.0.26
+	feat: src/device/device: request fw/wifi/get
+		on device online reporting and if device is connected through wifi
+	fix: add logs in json format to logs_fw table
+	forces: usage of "ws": "^7.5.10" for websocket-stream package
+	vulnerabilities: 0 found
+
 ## 1.0.25
 
 	Sensors template (#9)

package/models/devices.models.js

@@ -31,6 +31,13 @@ module.exports = (sequelize,DataTypes)=>{
 				key: 'id'
 			}
 		},
+		variant_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'variants',
+				key: 'id'
+			}
+		},
 		version: {
 			type: DataTypes.STRING,
 			allowNull: true

package/models/firmwares.models.js

@@ -29,6 +29,13 @@ module.exports = (sequelize,DataTypes)=>{
 				key: 'id'
 			},
 		},
+		variant_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'variants',
+				key: 'id'
+			}
+		},
 		token: {
 			type: DataTypes.STRING,
 			allowNull: true

package/models/variants.models.js

@@ -0,0 +1,23 @@
+
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("variants", {
+		name: {
+			type: DataTypes.STRING,
+			unique: true
+		},
+		model_id: {
+			type: DataTypes.INTEGER,
+			references: {
+				model: 'models',
+				key: 'id'
+			}
+		},
+		description: {
+			type: DataTypes.STRING
+		},
+	},
+	{
+		tableName: 'variants',
+		freezeTableName: true
+	})
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mqtt-devices-parser",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,14 @@
     "path": "^0.12.7",
     "semver": "^7.3.8",
     "sequelize": "^6.32.1",
-    "websocket-stream": "^5.3.0"
+    "websocket-stream": "^5.4.0"
+  },
+  "overrides": {
+    "websocket-stream": {
+      "ws": "^7.5.10"
+    },
+    "sequelize": {
+      "uuid": "^11.1.1"
+    }
   }
 }

package/src/db/data.js

@@ -275,7 +275,7 @@ var self = module.exports = {
 	  });
 	},
 
-	addJsonLog: async (table, deviceId, dataObject) => {
+	addJsonLog: async (table, deviceId, dataObject, column = "") => {
 		return new Promise((resolve, reject) => {
 			if (!dataObject || typeof dataObject !== 'object') 
 				return reject("Not an object");
@@ -291,17 +291,22 @@ var self = module.exports = {
 			if (db_columns == null) 
 				return reject(`No columns for table: ${table}`);
 
-			// Prepare data for insertion
-			for (let key in dataObject) {
-				if (db_columns.hasOwnProperty(key)) {
-					let value = dataObject[key];
+			if(column != ""){
+				if (db_columns.hasOwnProperty(column))
+					obj[column] = JSON.stringify(dataObject);
+			}else{
+				// Prepare data for insertion
+				for (let key in dataObject) {
+					if (db_columns.hasOwnProperty(key)) {
+						let value = dataObject[key];
+
+						// Convert object to JSON string if needed
+						if (typeof value === 'object') {
+							value = JSON.stringify(value);
+						}
 
-					// Convert object to JSON string if needed
-					if (typeof value === 'object') {
-						value = JSON.stringify(value);
+						obj[key] = value;
 					}
-
-					obj[key] = value;
 				}
 			}
 

package/src/device/device.js

@@ -412,6 +412,10 @@ async function parseMqttMessage(client, project_name, device, topic, payload, re
           let topic = `${mqtt_prefix}/settings/mqtt/get`
           $.mqtt_client.publish(topic,"",{qos:1,retain:false});
         }
+        if(device?.tech.toLowerCase() === "wifi"){
+          let topic = `${mqtt_prefix}/fw/wifi/get`
+          $.mqtt_client.publish(topic,"",{qos:1,retain:false});
+        }
       }
       break;
     case "model":
@@ -446,10 +450,11 @@ async function parseMqttMessage(client, project_name, device, topic, payload, re
       if(topic === "fota/update/status"){
         handleFotaError(device.id, payload);
       }else{
+        let word = $.parser.getFirstWord(topic);
         if(typeof payload === 'object' && payload !== null){
           try{
             let rows = await $.db_data.updateJson("fw",device.id,payload);
-            rows = await $.db_data.addJsonLog("logs_fw",device.id,payload);
+            rows = await $.db_data.addJsonLog("logs_fw",device.id,payload,word);
           }catch(error){
             console.error(error)
           }