From fd49aecd314c280fdb781d50ab363e0b3003e975 Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Thu, 27 Feb 2020 00:25:55 +0100 Subject: [PATCH] ## 0.10.0 (2020-02-27) * (Volker Richert) Added the possibility to use the external nightscout server again * (Volker Richert) Added the cage & sage to the objects --- README.md | 4 ++++ io-package.json | 14 +++++++++++++- lib/client.js | 29 ++++++++++++++--------------- main.js | 12 ++++++------ package.json | 2 +- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index d4e53cb..539ebab 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,10 @@ on('nightscout.0.data.mgdl', obj => { ## Changelog +## 0.10.0 (2020-02-27) +* (Volker Richert) Added the possibility to use the external nightscout server again +* (Volker Richert) Added the cage & sage to the objects + ### 0.9.10 (2020-02-14) * (Volker Richert) Fixed last Updated value diff --git a/io-package.json b/io-package.json index da28735..7a1a98b 100644 --- a/io-package.json +++ b/io-package.json @@ -1,8 +1,20 @@ { "common": { "name": "nightscout", - "version": "0.9.7", + "version": "0.10.0", "news": { + "0.10.0": { + "en": "Added the possibility to use the external nightscout server again\nAdded the cage & sage to the objects", + "de": "Es wurde die Möglichkeit hinzugefügt, den externen Nightcout-Server erneut zu verwenden\nKäfig & Salbei zu den Objekten hinzugefügt", + "ru": "Добавлена возможность снова использовать внешний сервер nightcout\nДобавил клетку и шалфей к объектам", + "pt": "Foi adicionada a possibilidade de usar o servidor externo noturno novamente\nAdicionado gaiola e sálvia aos objetos", + "nl": "De mogelijkheid toegevoegd om de externe nightscout-server opnieuw te gebruiken\nDe kooi en salie toegevoegd aan de objecten", + "fr": "Ajout de la possibilité d'utiliser à nouveau le serveur de nightcout externe\nAjout de la cage et de la sauge aux objets", + "it": "Aggiunta la possibilità di utilizzare nuovamente il server nightscout esterno\nAggiunta la gabbia e la salvia agli oggetti", + "es": "Se agregó la posibilidad de volver a usar el servidor externo de nightcout\nSe agregó la jaula y la salvia a los objetos.", + "pl": "Dodano możliwość ponownego korzystania z zewnętrznego serwera nightscout\nDodano klatkę i szałwię do obiektów", + "zh-cn": "添加了再次使用外部Nightscout服务器的可能性\n将笼子和鼠尾草添加到对象中" + }, "0.9.7": { "en": "Fixed last Updated value", "de": "Letzter aktualisierter Wert behoben", diff --git a/lib/client.js b/lib/client.js index 1197122..e18f578 100644 --- a/lib/client.js +++ b/lib/client.js @@ -146,16 +146,16 @@ function NightscoutClient(adapter, URL, secretHash) { let prevDate = 0; - sitechangeTreatments.forEach((treatment) => { + sitechangeTreatments.forEach(treatment => { const treatmentDate = treatment.mills; if (treatmentDate > prevDate && treatmentDate <= now) { prevDate = treatmentDate; - const b = moment(treatmentDate), - days = a.diff(b, 'days'), - hours = a.diff(b, 'hours') - days * 24, - age = a.diff(b, 'hours'); + const b = moment(treatmentDate); + const days = a.diff(b, 'days'); + const hours = a.diff(b, 'hours') - days * 24; + const age = a.diff(b, 'hours'); if (!cannulaInfo.found || (age >= 0 && age < cannulaInfo.age)) { cannulaInfo.found = true; @@ -178,10 +178,9 @@ function NightscoutClient(adapter, URL, secretHash) { } } - const sensorTreatments = dataUpdate.treatments.filter((treatment) => { - return treatment.eventType.indexOf('Sensor Start') > -1 || - treatment.eventType.indexOf('Sensor Change') > -1; - }); + const sensorTreatments = dataUpdate.treatments.filter(treatment => + treatment.eventType.indexOf('Sensor Start') > -1 || + treatment.eventType.indexOf('Sensor Change') > -1); if (sensorTreatments.length) { const sensorInfo = { @@ -194,16 +193,16 @@ function NightscoutClient(adapter, URL, secretHash) { let prevDate = 0; - sensorTreatments.forEach((treatment) => { + sensorTreatments.forEach(treatment => { const treatmentDate = treatment.mills; if (treatmentDate > prevDate && treatmentDate <= now) { prevDate = treatmentDate; - const b = moment(treatmentDate), - days = a.diff(b, 'days'), - hours = a.diff(b, 'hours') - days * 24, - age = a.diff(b, 'hours'); + const b = moment(treatmentDate); + const days = a.diff(b, 'days'); + const hours = a.diff(b, 'hours') - days * 24; + const age = a.diff(b, 'hours'); if (!sensorInfo.found || (age >= 0 && age < sensorInfo.age)) { sensorInfo.found = true; @@ -243,4 +242,4 @@ function NightscoutClient(adapter, URL, secretHash) { // extend the EventEmitter class using our class util.inherits(NightscoutClient, EventEmitter); -module.exports = NightscoutClient; \ No newline at end of file +module.exports = NightscoutClient; diff --git a/main.js b/main.js index ff34d5d..b65c573 100644 --- a/main.js +++ b/main.js @@ -128,19 +128,19 @@ function startAdapter(options) { online: true // default value }, result => { - if (result.error) { - adapter.log.error('Cannot render website: ' + JSON.stringify(result.error)); + if (!result || result.error) { + adapter.log.error('Cannot render website: ' + JSON.stringify(result && result.error)); adapter.setState('trigger.picture', false, true); } else { adapter.setState('trigger.picture', true, true); } - if (result.stderr) { + if (result && result.stderr) { adapter.log.error('Cannot render website: ' + result.stderr); } - if (result.stdout) { + if (result && result.stdout) { adapter.log.debug('Nightscout rendered: ' + result.stdout); } - adapter.log.debug('Nightscout rendered: ' + result.output); + adapter.log.debug('Nightscout rendered: ' + (result && result.output)); adapter.log.debug('Picture can be find under phantomjs.0.pictures.nightscout_png'); }); }) @@ -273,4 +273,4 @@ if (module.parent) { } else { // otherwise start the instance directly startAdapter(); -} \ No newline at end of file +} diff --git a/package.json b/package.json index 34a495f..4f5f448 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iobroker.nightscout", - "version": "0.9.7", + "version": "0.10.0", "description": "Provides nightscout server for sugar monitoring", "author": { "name": "bluefox",