mqtt-devices-parser 1.0.14 → 1.0.16

package/Changelog.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.0.16
+	changes db tables:
+	 - models/devices.models: removes endpoint, adds protocol and psk.
+	 - adds mqtt_password
+
+## 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
 	

package/Release.md

@@ -3,6 +3,7 @@
 ## Before release
 
   increases version on package.json
+  run npm install
   edit changelog
   commit and push to repo
 

package/models/clients.models.js

@@ -20,6 +20,10 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
+		mqtt_password: {
+			type: DataTypes.STRING(24),
+			allowNull: true
+		},
 		gmail: {
 			type: DataTypes.STRING(64),
 			//unique: true,

package/models/devices.models.js

@@ -59,11 +59,14 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.INTEGER,
 			allowNull: true
 		},
-		endpoint: { // info about protocol communication
-			type: DataTypes.JSON,
+		protocol: { // protocol communication to be used
+			type: DataTypes.STRING,
+			allowNull: false
+		},
+		psk: { // pre shared key
+			type: DataTypes.STRING,
 			allowNull: true
 		},
-
 	},
 	{
 		tableName: 'devices',

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.14",
+  "version": "1.0.16",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/device/device.js

@@ -401,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{