source now in separate modules;

Implemented MQTT coms.
Using Tasmota for ESP8266;
IR working reliably

dht.js

@@ -4,156 +4,64 @@
 const util = require('util');
 const express = require('express');
 const bodyParser = require('body-parser');
+
+const request = require('request');
+const got = require('got');
+const WebSocket = require('ws');
+
 const cors = require('cors');
 const helmet = require('helmet');
 const morgan = require('morgan');
 const cron = require('node-cron');
-const request = require('request');
-const got = require('got');
-
-const WebSocket = require('ws');
-
-//auth ++
-var session = require('express-session')
-var passport = require('passport')
-var Strategy = require('passport-local').Strategy;
-var db = require('./db');
-var ensureLoggedIn = require("connect-ensure-login").ensureLoggedIn("/n/login");
-
-//! Configure the local strategy for use by Passport.
-//
-// The local strategy require a `verify` function which receives the credentials
-// (`username` and `password`) submitted by the user.  The function must verify
-// that the password is correct and then invoke `cb` with a user object, which
-// will be set at `req.user` in route handlers after authentication.
-passport.use(new Strategy(
-  function(username, password, cb) {
-  console.log('requesting authentication for user '+ username);
-    db.users.findByUsername(username, function(err, user) {
-      if (err) {console.log('err:'+ util.inspect(err)); return cb(err); }
-      if (!user) { console.log('user is null:'); return cb(null, false); }
-      if (user.password != password) { console.log('wrong pass '); return cb(null, false); }
-      console.log('authenticated!');
-      return cb(null, user);
-    });
-  }));
-
-// Configure Passport authenticated session persistence.
-//
-// In order to restore authentication state across HTTP requests, Passport needs
-// to serialize users into and deserialize users out of the session.  The
-// typical implementation of this is as simple as supplying the user ID when
-// serializing, and querying the user record by ID from the database when
-// deserializing.
-passport.serializeUser(function(user, cb) {
-  cb(null, user.id);
-});
-
-passport.deserializeUser(function(id, cb) {
-  console.log("user deser:"+ id );
-  db.users.findById(id, function (err, user) {
-    if (err) { return cb(err); }
-    cb(null, user);
-  });
-});
-
-// auth --
 
 //!https endpoint
 var fs = require("fs");
 var http = require('http');
 var https = require('https');
 try{
-var _privateKey  = fs.readFileSync('/etc/letsencrypt/live/iot.d-popov.com/privkey.pem', 'utf8');
-var _certificate = fs.readFileSync('/etc/letsencrypt/live/iot.d-popov.com/cert.pem', 'utf8');
-var credentials = {key: _privateKey, cert: _certificate};
+  var SECURE_KEY = "/etc/letsencrypt/live/iot.d-popov.com/privkey.pem"; //__dirname + '/../../test/secure/tls-key.pem';
+  var SECURE_CERT = "/etc/letsencrypt/live/iot.d-popov.com/cert.pem";
+  var _privateKey  = fs.readFileSync(SECURE_KEY, 'utf8');
+  var _certificate = fs.readFileSync(SECURE_CERT, 'utf8');
+  var credentials = {key: _privateKey, cert: _certificate};
 }catch(ex){console.log("can't load certificates.");}
 
 
-//!database
-var mysql      = require('mysql');
-var con = mysql.createConnection({
-  host     : 'localhost',
-  user     : 'iot',
-  password : '!iot_popovi',
-  database : 'iot'
-});
-
-
-
-
 // defining the Express app
 const app = express();
-
-// adding Helmet to enhance your API's security
 app.use(helmet());
-
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(bodyParser.json());
 app.use(express.static('public'));
-
-// enabling CORS for all requests
 app.use(cors());
-
-//Authentication ++
-app.use(session({
-  key: 'user_sid',
-  secret: 'че първият ще генерира грешка',
-  resave: true,
-  saveUninitialized: false,
-  cookie: {
-    expires: 600000
-  },
-}));
-app.use(passport.initialize()); 
-app.use(passport.session());
-//Authentication --
-// app.use(function (req, res, next) {
-//   res.status(404).send("Can't find that!")
-// });
-
-//app.set('views', __dirname + '/views');
 app.set('view engine', 'ejs');
 app.use(require('express-ejs-layouts'));//https://www.npmjs.com/package/express-ejs-layouts
-
 // adding morgan to log HTTP requests
 app.use(morgan('combined'));
 
 //defining endpoints
 //!UI 
