Update endpoints

Author: jason-fox

app/controllers/iot/command-listener.js

@@ -171,17 +171,17 @@ function alterWeather(action) {
     });
 }
 
-function fireDevices() {
-    return fetch(`${devices}/devices`, {
-        method: 'PUT'
+function fireDevices(type) {
+    return fetch(`${devices}/devices/${type}`, {
+        method: 'GET'
     }).catch((e) => {
         debug(e);
     });
 }
 
 function fireAnimalCollars() {
     return fetch(`${devices}/animals`, {
-        method: 'PUT'
+        method: 'GET'
     }).catch((e) => {
         debug(e);
     });
@@ -195,20 +195,28 @@ function fireOverallFarmStatus() {
     });
 }
 
-function fireTractors() {
-    return fetch(`${devices}/devices/tractors`, {
+function updateTractorStatus() {
+    return fetch(`${devices}/devices/tractor`, {
         method: 'PUT'
     }).catch((e) => {
         debug(e);
     });
 }
 
-setInterval(fireAnimalCollars, 5000);
-setInterval(fireDevices, 3000);
+setInterval(() => {
+    fireDevices('tractor');
+}, 3361);
+setInterval(fireAnimalCollars, 5099);
+setInterval(() => {
+    fireDevices('temperature');
+}, 7001);
 setInterval(fireOverallFarmStatus, 10000);
+setInterval(() => {
+    fireDevices('humidity');
+}, 8009);
 
 if (autoMoveTractors > 0) {
-    setInterval(fireTractors, autoMoveTractors);
+    setInterval(updateTractorStatus, autoMoveTractors);
 }
 
 // The temperature Gauge does not accept commands,

iot-devices/app.js

@@ -47,17 +47,17 @@ iotRouter.get('/status', (req, res) => {
   res.status(200).send();
 });
 
-iotRouter.put('/devices', (req, res) => {
-  IoTDevices.fireDevices();
+iotRouter.get('/devices/:type', (req, res) => {
+  IoTDevices.fireDevices(req.params.type);
   res.status(204).send();
 });
 
-iotRouter.put('/devices/tractors', (req, res) => {
-  IoTDevices.fireTractorStatus();
+iotRouter.put('/devices/tractor', (req, res) => {
+  IoTDevices.updateTractorStatus();
   res.status(204).send();
 });
 
-iotRouter.put('/animals', (req, res) => {
+iotRouter.get('/animals', (req, res) => {
   IoTDevices.fireAnimalCollars();
   res.status(204).send();
 });

iot-devices/models/devices.js

@@ -236,7 +236,7 @@ function emitOverallFarmStatus() {
   }
 }
 
-function fireTractorStatus() {
+function updateTractorStatus() {
   myCache.get('barn').then((state) => {
     if (state === 'door-open') {
       sendTractorReadings();
@@ -384,127 +384,129 @@ function sendAnimalCollarReadings() {
   });
 }
 
-function fireDevices() {
+function fireDevices(deviceType) {
   myCache.get('barn').then((state) => {
     if (state === 'door-open') {
-      sendDeviceReadings();
+      const deviceIds = myCache.keys();
+      _.forEach(deviceIds, (deviceId) => {
+        if (deviceId.replace(/\d/g, '') === deviceType) {
+          sendDeviceReading(deviceType, deviceId);
+        }
+      });
     }
   });
 }
 
 // Update state of Sensors
-function sendDeviceReadings() {
-  const deviceIds = myCache.keys();
+function sendDeviceReading(deviceType, deviceId) {
   const weather = myCache.get('weather');
 
-  _.forEach(deviceIds, (deviceId) => {
-    getDeviceState(deviceId).then((state) => {
-      const isSensor = true;
-      let humid;
-      let isDry;
-      let targetTemp;
-      let location;
+  getDeviceState(deviceId).then((state) => {
+    const isSensor = true;
+    let humid;
+    let isDry;
+    let targetTemp;
+    let location;
+
+    switch (deviceType) {
+      case 'humidity':
+        humid = parseInt(state.h);
+        isDry = weather === 'sunny' ? getRandom() > 5 : getRandom() > 7;
+
+        // If the water is ON, randomly increase the soil humidity.
+        if (
+          weather === 'raining' ||
+          getWaterState(deviceId, 'humidity') === 'ON'
+        ) {
+          state.h = humid + (getRandom() % 3);
+        } else if (isDry && humid > 50) {
+          state.h = humid - (getRandom() % 3);
+        } else if (isDry && humid > 30) {
+          state.h = humid - 3 + (getRandom() % 4);
+        } else if (humid <= 30) {
+          state.h = humid + 3 - (getRandom() % 4);
+        }
 
-      switch (deviceId.replace(/\d/g, '')) {
-        case 'humidity':
-          humid = parseInt(state.h);
-          isDry = weather === 'sunny' ? getRandom() > 5 : getRandom() > 7;
-
-          // If the water is ON, randomly increase the soil humidity.
-          if (
-            weather === 'raining' ||
-            getWaterState(deviceId, 'humidity') === 'ON'
-          ) {
-            state.h = humid + (getRandom() % 3);
-          } else if (isDry && humid > 50) {
-            state.h = humid - (getRandom() % 3);
-          } else if (isDry && humid > 30) {
-            state.h = humid - 3 + (getRandom() % 4);
-          } else if (humid <= 30) {
-            state.h = humid + 3 - (getRandom() % 4);
+        if (state.h > 100) {
+          state.h = 100;
+        }
+        if (state.h < 0) {
+          state.h = 0;
+        }
+        setDeviceState(deviceId, toUltraLight(state), isSensor);
+
+        break;
+      case 'tractor':
+        getDeviceState(
+          'targetTractor' + deviceId.replace(/[a-zA-Z]/g, '')
+        ).then((target) => {
+          location = state.gps.split(',');
+          state.y = parseFloat(location[0]);
+          state.x = parseFloat(location[1]);
+
+          if (state.d === 'SOWING') {
+            if (getRandom() > 9) {
+              state.y =
+                Math.round((state.y + 0.001 * parseInt(target.x)) * 1000) /
+                1000;
+              state.x =
+                Math.round((state.x + 0.001 * parseInt(target.y)) * 1000) /
+                1000;
+            }
           }
 
-          if (state.h > 100) {
-            state.h = 100;
+          if (state.d === 'MOVING') {
+            state.x =
+              Math.round((state.x + parseInt(target.x) / 300) * 1000) / 1000;
+            state.y =
+              Math.round((state.y + parseInt(target.y) / 300) * 1000) / 1000;
           }
-          if (state.h < 0) {
-            state.h = 0;
+
+          if (getRandom() > 9 && state.d === 'MOVING') {
+            state.d = 'SOWING';
+          } else if (getRandom() > 7 && state.d === 'SOWING') {
+            target.x = -target.x;
+            target.y = -target.y;
+            setDeviceState(
+              'targetTractor' + deviceId.replace(/[a-zA-Z]/g, ''),
+              toUltraLight(target),
+              false
+            );
+            state.y =
+              Math.round(
+                (state.y + Math.abs(parseInt(target.x) / 1000)) * 1000
+              ) / 1000;
+            state.x =
+              Math.round(
+                (state.x + Math.abs(parseInt(target.y) / 1000)) * 1000
+              ) / 1000;
+            state.d = 'MOVING';
           }
+
+          state.s = getStatusCode(state.d);
+          state.gps = state.y + ',' + state.x;
+          delete state.y;
+          delete state.x;
           setDeviceState(deviceId, toUltraLight(state), isSensor);
+        });
+        break;
 
-          break;
-        case 'tractor':
-          getDeviceState(
-            'targetTractor' + deviceId.replace(/[a-zA-Z]/g, '')
-          ).then((target) => {
-            location = state.gps.split(',');
-            state.y = parseFloat(location[0]);
-            state.x = parseFloat(location[1]);
-
-            if (state.d === 'SOWING') {
-              if (getRandom() > 9) {
-                state.y =
-                  Math.round((state.y + 0.001 * parseInt(target.x)) * 1000) /
-                  1000;
-                state.x =
-                  Math.round((state.x + 0.001 * parseInt(target.y)) * 1000) /
-                  1000;
+      case 'temperature':
+        getDeviceState('targetTemp' + deviceId.replace(/[a-zA-Z]/g, '')).then(
+          (target) => {
+            if (getRandom() > 7) {
+              targetTemp = parseInt(target.t);
+              if (state.t < targetTemp) {
+                state.t++;
+              } else if (state.t > targetTemp) {
+                state.t--;
               }
             }
-
-            if (state.d === 'MOVING') {
-              state.x =
-                Math.round((state.x + parseInt(target.x) / 300) * 1000) / 1000;
-              state.y =
-                Math.round((state.y + parseInt(target.y) / 300) * 1000) / 1000;
-            }
-
-            if (getRandom() > 9 && state.d === 'MOVING') {
-              state.d = 'SOWING';
-            } else if (getRandom() > 7 && state.d === 'SOWING') {
-              target.x = -target.x;
-              target.y = -target.y;
-              setDeviceState(
-                'targetTractor' + deviceId.replace(/[a-zA-Z]/g, ''),
-                toUltraLight(target),
-                false
-              );
-              state.y =
-                Math.round(
-                  (state.y + Math.abs(parseInt(target.x) / 1000)) * 1000
-                ) / 1000;
-              state.x =
-                Math.round(
-                  (state.x + Math.abs(parseInt(target.y) / 1000)) * 1000
-                ) / 1000;
-              state.d = 'MOVING';
-            }
-
-            state.s = getStatusCode(state.d);
-            state.gps = state.y + ',' + state.x;
-            delete state.y;
-            delete state.x;
             setDeviceState(deviceId, toUltraLight(state), isSensor);
-          });
-          break;
-
-        case 'temperature':
-          getDeviceState('targetTemp' + deviceId.replace(/[a-zA-Z]/g, '')).then(
-            (target) => {
-              if (getRandom() > 7) {
-                targetTemp = parseInt(target.t);
-                if (state.t < targetTemp) {
-                  state.t++;
-                } else if (state.t > targetTemp) {
-                  state.t--;
-                }
-              }
-              setDeviceState(deviceId, toUltraLight(state), isSensor);
-            }
-          );
-          break;
-      }
-    });
+          }
+        );
+        break;
+    }
   });
 }
 
@@ -654,7 +656,7 @@ module.exports = {
   barnDoor,
   fireDevices,
   fireAnimalCollars,
-  fireTractorStatus,
+  updateTractorStatus,
   emitOverallFarmStatus,
   initDevices,
 };