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

working AC code generation for TLC_112;

Browse Source 
fallback to HTTP if HTTPS certs not loaded.
This commit is contained in:
d-popov
2020-04-15 16:40:16 +03:00
parent 2c2190a514
commit 608344f876
2 changed files with 145 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ac.js
View File

@@ -11,6 +11,15 @@ var INT8_MAX = 127;
var UINT8_MAX = 255; var UINT8_MAX = 255;
var UINT8_MAX2 = 0xFF; 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 // Constants
var AcTimes = var AcTimes =
@@ -26,13 +35,7 @@ var AcTimes =
// var AcTolerance = 5; // Extra Percentage for the rest. // 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 var AcModeSize = 4; // Nr. of Bits
@@ -82,7 +85,7 @@ var b = setBits(state[0],0,5,0x0);
console.log("" + state.toString('hex')); console.log("" + state.toString('hex'));
setTemp(24); setTemp(24);
// console.log("" + state.toString('hex')); // console.log("" + state.toString('hex'));
setMode(AcHeat); setMode(AcMode.Heat);
// console.log("" + state.toString('hex')); // console.log("" + state.toString('hex'));
setPower(true); setPower(true);
// console.log("" + state.toString('hex')); // console.log("" + state.toString('hex'));
@@ -92,20 +95,20 @@ var rawTime = "38000,"+GenerateTimingString();
console.log(rawTime); console.log(rawTime);
const request = require('request'); // const request = require('request');
request.post( // request.post(
'http://192.168.1.126/ir', // 'http://192.168.1.126/ir',
{ form: { code: rawTime, type: 30} }, // { form: { code: rawTime, type: 30} },
function (error, response, body) { // function (error, response, body) {
if (!error && response.statusCode == 200) { // if (!error && response.statusCode == 200) {
console.log("GOT " + body); // console.log("GOT " + body);
//var m = model; // //var m = model;
//res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); // //res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}});
}else{ // }else{
model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode // model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode
} // }
} // }
); // );
function GenerateTimingString() function GenerateTimingString()
{ {
@@ -186,17 +189,16 @@ function setPower( on) {
function setMode(mode) { function setMode(mode) {
// If we get an unexpected mode, default to AUTO. // If we get an unexpected mode, default to AUTO.
switch (mode) { switch (mode) {
case AcFanHi: case AcMode.Fan:
setFan(AcFanHigh);break; setFan(AcFanHigh);break;
// FALLTHRU case AcMode.Auto:
case AcAuto: case AcMode.Cool:
case AcCool: case AcMode.Heat:
case AcHeat: case AcMode.Dry:
case AcDry:
state[6] = setBits(state[6], kLowNibble, AcModeSize, mode); state[6] = setBits(state[6], kLowNibble, AcModeSize, mode);
break; break;
default: default:
setMode(AcAuto); setMode(AcMode.Auto);
} }
} }

162
dht.js
View File

@@ -90,10 +90,11 @@ passport.deserializeUser(function(id, cb) {
var fs = require("fs"); var fs = require("fs");
var http = require('http'); var http = require('http');
var https = require('https'); var https = require('https');
var privateKey = fs.readFileSync('/etc/letsencrypt/live/iot.d-popov.com/privkey.pem', 'utf8'); try{
var certificate = fs.readFileSync('/etc/letsencrypt/live/iot.d-popov.com/cert.pem', 'utf8'); var _privateKey = fs.readFileSync('/etc/letsencrypt/live/iot.d-popov.com/privkey.pem', 'utf8');
var credentials = {key: privateKey, cert: certificate}; 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 //!database
@@ -145,6 +146,9 @@ app.use(require('express-ejs-layouts'));//https://www.npmjs.com/package/express-
// defining endpoints // defining endpoints
app.get('/', function(req, res){
res.redirect('/n/login');
});
//Authentication ++ //Authentication ++
app.get('/login', function(req, res) { app.get('/login', function(req, res) {
res.render('login', { user: req.user }); res.render('login', { user: req.user });
@@ -161,62 +165,81 @@ app.post('/login',
res.redirect(req.session); res.redirect(req.session);
} }
); );
app.get('/logout', function(req, res){ app.get('/logout', function(req, res){
req.logout(); req.logout();
res.redirect('/n/login'); res.redirect('/n/login');
}); });
app.get('/accontrol', ensureLoggedIn, function(req, res){ app.get('/accontrol', ensureLoggedIn, function(req, res){
console.log("viewing /accontrol as authenticated user:"+ req.user); res.render('accontrol',{model:{data:req.body, user:req.user, command:"", info:""}});
res.render('accontrol', { model: { user: req.user, data:{} }});
}); });
var ac = require('./ac.js');
app.post('/accontrol', ensureLoggedIn, function(req, res){ app.post('/accontrol', ensureLoggedIn, function(req, res){
var model = { model: {user: req.user, data: req.body} }; var model = { model: {user: req.user, data: req.body} };
console.log("power:"+ req.body.power); console.log("power:"+ req.body.power);
console.log("heat:"+ req.body.heat); console.log("heat:"+ req.body.heat);
console.log("temp:"+ req.body.temp); console.log("temp:"+ req.body.temp);
console.log("econo:"+ req.body.econo); console.log("econo:"+ req.body.econo);
var where = {ac_power: req.body.power?true:false}; ac.Tlc112.Init();
if(where.ac_power){ ac.Tlc112.SetPower(req.body.power);
where.ac_mode = req.body.heat?"Heat":"Cool"; ac.Tlc112.SetMode(req.body.heat? ac.Mode.Heat:ac.Mode.Cool);
if(req.body.temp){ where.ac_temp = req.body.temp; }else{where.ac_temp = 23} ac.Tlc112.SetTemp( req.body.temp);
var code = ac.Tlc112.GetCommand();
//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( request.post(
'http://192.168.1.126/ir', 'http://192.168.1.126/ir',
{ form: { cmd: "RAW:" + model.command.command } }, { form: { code: code, type: 30} },
function (error, response, body) { function (error, response, body) {
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
//console.log("GOT " + body); console.log("GOT " + body);
var m = model; //var m = model;
res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}}); //res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}});
}else{ }else{
model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode
} }
} }
); );
} else
{ // var where = {ac_power: req.body.power?true:false};
model.info = "Command not executed. Found " + com.length + "commands" // if(where.ac_power){
res.render('accontrol', model); // 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, app.get('/chart', ensureLoggedIn,
function(req, res){ function(req, res){
res.render('chart', { user: req.user }); res.render('chart', { user: req.user });
@@ -225,16 +248,7 @@ app.get('/accontrol', ensureLoggedIn, function(req, res){
//Authentication -- //Authentication --
const { parse } = require('querystring');
app.post('/dht/ping', (req, res) => { (async (res) => { app.post('/dht/ping', (req, res) => { (async (res) => {
try { try {
console.log("HEADERS:" + req.headers); res.sendStatus(200); console.log("HEADERS:" + req.headers); res.sendStatus(200);
@@ -243,32 +257,48 @@ app.post('/dht/ping', (req, res) => { (async (res) => {
} })(res); } })(res);
}); });
var moment = require('moment');
app.use('/ir', bodyParser.text(), function(rq, rs) { 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") if(rq.method == "GET")
{ {
//var t = moment.duration(parseInt(req.param('uptime')), 'milliseconds'); var cmd = rq.param('command');
var _message = req.param('ip'); console.log("GET CMD:"+cmd );
console.log("watchdog from " + _message); switch(cmd)
res.send("You are alive!"); {
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 { }else {
console.log("REQ:"+rq.headers); let body = '';
console.log("BODY:"+rq.body); rq.on('data', chunk => {
rs.sendStatus(200); 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) => { app.get('/dht', (req, res) => { (async (res) => {
try { try {
@@ -330,11 +360,13 @@ app.get('/ac', (req, res) => { (async (res) => {
//Startup //Startup
var httpServer = http.createServer(app); var httpServer = http.createServer(app);
if(credentials){
var httpsServer = https.createServer(credentials, app); var httpsServer = https.createServer(credentials, app);
httpsServer.listen(8443, () => { httpsServer.listen(8443, () => {
console.log('HTTPS server listening on port 8443'); console.log('HTTPS server listening on port 8443');
}); });
}
httpServer.listen(81, () => { httpServer.listen(81, () => {
console.log('HTTP server listening on port 81'); console.log('HTTP server listening on port 81');
}); });