work

Web-Server/modules/express.js

@@ -4,6 +4,7 @@
 */
 const express = require("express");
 const helmet = require('helmet')
+
 const app = express();
 app.use(helmet())
 const port = 80;
@@ -11,10 +12,11 @@ const port = 80;
 //disable x-powered-by header for security reasons
 app.disable('x-powered-by')
 
+const { APIlogger } = require('../middleware/ApiLogger.js');
 
 //middleware logic
 //app.use('/api/v1', require('../middleware/ApiKey.js'));
-//app.use('/api/v1', require('../middleware/ApiLogger.js'));
+app.use('/api/', APIlogger );
 
 //route logic 
 app.use('/api/', require('../routes/api_route.js'));
@@ -32,4 +34,6 @@ app.listen(port, () => {
 	console.log(`app listening on port ${port}`);
 });
 
-module.exports = { app };
+module.exports = { app };
+
+

Web-Server/modules/mqtt.js

@@ -17,32 +17,6 @@ const options = {
 
 const client = mqtt.connect(brokerUrl, options);
 
+module.exports = client;
 
-// Event handlers
-client.on('connect', () => {
-  console.log('Connected to MQTT broker');
-  client.subscribe('iot-data'); 
-});
-
-client.on('message', (topic, message) => {
-  //console.log(`Received message on topic ${topic}: ${message}`);
-  let data = JSON.parse(message);
-  if (validateData(data)) {
-    //upload to db logic here
-  }
-  else {
-    console.log("Data is invalid");
-  }
-});
-
-client.on('error', (err) => {
-  console.error('Error:', err);
-  client.end(); 
-});
-
-client.on('end', () => {
-  console.log('Disconnected from MQTT broker');
-  client.reconnect = true;
-}
-);