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

Improved js UI & backend (webSockets, async, etc...) ;

Browse Source 
Changed users/passwords.
This commit is contained in:
d-popov
2020-04-25 01:45:48 +03:00
parent 7854b67905
commit 2d8f6ed8ce
4 changed files with 288 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/users.js
View File

@@ -1,6 +1,6 @@
var records = [
{ id: 1, username: 'jack', password: 'secret', displayName: 'Jack', emails: [ { value: 'jack@example.com' } ] }
, { id: 2, username: 'jill', password: 'birthday', displayName: 'Jill', emails: [ { value: 'jill@example.com' } ] }
{ id: 1, username: 'me', password: 'A23', displayName: 'admin', emails: [ { value: 'jack@example.com' } ] }
, { id: 2, username: 'db', password: 'doby', displayName: 'DB', emails: [ { value: 'jill@example.com' } ] }
, { id: 3, username: 'popov', password: 'Zelenakrav@', displayName: 'Doby', emails: [ { value: 'db@example.com' } ] }
];

451
dht.js
View File

@@ -11,6 +11,8 @@ 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')
@@ -18,36 +20,6 @@ var Strategy = require('passport-local').Strategy;
var db = require('./db');
var ensureLoggedIn = require("connect-ensure-login").ensureLoggedIn("/n/login");
// passport.use(new Strategy(
// // {
// // usernameField: 'email',
// // passwordField: 'passwd',
// // session: false
// // },
// function(username, password, done) {
// console.log("executing auth strategy: local");
// if(username == "popov" & password == "test12345")
// {
// done(null, new {username:"popov"});
// }else
// {
// return done(null, false);
// }
// }
// ));
// passport.serializeUser(function(user, cb) {
// console.log("serializeUser()");
// cb(null, user.id);
// });
// passport.deserializeUser(function(id, cb) {
// console.log("de-serializeUser()");
// cb(null, new {username:"popov"});
// });
//! Configure the local strategy for use by Passport.
//
// The local strategy require a `verify` function which receives the credentials
@@ -58,14 +30,14 @@ passport.use(new Strategy(
function(username, password, cb) {
console.log('requesting authentication for user '+ username);
db.users.findByUsername(username, function(err, user) {
if (err) { return cb(err); }
if (!user) { return cb(null, false); }
if (user.password != password) { return cb(null, false); }
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
@@ -78,6 +50,7 @@ passport.serializeUser(function(user, cb) {
});
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);
@@ -115,36 +88,39 @@ const app = express();
// adding Helmet to enhance your API's security
app.use(helmet());
// using bodyParser to parse JSON bodies into JS objects
//app.use(bodyParser.text({ type: 'text/html' }))
//app.use(bodyParser.json({ type: 'application/*+json' }));
//app.use(bodyParser.text());
app.use(bodyParser.json());
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({
secret: 'че първият ще генерира грешка, ако изгледът не дефинира съдържание за този раздел',
key: 'user_sid',
secret: 'че първият ще генерира грешка',
resave: true,
saveUninitialized: false
saveUninitialized: false,
cookie: {
expires: 600000
},
}));
app.use(passport.initialize());
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
//app.set("layout extractScripts", true)
//app.set('view engine', 'vash');//https://www.npmjs.com/package/vash#layout-helpers
// adding morgan to log HTTP requests
//app.use(morgan('combined'));
app.use(morgan('combined'));
// defining endpoints
//defining endpoints
//!UI
app.get('/', function(req, res){
res.redirect('/n/login');
@@ -170,167 +146,168 @@ app.get('/logout', function(req, res){
res.redirect('/n/login');
});
var ac = require('./ac.js');
app.get('/accontrol', ensureLoggedIn, function(req, res){
res.render('accontrol',{model:{data:req.body, user:req.user, command:"", info:""}});
});
var ac = require('./ac.js');
app.post('/accontrol', ensureLoggedIn, function(req, res){
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);
console.log("econo:"+ req.body.econo);
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.SetTemp(req.body.temp);
ac.Tlc112.SetSwingVertical( req.body.swing);
ac.Tlc112.SetFan(ac.FanSpeed.Med);
var code = ac.Tlc112.GetCommand();
request.post(
'http://192.168.1.126/ir',
{ form: { code: code, type: 30} },
function (error, response, body) {
//break it
//code = code.substring(150);
//console.log("RAW: " + code);
if(SendIRCommand(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}});
});
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);
//var m = model;
//res.render('accontrol', {model:{data:req.body, user:req.user, command:com[0], info:com[0].info}});
console.log("GOT '" + body + "'");
return true;
}else{
model.info = "Error executing command " + model.command.info + ". Server resturned:" + req.statusCode
console.log("ERROR on SendIRCommand:" + util.inspect(error));
return false;
}
}
);
// 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){
res.render('chart', { user: req.user });
});
//Authentication --
const { parse } = require('querystring');
app.post('/dht/ping', (req, res) => { (async (res) => {
try {
console.log("HEADERS:" + req.headers);
res.sendStatus(200);
} catch (error) {
console.log("PING Error:" + error);
res.sendStatus(500);
} })(res);
});
var moment = require('moment');
app.use('/setup', bodyParser.text(), function(req, res) {
let resp = JSON.stringify(req.body);
console.log(Jresp);
console.log("/setup> Device is online:" + req.body.IP);
res.setHeader('Content-Type', 'text/plain');
//res.write('you posted:\n');
res.write(resp);
let body = '';
req.on('data', chunk => {
console.log("d>"+chunk);
body += chunk.toString();
});
req.on('end', () => {
console.log("ended>"+body);
var ob = parse(body);
console.log(ob);
res.end('ok');
});
});
app.use('/ir', bodyParser.text(), function(rq, rs) {
console.log("");
console.log("");
console.log("");
console.log("/ir>:"+rq.method );
if(rq.method == "GET")
{
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");
//! ESP HANDLERS
function GetDht() {
var ret;
(async () => {
try {
ret = await got('http://192.168.1.126/json');
} catch (error) {
console.log(error.response.body);
}
}else {
let body = '';
rq.on('data', chunk => {
body += chunk.toString();
});
rq.on('end', () => {
console.log("POSTED IR DATA>"+body);
var ob = parse(body);
console.log(ob);
rs.end('ok');
});
})();
while(ret === undefined) {
require('deasync').runLoopOnce();
}
return ret;
}
const { parse } = require('querystring');
var moment = require('moment');
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);
}
});
function BroadcastWS(msg){
wss.clients.forEach(function each(client) {
if (client.readyState === WebSocket.OPEN) {
client.send(moment().format() +" : "+ msg);
}
});
}
app.get('/dht', (req, res) => { (async (res) => {
try {
const response = await got('http://192.168.1.126/json');
res.send(response.body);
} catch (error) {
console.log("DHT Error:" + error); //..response.body);
} })(res);
});
String.prototype.replaceAll = function(search, replacement) {
var target = this;
return target.replace(new RegExp(search, 'g'), replacement);
};
app.get("/dht/:field_name", (req, res) => {
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) => {
@@ -342,7 +319,7 @@ app.get("/dht/:field_name", (req, res) => {
});
});
app.put('/dht/:device_id/:field_name/:field_value', (req, res) => {
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());`;
@@ -352,54 +329,54 @@ app.put('/dht/:device_id/:field_name/:field_value', (req, res) => {
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 });
});
//con.end();
//fs.appendFileSync('dht.txt', 'data to append');
});
app.get('/ac', (req, res) => { (async (res) => {
try {
const response = await got('http://192.168.1.126/json')
res.send(response.body);
} catch (error) {
console.log("DHT Error:" + error); //..response.body);
} })(res);
});
//Startup
//!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');
});
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');
});
var data = require('./database.js');
//require('./database.js')();
//data.init();
// 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);
// }
var device = data.Device.build({
name: 'A23',
url: "http://192.168.1.126/"
});
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);}
@@ -422,6 +399,13 @@ cron.schedule(' */30 * * * *', () => {//cron.schedule('*/5 * * * * *', () =>
StoreSensorReadingsAsync();
}).start();
wss.on('connection', ws => {
ws.on('message', message => {
console.log(`Received message => ${message}`)
})
ws.send('ho!')
})
//StoreSensorReadings();
async function StoreSensorReadingsAsync()
@@ -430,22 +414,10 @@ async function 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);
}
if(err) { return reject(err); }
else {
var params = [0, "A23_DHT", JSON.stringify(body)];
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);
}else{
console.log("inserted record: ", { id: r.insertId, ...params });
}
});
SaveSensorReading(JSON.stringify(body))
resolve(body);
console.log(body);
}
});
});
@@ -454,25 +426,28 @@ async function StoreSensorReadingsAsync()
}
}
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 });
}
});
}
function StoreSensorReadings()
{
console.log("StoreSensorReadings");
(async () => {
try {
const dht = await got('http://192.168.1.126/json')
var params = [0, "A23_DHT", dht.body];
let sql = `INSERT INTO devicemessages(device_id,field_name,field_value,timestamp)
VALUES (?,?,?,NOW());`;
con.query(sql,params,(err, r) => {
if (err) {
console.log(err);
}else{
console.log("inserted record: ", { id: r.insertId, ...params });
}
});
} catch (error) {
console.log("DHT Error:" + error); //..response.body);
} })();
try {
const dht = await got('http://192.168.1.126/json')
SaveSensorReading(dht.body);
} catch (error) { console.log("DHT Error:" + error); //..response.body);
}
})();
}

79
views/accontrol.ejs
View File

@@ -1,6 +1,8 @@
<h2>AC Control for <%= model.user.username %></h2>
<form action="/n/accontrol" class="form-inline" method="POST">
<div class="form-group">
<h4 id="current">Retrieving current conditions...</h4>
<!-- class="form-inline" -->
<form id="accontrol" action="/n/accontrol" method="POST">
<div class="form-group ">
<input type='checkbox' name='power' <%= model.data.power|true ? "checked" : "" %> data-toggle='toggle'
data-style='android' data-on='ON' data-off='Off' />
</div>
@@ -9,15 +11,76 @@
data-off='Cool' data-onstyle='warning' data-offstyle='info' />
</div>
<div class="form-group">
<input type='number' name='temp' value='<%= model.data.temp|23%>' min='16' max='32' step='0.5' />
<input type='number' name='temp' value='<%= model.data.temp|22 %>' min='16' max='32' step='0.5' />
</div>
<div class="form-group">
<!-- <input type='checkbox' name='econo'<%= model.data.econo ? "checked" : "" %> data-toggle='toggle' data-style='android' data-on='Eco' data-off='Normal' data-onstyle='info' data-offstyle='warning'/> -->
<input type='submit' class='button' value='SET!'>
<input type='checkbox' name='econo'<%= model.data.econo ? "checked" : "" %> data-toggle='toggle' data-style='android' data-on='Eco' data-off='Normal' data-onstyle='info' data-offstyle='warning'/>
</div>
<div class="form-group">
<label></label>
<input type='checkbox' name='swing'<%= model.data.swing ? "checked" : "" %> data-toggle='toggle' data-style='android' data-on='Swing' data-off='No Swing' data-onstyle='info' data-offstyle='warning'/>
</div>
<div class="form-group">
<input id='set' type='submit' class='button' value='SET!'>
</div>
</form>
INFO:
<%= model.info %>
<%# post.forEach(function(posts){ %>
<!-- <li><%#= posts[i].title %> - <%#= posts[i].name %> </li> -->
<%# }) %>
<div class="form-group">
<h3 id="ws"></h3>
</div>
<%- contentFor('head') %>
<script>
const url = 'wss://iot.d-popov.com/n/ws'
const connection = new WebSocket(url)
connection.onopen = (d) => {
console.log(`WebSocket error: ${d}`)
}
connection.onerror = error => {
console.log(`WebSocket error: ${error}`)
//console.log(inspect(error));
}
connection.onmessage = e => {
console.log(`ws data `);
console.log(e.data);
$('#ws').html(e.data);
}
</script>
<%- contentFor('scripts') %>
<script>
window.onload = function () {
$.getJSON("/n/dht?e=now", function(data){
if(data && data.dht){
$('#current').text( "A23 Currently is " + data.dht.temp + "°C, " + data.dht.hum +"% RH" );
}else {
//chart.title.set("text", "A23 conditions");
}
});
}
$(function(){
console.log("ready");
$("#set").click(function(e){
e.preventDefault();
$.post(
$("#accontrol").prop("action"),
$("#accontrol").serialize(),
function(data, result, response) {
// ... do something with response from server
console.log('sent');
},
//'json' // I expect a JSON response
);
});
});
</script>

4
views/chart.ejs
View File

@@ -112,7 +112,7 @@
}
chart.render();
$.getJSON("/n/dht", function(data){
$.getJSON("/n/dht?e=now", function(data){
if(data && data.dht){
chart.title.set("text", "A23 Currently is " + data.dht.temp + "°C, " + data.dht.hum +"% RH" );
}else {
@@ -121,7 +121,7 @@
});
}
$.getJSON("/n/dht/A23_DHT", addData);
$.getJSON("/n/device/A23_DHT", addData);
}
</script>