mqtt-devices-parser 1.0.10 → 1.0.12

package/Changelog.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.0.12
+	Adds periodically call to check and update devices
+
+## 1.0.11
+	index: MQTT
+		- makes mqtt client global,
+		- adds periodically call for FOTA update
+	models/devices.models: adds version fields to devices table
+	models/firmwares.models: adds new fields for firmware management
+	src/db/device: optimizes calls to manage devices table
+	src/device/device: Fota changes, db calls updated to match previous changes
+	Adds method to check FOTA updates. Doing 10 at time at each minute for now. Non configurable
+
 ## 1.0.10
 	src/db/data: handles json data
 	- Adds updateJson call

package/index.js

@@ -14,6 +14,8 @@ $.db_device = require('./src/db/device');
 $.db_model = require('./src/db/model');
 $.db_firmware = require('./src/db/firmware');
 $.db_sensor = require('./src/db/sensor');
+$.db_fota = require('./src/db/fota');
+$.mqtt_client = null;
 
 const packageJson = require(__dirname+'/package.json');
 const packageVersion = packageJson.version;
@@ -44,7 +46,6 @@ var self = module.exports = {
       setInterval(async ()=>{
         await $.device.deleteLogs();
       },60*60*1000);
-      
 
       return resolve();
     })
@@ -63,6 +64,7 @@ var self = module.exports = {
       })
 
       let counter_help = 0;
