diff --git a/ac.js b/ac.js index 4ede551..87b150d 100644 --- a/ac.js +++ b/ac.js @@ -11,6 +11,15 @@ var INT8_MAX = 127; var UINT8_MAX = 255; var UINT8_MAX2 = 0xFF; +const AcMode = Object.freeze({"Heat":1, "Dry":2, "Cool":3, "Fan":7, "Auto":8}) + +// var AcMode { +// Heat = 1, +// Dry = 2, +// Cool = 3, +// FanHi = 7, +// Auto = 8 +// } // Constants var AcTimes = @@ -26,13 +35,7 @@ var AcTimes = // var AcTolerance = 5; // Extra Percentage for the rest. }; -const enum AcMode { - Heat = 1, - Dry = 2, - Cool = 3, - FanHi = 7, - Auto = 8 -}; + var AcModeSize = 4; // Nr. of Bits @@ -82,7 +85,7 @@ var b = setBits(state[0],0,5,0x0); console.log("" + state.toString('hex')); setTemp(24); // console.log("" + state.toString('hex')); -setMode(AcHeat); +setMode(AcMode.Heat); // console.log("" + state.toString('hex')); setPower(true); // console.log("" + state.toString('hex')); @@ -92,20 +95,20 @@ var rawTime = "38000,"+GenerateTimingString(); console.log(rawTime); -const request = require('request'); -request.post( - 'http://192.168.1.126/ir', - { form: { code: rawTime, type: 30} }, - function (error, response, body) { - if (!error && response.statusCode == 200) { - console.log("GOT " + body); - //var m = model; - //res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); - }else{ - model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode - } - } -); +// const request = require('request'); +// request.post( +// 'http://192.168.1.126/ir', +// { form: { code: rawTime, type: 30} }, +// function (error, response, body) { +// if (!error && response.statusCode == 200) { +// console.log("GOT " + body); +// //var m = model; +// //res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); +// }else{ +// model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode +// } +// } +// ); function GenerateTimingString() { @@ -186,17 +189,16 @@ function setPower( on) { function setMode(mode) { // If we get an unexpected mode, default to AUTO. switch (mode) { - case AcFanHi: + case AcMode.Fan: setFan(AcFanHigh);break; - // FALLTHRU - case AcAuto: - case AcCool: - case AcHeat: - case AcDry: + case AcMode.Auto: + case AcMode.Cool: + case AcMode.Heat: + case AcMode.Dry: state[6] = setBits(state[6], kLowNibble, AcModeSize, mode); break; default: - setMode(AcAuto); + setMode(AcMode.Auto); } } diff --git a/dht.js b/dht.js index acdaa5c..fbc78df 100644 --- a/dht.js +++ b/dht.js @@ -90,10 +90,11 @@ passport.deserializeUser(function(id, cb) { var fs = require("fs"); var http = require('http'); var https = require('https'); -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}; - +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}; +}catch(ex){console.log("can't load certificates.");} //!database @@ -145,6 +146,9 @@ app.use(require('express-ejs-layouts'));//https://www.npmjs.com/package/express- // defining endpoints +app.get('/', function(req, res){ + res.redirect('/n/login'); +}); //Authentication ++ app.get('/login', function(req, res) { res.render('login', { user: req.user }); @@ -161,61 +165,80 @@ app.post('/login', res.redirect(req.session); } ); - app.get('/logout', function(req, res){ req.logout(); res.redirect('/n/login'); }); app.get('/accontrol', ensureLoggedIn, function(req, res){ - console.log("viewing /accontrol as authenticated user:"+ req.user); - res.render('accontrol', { model: { user: req.user, data:{} }}); - }); + res.render('accontrol',{model:{data:req.body, user:req.user, command:"", info:""}}); +}); - app.post('/accontrol', ensureLoggedIn, function(req, res){ - 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); - console.log("econo:"+ req.body.econo); - var where = {ac_power: req.body.power?true:false}; - if(where.ac_power){ - where.ac_mode = req.body.heat?"Heat":"Cool"; - if(req.body.temp){ where.ac_temp = req.body.temp; }else{where.ac_temp = 23} - - //where.ac_econo = req.body.econo?true:false; - //// if(req.body.turbo){ where.ac_turbo = req.body.turbo?true:false; } - //// if(req.body.swing){ where.ac_swing = req.body.swing?true:false; } - //// if(req.body.display){ where.ac_display = req.body.display?true:false; } - //// if(req.body.health){ where.ac_health = req.body.health?true:false; } +var ac = require('./ac.js'); +app.post('/accontrol', ensureLoggedIn, function(req, res){ + 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); + console.log("econo:"+ req.body.econo); + 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); + var code = ac.Tlc112.GetCommand(); + request.post( + 'http://192.168.1.126/ir', + { form: { code: code, type: 30} }, + function (error, response, body) { + if (!error && response.statusCode == 200) { + console.log("GOT " + body); + //var m = model; + //res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); + }else{ + model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode + } } - data.DeviceCommand.findAll({ where: where }).then(function(com){ - console.log("FOUND "+ com.length + " RESULTS"); - if(com.length > 0) - { - model.command = com[0]; - model.info = model.command.info; - console.log("executing command "+ model.info+ ""); - request.post( - 'http://192.168.1.126/ir', - { form: { cmd: "RAW:" + model.command.command } }, - function (error, response, body) { - if (!error && response.statusCode == 200) { - //console.log("GOT " + body); - var m = model; - res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); - }else{ - model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode - } - } - ); - } else - { - model.info = "Command not executed. Found " + com.length + "commands" - res.render('accontrol', model); - } - }); - }); + ); + + // var where = {ac_power: req.body.power?true:false}; + // if(where.ac_power){ + // where.ac_mode = req.body.heat?"Heat":"Cool"; + // if(req.body.temp){ where.ac_temp = req.body.temp; }else{where.ac_temp = 23} + + // //where.ac_econo = req.body.econo?true:false; + // //// if(req.body.turbo){ where.ac_turbo = req.body.turbo?true:false; } + // //// if(req.body.swing){ where.ac_swing = req.body.swing?true:false; } + // //// if(req.body.display){ where.ac_display = req.body.display?true:false; } + // //// if(req.body.health){ where.ac_health = req.body.health?true:false; } + // } + // data.DeviceCommand.findAll({ where: where }).then(function(com){ + // console.log("FOUND "+ com.length + " RESULTS"); + // if(com.length > 0) + // { + // model.command = com[0]; + // model.info = model.command.info; + // console.log("executing command "+ model.info+ ""); + // request.post( + // 'http://192.168.1.126/ir', + // { form: { cmd: "RAW:" + model.command.command } }, + // function (error, response, body) { + // if (!error && response.statusCode == 200) { + // //console.log("GOT " + body); + // var m = model; + // res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); + // }else{ + // model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode + // } + // } + // ); + // } else + // { + // model.info = "Command not executed. Found " + com.length + "commands" + // res.render('accontrol', model); + // } + //}); +}); + app.get('/chart', ensureLoggedIn, function(req, res){ @@ -225,16 +248,7 @@ app.get('/accontrol', ensureLoggedIn, function(req, res){ //Authentication -- - - - - - - - - - - +const { parse } = require('querystring'); app.post('/dht/ping', (req, res) => { (async (res) => { try { console.log("HEADERS:" + req.headers); res.sendStatus(200); @@ -243,32 +257,48 @@ app.post('/dht/ping', (req, res) => { (async (res) => { } })(res); }); +var moment = require('moment'); + app.use('/ir', bodyParser.text(), function(rq, rs) { + + console.log(""); + console.log(""); + console.log(""); + console.log(""); + console.log("IR request:"+rq.method ); if(rq.method == "GET") { - //var t = moment.duration(parseInt(req.param('uptime')), 'milliseconds'); - var _message = req.param('ip'); - console.log("watchdog from " + _message); - res.send("You are alive!"); - }else{ - console.log("REQ:"+rq.headers); - console.log("BODY:"+rq.body); - rs.sendStatus(200); + var cmd = rq.param('command'); + console.log("GET CMD:"+cmd ); + switch(cmd) + { + case 'ping': + var t = moment.duration(parseInt(rq.param('uptime')), 'milliseconds'); + var _message = rq.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"); + rs.end('End\n'); + console.log("response ended"); + break; + case 'on': + default:rs.send("OK"); + } + }else { + let body = ''; + rq.on('data', chunk => { + body += chunk.toString(); + }); + rq.on('end', () => { + console.log(">"+body); + var ob = parse(body); + console.log(ob); + rs.end('ok'); + }); } }); -// app.post('/ir', (req, res) => { -// (async (res) => { -// try { -// //console.log(req.params); -// console.log("REQ:"+req.body); -// console.log(`post/${util.inspect(req.body,false,null)}`); -// res.sendStatus(200); -// } catch (error) { -// console.log("IR Error:" + error); //..response.body); -// } -// })(res); -// }); app.get('/dht', (req, res) => { (async (res) => { try { @@ -330,11 +360,13 @@ app.get('/ac', (req, res) => { (async (res) => { //Startup var httpServer = http.createServer(app); +if(credentials){ var httpsServer = https.createServer(credentials, app); - httpsServer.listen(8443, () => { console.log('HTTPS server listening on port 8443'); }); +} + httpServer.listen(81, () => { console.log('HTTP server listening on port 81'); });