formatting js; removed GARDEN_IP config

dht.js

@@ -38,14 +38,22 @@ try{
   var _privateKey = fs.readFileSync(SECURE_KEY, 'utf8');
   var _certificate = fs.readFileSync(SECURE_CERT, 'utf8');
   var _ca = fs.readFileSync(CERT_ROOT + "/chain.pem", 'utf8');
-  var credentials = {key: _privateKey, cert: _certificate, ca:_ca};
+  var credentials = {
-}catch(ex){console.log("can't load certificates.");}
+    key: _privateKey,
+    cert: _certificate,
+    ca: _ca
+  };
+} catch (ex) {
+  console.log("can't load certificates.");
+}
 
 
 // defining the Express app
 const app = express();
 app.use(helmet());
-app.use(bodyParser.urlencoded({ extended: true }));
+app.use(bodyParser.urlencoded({
+  extended: true
+}));
 app.use(bodyParser.json());
 app.use(express.static('public'));
 app.use(cors());
@@ -65,11 +73,20 @@ var u = require('./src/utils');
 
 
 app.use(auth.init());
-app.get('/', function(req, res){ res.redirect('/login');});
+app.get('/', function (req, res) {
+  res.redirect('/login');
+});
 
 app.get('/accontrol', auth.ensureLoggedIn_Orig,
   function (req, res) {
-  res.render('accontrol',{model:{data:req.body, user:req.user, command:"", info:""}});
+    res.render('accontrol', {
+      model: {
+        data: req.body,
+        user: req.user,
+        command: "",
+        info: ""
+      }
+    });
   });
 
 
