iobroker.ebus 3.6.10 → 3.7.0

package/README.md

@@ -76,6 +76,9 @@ in /opt/iobroker/node_modules/iobroker.ebus/lib/scripts you can find a scripts t
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 3.7.0 (2025-11-02)
+* (René) issue #469: telnet connection overworked, promise-socket removed
+
 ### 3.6.10 (2025-10-26)
 * (René) sentry bug fix
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "ebus",
-    "version": "3.6.10",
+    "version": "3.7.0",
     "news": {
+      "3.7.0": {
+        "en": "issue #469: telnet connection overworked, promise-socket removed",
+        "de": "ausgabe #469: telnet-verbindung überbearbeitet, versprechen-socket entfernt",
+        "ru": "проблема no 469: перегруженное соединение с сетью telnet, удаленное сокет-обещание",
+        "pt": "problema #469: conexão telnet overworked, promessa-socket removido",
+        "nl": "nummer #469: telnetverbinding overwerkt, belofte-socket verwijderd",
+        "fr": "numéro 469: connexion telnet surchargée, promesse-socket supprimée",
+        "it": "numero #469: connessione telnet overworked, promessa-socket rimosso",
+        "es": "cuestión #469: conexión de telnet superada, promesa-socket eliminado",
+        "pl": "numer # 469: przepracowane połączenie telnet, usunięte gniazdo",
+        "uk": "problem #469: перероблено зв'язку телнет, вилучено обіцянку",
+        "zh-cn": "第469期: 电话网连接超负荷工作, 承诺口袋被移除"
+      },
       "3.6.10": {
         "en": "sentry bug fix",
         "de": "fehler beheben",
@@ -80,19 +93,6 @@
         "pl": "uzyskać informacje o wersji dla ebusd z github, jeśli lokalnie nie jest dostępny\naktualizacji zależności\nnowe badania",
         "uk": "отримати інформацію про версію для ebusd від github, якщо локально не доступний\nоновлення залежності\nновий тест",
         "zh-cn": "如果本地不可用, 从 github 获取 ebusd 的版本信息\n更新依赖关系\n新测试"
-      },
-      "3.6.2": {
-        "en": "(Galileo53) #419 avoid Warning and error when history list is empty",
-        "de": "(Galileo53) #419 vermeiden Warnung und Fehler bei leerer Geschichtsliste",
-        "ru": "(Galileo53) #419 Избегайте Предупреждение и ошибка, когда список истории пуст",
-        "pt": "#419 evitam Aviso e erro quando a lista de histórico estiver vazia",
-        "nl": "(Galileo53) #419 vermijden Waarschuwing en fout wanneer geschiedenislijst leeg is",
-        "fr": "(Galileo53) #419 éviter Avertissement et erreur lorsque la liste d'historique est vide",
-        "it": "#419 evita Avvertenza ed errore quando l'elenco di storia è vuoto",
-        "es": "(Galileo53) #419 evitar Advertencia y error cuando la lista de historia está vacía",
-        "pl": "(Galileo53) # 419 unikać Ostrzeżenie i błąd, gdy lista historii jest pusta",
-        "uk": "(Galileo53) #419 уникнути Попередження та похибка, коли список історії порожній",
-        "zh-cn": "(加利略53) #419避免 历史列表为空时的警告和错误"
       }
     },
     "titleLang": {

package/lib/TelnetClient.js

@@ -0,0 +1,88 @@
+/* eslint-disable prefer-template */
+const net = require("net");
+
+class TelnetClient {
+
+    constructor() {
+        this.socket = new net.Socket();
+        this.connected = false;
+
+        // Fehlerbehandlung
+        this.socket.on("error", (err) => {
+            console.error("Socket Error:", err);
+        });
+    }
+
+    async connect(host, port) {
+        if (this.connected) {
+            return;
+        }
+        await new Promise((resolve, reject) => {
+            this.socket.connect(port, host, () => {
+                this.connected = true;
+                resolve();
+            });
+            this.socket.once("error", reject);
+        });
+    }
+
+    async write(data) {
+        if (!this.connected) {
+            throw new Error("Socket not connected");
+        }
+
+        await new Promise((resolve, reject) => {
+            this.socket.write(data, (err) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve();
+                }
+            });
+        });
+    }
+
+    async read(timeoutMs = 4000) {
+        if (!this.connected) {
+            throw new Error("Socket not connected");
+        }
+
+        return new Promise((resolve, reject) => {
+            const onData = (data) => {
+                clearTimeout(timer);
+                this.socket.removeListener("error", onError);
+                resolve(data.toString());
+            };
+
+            const onError = (err) => {
+                clearTimeout(timer);
+                this.socket.removeListener("data", onData);
+                reject(err);
+            };
+
+            const timer = setTimeout(() => {
+                this.socket.removeListener("data", onData);
+                this.socket.removeListener("error", onError);
+                reject(new Error("Read timeout"));
+            }, timeoutMs);
+
+            this.socket.once("data", onData);
+            this.socket.once("error", onError);
+        });
+    }
+
+
+    async disconnect() {
+        if (!this.connected) {
+            return;
+        }
+        await new Promise((resolve) => {
+            this.socket.end(() => {
+                this.connected = false;
+                resolve();
+            });
+        });
+    }
+}
+
+module.exports = TelnetClient;

