Merge pull request #22 from jhotmann/automated-tests

Big Refactor, Many Automated Tests

.eslintrc.json

@@ -4,7 +4,8 @@
         "commonjs": true,
         "es2021": true,
         "node": true,
-        "jquery": true
+        "jquery": true,
+        "jest/globals": true,
     },
     "extends": [
         "airbnb-base"
@@ -19,5 +20,6 @@
         "no-param-reassign": "warn",
         "max-len": "off",
         "no-console": "off"
-    }
+    },
+    "plugins": ["jest"]
 }

.github/workflows/docker-image.yml

@@ -4,16 +4,29 @@ on:
   push:
     branches:
       - 'main'
+      - 'automated-tests'
     tags:
       - 'v*'
 
 jobs:
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test using Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '16'
+      - run: npm ci
+      - run: npm test
+
   build:
+    needs: test
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    # Generate container tags
     - name: Docker meta
       id: meta
       uses: docker/metadata-action@v3

.gitignore

@@ -60,4 +60,5 @@ typings/
 # next.js build output
 .next
 
-data/
+data/
+.DS_Store

Dockerfile

@@ -1,10 +1,12 @@
 FROM node:16
 
+ENV BEHIND_PROXY=true
+ENV NODE_ENV=production
+
 WORKDIR /app
 COPY package*.json ./
 RUN npm ci
 RUN npm i -g forever
-ENV BEHIND_PROXY=true
 
 COPY . .
 

bin/www

@@ -4,11 +4,11 @@
  * Module dependencies.
  */
 
+const aedes = require('aedes')();
 const http = require('http');
-const app = require('../app');
-const db = require('../src/database');
-
-(async () => { await db.dataMigration(); })();
+const ws = require('websocket-stream');
+const app = require('../src/app');
+const mqtt = require('../src/mqtt');
 
 /**
  * Get port from environment and store in Express.
@@ -22,6 +22,8 @@ app.set('port', port);
  */
 
 const server = http.createServer(app);
+const mqttServer = http.createServer();
+ws.createServer({ server: mqttServer }, aedes.handle);
 
 /**
  * Listen on provided port, on all network interfaces.
@@ -31,6 +33,10 @@ server.listen(port);
 server.on('error', onError);
 server.on('listening', onListening);
 
+mqttServer.listen(process.env.MQTT_PORT || 8888, () => {
+  console.log(`MQTT websocket server listening on port ${process.env.MQTT_PORT || 8888}`);
+});
+
 /**
  * Normalize a port into a number, string, or false.
  */
@@ -86,3 +92,10 @@ function onListening() {
   const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr.port}`;
   console.log(`Express server listening on ${bind}`);
 }
+
+// MQTT Event Handlers
+
+mqtt.set(aedes);
+aedes.authenticate = mqtt.authenticate;
+aedes.authorizeSubscribe = mqtt.authorizeSubscribe;
+aedes.authorizePublish = mqtt.authorizePublish;