@@ -78,10 +95,21 @@ app.post('/accontrol',
   function (req, res) {
     console.log("POST accontrol");
     var sess = req.session;
-    var model = { model: {user: req.user, data: req.body} };
+    var model = {
-    console.log("power:" + req.body.power);  console.log("heat:"  + req.body.heat);  console.log("temp:"  + req.body.temp);
+      model: {
-    if(!req.body.temp){req.body.temp = 23;}
+        user: req.user,
-    console.log("temp:"  + req.body.temp);  console.log("econo:" + req.body.econo);  console.log("swing:" + req.body.swing);
+        data: req.body
+      }
+    };
+    console.log("power:" + req.body.power);
+    console.log("heat:" + req.body.heat);
+    console.log("temp:" + req.body.temp);
+    if (!req.body.temp) {
+      req.body.temp = 23;
+    }
+    console.log("temp:" + req.body.temp);
+    console.log("econo:" + req.body.econo);
+    console.log("swing:" + req.body.swing);
     ac.Tlc112.Init();
     ac.Tlc112.SetPower(req.body.power);
     ac.Tlc112.SetMode(req.body.heat ? ac.Mode.Heat : ac.Mode.Cool);
@@ -95,8 +123,7 @@ app.post('/accontrol',
     //break it
     //code = code.substring(150);
     //console.log("RAW: " + code);
-    if(ir.SendCmd("http://"+config.AcIP, code))
+    if (ir.SendCmd("http://" + config.AcIP, code)) {
-    {
       console.log("OK. Temp: " + req.body.temp);
       BroadcastWS(ac.Tlc112.GetState());
     } else {
@@ -110,11 +137,15 @@ app.post('/accontrol',
 
 app.get('/chart', auth.ensureLoggedIn_Orig,
   function (req, res) {
-    res.render('chart', { user: req.user });
+    res.render('chart', {
+      user: req.user
+    });
   });
 
 app.get('/garden/:days?', function (req, res) {
-    res.render('chartGarden', {model:req.params}); 
+  res.render('chartGarden', {
+    model: req.params
+  });
 });
 
 //Authentication --
@@ -122,7 +153,9 @@ app.post('/accontrol',
 //! ESP HANDLERS
 
 
-const { parse } = require('querystring');
+const {
+  parse
+} = require('querystring');
 var moment = require('moment');
 // var Sync = require('sync');
 
@@ -133,27 +166,37 @@ app.use('/waterTest',function(req, res){
   console.log("Watering TEST for: " + req.params);
 });
 
-config.gardenIP = process.env.GARDEN_IP || config.gardenIP
+config.gardenIP = process.env.GARDEN_IP || config.gardenIP || "";
 
 app.use('/water', function (req, res) {
   var time = req.query.t;
   console.log("Watering cmd for: " + time);
   if (config.gardenIP != "" && config.gardenIP != "0.0.0.0") {
-    request('http://'+config.gardenIP+'/tools?cmd=event,manualwatering='+ time, { json: true }, (err, res, body) => {
+    console.log("DHT> sending cmd over HTTP");
-      if (err) { return console.log("Problem watering: " + err);  }
+    request('http://' + config.gardenIP + '/tools?cmd=event,manualwatering=' + time, {
+      json: true
+    }, (err, res, body) => {
+      if (err) {
+        return console.log("Problem watering: " + err);
+      }
       console.log("Watering cmd successfully sent over HTTP!");
     });
   }
-  mqtt.Send("event,manualwatering="+ time,"");
+  mqtt.SendCmd("event,manualwatering=" + time);
 });
 app.use('/waterStop', function (req, res) {
   if (config.gardenIP != "" && config.gardenIP != "0.0.0.0") {
-    request('http://'+config.gardenIP+'/tools?cmd=event,stopwatering', { json: true }, (err, res, body) => {
+    console.log("DHT> sending cmd over HTTP");
-      if (err) { return console.log("Problem watering: " + err);  }
+    request('http://' + config.gardenIP + '/tools?cmd=event,stopwatering', {
+      json: true
+    }, (err, res, body) => {
+      if (err) {
+        return console.log("Problem watering: " + err);
+      }
       console.log("STOP watering cmd sent!");
     });
   }
-  mqtt.Send("event,stopwatering","Garden/cmd");
+  mqtt.SendCmd("event,stopwatering");
 });
 
 function BroadcastWS(msg) {
@@ -164,39 +207,46 @@ function BroadcastWS(msg){
   });
 }
 
-
 app.get("/device/:field_name/:days?", function (req, res) {
   db.devicemessages.findByName(req.params.field_name, req.params.days, function (err, data) {
-    if (!err) { res.send(data); }
+    if (!err) {
-    else { console.log("error: ", err); }
+      res.send(data);
+    } else {
+      console.log("error: ", err);
+    }
   });
 });
 
 app.put('/device/:device_id/:field_name/:field_value', (req, res) => {
   db.devicemessages.insert(req.params.device_id, req.params.field_name, req.params.field_value,
     function (err, data) {
-      if (!err) { res.send(data); }
+      if (!err) {
-      else { console.log("error: ", err); }
+        res.send(data);
+      } else {
+        console.log("error: ", err);
+      }
     });
 });
 
+
 //!Startup
-
 var wws;
 if (credentials) {
   var httpsServer = https.createServer(credentials, app);
   httpsServer.listen(2443, () => {
     console.log('\r\n\r\nHTTPS server listening on port 2443');
   });
- wss = new WebSocket.Server({ server: httpsServer });
+  wss = new WebSocket.Server({
-}
+    server: httpsServer
-else
+  });
-{
+} else {
   var httpServer = http.createServer(app);
   httpServer.listen(2080, () => {
     console.log('HTTP server listening on port 2080');
   });
-  wss = new WebSocket.Server({ port: 2081 });//not secure
+  wss = new WebSocket.Server({
+    port: 2081
+  }); //not secure
   console.log('WebSocket server listening on port 2081');
 }
 

docker-compose.yml

@@ -8,7 +8,8 @@ services:
             - DATABASE_NAME=iot
             - DATABASE_USER=iot
             - DATABASE_PASS=mitko2021
-            - GARDEN_IP=192.168.0.100
+            - GARDEN_IP=0.0.0.0
+            # - GARDEN_IP=192.168.0.100
             - MQTT_HOST=node-mqtt
             - MQTT_PORT_HTTP=1883
             - MQTT_PORT_HTTPS=8444

index.js

@@ -59,7 +59,7 @@ app.get("/device/:field_name/:days?", function (req, res) {
 });
 
 
-
+//ToDo: do also MQTT
 app.use('/water',function(req, res){
   var time = req.query.t;
   console.log("Watering cmd for: " + time);

src/mqtt.js

@@ -148,34 +148,26 @@ mqtt_client.on("message", function (topic, message) {
     handled = true;
   }
   if (topic === EspDeviceName + "/Water/start") {
+    try {
       var j = JSON.parse(message);
       dht.Soil = j.soil;
       SaveDhtIf();
       handled = true;
-    console.log(
+      console.log(formatDate(new Date()) + EspDeviceName + " > Started watering at " + j.time + "(GMT) with " + j.soil + "% soil RH");
-      formatDate(new Date()) +
+    } catch (e) {
-      EspDeviceName +
+      console.log("MQTT> unexpected json payload at /Water/start:" + message);
-      " > Started watering at " +
+    }
-      j.time +
-      "(GMT) with " +
-      j.soil +
-      "% soil RH"
-    );
   }
   if (topic === EspDeviceName + "/Water/stop") {
+    try {
       var j = JSON.parse(message);
       dht.Soil = j.soil;
       SaveDhtIf();
       handled = true;
-    console.log(
+      console.log(formatDate(new Date()) + EspDeviceName + " > Finished watering at " + j.time + "(GMT) with " + j.soil + "% soil RH");
-      formatDate(new Date()) +
+    } catch (e) {
-      EspDeviceName +
+      console.log("MQTT> unexpected json payload at /Water/stop:" + message);
-      " > Finished watering at " +
+    }
-      j.time +
-      "(GMT) with " +
-      j.soil +
-      "% soil RH"
-    );
   }
 
   if (!handled) {
@@ -222,3 +214,12 @@ exports.Send = function (topic = "", message = "") {
     console.log(r);
   });
 };
+exports.SendCmd = function (message = "") {
+  topic = EspDeviceName + "/cmd";
+  console.log("MQTT> command topic is:" + topic);
+  console.log("MQTT> message:" + message);
+  mqtt_client.publish(topic, message, (r) => {
+    console.log("MQTT> Published to '" + topic + "'>'" + message + "'");
+    console.log(r);
+  });
+};