tidy up

webserver/modules/express.js

@@ -0,0 +1,83 @@
+const express = require("express");
+const helmet = require("helmet");
+const { rateLimit } = require("express-rate-limit");
+const { APIlogger } = require('../middleware/apiLogger.js');
+
+const app = express();
+app.use(helmet());
+const port = 80;
+
+//express-rate-limit stolen from docs
+const limiter = rateLimit({
+	windowMs: 15 * 60 * 1000, // 15 minutes
+	limit: 600, // Limit each IP to 100 requests per `window` (here, per 15 minutes).
+	standardHeaders: 'draft-7', // draft-6: `RateLimit-*` headers; draft-7: combined `RateLimit` header
+	legacyHeaders: false, // Disable the `X-RateLimit-*` headers.
+})
+
+
+// Apply the rate limiting middleware to all requests.
+app.use(limiter)
+
+//disable x-powered-by header for security reasons
+app.disable("x-powered-by");
+
+//parse json body format 
+app.use(express.json());
+app.set("json spaces", 2);
+
+
+/*
+middleware logic ( called by next() )
+*/
+//app.use('/api/v0', require('../middleware/ApiKey.js'));
+app.use('/api/v0', APIlogger, require('../routes/api_route.js'));
+
+//route logic
+app.use("/api/v0", require("../routes/api_route.js"));
+
+//seed logic
+app.use("/api/seed/v0", require("../routes/seed_route.js"));
+
+// Catch 404 and forward to error handler. If none of the above routes are
+// used, this is what will be called.
+app.use(function (req, res, next) {
+	var err = new Error("Not Found");
+	err.message = "Page not found";
+	err.status = 404;
+	next(err);
+});
+
+// Error handler. This is where `next()` will go on error
+app.use(function(err, req, res, next) {
+	console.error(err.status || res.status, err.name, req.method, req.url);
+	if(![ 404].includes(err.status || res.status)){
+	  console.error(err.message);
+	  console.error(err.stack);
+	  console.error('=========================================');
+	}
+	
+	console.log(err.name + " validation error");
+	// Parse key error for Sequilzw
+	let keyErrors = {}
+	if(['SequelizeValidationError'].includes(err.name) && err.errors){
+		for(let item of err.errors){
+			if(item.path){
+				keyErrors[item.path] = item.message
+			}
+		}
+	}
+  
+	res.status(err.status || 500);
+	console.log(keyErrors);
+	res.json({
+	  name: err.name,
+	  message: err.message,
+	  keyErrors,
+	});
+  });
+app.listen(port, () => {
+	console.log(`app listening on port ${port}`);
+});
+
+module.exports = { app };

webserver/modules/mqtt.js

@@ -0,0 +1,22 @@
+const mqtt = require('mqtt');
+const fs = require('fs');
+const path = require('path')
+require('dotenv').config({ path: path.resolve(__dirname, '../../.env') })
+const { validateData } = require("../functions/validateData.js");
+
+const brokerUrl = 'mqtt://mqtt.teeseng.uk';
+const options = {
+  port: 8883, 
+  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')), 
+  cert: fs.readFileSync(path.resolve(__dirname, '../../cert/cert.pem')), 
+
+};
+
+const client = mqtt.connect(brokerUrl, options);
+
+module.exports = client;
+
+