Update dependencies and fix file paths

IoT-sensor/Database/locationModel.js

@@ -1,7 +1,6 @@
 "use strict";
 const { Sequelize, DataTypes } = require("sequelize");
 const { sequelize } = require("./mySQL");
-const { isAlphaNumericwithSpaces } = require('../../Web-Server/functions/validateData')
 
 //sequelize.sync();
 const locationModel = sequelize.define(

IoT-sensor/Database/sensorModel.js

@@ -2,11 +2,7 @@
 const { Sequelize, DataTypes } = require("sequelize");
 const { sequelize } = require("./mySQL");
 const { locationModel } = require("./locationModel");
-const {
+
-	isAlphaNumericwithSpaces,
-	isAlphaNumericWithSpacesAndDash,
-	isMacAddress,
-} = require("../../Web-Server/functions/validateData");
 
 //sequelize.sync();
 const sensorModel = sequelize.define(

IoT-sensor/functions/dbFunctions.js

@@ -1,5 +1,5 @@
-const { locationModel } = require("../Database/locationModel");
+const { locationModel } = require("../database/locationModel");
-const { sensorModel } = require("../Database/sensorModel");
+const { sensorModel } = require("../database/sensorModel");
 
 async function getLocation() {
 	const location = locationModel.findAll({

IoT-sensor/index.js

@@ -27,9 +27,9 @@ client.on("error", (err) => {
 });
 
 //every 15 minutes
-setInterval(publishData, 900000);
+//setInterval(publishData, 900000);
 //every 1 minute
-//setInterval(publishData, 60000);
+setInterval(publishData, 60000);
 
 
 

api.MD

@@ -174,4 +174,4 @@ http://localhost/api/v0/sensor-data/data?week=1&sensorid=1&locationid=1&page=2&p
 curl localhost/api/v0/user/register -H "Content-Type: application/json" -X POST -d '{"username": "testuser123", "password": "thisisthesystemuserpasswordnoob", "email": "testuser123@ecosaver.com", "address": "Nanyang Polytechnic 180 Ang Mo Kio Avenue 8 Singapore 569830", "phone": "12345678"}'
 
 
-curl localhost/api/v0/apikey/new -H "Content-Type: application/json" -X POST -d '{"userid": "5", "permission": "canRead"}'
+curl localhost:3000/api/v0/apikey/new -H "Content-Type: application/json" -X POST -d '{"userid": "5", "permission": "canRead"}'

consumerWebsite/public/js/app.js

@@ -144,6 +144,33 @@ app.api = (function (app) {
 	return { post: post, get: get, put: put, delete: remove };
 })(app);
 
+//socket.io
+app.socket = (function (app) {
+	//need to replace with domain name of server when published
+	var socket = io("localhost", {
+		transports: ["websocket"],
+		'Access-Control-Allow-Origin': 'http://localhost:3000',
+	});
+	socket.on("disconnect", () => {
+		console.log("disconnected");
+	});
+
+	socket.io.on("reconnect", () => {
+		console.log("reconnected");
+	});
+	socket.io.on("connect_error", (err) => {
+		console.log(err);
+	});
+	return socket;
+})(app);
+
+//sensor data
+app.sensordata = (function (app) {
+
+
+})(app);
+
+
 app.auth = (function (app) {
 	var user = {};
 	function setToken(token) {
@@ -154,18 +181,20 @@ app.auth = (function (app) {
 		return localStorage.getItem("APIToken");
 	}
 
-
 	function isLoggedIn(callback) {
 		if (getToken()) {
 			return app.api.get("user/me", function (error, data) {
 				if (!error) app.auth.user = data;
 				//for navbar to show username
+				if (!location.pathname === "/login")
+				{
 					$.scope.getUsername.update(data);
 
+				}
+
 				//for edit profile to show user details
 				//if not in edit profile page, it will not show
-				if (location.pathname === "/profile")
+				if (location.pathname === "/profile") {
-				{
 					$.scope.getUserDetails.update(data);
 				}
 				return callback(error, data);
@@ -232,12 +261,9 @@ app.auth = (function (app) {
 		logInRedirect,
 		homeRedirect,
 		profileRedirect,
-		//showUser,
-		//redirectIfLoggedIn,
 	};
 })(app);
 
-
 app.user = (function (app) {
 	//delete profile
 	function deleteProfile() {
@@ -250,12 +276,10 @@ app.user = (function (app) {
 				});
 			}
 		});
-		
 	}
 	return {
 		deleteProfile,
 	};
-
 })(app);
 
 //ajax form submit and pass to api

consumerWebsite/views/index.ejs

@@ -1,5 +1,11 @@
 <%- include('top') %>
+   <script>
+      //call socket.io
+      app.socket.on("sensorData:new", function (data) {
+         console.log(data);
+      });
 
+   </script>
 
 
    <header class="slider-main">
@@ -50,18 +56,7 @@
           <h1 class="my-4">Services</h1>
           <!-- Services Section -->
           <div class="row">
-            <div class="col-lg-4 mb-4">
+              <div class="col-lg-3 mb-4">
-               <div class="card">
-                  <h4 class="card-header">Humidity</h4>
-                  <div class="card-body text-center">
-                     <p class="card-text display-4"> 70% - 75% </p>
-                  </div>
-                  <div class="card-footer">
-                     <a href="/learnmore" class="btn btn-primary">Learn More</a>
-                  </div>
-               </div>
-            </div>
-            <div class="col-lg-4 mb-4">
                   <div class="card">
                       <h4 class="card-header">Air Quality Index</h4>
                       <div class="card-body text-center">
@@ -72,7 +67,18 @@
                       </div>
                   </div>
               </div>
-            <div class="col-lg-4 mb-4">
+              <div class="col-lg-3 mb-4">
+                  <div class="card">
+                      <h4 class="card-header">Humidity</h4>
+                      <div class="card-body text-center">
+                          <p class="card-text display-4">70% - 75%</p>
+                      </div>
+                      <div class="card-footer">
+                          <a href="/learnmore" class="btn btn-primary">Learn More</a>
+                      </div>
+                  </div>
+              </div>
+              <div class="col-lg-3 mb-4">
                   <div class="card">
                       <h4 class="card-header">Temperature</h4>
                       <div class="card-body text-center">
@@ -83,7 +89,19 @@
                       </div>
                   </div>
               </div>
+              <div class="col-lg-3 mb-4">
+                  <div class="card">
+                      <h4 class="card-header">Another Category</h4>
+                      <div class="card-body text-center">
+                          <p class="card-text display-4">values</p>
                       </div>
+                      <div class="card-footer">
+                          <a href="/learnmore" class="btn btn-primary">Learn More</a>
+                      </div>
+                  </div>
+              </div>
+          </div>
+  
          <!-- /.row -->
       </div>
       <!-- About Section -->

consumerWebsite/views/logintop.ejs

@@ -26,6 +26,8 @@
     <!-- Mustache JS -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/0.1/mustache.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/0.1/mustache.js"></script>
+    <!-- socket.io scriot -->
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.2.0/socket.io.min.js"></script>
 
     <!-- jquery app.js -->
     <script src="js/app.js"></script>

consumerWebsite/views/top.ejs

@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
 	<meta charset="utf-8" />
-		<meta
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-			name="viewport"
-			content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 	<meta name="description" content="" />
 	<meta name="author" content="" />
 	<meta http-equiv="cleartype" content="on" />
@@ -14,11 +13,8 @@
 
 
 	<!-- Bootstrap core CSS -->
-		<link
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
-			href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
+		integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous" />
-			rel="stylesheet"
-			integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
-			crossorigin="anonymous" />
 
 	<!-- Custom styles for this template -->
 	<link href="css/all.css" rel="stylesheet" />
@@ -33,10 +29,8 @@
 	<script src="https://sso.theta42.com/static/js/mustache.min.js"></script>
 	<!-- jQuery library -->
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
-
 	<!-- Bootstrap 5 JavaScript -->
-		<script
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-			src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
 		integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
 		crossorigin="anonymous"></script>
 
@@ -46,6 +40,9 @@
 	<script>
 		hljs.initHighlightingOnLoad();
 	</script>
+	<!-- socket.io scriot -->
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.2.0/socket.io.min.js"></script>
+
 
 	<!-- jq-repeat -->
 	<script src="js/jq-repeat.js"></script>
@@ -61,6 +58,7 @@
 		app.auth.isLoggedIn(function (error, data) {
 			if (data) {
 				$("#cl-logout-button").show("fast");
+				$("#cl-api-button").show("fast");
 				$("#cl-profile-button").show("fast");
 				$("#cl-login-button").hide("fast");
 			} else {
@@ -73,20 +71,13 @@
 </script>
 
 <body>
-		<nav
+	<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-light top-nav fixed-top">
-			class="navbar fixed-top navbar-expand-lg navbar-dark bg-light top-nav fixed-top">
 		<div class="container">
 			<a class="navbar-brand" href="/">
 				<img src="images/logo.png" alt="logo" />
 			</a>
-				<button
+			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive"
-					class="navbar-toggler"
+				aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-					type="button"
-					data-toggle="collapse"
-					data-target="#navbarResponsive"
-					aria-controls="navbarResponsive"
-					aria-expanded="false"
-					aria-label="Toggle navigation">
 				<span class="fas fa-bars"></span>
 			</button>
 			<div class="collapse navbar-collapse" id="navbarResponsive">
@@ -103,36 +94,33 @@
 					<li class="nav-item">
 						<a class="nav-link" href="/contact">Contact</a>
 					</li>
+					<!-- 
 					<li class="nav-item">
 						<a class="nav-link" href="/api">API Doc</a>
 					</li>
+
+					 -->
 					<!-- profile button -->
 					<div class="form-inline mt-2 mt-md-0">
+						<a id="cl-api-button" class="btn btn-outline-info btn-sm my-2 my-sm-0" href="/api"
+							style="display: none">
+							<i class="fas fa-sign-out"></i> API
+						</a>
 						<!-- Profile Button -->
-							<a
+						<a id="cl-profile-button" class="btn btn-outline-info btn-sm my-2 my-sm-0" href="/profile"
-								id="cl-profile-button"
-								class="btn btn-outline-info btn-sm my-2 my-sm-0"
-								href="/profile"
 							style="display: none">
 							<i class="fas fa-sign-out"></i> Profile
 						</a>
 
 						<!-- Login Button -->
-							<a
+						<a id="cl-login-button" class="btn btn-outline-danger btn-sm my-2 my-sm-0"
-								id="cl-login-button"
+							onclick="app.auth.forceLogin()" style="display: none">
-								class="btn btn-outline-danger btn-sm my-2 my-sm-0"
-								onclick="app.auth.forceLogin()"
-								style="display: none">
 							<i class="fas fa-sign-out"></i> Login
 						</a>
 
 						<!-- Logout Button -->
-							<button
+						<button id="cl-logout-button" class="btn btn-outline-danger btn-sm my-2 my-sm-0" href="/"
-								id="cl-logout-button"
+							onclick="app.auth.logOut(e => window.location.href='/')" style="display: none">
-								class="btn btn-outline-danger btn-sm my-2 my-sm-0"
-								href="/"
-								onclick="app.auth.logOut(e => window.location.href='/')"
-								style="display: none">
 							<i class="fas fa-sign-out"></i> Logout
 						</button>
 					</div>
@@ -141,4 +129,5 @@
 		</div>
 	</nav>
 </body>
+
 </html>

package-lock.json

@@ -12,6 +12,7 @@
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
         "cookie-parser": "^1.4.6",
+        "cors": "^2.8.5",
         "csurf": "^1.11.0",
         "date-fns": "^3.2.0",
         "date-fns-tz": "^2.0.0",
@@ -35,6 +36,7 @@
         "sequelize": "^6.35.2",
         "sequelize-cli": "^6.6.2",
         "socket.io": "^4.7.4",
+        "socket.io-client": "^4.7.4",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -1227,6 +1229,38 @@
         "node": ">=10.2.0"
       }
     },
+    "node_modules/engine.io-client": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz",
+      "integrity": "sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.11.0",
+        "xmlhttprequest-ssl": "~2.0.0"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/engine.io-parser": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz",
@@ -3606,6 +3640,20 @@
         }
       }
     },
+    "node_modules/socket.io-client": {
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.4.tgz",
+      "integrity": "sha512-wh+OkeF0rAVCrABWQBaEjLfb7DVPotMbu0cgWgyR0v6eA4EoVnAwcIeIbcdTE3GT/H3kbdLl7OoH2+asoDRIIg==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
@@ -4091,6 +4139,14 @@
         }
       }
     },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
+      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/y18n": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",

package.json

@@ -20,6 +20,7 @@
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
+    "cors": "^2.8.5",
     "csurf": "^1.11.0",
     "date-fns": "^3.2.0",
     "date-fns-tz": "^2.0.0",
@@ -43,6 +44,7 @@
     "sequelize": "^6.35.2",
     "sequelize-cli": "^6.6.2",
     "socket.io": "^4.7.4",
+    "socket.io-client": "^4.7.4",
     "validator": "^13.11.0"
   },
   "devDependencies": {

webserver/bin/www

@@ -0,0 +1,109 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+var app = require('../../webserver/modules/express.js');
+const index = require("../index.js")
+var debug = require('debug')('proxy-api:server');
+var http = require('http');
+
+/**
+ * Get port from environment and store in Express.
+ */
+
+const port = normalizePort(process.env.PORT || '80');
+app.set('port', port);
+
+/**
+ * Create HTTP server.
+ */
+
+var server = http.createServer(app);
+
+const io = require('socket.io')(server
+    , {
+    cors: {
+        //replace with domain name when deployed
+        origin: 'http://localhost:3000', // client!
+        methods: ["GET"],
+        allowedHeaders: ["my-custom-header"],
+        credentials: true
+
+    }
+});
+
+app.io = io;
+
+/**
+ * Listen on provided port, on all network interfaces.
+ */
+
+server.listen(port);
+server.on('error', onError);
+server.on('listening', onListening);
+
+/**
+ * Normalize a port into a number, string, or false.
+ */
+
+function normalizePort(val) {
+  var port = parseInt(val, 10);
+
+  if (isNaN(port)) {
+    // named pipe
+    return val;
+  }
+
+  if (port >= 0) {
+    // port number
+    return port;
+  }
+
+  return false;
+}
+
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+function onError(error) {
+  if (error.syscall !== 'listen') {
+    throw error;
+  }
+
+  var bind = typeof port === 'string'
+    ? 'Pipe ' + port
+    : 'Port ' + port;
+
+  // handle specific listen errors with friendly messages
+  switch (error.code) {
+    case 'EACCES':
+      console.error(bind + ' requires elevated privileges');
+      process.exit(1);
+      break;
+    case 'EADDRINUSE':
+      console.error(bind + ' is already in use');
+      process.exit(1);
+      break;
+    default:
+      throw error;
+  }
+}
+
+/**
+ * Event listener for HTTP server "listening" event.
+ */
+
+function onListening() {
+  var addr = server.address();
+  var bind = typeof addr === 'string'
+    ? 'pipe ' + addr
+    : 'port ' + addr.port;
+  console.log('Listening on ' + bind);
+
+  for(let listener of app.onListen){
+    listener()
+  }
+}

webserver/functions/Database.js

@@ -23,11 +23,15 @@ async function insertLogData(log) {
 
 async function insertDatatoDB(data) {
 	try {
+		const app = require("../modules/express.js");
+
 		sensorDataModel.create({
 			sensorid: data.sensorid,
 			locationid: data.locationid,
 			measurement: data.measurement,
 		});
+		//ws broadcast event except to the sender.
+		app.io.emit("sensorData:new", data);
 	} catch (error) {
 		console.error(error);
 	}
@@ -39,7 +43,7 @@ async function checkAPikey(SuppliedKey, rowid) {
 			raw: true,
 			attributes: ["apikey", "permission"],
 			where: {
-				userid: rowid,
+				id: rowid,
 			},
 		});
 		//console.log(retrivedKey.apikey);

webserver/index.js

@@ -1,4 +1,3 @@
-const { app } = require("./modules/express.js");
 const client = require("./modules/mqtt");
 const { isJson, isNumber } = require("./functions/validateData.js");
 const { insertDatatoDB } = require("./functions/database.js");

webserver/modules/express.js

@@ -1,13 +1,24 @@
 const express = require("express");
-const helmet = require("helmet");
+//const helmet = require("helmet");
+var cors = require('cors');
 const { rateLimit } = require("express-rate-limit");
 const { APIlogger } = require('../middleware/apiLogger.js');
 const { apikeyCheck } = require('../middleware/apiKey.js');
 
 const app = express();
-app.use(helmet());
+//app.use(cors());
+//allow cors from localhost:3000
+//app.use(helmet({ crossOriginResourcePolicy: { policy: "cross-origin" } }));
 const port = 80;
 
+// Hold list of functions to run when the server is ready
+app.onListen = [function(){console.log('hello')}];
+
+module.exports = app; 
+
+//handle cors 
+
+
 //express-rate-limit stolen from docs
 const limiter = rateLimit({
 	windowMs: 15 * 60 * 1000, // 15 minutes
@@ -73,8 +84,8 @@ app.use(function(err, req, res, next) {
 	  keyErrors,
 	});
   });
+/*
 app.listen(port, () => {
 	console.log(`app listening on port ${port}`);
 });
-
+*/
-module.exports = { app };

webserver/modules/mqtt.js

@@ -10,8 +10,8 @@ const options = {
   username: process.env.MQTT_USER, 
   password: process.env.MQTT_PASS, 
   protocol: 'mqtts', // Use MQTT over TLS
-  key: fs.readFileSync(path.resolve(__dirname, '../../cert/privkey.pem')), 
+  key: fs.readFileSync(path.resolve(__dirname, '../cert/privkey.pem')), 
-  cert: fs.readFileSync(path.resolve(__dirname, '../../cert/cert.pem')), 
+  cert: fs.readFileSync(path.resolve(__dirname, '../cert/cert.pem')), 
 
 };