Merge pull request #62 from eiabea/update-packages

Update packages

.travis.yml

@@ -4,7 +4,7 @@ jobs:
     language: node_js
     cache: npm
     node_js:
-      - 10.16.1
+      - 12.18.3
     after_success:
       - npm run codecov
     on:

Dockerfile

@@ -1,4 +1,4 @@
-FROM balenalib/rpi-node:10.16.1-stretch
+FROM balenalib/rpi-node:12.18.3-stretch
 LABEL eiabea <[email protected]>
 
 ENV NODE_PATH=/root/node_modules

README.md

@@ -531,15 +531,15 @@ $ cd tempea-api
 
 7. Start tempea in development mode
 ```
-$ docker-compose up
+$ docker-compose -f docker-compose.yml -f docker-compose-dev.yml up
 ```
 
 ## Testing
 
-1. Make sure you have at least [NodeJS](https://nodejs.org/en/) v10.14.0 installed
+1. Make sure you have at least [NodeJS](https://nodejs.org/en/) v12.18.3 installed
 ```
 $ node -v
-v10.14.0
+v12.18.3
 ```
 
 2. Clone the project on your machine

controller/slave.controller.js

@@ -1,32 +1,31 @@
 const request = require('request');
+const axios = require('axios');
 const { assert } = require('chai');
 
 module.exports = (log, cache) => {
-  const getData = async () => new Promise((resolve, reject) => {
+  const getData = async () => {
+
     const {
       SLAVE_HOST, SLAVE_PORT, SLAVE_ENDPOINT,
     } = process.env;
+
     log.trace({ SLAVE_HOST, SLAVE_PORT, SLAVE_ENDPOINT }, 'Getting data from slave');
-    request(`http://${SLAVE_HOST}:${SLAVE_PORT}${SLAVE_ENDPOINT}`, async (error, response, body) => {
-      if (error) {
-        log.error({ error }, `Error getting data from slave ${SLAVE_HOST}`);
-        return reject(error);
-      }
-      log.trace({ body }, 'Received data from slave');
-      try {
-        const jsonData = JSON.parse(body);
+    try {
+      const response = await axios.get(`http://${SLAVE_HOST}:${SLAVE_PORT}${SLAVE_ENDPOINT}`);
+
+      const { data } = response;
 
-        assert.isTrue(jsonData.success);
-        assert.isDefined(jsonData.data);
-        assert.isNumber(jsonData.data.temp);
+      assert.isTrue(data.success);
+      assert.isDefined(data.data);
+      assert.isNumber(data.data.temp);
 
-        await cache.updateSlaveData(jsonData.data);
-        return resolve(jsonData.data);
-      } catch (err) {
-        return reject(err);
-      }
-    });
-  });
+      await cache.updateSlaveData(data.data);
+      return data.data;
+    } catch (error) {
+      log.error({ error }, `Error getting data from slave ${SLAVE_HOST}`);
+      throw error;
+    }
+  }
 
   return {
     getData,

docker-compose-dev.yml

@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+  tempea:
+    build: .
+    restart: unless-stopped
+    privileged: "true"
+    ports:
+      - "3000:3000"
+    volumes:
+      - "./:/src"
+    command: [ 
+      "wait-for-it.sh", "influx:8086","--timeout=60", "--",
+      "npm", "run", "start:dev:pretty"
+    ]
+    env_file:
+      - tempea.env

docker-compose.yml

@@ -10,15 +10,15 @@ volumes:
 
 services:
   grafana:
-    image: "grafana/grafana:5.4.3"
+    image: "grafana/grafana:7.2.1"
     restart: unless-stopped
     ports:
       - "3001:3000"
     volumes:
       - "grafana:/var/lib/grafana"
 
   mqtt:
-    image: "eclipse-mosquitto:1.6.7"
+    image: "eclipse-mosquitto:1.6.12"
     restart: unless-stopped
     ports:
       - "1883:1883"
@@ -27,15 +27,15 @@ services:
       - "mqtt:/mosquitto/data"
 
   telegraf:
-    image: "telegraf:1.12.4"
+    image: "telegraf:1.15.2"
     restart: unless-stopped
     depends_on:
       - "mqtt"
     volumes:
       - ./telegraf.conf:/etc/telegraf/telegraf.conf:ro
 
   influx:
-    image: "arm32v7/influxdb:1.7.8"
+    image: "arm32v7/influxdb:1.8.2"
     restart: unless-stopped
     ports:
       - "8086:8086"