-
-app.get('/', function(req, res){
-  res.redirect('/n/login');
-});
-//Authentication ++
-app.get('/login', function(req, res) {
-  res.render('login', { user: req.user });
-});
-
-app.post('/login', 
-  passport.authenticate('local', {
-    successRedirect: '/n/accontrol', 
-    failureRedirect: '/n/login' }),
-  // authenticated user.
-  function(req, res) {
-    
-    console.log("logged in. session:" + req.session);
-    res.redirect(req.session);
-  }
-  );
-app.get('/logout', function(req, res){
-    req.logout();
-    res.redirect('/n/login');
-});
-
+var auth = require('./src/auth.js');
 var ac = require('./ac.js');
+var db = require('./src/db');
+var ir = require('./src/devices/ir');
+var u = require('./src/utils');
 
-app.get('/accontrol', ensureLoggedIn, function(req, res){
+
+
+app.use(auth.init());
+app.get('/', function(req, res){ res.redirect('/n/login');});
+
+app.get('/accontrol', auth.ensureLoggedIn_Orig,
+ function(req, res){
   res.render('accontrol',{model:{data:req.body, user:req.user, command:"", info:""}});
 });
 
 
-app.post('/accontrol', ensureLoggedIn, function(req, res){
+app.post('/accontrol', 
+//ensureLoggedIn,
+function(req, res){
+  console.log("POST accontrol");
   var sess=req.session;
   var model = { model: {user: req.user, data: req.body} };
   console.log("power:" + req.body.power);  console.log("heat:"  + req.body.heat);  console.log("temp:"  + req.body.temp);
@@ -167,14 +75,17 @@ app.post('/accontrol', ensureLoggedIn, function(req, res){
   ac.Tlc112.SetFan(ac.FanSpeed.Med);
   
   var code = ac.Tlc112.GetCommand();
+  
+  mqtt_client.publish('cmnd/', 'controller')
   //break it
   //code = code.substring(150);
   //console.log("RAW: " + code);
-  if(SendIRCommand(code))
+  // if(ir.SendCmd("http://192.168.1.126/irraw", code))
+  if(ir.SendCmd("http://192.168.1.126", code))
   {
     console.log("OK. Temp: " + req.body.temp);
     BroadcastWS(ac.Tlc112.GetState());
-  }else{
+  } else {
     model.info = "Error executing command. Server resturned:" + req.statusCode;
     BroadcastWS("Error sending IR command");
   }
@@ -183,23 +94,7 @@ app.post('/accontrol', ensureLoggedIn, function(req, res){
   // res.render('accontrol',{model: {data: req.body, user: req.user, command: "", info: model.info}});
   });
 
-  function SendIRCommand(code){
-    console.log("RAW:" + code);
-    request.post(
-      'http://192.168.1.126/irraw', { form: { cmd: code } },
-      function (error, response, body) {
-        if (!error && response.statusCode == 200) {
-          console.log("GOT '" + body + "'");
-          return true;
-        }else{
-          console.log("ERROR on SendIRCommand:" + util.inspect(error));
-          return false;
-        }
-      }
-    );
-  }
-
-  app.get('/chart', ensureLoggedIn,
+  app.get('/chart', auth.ensureLoggedIn_Orig,
   function(req, res){
     res.render('chart', { user: req.user });
   });
@@ -207,92 +102,13 @@ app.post('/accontrol', ensureLoggedIn, function(req, res){
 //Authentication --
 
 //! ESP HANDLERS
-function GetDht() {
-  var ret;
-  (async () => {
-    try {
-        ret = await got('http://192.168.1.126/json');
-    } catch (error) {
-        console.log(error.response.body);
-    }
-  })();
-  while(ret === undefined) {
-    require('deasync').runLoopOnce();
-  }
-  return ret;
-}
+
 
 const { parse } = require('querystring');
 var moment = require('moment');
-var Sync = require('sync');
+// var Sync = require('sync');
 
-app.use('/dht',  (req, res) => {
-    try {
-      console.log("body:"+util.inspect(req.body));
-      var cmd = req.param('e');
-      console.log("cmd:" + cmd);
-      //console.log("HEADERS:" + util.inspect(req.headers));
-      switch(cmd)
-      {
-        //if(rq.method =="GET")
-        case 'setup':
-          console.log("/setup> Device is online: " + req.headers.mac);
-          break;
-
-        case 'ping':
-          var t = moment.duration(parseInt(req.param('uptime')), 'milliseconds');
-          var _message = req.param('ip') + " uptime " + t.hours() + "h " + t.minutes() + "m " + t.seconds() +"s";
-          // var t = moment.duration(parseInt(rq.params.uptime), 'milliseconds');
-          // var _message = rq.params.ip + " uptime " + t.hours() + "h " + t.minutes() + "m " + t.seconds() +"s";
-          console.log("ping from " + _message);
-          //rs.send("pong=ok");
-          res.send(t.hours() + "h " + t.minutes() + "m " + t.seconds() +"s");
-          break;
-
-        case "now":
-          console.log("getting current conditions");
-          try {
-            const response = GetDht();
-            console.log(response.body);
-            res.send(response.body);
-          } catch (error) {
-            console.log("DHT Error:" + error);
-          }
-        console.log("got current conditions??");
-        break;
-
-        case 'ir':
-          console.log("got IR message!");
-          console.log(body);
-          try{
-            ob = JSON.parse(body);
-            if(ob.times)
-            {
-              console.log("GOT TIMING INFO:");
-              if(!ob.ir){
-                if(SendIRCommand(ob.times)) { res.sendStatus(200);} 
-                else { res.sendStatus(500); }
-              } else {
-              console.log("It is from the IR reader. Ignoring...");
-              }
-            }
-            BroadcastWS(ob.info.replaceAll('\n','<br/>') + "<br/><br/>" + ob.descr.replaceAll(',', '<br/>') );
-          }catch(ex){
-          }
-          if(req.param('info') && req.param('descr') )
-          {
-            console.log("Got Url encoded IR message");
-            BroadcastWS(req.param('info').replaceAll('\n','<br/>') + "<br/><br/>" + req.param('descr').replaceAll(',', '<br/>'));
-          }
-        break;
-      }
-      res.sendStatus(200);
-    } catch (error) {
-      console.log("ESP Error:" + error);
-      //res.end();
-      //res.send(error);
-    }
-});
+app.use('/dht', ir.html_handle_dht);
 
 function BroadcastWS(msg){
   wss.clients.forEach(function each(client) {
@@ -302,88 +118,42 @@ function BroadcastWS(msg){
   });
 }
 
-String.prototype.replaceAll = function(search, replacement) {
-  var target = this;
-  return target.replace(new RegExp(search, 'g'), replacement);
-};
 
-app.get("/device/:field_name", (req, res) => {
-   dht = con.query("SELECT * FROM devicemessages WHERE field_name=? OR ? IS NULL", 
-   [req.params.field_name, req.params.field_name], (err, data) => {
-      //dht = con.query("SELECT * FROM devicemessages", (err, data) => {
-        if (!err) {
-            res.send(data);
-        } else {
-          console.log("error: ", err);
-        }
-      });
-});
-
-app.put('/device/:device_id/:field_name/:field_value', (req, res) => {
-  var params = [req.params.device_id,req.params.field_name,req.params.field_value];
-  let sql = `INSERT INTO devicemessages(device_id,field_name,field_value,timestamp)
-  VALUES (?,?,?,NOW());`;
-  con.query(sql,params, (err, r) => {
-    if (err) {
-      console.log("error: ", err);
-      res.send( err);
-      return;
-    }
-    if (r.affectedRows == 0) {
-      // not found Customer with the id
-      res.send({ kind: "not_found" });
-      return;
-    }
-    console.log("inserted record: ", { id: r.insertId, ...params });
-    res.send( { id: r.insertId, ...params });
+app.get("/device/:field_name", function (req, res) {
+  db.devicemessages.findByName(req.params.field_name, function (err, data) {
+    if (!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); }
+      else { console.log("error: ", err); }
+    });
+});
 
 //!Startup
 
-var httpServer = http.createServer(app);
+var wws;
 if(credentials){
   var httpsServer = https.createServer(credentials, app);
   httpsServer.listen(8443, () => {
     console.log('HTTPS server listening on port 8443');
   });
+ wss = new WebSocket.Server({ server: httpsServer });
+}
+else
+{
+  var httpServer = http.createServer(app);
+  httpServer.listen(82, () => {
+    console.log('HTTP server listening on port 82');
+  });
+  wss = new WebSocket.Server({ port: 8080 });//not secure
 }
 
-httpServer.listen(81, () => {
-  console.log('HTTP server listening on port 81');
-});
 
-// store a reference to the original request function
-// const originalRequest = httpsServer.request; 
-// // override the function
-// httpsServer.request = function wrapMethodRequest(req) {
-//   console.log(req.host, req.body);
-//   // do something with the req here
-//   // ...
-//   // call the original 'request' function   
-//   return originalRequest.apply(this, arguments);
-// }
-
-
-const wss = new WebSocket.Server({ server: httpsServer })//{ port: 8080 })
-
-// //!database
-// var data = require('./database.js');
-// //require('./database.js')();
-// //data.init();
-
-// var device = data.Device.build({
-//   name: 'A23',
-//   url: "http://192.168.1.126/"
-// });
-
-// device.save().then().catch(
-//   err => {console.log(err);}
-// )
-//.success(function(savedTask) {
-//    console.log('device saved with id' + savedTask.id);
- // });
 
             // # ┌────────────── second (optional)
             // # │ ┌──────────── minute
@@ -396,9 +166,12 @@ const wss = new WebSocket.Server({ server: httpsServer })//{ port: 8080 })
             // # * * * * * *
 cron.schedule('    */30 * * * *', () => {//cron.schedule('*/5 * * * * *', () => {
   console.log(new Date().toISOString() + ' running a task every 30 minutes');
-  StoreSensorReadingsAsync();
+  //StoreSensorReadings();
+  db.devicemessages.getFromDht('http://192.168.1.126/json');
 }).start();
 
+//db.devicemessages.getFromDht('http://192.168.1.126/json');
+
 wss.on('connection', ws => {
   ws.on('message', message => {
     console.log(`Received message => ${message}`)
@@ -406,48 +179,64 @@ wss.on('connection', ws => {
   ws.send('ho!')
 })
 
-//StoreSensorReadings();
 
-async function StoreSensorReadingsAsync()
-{
-  console.log("StoreSensorReadingsAsync");
-  try {
-    await new Promise(function(resolve, reject) {
-      request('http://192.168.1.126/json', { json: true }, (err, res, body) => {
-        if(err) { return reject(err);   }
-        else {
-          SaveSensorReading(JSON.stringify(body))
-          resolve(body);
-        }
-      });
-    });
-  } catch(error) {
-    console.error(error);
+var mosca = require('mosca')
+var mqtt_settings = {
+  port:1884,
+  secure : {
+    port: 8444,
+    keyPath: SECURE_KEY,
+    certPath: SECURE_CERT,
   }
 }
+var mqtt =  new mosca.Server(mqtt_settings);
+mqtt.on('ready', function(){
+  console.log("MQTT ready on port " + mqtt_settings.port);
+})
+mqtt.on('clientConnected', function(){
+  console.log("MQTT client connected !");
+});
 
-function SaveSensorReading(data)
-{
-  var params = [0, "A23_DHT", data];
-  let sql = `INSERT INTO devicemessages(device_id,field_name,field_value,timestamp)
-  VALUES (?,?,?,NOW());`;
-  con.query(sql,params,(err, r) => {
-    if (err) {
-      console.log("SQL: ", err);
-    }else{
-      console.log("inserted record: ", { id: r.insertId, ...params });
+var mqtt = require('mqtt')
+var mqtt_client  = mqtt.connect('mqtt://192.168.1.131')
+mqtt_client.on('connect', function () {
+  console.log("MQTT connected. subscribing to topics");
+  mqtt_client.subscribe('tele/tasmota/STATE');
+  mqtt_client.subscribe('tele/tasmota/RESULT');//IR
+  mqtt_client.subscribe('tele/tasmota/INFO2');
+  mqtt_client.subscribe('tele/tasmota/SENSOR');//DHT
+
+  mqtt_client.subscribe('tasmota_3FD92D');
+  mqtt_client.subscribe('tele');
+  mqtt_client.subscribe('dht');
+  mqtt_client.subscribe('ir');
+  mqtt_client.publish('tasmota', 'controller')
+});
+// https://github.com/pauloromeira/Sonoff-Tasmota/wiki/Commands
+//https://stevessmarthomeguide.com/setting-up-the-sonoff-tasmota-mqtt-switch/
+mqtt_client.on('message', function (topic, message) {
+  var context = message.toString();
+  console.log("MMQT> " + topic + " : " +  context);
+  if(topic === "tele/tasmota/SENSOR")
+  {
+    var j = JSON.parse(message);
+    console.log("JSON> " + util.inspect(j));
+    if(j.DHT11 && j.DHT11.Humidity !== null)
+    {
+      var msg = {
+        dht:{
+          hum: j.DHT11.Humidity,
+          temp:  j.DHT11.Temperature,
+          dew: j.DHT11.DewPoint
+        }
+      };
+
+      db.devicemessages.insert( 0, "A23_DHT", JSON.stringify(msg), function (err, data) {
+          if (!err) { console.log("success: "+ data);}
+          else { console.log("error: " + err); }
+        });
+    }else {
+      console.log("got wrong DHT data: " + message );
     }
-  });
-}
-
-function StoreSensorReadings()
-{ 
-  console.log("StoreSensorReadings");
-  (async () => {
-      try {
-      const dht = await got('http://192.168.1.126/json')
-      SaveSensorReading(dht.body);    
-    } catch (error) {    console.log("DHT Error:" + error); //..response.body);
-    } 
-  })();
-}
+  }
+});