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

replasing 'got' with 'request' package;

Browse Source 
UI for garden watering (start/stop);
This commit is contained in:
d-popov
2020-06-16 20:35:22 +03:00
parent 6a8a895f69
commit 5f02e7fb61
7 changed files with 640 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/devicemessages.js
View File

@@ -7,7 +7,7 @@ var con = mysql.createConnection({
database : 'iot'
});
const got = require('got');
//const got = require('got');
exports.findByName = function(fieldName, days, cb) {
process.nextTick(function() {
@@ -44,7 +44,7 @@ exports.getFromDht = function(url, cb)
{
(async () => {
try {
const dht = await got('http://192.168.1.126/json')
//! const dht = await got('http://192.168.1.126/json')
var j = JSON.parse(body);
if(j.dht && j.dht.hum <= 100 && j.dht.hum >= 0){
exports.insert(0, "A23_DHT", dht.body, cb);

21
src/devices/ir.js
View File

@@ -2,7 +2,6 @@
const util = require('util');
const { parse } = require('querystring');
var moment = require('moment');
const got = require('got');
const request = require('request');
function GetDht() {
@@ -10,9 +9,12 @@ function GetDht() {
var result;
(async () => {
try {
var ret = await got('http://192.168.1.126/cm?cmnd=status%2010&user=admin&password=vlado555');
console.log("DHT: "+ util.inspect(ret.body));
var j = JSON.parse(ret.body);
var url='http://192.168.1.143/cm?cmnd=status%2010&user=admin&password=vlado555';
request(url, { json: true }, (err, res, body) => {
if (err) { return console.log("Problem getting current conditions: " + err); }
console.log("DHT:"+ util.inspect(body));
var j = body; //JSON.parse(body);
console.log("JSON> " + util.inspect(j));
if(j.StatusSNS && j.StatusSNS.DHT11 && j.StatusSNS.DHT11.Humidity !== null)
{
@@ -23,6 +25,7 @@ function GetDht() {
dew: j.StatusSNS.DHT11.DewPoint
}};
}
});
} catch (error) {
console.log(error);
}
@@ -44,7 +47,11 @@ function GetDht() {
console.log("IR_SEND_RAW:" + url);
(async () => {
try {
ret = await got(url);
request(url, { json: true }, (err, res, body) => {
if (err) { return console.log("Problem sending IR: " + err); }
console.log("IR command send!");
});
} catch (error) {
console.log(error);
}
@@ -105,11 +112,11 @@ function GetDht() {
} catch (error) {
console.log("DHT Error:" + error);
}
console.log("got current conditions??");
console.log("current conditions??");
break;
case 'ir':
console.log("got IR message!");
console.log("IR message!");
console.log(req.body);
console.log(util.inspect(req.params));
try{