iobroker.ebus 3.1.0 → 3.1.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2022 rg-engineering <info@rg-engineering.eu>
+Copyright (c) 2017-2023 rg-engineering info@rg-engineering.eu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -55,7 +55,11 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
    
 ## Changelog
 
-### 3.1.0 (in progress)
+### 3.1.1 (2023-01-31)
+* (René) support ebusd 23.1
+* (René) see issue #77: make sure that only one data request is running at the same time
+
+### 3.1.0 (2022-12-01)
 * (René) support ebusd 22.4
 * (René) see issue #77: Update data point when read-cmd is used
 * (René) see issue #78: remove CR, LF in answer from ebusd for DP ebus.0.cmdResult
@@ -203,15 +207,27 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
 * (René) initial release
 
 ## License
-Copyright (C) <2017 - 2022>  <info@rg-engineering.eu>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
+MIT License
+
+Copyright (c) 2017-2023 rg-engineering info@rg-engineering.eu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
     "common": {
         "name": "ebus",
-        "version": "3.1.0",
+        "version": "3.1.1",
         "news": {
+            "3.1.1": {
+                "en": "wait for all commands before update of data",
+                "de": "Warten Sie auf alle Befehle, bevor Sie die Daten aktualisieren",
+                "ru": "дождаться всех команд перед обновлением данных",
+                "pt": "aguarde todos os comandos antes da atualização dos dados",
+                "nl": "wacht op alle commando's voordat de gegevens worden bijgewerkt",
+                "fr": "attendre toutes les commandes avant la mise à jour des données",
+                "it": "attendere tutti i comandi prima dell'aggiornamento dei dati",
+                "es": "esperar todos los comandos antes de actualizar los datos",
+                "pl": "poczekaj na wszystkie polecenia przed aktualizacją danych",
+                "uk": "дочекатися всіх команд перед оновленням даних",
+                "zh-cn": "在更新数据之前等待所有命令"
+            },
             "3.1.0": {
                 "en": "optimize answer of ebus.0.cmd",
                 "de": "Antwort von ebus.0.cmd optimieren",
@@ -15,97 +28,6 @@
                 "pl": "zoptymalizować odpowiedź ebus.0.cmd",
                 "uk": "оптимізувати відповідь ebus.0.cmd",
                 "zh-cn": "优化 ebus.0.cmd 的答案"
-            },
-            "3.0.7": {
-                "en": "support of ebusd 22.3",
-                "de": "Unterstützung von ebusd 22.3",
-                "ru": "поддержка ebusd 22.3",
-                "pt": "suporte de ebusd 22.3",
-                "nl": "ondersteuning van ebusd 22.3",
-                "fr": "prise en charge d'ebusd 22.3",
-                "it": "supporto di ebusd 22.3",
-                "es": "soporte de ebusd 22.3",
-                "pl": "obsługa ebusd 22.3",
-                "zh-cn": "支持 ebusd 22.3",
-                "uk": "підтримка ebusd 22.3"
-            },
-            "3.0.6": {
-                "en": "widget with tooltip",
-                "de": "Widget mit Tooltip",
-                "ru": "виджет с подсказкой",
-                "pt": "widget com dica de ferramenta",
-                "nl": "widget met knopinfo",
-                "fr": "widget avec info-bulle",
-                "it": "widget con descrizione comando",
-                "es": "widget con información sobre herramientas",
-                "pl": "widżet z podpowiedź",
-                "zh-cn": "带有工具提示的小部件",
-                "uk": "віджет із підказкою"
-            },
-            "3.0.2": {
-                "en": "message installation hint added",
-                "de": "Nachricht Installationshinweis hinzugefügt",
-                "ru": "добавлена ​​подсказка установки сообщения",
-                "pt": "dica de instalação de mensagem adicionada",
-                "nl": "bericht installatie hint toegevoegd",
-                "fr": "astuce d'installation de message ajoutée",
-                "it": "suggerimento per l'installazione del messaggio aggiunto",
-                "es": "sugerencia de instalación de mensajes agregada",
-                "pl": "dodano wskazówkę dotyczącą instalacji wiadomości",
-                "zh-cn": "添加了消息安装提示",
-                "uk": "додано підказку щодо встановлення повідомлення"
-            },
-            "3.0.1": {
-                "en": "read interval in admin added",
-                "de": "Leseintervall im Admin hinzugefügt",
-                "ru": "добавлен интервал чтения в админке",
-                "pt": "intervalo de leitura no admin adicionado",
-                "nl": "leesinterval in admin toegevoegd",
-                "fr": "intervalle de lecture ajouté dans l'administrateur",
-                "it": "intervallo di lettura in admin aggiunto",
-                "es": "Intervalo de lectura en el administrador agregado",
-                "pl": "dodano interwał odczytu w admin",
-                "zh-cn": "添加了管理员中的读取间隔",
-                "uk": "додано інтервал читання в адмінці"
-            },
-            "3.0.0": {
-                "en": "from 'scheduled' to 'daemon' adapter changed",
-                "de": "von 'geplant' zu 'daemon' Adapter geändert",
-                "ru": "изменен адаптер с «запланированного» на «демон»",
-                "pt": "adaptador 'agendado' para 'daemon' alterado",
-                "nl": "van 'scheduled' naar 'daemon' adapter gewijzigd",
-                "fr": "de l'adaptateur 'scheduled' à 'daemon' changé",
-                "it": "adattatore da \"programmato\" a \"demone\" modificato",
-                "es": "Se cambió el adaptador de 'programado' a 'daemon'",
-                "pl": "Zmieniono adapter z „zaplanowanego” na „demon”",
-                "zh-cn": "从 'scheduled' 到 'daemon' 适配器已更改",
-                "uk": "змінено адаптер із 'scheduled' на 'daemon'"
-            },
-            "2.6.0": {
-                "en": " 'bent' replaced by 'axios'",
-                "de": "'bent' ersetzt durch 'axios'",
-                "ru": "«согнутый» заменен на «аксиос»",
-                "pt": "'curvado' substituído por 'axios'",
-                "nl": "'gebogen' vervangen door 'axios'",
-                "fr": "'plié' remplacé par 'axios'",
-                "it": "'piegato' sostituito da 'assios'",
-                "es": "'doblado' reemplazado por 'axios'",
-                "pl": "„wygięty” zastąpiony przez „axios”",
-                "zh-cn": "'bent' 替换为 'axios'",
-                "uk": "\"bent\" замінено на \"axios\""
-            },
-            "2.5.1": {
-                "en": "maximum retries to send data in case of arbitration error",
-                "de": "maximale Wiederholungsversuche zum Senden von Daten im Falle eines Vermittlungsfehlers",
-                "ru": "максимальное количество попыток отправки данных в случае ошибки арбитража",
-                "pt": "máximo de tentativas para enviar dados em caso de erro de arbitragem",
-                "nl": "maximaal aantal pogingen om gegevens te verzenden in geval van arbitragefout",
-                "fr": "nombre maximum de tentatives d'envoi de données en cas d'erreur d'arbitrage",
-                "it": "numero massimo di tentativi di invio dei dati in caso di errore di arbitrato",
-                "es": "reintentos máximos para enviar datos en caso de error de arbitraje",
-                "pl": "maksymalna liczba prób wysłania danych w przypadku błędu arbitrażu",
-                "zh-cn": "仲裁错误时发送数据的最大重试次数",
-                "uk": "максимальна кількість повторних спроб надсилання даних у разі помилки арбітражу"
             }
         },
         "titleLang": {

package/main.js

@@ -15,7 +15,7 @@
 
 
 const utils = require("@iobroker/adapter-core");
-const ebusdMinVersion = [22, 4];
+const ebusdMinVersion = [23, 1];
 let ebusdVersion = [0, 0];
 let ebusdUpdateVersion = [0, 0];
 
@@ -39,6 +39,13 @@ function startAdapter(options) {
         //  is called when adapter shuts down
         unload: function (callback) {
             try {
+
+                if (intervalID != null) {
+                    clearInterval(intervalID);
+                }
+                if (updateTimerID != null) {
+                    clearTimeout(updateTimerID);
+                }
                 adapter && adapter.log && adapter.log.info && adapter.log.info("cleaned everything up...");
                 //to do stop intervall
                 callback();
@@ -63,7 +70,8 @@ const axios = require('axios');
 const net = require("net");
 const { PromiseSocket } = require("promise-socket");
 
-let intervalID;
+let intervalID=null;
+let updateTimerID=null;
 
 async function main() {
 
@@ -83,18 +91,37 @@ async function main() {
     adapter.log.debug("read every  " + readInterval + " minutes");
     intervalID = setInterval(Do, readInterval * 60 * 1000);
 
+    //read at adapterstart
+    await Do();
 
 }
 
+let requestRunning = false;
+
+async function DoRequest() {
+
+    adapter.log.debug("DoRequest ");
+
+    if (!requestRunning) {
+        requestRunning = true;
+        await ebusd_ReadValues();
+
+        await ebusd_ReceiveData();
+    }
+    else {
+        adapter.log.debug("DoRequest: do nothing already running ");
+    }
+    requestRunning = false;
+}
+
 async function Do() {
 
     adapter.log.debug("starting ... " );
 
     await ebusd_Command();
 
-    await ebusd_ReadValues();
-
-    await ebusd_ReceiveData();
+    await DoRequest();
+    
 }
 
 
@@ -107,16 +134,40 @@ async function HandleStateChange(id, state) {
         const ids = id.split(".");
 
         if (ids[2] === "cmd") {
-            await Do();
+            await ebusd_Command();
+            StartDataRequest();
+            //see issue #77: only one request possible
+            //await Do();
         }
         else {
             adapter.log.warn("unhandled state change " + id);
         }
     }
+}
+
 
+function StartDataRequest() {
+
+    if (updateTimerID != null) {
+        //already running
+        clearTimeout(updateTimerID);
+        updateTimerID = null;
+    }
+    //start or restart
+    updateTimerID = setTimeout(DataRequest, 500);
+    adapter.log.debug("StartDataRequest");
 }
 
 
+async function DataRequest() {
+    adapter.log.debug("get data after command and timeout");
+    if (updateTimerID != null) {
+        clearTimeout(updateTimerID);
+        updateTimerID = null;
+    }
+    await DoRequest();
+}
+
 
 let oPolledVars = [];
 function FillPolledVars() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.ebus",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "ioBroker ebus Adapter",
   "author": {
     "name": "René G.",
@@ -24,8 +24,8 @@
     "flat": "5.0.2",
     "net": "1.0.2",
     "promise-socket": "7.0.0",
-    "cron": "2.1.0",
-    "axios": "1.2.0"
+    "cron": "2.2.0",
+    "axios": "0.27.2"
   },
   "devDependencies": {
     "@iobroker/adapter-dev": "1.2.0",
@@ -33,20 +33,20 @@
     "@types/chai": "4.3.4",
     "@types/chai-as-promised": "7.1.5",
     "@types/gulp": "4.0.10",
-    "@types/mocha": "10.0.0",
-    "@types/node": "18.11.9",
+    "@types/mocha": "10.0.1",
+    "@types/node": "18.11.18",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
     "@types/sinon": "10.0.13",
     "@types/sinon-chai": "3.2.9",
-    "axios": "1.2.0",
+    "axios": "0.27.2",
     "chai": "4.3.7",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.28.0",
+    "eslint": "8.31.0",
     "gulp": "4.0.2",
-    "mocha": "10.1.0",
+    "mocha": "10.2.0",
     "proxyquire": "2.1.3",
-    "sinon": "15.0.0",
+    "sinon": "15.0.1",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",