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

refactring & config object

Browse Source
This commit is contained in:
Dobromir Popov
2021-07-16 15:35:59 +03:00
parent 643c6c6b5f
commit 919d29c894
8 changed files with 1810 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
dht.js
View File

@@ -61,45 +61,48 @@ app.get('/accontrol', auth.ensureLoggedIn_Orig,
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);
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);
ac.Tlc112.SetTemp(req.body.temp);
ac.Tlc112.SetSwingVertical( req.body.swing);
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(ir.SendCmd("http://"+AcIP, code))
{
console.log("OK. Temp: " + req.body.temp);
BroadcastWS(ac.Tlc112.GetState());
} else {
model.info = "Error executing command. Server resturned:" + req.statusCode;
BroadcastWS("Error sending IR command");
}
//console.log("req.user:" + util.inspect( req.user));
res.render('accontrol', model);
// res.render('accontrol',{model: {data: req.body, user: req.user, command: "", info: model.info}});
//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);
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);
ac.Tlc112.SetTemp(req.body.temp);
ac.Tlc112.SetSwingVertical( req.body.swing);
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(ir.SendCmd("http://"+AcIP, code))
{
console.log("OK. Temp: " + req.body.temp);
BroadcastWS(ac.Tlc112.GetState());
} else {
model.info = "Error executing command. Server resturned:" + req.statusCode;
BroadcastWS("Error sending IR command");
}
//console.log("req.user:" + util.inspect( req.user));
res.render('accontrol', model);
// res.render('accontrol',{model: {data: req.body, user: req.user, command: "", info: model.info}});
});
app.get('/chart', auth.ensureLoggedIn_Orig,
function(req, res){
res.render('chart', { user: req.user });
});
app.get('/garden/:days?', function(req, res){ res.render('chartGarden', {model:req.params}); });
app.get('/garden/:days?', function(req, res){
res.render('chartGarden', {model:req.params});
});
//Authentication --
@@ -119,13 +122,13 @@ app.use('/waterTest',function(req, res){
app.use('/water',function(req, res){
var time = req.query.t;
console.log("Watering cmd for: " + time);
request('http://'+config.GardenIP+'/control?cmd=event,manualwatering='+ time, { json: true }, (err, res, body) => {
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!");
});
});
app.use('/waterStop',function(req, res){
request('http://'+config.GardenIP+'/control?cmd=event,stopwatering', { json: true }, (err, res, body) => {
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!");
});
@@ -201,8 +204,11 @@ wss.on('connection', ws => {
var mosca = require('mosca');
var mqtt_settings = {
port:1883,
secure : {
port:1883
}
if(credentials)
{
mqtt_settings.secure = {
port: 8444,
keyPath: SECURE_KEY,
certPath: SECURE_CERT,
@@ -366,12 +372,14 @@ function SaveDhtIf(){
console.log("Missing all data to write to DB !");
}
}
const env = process.env.NODE_ENV || 'development';
const cfg = require(__dirname + '/config/config.json')[env];
(function() {
var exLog = console.log;
console.log = function(msg) {
exLog.apply(this, arguments);
fs.appendFileSync('/var/www/dht.log', msg +"\r\n");
fs.appendFileSync(cfg.logFile, msg +"\r\n");
}
})();