package/main.js

@@ -1,4 +1,4 @@
-/* eslint-disable prefer-template */
+/* eslint-disable prefer-template */
 /*
  * ebus adapter für iobroker
  *
@@ -19,8 +19,10 @@ const { spawn } = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const axios = require("axios");
-const net = require("net");
-const { PromiseSocket } = require("promise-socket");
+//const net = require("net");
+//const { PromiseSocket } = require("promise-socket");
+
+const telnetClient = require("./lib/TelnetClient");
 
 const ebusdMinVersion = [25, 1];
 const ebusdVersion = [0, 0];
@@ -324,12 +326,15 @@ async function ebusd_Command() {
             adapter.log.debug(`connect telnet to IP ${  adapter.config.targetIP  } port ${  parseInt(adapter.config.targetTelnetPort)}`);
 
             try {
-                const socket = new net.Socket();
-                const promiseSocket = new PromiseSocket(socket);
+                //const socket = new net.Socket();
+                //const promiseSocket = new PromiseSocket(socket);
+
+                //await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
+                //adapter.log.debug("telnet connected for cmd");
+                //promiseSocket.setTimeout(5000);
 
-                await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
-                adapter.log.debug("telnet connected for cmd");
-                promiseSocket.setTimeout(5000);
+                const telnet = new telnetClient();
+                await telnet.connect(adapter.config.targetIP, parseInt(adapter.config.targetTelnetPort));
 
                 const oCmds = cmds.split(",");
 
@@ -337,9 +342,11 @@ async function ebusd_Command() {
                     let received = "";
                     for (let n = 0; n < oCmds.length; n++) {
                         adapter.log.debug(`send ${  oCmds[n]}`);
-                        await promiseSocket.write(`${oCmds[n]  }\n`);
+                        //await promiseSocket.write(`${oCmds[n]  }\n`);
+                        await telnet.write(`${oCmds[n]}\n`);
 
-                        const data = await promiseSocket.read();
+                        //const data = await promiseSocket.read();
+                        const data = await telnet.read();
 
                         if (data.includes("ERR")) {
                             adapter.log.warn(`sent ${  oCmds[n]  }, received ${  data  } please check ebusd logs for details!`);
@@ -362,7 +369,8 @@ async function ebusd_Command() {
                 }
                 await adapter.setStateAsync("cmd", { ack: true, val: "" });
 
-                promiseSocket.destroy();
+                //promiseSocket.destroy();
+                await telnet.disconnect();
             } catch (e) {
                 adapter.log.error(`exception from tcp socket` + `[${  e  }]`);
             }
@@ -374,16 +382,21 @@ async function ebusd_Command() {
 
 async function ebusd_find() {
     try {
-        const socket = new net.Socket();
-        const promiseSocket = new PromiseSocket(socket);
+        //const socket = new net.Socket();
+        //const promiseSocket = new PromiseSocket(socket);
 
-        await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
-        adapter.log.debug("telnet connected for cmd");
-        promiseSocket.setTimeout(5000);
+        //await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
+        //adapter.log.debug("telnet connected for cmd");
+        //promiseSocket.setTimeout(5000);
+        const telnet = new telnetClient();
+        await telnet.connect(adapter.config.targetIP, parseInt(adapter.config.targetTelnetPort));
 
-        await promiseSocket.write("find -F circuit,name,comment\n");
 
-        const data = await promiseSocket.read();
+        //await promiseSocket.write("find -F circuit,name,comment\n");
+        await telnet.write("find -F circuit,name,comment\n");
+
+        //const data = await promiseSocket.read();
+        const data = await telnet.read();
 
         if (data.includes("ERR")) {
             adapter.log.warn(`received error! sent find, received ${  data  } please check ebusd logs for details!`);
@@ -407,14 +420,18 @@ async function ebusd_find() {
             adapter.log.debug(`send cmd ${  cmd}`);
 
             cmd += "\n";
-            await promiseSocket.write(cmd);
+            //await promiseSocket.write(cmd);
+            await telnet.write(cmd);
 
-            const result = await promiseSocket.read();
+            //const result = await promiseSocket.read();
+            const result = await telnet.read();
 
             adapter.log.debug(`received ${  typeof result  } ${  result}`);
         }
 
-        promiseSocket.destroy();
+        //promiseSocket.destroy();
+        await telnet.disconnect();
+
     } catch (e) {
         adapter.log.error(`exception from tcp socket in ebusd_find` + `[${  e  }]`);
     }
@@ -1445,12 +1462,15 @@ async function ebusd_ReadValues() {
         adapter.log.debug(`to poll ctr ${  oPolledVars.length  } vals:  ${  JSON.stringify(oPolledVars)}`);
 
         try {
-            const socket = new net.Socket();
-            const promiseSocket = new PromiseSocket(socket);
+            //const socket = new net.Socket();
+            //const promiseSocket = new PromiseSocket(socket);
 
-            await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
-            adapter.log.debug(`telnet connected to poll variables ${  adapter.config.targetIP  } port ${  adapter.config.targetTelnetPort}`);
-            promiseSocket.setTimeout(5000);
+            //await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
+            //adapter.log.debug(`telnet connected to poll variables ${  adapter.config.targetIP  } port ${  adapter.config.targetTelnetPort}`);
+            //promiseSocket.setTimeout(5000);
+
+            const telnet = new telnetClient();
+            await telnet.connect(adapter.config.targetIP, parseInt(adapter.config.targetTelnetPort));
 
             let retries = 0;
             for (let nCtr = 0; nCtr < oPolledVars.length; nCtr++) {
@@ -1467,32 +1487,58 @@ async function ebusd_ReadValues() {
                 adapter.log.debug(`send cmd ${  cmd}`);
 
                 cmd += "\n";
-                await promiseSocket.write(cmd);
+                let data = null;
+
+                try {
+                    //await promiseSocket.write(cmd);
+                    await telnet.write(cmd);
+
+                    //const data = await promiseSocket.read();
+                    data = await telnet.read();
+                } catch (e) {
+                    adapter.log.warn(`exception from tcp socket write/read in ebusd_ReadValues for cmd ${cmd}` + `[${e}]` + ` -> retry` );
+
+                    //todo: retry nur für timeout und arbitration lost? 2025-11-01
+                    retries++;
+                    if (retries > adapter.config.maxretries) {
+                        adapter.log.error(`max retries, skip cmd ${cmd}`);
+                        
+                    } else {
+                        nCtr--; //counter wieder zurücksetzen
+                        adapter.log.debug("retry to send data ");
+                    }
 
-                const data = await promiseSocket.read();
+                }
+                if (data !== null) {
+                    adapter.log.debug(`received ${data} for ${JSON.stringify(oPolledVars[nCtr])}`);
 
-                //received ERR: arbitration lost for YieldThisYear
-                if (data.includes("ERR")) {
-                    adapter.log.warn(`sent ${  cmd  }, received ${  data  } for ${  JSON.stringify(oPolledVars[nCtr])  } please check ebusd logs for details!`);
-
-                    /*
-                     * sent read -f YieldLastYear, received ERR: arbitration lost for {"circuit":"","name":"YieldLastYear","parameter":""}
-                     * */
-                    if (data.includes("arbitration lost")) {
-                        retries++;
-                        if (retries > adapter.config.maxretries) {
-                            adapter.log.error(`max retries, skip cmd ${  cmd}`);
-                            retries = 0;
-                        } else {
-                            nCtr--;
-                            adapter.log.debug("retry to send data ");
-                        }
-                    }
-                } else {
-                    adapter.log.debug(`received ${  data  } for ${  JSON.stringify(oPolledVars[nCtr])}`);
+                    //todo: parse data and set DP's 2025-11-01
                 }
