popov/iot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting js; removed GARDEN_IP config

Browse Source
This commit is contained in:
Dobromir Popov ONE
2022-04-16 14:00:10 +03:00
parent d9b2af2511
commit 907531eee9
4 changed files with 155 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
dht.js
View File

@@ -4,11 +4,11 @@ const env = process.env.NODE_ENV || 'development';
console.log("ENV: %s", env); console.log("ENV: %s", env);
const config = require(__dirname + '/config/config.json')[env]; const config = require(__dirname + '/config/config.json')[env];
(function() { (function () {
var exLog = console.log; var exLog = console.log;
console.log = function(msg) { console.log = function (msg) {
exLog.apply(this, arguments); exLog.apply(this, arguments);
fs.appendFileSync(config.logFile, msg +"\r\n"); fs.appendFileSync(config.logFile, msg + "\r\n");
} }
})(); })();
@@ -31,26 +31,34 @@ const cron = require('node-cron');
var fs = require("fs"); var fs = require("fs");
var http = require('http'); var http = require('http');
var https = require('https'); var https = require('https');
try{ try {
var CERT_ROOT = "/etc/letsencrypt/live/iot.d-popov.com-0003"; var CERT_ROOT = "/etc/letsencrypt/live/iot.d-popov.com-0003";
var SECURE_KEY = CERT_ROOT+ "/privkey.pem"; //__dirname + '/../../test/secure/tls-key.pem'; var SECURE_KEY = CERT_ROOT + "/privkey.pem"; //__dirname + '/../../test/secure/tls-key.pem';
var SECURE_CERT = CERT_ROOT+ "/cert.pem"; var SECURE_CERT = CERT_ROOT + "/cert.pem";
var _privateKey = fs.readFileSync(SECURE_KEY, 'utf8'); var _privateKey = fs.readFileSync(SECURE_KEY, 'utf8');
var _certificate = fs.readFileSync(SECURE_CERT, 'utf8'); var _certificate = fs.readFileSync(SECURE_CERT, 'utf8');
var _ca = fs.readFileSync(CERT_ROOT+ "/chain.pem", '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 // defining the Express app
const app = express(); const app = express();
app.use(helmet()); app.use(helmet());
app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.urlencoded({
extended: true
}));
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use(express.static('public')); app.use(express.static('public'));
app.use(cors()); app.use(cors());
app.set('view engine', 'ejs'); app.set('view engine', 'ejs');
app.use(require('express-ejs-layouts'));//https://www.npmjs.com/package/express-ejs-layouts app.use(require('express-ejs-layouts')); //https://www.npmjs.com/package/express-ejs-layouts
// adding morgan to log HTTP requests // adding morgan to log HTTP requests
app.use(morgan('combined')); app.use(morgan('combined'));
@@ -65,28 +73,48 @@ var u = require('./src/utils');
app.use(auth.init()); 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, app.get('/accontrol', auth.ensureLoggedIn_Orig,
function(req, res){ 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: ""
}
});
});
app.post('/accontrol', app.post('/accontrol',
//ensureLoggedIn, //ensureLoggedIn,
function(req, res){ function (req, res) {
console.log("POST accontrol"); console.log("POST accontrol");
var sess=req.session; 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.Init();
ac.Tlc112.SetPower(req.body.power); ac.Tlc112.SetPower(req.body.power);
ac.Tlc112.SetMode(req.body.heat? ac.Mode.Heat:ac.Mode.Cool); ac.Tlc112.SetMode(req.body.heat ? ac.Mode.Heat : ac.Mode.Cool);
ac.Tlc112.SetTemp(req.body.temp); ac.Tlc112.SetTemp(req.body.temp);
ac.Tlc112.SetSwingVertical( req.body.swing); ac.Tlc112.SetSwingVertical(req.body.swing);
ac.Tlc112.SetFan(ac.FanSpeed.Med); ac.Tlc112.SetFan(ac.FanSpeed.Med);
var code = ac.Tlc112.GetCommand(); var code = ac.Tlc112.GetCommand();
@@ -95,8 +123,7 @@ app.post('/accontrol',
//break it //break it
//code = code.substring(150); //code = code.substring(150);
//console.log("RAW: " + code); //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); console.log("OK. Temp: " + req.body.temp);
BroadcastWS(ac.Tlc112.GetState()); BroadcastWS(ac.Tlc112.GetState());
} else { } else {
@@ -108,95 +135,118 @@ app.post('/accontrol',
// res.render('accontrol',{model: {data: req.body, user: req.user, command: "", info: model.info}}); // res.render('accontrol',{model: {data: req.body, user: req.user, command: "", info: model.info}});
}); });
app.get('/chart', auth.ensureLoggedIn_Orig, app.get('/chart', auth.ensureLoggedIn_Orig,
function(req, res){ function (req, res) {
res.render('chart', { user: req.user }); res.render('chart', {
user: req.user
});
}); });
app.get('/garden/:days?', function(req, res){ app.get('/garden/:days?', function (req, res) {
res.render('chartGarden', {model:req.params}); res.render('chartGarden', {
model: req.params
}); });
});
//Authentication -- //Authentication --
//! ESP HANDLERS //! ESP HANDLERS
const { parse } = require('querystring'); const {
parse
} = require('querystring');
var moment = require('moment'); var moment = require('moment');
// var Sync = require('sync'); // var Sync = require('sync');
app.use('/dht', ir.html_handle_dht); app.use('/dht', ir.html_handle_dht);
app.use('/waterTest',function(req, res){ app.use('/waterTest', function (req, res) {
console.log("Watering TEST for: " + req.params); 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){ app.use('/water', function (req, res) {
var time = req.query.t; var time = req.query.t;
console.log("Watering cmd for: " + time); console.log("Watering cmd for: " + time);
if(config.gardenIP !="" && config.gardenIP !="0.0.0.0"){ 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, {
console.log("Watering cmd successfully sent over HTTP!"); 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){ app.use('/waterStop', function (req, res) {
if(config.gardenIP !="" && config.gardenIP !="0.0.0.0"){ 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', {
console.log("STOP watering cmd sent!"); 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){ function BroadcastWS(msg) {
wss.clients.forEach(function each(client) { wss.clients.forEach(function each(client) {
if (client.readyState === WebSocket.OPEN) { if (client.readyState === WebSocket.OPEN) {
client.send(moment().format() +" : "+ msg); client.send(moment().format() + " : " + msg);
} }
}); });
} }
app.get("/device/:field_name/:days?", function (req, res) { app.get("/device/:field_name/:days?", function (req, res) {
db.devicemessages.findByName(req.params.field_name, req.params.days, function (err, data) { 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) => { 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, db.devicemessages.insert(req.params.device_id, req.params.field_name, req.params.field_value,
function (err, data) { function (err, data) {
if (!err) { res.send(data); } if (!err) {
else { console.log("error: ", err); } res.send(data);
} else {
console.log("error: ", err);
}
}); });
}); });
//!Startup
//!Startup
var wws; var wws;
if(credentials){ if (credentials) {
var httpsServer = https.createServer(credentials, app); var httpsServer = https.createServer(credentials, app);
httpsServer.listen(2443, () => { httpsServer.listen(2443, () => {
console.log('\r\n\r\nHTTPS server listening on port 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); var httpServer = http.createServer(app);
httpServer.listen(2080, () => { httpServer.listen(2080, () => {
console.log('HTTP server listening on port 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'); console.log('WebSocket server listening on port 2081');
} }
@@ -279,19 +329,19 @@ wss.on('connection', wss => {
// console.log("Console MSG"); // console.log("Console MSG");
function formatDate (date) { function formatDate(date) {
var hour = date.getHours(); var hour = date.getHours();
var minutes = date.getMinutes(); var minutes = date.getMinutes();
var seconds = date.getSeconds(); var seconds = date.getSeconds();
var milliseconds = date.getMilliseconds(); var milliseconds = date.getMilliseconds();
return '[' + return '[' +
((hour < 10) ? '0' + hour: hour) + ((hour < 10) ? '0' + hour : hour) +
':' + ':' +
((minutes < 10) ? '0' + minutes: minutes) + ((minutes < 10) ? '0' + minutes : minutes) +
':' + ':' +
((seconds < 10) ? '0' + seconds: seconds) + ((seconds < 10) ? '0' + seconds : seconds) +
'.' + '.' +
('00' + milliseconds).slice(-3) + ('00' + milliseconds).slice(-3) +
'] '; '] ';
} }

3
docker-compose.yml
View File

@@ -8,7 +8,8 @@ services:
- DATABASE_NAME=iot - DATABASE_NAME=iot
- DATABASE_USER=iot - DATABASE_USER=iot
- DATABASE_PASS=mitko2021 - 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_HOST=node-mqtt
- MQTT_PORT_HTTP=1883 - MQTT_PORT_HTTP=1883
- MQTT_PORT_HTTPS=8444 - MQTT_PORT_HTTPS=8444

2
index.js
View File

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

53
src/mqtt.js
View File

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