+      let project = {}
       files.forEach( async(name,counter) => {
         if($.config.projects[name]){
           project[name] = {};
@@ -82,7 +84,7 @@ var self = module.exports = {
 
   },
 
-  deploy: async(_config,projectsPath)=>{
+  deploy: async(_config,projectsPath, projects)=>{
 
     if(_config != null)
         $.config = _config;
@@ -104,6 +106,15 @@ var self = module.exports = {
       await $.models.insertUser("client","client_pwd",3);
       // adds client with credentials admin@admin
       await $.models.insertClient("admin","admin",user_id); // dashboard login
+
+      for(name of projects){
+        project = $.config[name];
+        if (project) {
+          // Make a copy if you don't want to modify the original config object
+          const projectData = { ...project, name: name };
+          await $.models.insertProject(projectData);
+        }
+      }
     }
 
     // project tables
@@ -117,7 +128,8 @@ var self = module.exports = {
 function mqtt_connect(){
 
   const mqtt_prefix = $.config.mqtt.logs_path+"/"+$.config.mqtt.client;
-  const client = mqtt.connect({
+  let checkFota = null;
+  $.mqtt_client = mqtt.connect({
     host : $.config.mqtt.host,
     port : $.config.mqtt.port,
     username : $.config.mqtt.user,
@@ -132,50 +144,68 @@ function mqtt_connect(){
     }
   });
 
-  client.on("connect", () => {
+  $.mqtt_client.on("connect", () => {
 
-    client.publish(mqtt_prefix+"/status","online",{qos:2,retain:true});
-    client.publish(mqtt_prefix+"/version",packageVersion,{qos:2,retain:true});
+    $.mqtt_client.publish(mqtt_prefix+"/status","online",{qos:2,retain:true});
+    $.mqtt_client.publish(mqtt_prefix+"/version",packageVersion,{qos:2,retain:true});
 
     projects.map( (project)=>{
-      client.subscribe(project+"/#", (err) => {});
+      $.mqtt_client.subscribe(project+"/#", (err) => {});
 
       for(let project in $.config.projects){
         if($.config.projects[project])
-          client.publish(mqtt_prefix+"/"+project,"active",{qos:2,retain:true});
+          $.mqtt_client.publish(mqtt_prefix+"/"+project,"active",{qos:2,retain:true});
         else
-          client.publish(mqtt_prefix+"/"+project,"deactive",{qos:2,retain:true});
+          $.mqtt_client.publish(mqtt_prefix+"/"+project,"deactive",{qos:2,retain:true});
       };
     })
     console.log(`MQTT connected to: ${$.config.mqtt.host}:${$.config.mqtt.port}`);
     projects.map( project=>{
       console.log("subscribing project:",project);
-      client.subscribe(project+"/#")
+      $.mqtt_client.subscribe(project+"/#")
     })
+
+    // Update 'dev' devices at each 5 min 
+    checkFota = setInterval(async ()=>{
+      await $.device.checkFota("dev");
+      await $.device.triggerFota("dev");
+    },5*60*1000);
+
+    // Update 'prod' devices at each hour
+    checkFota = setInterval(async ()=>{
+      await $.device.checkFota("prod");
+      await $.device.triggerFota("prod");
+    },60*60*1000);
+
+    // Devices not set as dev or prod must be triggered manually
+
   });
 
-  client.on("message", (topic, payload, packet) => {
+  $.mqtt_client.on("message", (topic, payload, packet) => {
     // payload is Buffer
-    $.device.parseMessage(client,topic.toString(),payload.toString(),packet.retain);
+    $.device.parseMessage($.mqtt_client,topic.toString(),payload.toString(),packet.retain);
   });
 
-  client.on("reconnect",()=>{
+  $.mqtt_client.on("reconnect",()=>{
     console.log("reconnect")
   });
 
-  client.on("close",()=>{
+  $.mqtt_client.on("close",()=>{
     console.log("close")
+    checkFota = null;
   });
 
-  client.on("offline",()=>{
+  $.mqtt_client.on("offline",()=>{
     console.log("offline")
+    checkFota = null;
   });
 
-  client.on("disconnect",(packet)=>{
+  $.mqtt_client.on("disconnect",(packet)=>{
     console.log(packet)
+    checkFota = null;
   })
 
-  client.on("error",(error)=>{
+  $.mqtt_client.on("error",(error)=>{
     console.log(error)
   })
 }

package/models/devices.models.js

@@ -9,10 +9,6 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		project: { // deprecated
-			type: DataTypes.STRING,
-			allowNull: true
-		},
 		status: {
 			type: DataTypes.STRING,
 			allowNull: true
@@ -31,6 +27,18 @@ module.exports = (sequelize,DataTypes)=>{
 				key: 'id'
 			}
 		},
+		version: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		app_version: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		accept_release: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
 		tech: {
 			type: DataTypes.STRING,
 			allowNull: true

package/models/firmwares.models.js

@@ -10,7 +10,7 @@ module.exports = (sequelize,DataTypes)=>{
 			allowNull: true,
 			unique: true
 		},
-		fw_version: {
+		version: {
 			type: DataTypes.STRING,
 			allowNull: true
 		},
@@ -18,11 +18,11 @@ module.exports = (sequelize,DataTypes)=>{
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		fw_release: {
+		build_release: {
 			type: DataTypes.STRING,
 			allowNull: true
 		},
-		model_id: { // deprecated
+		model_id: { 
 			type: DataTypes.INTEGER,
 			references: {
 				model: 'models',

package/models/fota.models.js

@@ -0,0 +1,32 @@
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("fota", {
+		device_id: {
+			type: DataTypes.INTEGER,
+			unique: true,
+		},
+		target_version: {
+			type: DataTypes.STRING,
+		},
+		target_app_version: {
+			type: DataTypes.STRING,
+		},
+		target_release: {
+			type: DataTypes.STRING,
+		},
+		firmware_id: {
+			type: DataTypes.INTEGER,
+		},
+		nAttempts: {
+			type: DataTypes.INTEGER,
+			default: 0
+		},
+		fUpdate: {
+			type: DataTypes.BOOLEAN,
+			default: 0
+		},
+	},
+	{
+		tableName: 'fota',
+		freezeTableName: true
+	})
+}

package/models/logs_fota.models.js

@@ -0,0 +1,41 @@
+module.exports = (sequelize,DataTypes)=>{
+	return sequelize.define("logs_fota", {
+		device_id: {
+			type: DataTypes.INTEGER,
+		},
+		model_id: {
+			type: DataTypes.STRING,
+		},
+		local_version: {
+			type: DataTypes.STRING,
+		},
+		local_app_version: {
+			type: DataTypes.STRING,
+		},
+		target_version: {
+			type: DataTypes.STRING,
+		},
+		target_app_version: {
+			type: DataTypes.STRING,
+		},
+		target_file: {
+			type: DataTypes.STRING,
+		},
+		error: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		success: {
+			type: DataTypes.BOOLEAN,
+			default: 0
+		},
+		nAttempt: {
+			type: DataTypes.INTEGER,
+			default: 0
+		},
+	},
+	{
+		tableName: 'logs_fota',
+		freezeTableName: true
+	})
+}

package/models/{sensor_logs.models.js → logs_sensor.models.js}

@@ -1,5 +1,5 @@
 module.exports = (sequelize,DataTypes)=>{
-	return sequelize.define("sensor_logs", {
+	return sequelize.define("logs_sensor", {
 		device_id: {
 			type: DataTypes.INTEGER,
 			unique: false,
@@ -34,7 +34,7 @@ module.exports = (sequelize,DataTypes)=>{
 
 	},
 	{
-		tableName: 'sensor_logs',
+		tableName: 'logs_sensor',
 		freezeTableName: true
 	})
 }

package/models/modelPermissions.models.js

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