+                //received ERR: arbitration lost for YieldThisYear
+                //if (data !== null && data.includes("ERR")) {
+                //    adapter.log.warn(`sent ${  cmd  }, received ${  data  } for ${  JSON.stringify(oPolledVars[nCtr])  } please check ebusd logs for details!`);
+                //
+                //    /*
+                //     * sent read -f YieldLastYear, received ERR: arbitration lost for {"circuit":"","name":"YieldLastYear","parameter":""}
+                //     * */
+                //    if (data.includes("arbitration lost")) {
+                //        retries++;
+                //        if (retries > adapter.config.maxretries) {
+                //            adapter.log.error(`max retries, skip cmd ${  cmd}`);
+                //            retries = 0;
+                //        } else {
+                //            nCtr--;
+                //            adapter.log.debug("retry to send data ");
+                //        }
+                //    }
+                //} else {
+                //
+                //    //muss wieder debug werden 2025-11-01 todo
+                //    adapter.log.info(`received ${  data  } for ${  JSON.stringify(oPolledVars[nCtr])}`);
+                //}
             }
-            promiseSocket.destroy();
+            //promiseSocket.destroy();
+            await telnet.disconnect();
             adapter.log.debug("telnet disonnected");
         } catch (e) {
             adapter.log.error(`exception from tcp socket in ebusd_ReadValues ` + `[${  e  }]`);
@@ -1503,42 +1549,55 @@ async function ebusd_ReadValues() {
 }
 
 async function FindParams(obj) {
-    adapter.log.debug(`FindParams ${  JSON.stringify(obj)  } ${  JSON.stringify(obj.message)  } ${  JSON.stringify(obj.message.circuit)}`);
+
+    //todo muss wieder debug werden 2025-11-01
+    adapter.log.info(`FindParams ${  JSON.stringify(obj)  } ${  JSON.stringify(obj.message)  } ${  JSON.stringify(obj.message.circuit)}`);
 
     const list = [];
 
     try {
         //FindParams {"command":"findParams","message":{"circuit":"cc"},"from":"system.adapter.admin.0","callback":{"message":{"circuit":"cc"},"id":90,"ack":false,"time":1733690088670},"_id":39690903}
 
-        if (obj.message != null) {
+        if (obj.message !== null && obj.message.circuit!== null) {
             const circuit = obj.message.circuit;
 
-            const socket = new net.Socket();
-            const promiseSocket = new PromiseSocket(socket);
+            //const socket = new net.Socket();
+            //const promiseSocket = new PromiseSocket(socket);
 
-            await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
-            adapter.log.debug("telnet connected for cmd");
-            promiseSocket.setTimeout(5000);
+            //await promiseSocket.connect(parseInt(adapter.config.targetTelnetPort), adapter.config.targetIP);
+            //adapter.log.debug("telnet connected for cmd");
+            //promiseSocket.setTimeout(5000);
+
+            const telnet = new telnetClient();
+            await telnet.connect(adapter.config.targetIP, parseInt(adapter.config.targetTelnetPort));
 
             const cmd = `find -c ${  circuit  } -F circuit,name\n`;
-            await promiseSocket.write(cmd);
+            //await promiseSocket.write(cmd);
+
+            adapter.log.debug(`send cmd ${cmd}`);
+            await telnet.write(cmd);
 
-            const data = await promiseSocket.read();
+            adapter.log.debug(`sent, wait for data...`);
+            //const data = await promiseSocket.read();
+            const data = await telnet.read();
+            adapter.log.info(`data received: ` + data);
 
-            if (data.includes("ERR")) {
+            if ( data.includes("ERR")) {
                 adapter.log.warn(`received error! sent find, received ${  data  } please check ebusd logs for details! ${  cmd}`);
                 
             } else {
-                adapter.log.debug(`received ${  typeof data  } ${  data  } ${  + cmd}`);
+                adapter.log.info(`received ${  typeof data  } ${  data  } ${  + cmd}`);
             }
             /*
               received object ehp,AccelerationTestModeehp,AccelerationTestModeehp,ActualEnvironmentPowerehp,ActualEnvironmentPowerehp,ActualEnvironmentPowerPercentageehp,ActualEnvironmentPowerPercentageehp,ApplianceCodeehp,ApplianceCodeehp,Backupehp,Backupehp,BackupHoursehp,BackupHoursHcehp,BackupHoursHwcehp,BackupHysteresisehp,BackupIntegralehp,BackupModeHcehp,BackupModeHwcehp,BackupPowerCutehp,BackupStartsehp,BackupStartsHcehp,BackupStartsHwcehp,BackupTypeehp,BivalentTempehp,Bleedingehp,Bleedingehp,CirPumpehp,CirPumpehp,Code1ehp,Code1Code2Validehp,Code2ehp,Compehp,Compehp,CompControlStateehp,CompCutPressHighCountehp,CompCutPressLowCountehp,CompCutTempCountehp,CompDemandehp,CompHoursehp,CompHoursHcehp,CompHoursHwcehp,CompHysteresisehp,CompIntegralehp,CompPressHighehp,CompPressHighehp,CompPressLowehp,CompPressLowehp,CompStartsehp,CompStartsHcehp,CompStartsHwcehp,CompStateehp,CondensorTempehp,CondensorTempehp,currenterrorehp,Dateehp,DateTimeehp,DeltaTempT6T7ehp,ElectricWiringDiagramehp,ElectricWiringDiagramehp,EnergyBalancingReleaseehp,errorhistoryehp,FlowTempehp,FlowTempehp,FlowtempCoolingMinehp,FlowTempOffsetehp,Hc1Pumpehp,Hc1Pumpehp,Hc1PumpHoursehp,Hc1PumpPortehp,Hc1PumpStartsehp,Hc2Pumpehp,Hc2PumpHoursehp,HcFlowTempehp,HcFlowTempOffsetehp,HcModeDemandHoursehp,HcModeFulfilledHoursehp,HcParallelStorageFillingEnabledehp,HcPressehp,HcReturnTempehp,HcReturnTempehp,HcReturnTempOffsetehp,HeatPumpStatusehp,HeatPumpStatusehp,HeatpumpTypeehp,HwcHcValveehp,HwcHcValveehp,HwcHcValveStartsehp,HwcLaggingTimeehp,HwcLoadingDelayehp,HwcModeDemandHoursehp,HwcModeFulfilledHoursehp,HwcPumpStartsehp,HwcSwitchehp,HwcTempehp,HwcTempehp,HwcTempOffsetehp,HydraulicSchemeehp,ICLOutehp,ICLOutehp,Injectionehp,Integralehp,Mixer1DutyCycleehp,NumberCompStartsehp,OutsideTempehp,OutsideTempOffsetehp,OverpressureThresholdehp,PhaseOrderehp,PhaseOrderehp,PhaseStatusehp,PhaseStatusehp,PowerCutehp,PowerCutPreloadingehp,PressSwitchehp,PressSwitchehp,RebootCounterehp,ReturnTempMaxehp,SetModeehp,SoftwareCodeehp,Source2PumpHoursehp,Sourceehp,Sourceehp,SourceHoursehp,SourcePortehp,SourcePressehp,SourcePumpPrerunTimeehp,SourceStartsehp,SourceSwitchehp,SourceSwitchehp,SourceTempInputehp,SourceTempInputehp,SourceTempInputOffsetehp,SourceTempOutputehp,SourceTempOutputehp,SourceTempOutputOffsetehp,SourceTempOutputT8Minehp,StateSoftwareCodeehp,StateSoftwareCodeehp,Status01ehp,Status02ehp,Status16ehp,Statusehp,StatusCirPumpehp,StorageTempBottomehp,StorageTempBottomehp,StorageTempBottomOffsetehp,StorageTempTopehp,StorageTempTopehp,StorageTempTopOffsetehp,Subcoolingehp,Superheatehp,T19MaxToCompOffehp,TempInputehp,TempInputehp,TempInputOffsetehp,TempOutputehp,TempOutputehp,TempOutputOffsetehp,Timeehp,TimeBetweenTwoCompStartsMinehp,TimeCompOffMinehp,TimeCompOnMinehp,TimeOfNextPredictedPowerCutehp,TimeOfNextPredictedPowerCutehp,Weekdayehp,YieldTotalehp,YieldTotal
             */
-            const str = new TextDecoder().decode(data);
-            const datas = str.split(/\r?\n/);
+            //const str = new TextDecoder().decode(data);
+            const datas = data.split(/[\r?\n,]+/);
+
+            adapter.log.info("found entries: " + datas.length); 
 
             for (let i = 0; i < datas.length; i++) {
-                //adapter.log.debug(JSON.stringify(datas[i]));
+                //adapter.log.info(JSON.stringify(datas[i]));
 
                 const names = datas[i].split(",");
 
@@ -1567,6 +1626,8 @@ async function FindParams(obj) {
                     list.push(entry);
                 }
             }
+
+            await telnet.disconnect();
         } else {
             adapter.log.error("no circuit defined where to look for parameter, check values!");
         }
@@ -1727,6 +1788,13 @@ async function GetLatestVersionGithub() {
     return latestVersion;
 }
 
+
+
+
+
+
+
+
 // If started as allInOne/compact mode => return function to create instance
 if (module && module.parent) {
     module.exports = startAdapter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.ebus",
-  "version": "3.6.10",
+  "version": "3.7.0",
   "description": "ioBroker ebus Adapter",
   "author": {
     "name": "René G.",
@@ -17,16 +17,15 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/rg-engineering/ioBroker.ebus"
+    "url": "git+https://github.com/rg-engineering/ioBroker.ebus.git"
   },
   "engines": {
     "node": ">= 20"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
-    "axios": "^1.12.2",
-    "net": "^1.0.2",
-    "promise-socket": "^8.0.0"
+    "axios": "^1.13.1",
+    "net": "^1.0.2"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^5.0.0",