From a701761510ded56fe9aac8af3d94b4d7dfbd4737 Mon Sep 17 00:00:00 2001 From: Dobromir Popov ONE Date: Tue, 29 Mar 2022 23:38:01 +0300 Subject: [PATCH] setup docker with variables; debug logging for configuration variables; --- .ionide/symbolCache.db | Bin 0 -> 8192 bytes Dockerfile | 2 +- config/config.json | 15 ++++++++++++--- docker-compose.yml | 10 +++++++++- readme.md | 5 +++++ src/devices/ir.js | 12 +++++++++++- src/mqtt.js | 35 +++++++++++++++++++++++++---------- views/login.ejs | 5 ++++- views/sort.ejs | 1 + 9 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 .ionide/symbolCache.db create mode 100644 readme.md create mode 100644 views/sort.ejs diff --git a/.ionide/symbolCache.db b/.ionide/symbolCache.db new file mode 100644 index 0000000000000000000000000000000000000000..8a73c4f77ed2b2c7b869d888125b966bab395731 GIT binary patch literal 8192 zcmeI#O-sWt7zglV2!b&1=3$rIR1h!v0qnL63T4x^2d~-8SRiRi`xM;Wiyy%6Yw9-e zZLMedKQx3iPtxSqT#`N{hO}7u(kT)*?38iN?u1~B@lbl9?4xNP?Hi$P+Filf^{wcK zEZ%=(;XyzE0uX=z1Rwwb2tWV=5P-mEftNKuJ{t`9>p7`~)#=79ysdUsZ#0)tCPfwv z6Df8tFZw6qTTG1AQ{}YC zozAzDbbjz&5$Upf3)!Y docker-compose build ++ docker-compose up ++ OR ++ docker-compose up --build \ No newline at end of file diff --git a/src/devices/ir.js b/src/devices/ir.js index 2dfd915..39fea76 100644 --- a/src/devices/ir.js +++ b/src/devices/ir.js @@ -6,13 +6,23 @@ const { parse } = require('querystring'); var moment = require('moment'); const request = require('request'); +const env = process.env.NODE_ENV || 'development'; +console.log("ENV: %s", env); +const config = require(__dirname + '/../../config/config.json')[env]; + +var irHost = process.env.IR_HOST || config.irHost || '127.0.0.1' + +console.log('DB: Checking config sources: process.env.IR_HOST: %s', process.env.IR_HOST); +console.log('DB: Checking config sources: config.irHost : %s', config.irHost ); +console.log('IR: irHost : %s', irHost ); + function GetDht() { try {//? var result; (async () => { try { //http://192.168.0.58/json?view=sensorupdate - var url='http://'+'192.168.1.143'+'/cm?cmnd=status%2010&user=admin&password=vlado555'; + var url='http://'+irHost+'/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); } diff --git a/src/mqtt.js b/src/mqtt.js index 194894c..8f783df 100644 --- a/src/mqtt.js +++ b/src/mqtt.js @@ -4,29 +4,44 @@ const env = process.env.NODE_ENV || 'development'; console.log("ENV: %s", env); const config = require(__dirname + '/../config/config.json')[env]; +console.log('MQTT: Checking config sources: process.env.MQTT_HOST: %s', process.env.MQTT_HOST); +console.log('MQTT: Checking config sources: process.env.MQTT_PORT_HTTP: %s', process.env.MQTT_PORT_HTTP); +console.log('MQTT: Checking config sources: process.env.MQTT_PORT_HTTPS: %s', process.env.MQTT_PORT_HTTPS); +console.log('MQTT: Checking config sources: config.mqttIP : %s', config.mqttIP ); +console.log('MQTT: Checking config sources: config.mqttPortHttp : %s', config.mqttPortHttp ); +console.log('MQTT: Checking config sources: config.mqttPortHttps : %s', config.mqttPortHttps ); + var mosca = require('mosca'); var mqtt_settings = { - port:1884 + host:process.env.MQTT_HOST || config.mqttIP, + port:process.env.MQTT_PORT_HTTP || config.mqttPortHttp || 1884 } if(typeof credentials!=='undefined') { mqtt_settings.secure = { - port: 8444, + host:process.env.MQTT_HOST || config.mqttIP, + port: process.env.MQTT_PORT_HTTPS || config.mqttPortHttps || 8444, keyPath: SECURE_KEY, certPath: SECURE_CERT, } } -var mqtt = new mosca.Server(mqtt_settings); -mqtt.on('ready', function(){ - console.log("MQTT ready on port " + mqtt_settings.port); -}) -mqtt.on('clientConnected', function(){ - console.log("MQTT client connected !"); -}); + +mqtt_settings.port = parseInt(mqtt_settings.port); +console.log('MQTT: mqtt_settings.host : %s', mqtt_settings.host ); +console.log('MQTT: mqtt_settings.port : %s', mqtt_settings.port ); + +//MQTT SERVER!!! +//var mqttServer = new mosca.Server(mqtt_settings); +// mqttServer.on('ready', function(){ +// console.log("MQTT ready on port " + mqtt_settings.port); +// }) +// mqttServer.on('clientConnected', function(){ +// console.log("MQTT client connected !"); +// }); var mqtt = require('mqtt'); -var mqtt_client = mqtt.connect('mqtt://'+ config.mqttIP); +var mqtt_client = mqtt.connect('mqtt://'+ mqtt_settings.host); mqtt_client.on('connect', function () { console.log("MQTT connected. subscribing to topics"); mqtt_client.subscribe('tele/tasmota/STATE'); diff --git a/views/login.ejs b/views/login.ejs index 36b208d..2d37812 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -10,4 +10,7 @@
- \ No newline at end of file + + + \ No newline at end of file diff --git a/views/sort.ejs b/views/sort.ejs new file mode 100644 index 0000000..e34e4c2 --- /dev/null +++ b/views/sort.ejs @@ -0,0 +1 @@ +//generate ejs view to sort csv numbers from textbox \ No newline at end of file