iobroker.ebus 3.0.2 → 3.0.3

package/LICENSE

@@ -1,7 +1,21 @@
-Copyright (C) <2017 - 2022>  <info@rg-engineering.eu>
+MIT License
 
-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:
+Copyright (c) 2017-2022 rg-engineering <info@rg-engineering.eu>
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+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 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.
+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/README.md

@@ -55,6 +55,13 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
    
 ## Changelog
 
+### 3.0.3 (2022-08-18)
+* (René) tooltip in wizard added
+* (René) flot and dependencies updated
+* (René) errors from ebusd are shown as warning here in adapter, details schould be checked in logs of ebusd
+* (René) bug fix in widget: if less data available x axes grid point were not shown
+* (René) except null as valid value from ebusd (e.g. to reset CurrentError)
+
 ### 3.0.2 (2022-04-02)
 * (René) message for installation added
 

package/io-package.json

@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "ebus",
-        "version": "3.0.2",
+        "version": "3.0.3",
         "news": {
+            "3.0.3": {
+                "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": "带有工具提示的小部件"
+            },
             "3.0.2": {
                 "en": "message installation hint added",
                 "de": "Nachricht Installationshinweis hinzugefügt",

package/main.js

@@ -48,10 +48,12 @@ function startAdapter(options) {
         },
         //#######################################
         //
-        SIGINT: function () {
-            adapter && adapter.log && adapter.log.info && adapter.log.info("cleaned everything up...");
-            CronStop();
-        },
+        //SIGINT: function () {
+        //    clearInterval(intervalID);
+        //    intervalID = null;
+        //    adapter && adapter.log && adapter.log.info && adapter.log.info("cleaned everything up...");
+        //    CronStop();
+        //},
         //#######################################
         //  is called if a subscribed object changes
         //objectChange: function (id, obj) {
@@ -259,7 +261,7 @@ async function ebusd_Command() {
                         const data = await promiseSocket.read();
 
                         if (data.includes("ERR")) {
-                            adapter.log.error("sent " + oCmds[n] + ", received " + data);
+                            adapter.log.warn("sent " + oCmds[n] + ", received " + data + " please check ebusd logs for details!";
                         }
                         else {
                             adapter.log.debug("received " + data);
@@ -295,6 +297,39 @@ function subscribeVars() {
     adapter.subscribeStates("cmd");
 }
 
+async function CreateObject(key, obj) {
+
+    const obj_new = await adapter.getObjectAsync(key);
+    //adapter.log.warn("got object " + JSON.stringify(obj_new));
+
+    if (obj_new != null) {
+
+        if ((obj_new.common.role != obj.common.role
+            || obj_new.common.type != obj.common.type
+            || (obj_new.common.unit != obj.common.unit && obj.common.unit != null)
+            || obj_new.common.read != obj.common.read
+            || obj_new.common.write != obj.common.write
+            || obj_new.common.name != obj.common.name)
+            && obj.type === "state"
+        ) {
+            adapter.log.warn("change object " + JSON.stringify(obj) + " " + JSON.stringify(obj_new));
+            await adapter.extendObject(key, {
+                common: {
+                    name: obj.common.name,
+                    role: obj.common.role,
+                    type: obj.common.type,
+                    unit: obj.common.unit,
+                    read: obj.common.read,
+                    write: obj.common.write
+                }
+            });
+        }
+    }
+    else {
+        await adapter.setObjectNotExistsAsync(key, obj);
+    }
+}
+
 
 async function checkVariables() {
     adapter.log.debug("init variables ");
@@ -303,7 +338,7 @@ async function checkVariables() {
     let obj;
 
     key = "cmd";
-    await adapter.setObjectNotExistsAsync(key, {
+    obj= {
         type: "state",
         common: {
             name: "ebusd command",
@@ -312,23 +347,11 @@ async function checkVariables() {
             read: true,
             write: true
         }
-    });
-
-    obj = await adapter.getObjectAsync(key);
-
-    if (obj != null) {
-
-        if (obj.common.role != "text") {
-            await adapter.extendObject(key, {
-                common: {
-                    role: "text",
-                }
-            });
-        }
-    }
+    };
+    await CreateObject(key, obj);
 
     key = "cmdResult";
-    await adapter.setObjectNotExistsAsync(key, {
+    obj = {
         type: "state",
         common: {
             name: "ebusd command result",
@@ -337,25 +360,11 @@ async function checkVariables() {
             read: true,
             write: false
         }
-    });
-    obj = await adapter.getObjectAsync(key);
-
-    if (obj != null) {
-
-        if (obj.common.role != "text") {
-            await adapter.extendObject(key, {
-                common: {
-                    role: "text",
-                }
-            });
-        }
-    }
-
-
+    };
+    await CreateObject(key, obj);
 
     adapter.log.debug("init common variables and " + oHistoryVars.length + " history DP's");
     
-
     if (oHistoryVars.length > 0) {
 
         if (oHistoryVars.length > 4) {
@@ -367,7 +376,7 @@ async function checkVariables() {
             if (oHistoryVars[n - 1].name.length > 0) {
                 const name = "history value " + n + " as JSON " + oHistoryVars[n - 1].name;
                 key = "history.value" + n;
-                await adapter.setObjectNotExistsAsync(key, {
+                obj= {
                     type: "state",
                     common: {
                         name: name,
@@ -378,21 +387,8 @@ async function checkVariables() {
                         write: false
                     },
                     native: { location: key }
-                });
-
-                obj = await adapter.getObjectAsync(key);
-
-                if (obj != null) {
-
-                    if (obj.common.role != "value" || obj.common.name != name) {
-                        await adapter.extendObject(key, {
-                            common: {
-                                name: name,
-                                role: "value",
-                            }
-                        });
-                    }
-                }
+                };
+                await CreateObject(key, obj);
             }
             else {
                 adapter.log.warn("ignoring history value " + n + " (invalid name)");
@@ -400,42 +396,36 @@ async function checkVariables() {
         }
 
         key = "history.date";
-        await adapter.setObjectNotExistsAsync(key, {
+        obj= {
             type: "state",
-            common: { name: "ebus history date as JSON", type: "string", role: "value", unit: "", read: true, write: false },
-            native: { location: key }
-        });
-        obj = await adapter.getObjectAsync(key);
-
-        if (obj != null) {
-
-            if (obj.common.role != "value") {
-                await adapter.extendObject(key, {
-                    common: {
-                        role: "value",
-                    }
-                });
+            common: {
+                name: "ebus history date as JSON",
+                type: "string",
+                role: "value",
+                unit: "",
+                read: true,
+                write: false
+            },
+            native: {
+                location: key
             }
-        }
+        };
+        await CreateObject(key, obj);
     }
     key = "history.error";
-    await adapter.setObjectNotExistsAsync(key, {
+    obj= {
         type: "state",
-        common: { name: "ebus error", type: "string", role: "value", unit: "", read: true, write: false },
+        common: {
+            name: "ebus error",
+            type: "string",
+            role: "value",
+            unit: "",
+            read: true,
+            write: false
+        },
         native: { location: key }
-    });
-    obj = await adapter.getObjectAsync(key);
-
-    if (obj != null) {
-
-        if (obj.common.role != "value") {
-            await adapter.extendObject(key, {
-                common: {
-                    role: "value",
-                }
-            });
-        }
-    }
+    };
+    await CreateObject(key, obj);
 }
 
 
@@ -534,7 +524,7 @@ async function ebusd_ReceiveData() {
                 //adapter.log.info("in version, value " + value);
                 const versionInfo = value.split('.');
                 if (versionInfo.length > 1) {
-                    adapter.log.info("found ebusd version " + versionInfo[0] + "." + versionInfo[1]);
+                    adapter.log.info("installed ebusd version is " + versionInfo[0] + "." + versionInfo[1]);
 
                     ebusdVersion[0] = versionInfo[0];
                     ebusdVersion[1] = versionInfo[1];
@@ -578,11 +568,17 @@ async function ebusd_ReceiveData() {
 
 
                 if (name === "hcmode2") {
-                    adapter.log.debug("in hcmode2, value " + value);
-                    if (parseInt(value) === 5) {
-                        adapter.log.info(key + " with value 5");
+                    if (parseInt(value) === 0) {
+                        adapter.log.info(key + "in hcmode2 with value 0: off");
+                        value = "off";
+                    }
+                    else if (parseInt(value) === 5) {
+                        adapter.log.info(key + " with value 5: EVU Sperrzeit");
                         value = "EVU Sperrzeit";
                     }
+                    else {
+                        adapter.log.debug("in hcmode2, value " + value);
+                    }
                 }
 
                 let type = typeof value;
@@ -894,12 +890,15 @@ async function AddObject(key, type) {
 
 async function UpdateObject(key, value) {
     try {
-        if (value == null || value == undefined) {
-            adapter.log.debug("updateObject: not updated " + key + " value: " + value);
+        if (typeof value == undefined) {
+            adapter.log.warn("updateObject: not updated " + key + " value: " + value + " " + typeof value);
+        }
+        else if (value == null ) {
+            adapter.log.debug("updateObject: update to null " + key + " value: " + value);
+            await adapter.setStateAsync(key, { ack: true, val: null });
         }
         else {
             adapter.log.debug("updateObject " + key + " : " + value);
-
             await adapter.setStateAsync(key, { ack: true, val: value });
         }        
     } catch (e) {
@@ -963,7 +962,7 @@ async function ebusd_ReadValues() {
 
                 //received ERR: arbitration lost for YieldThisYear
                 if (data.includes("ERR")) {
-                    adapter.log.error("sent " + cmd + ", received " + data + " for " + JSON.stringify(oPolledVars[nCtr]));
+                    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":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.ebus",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "ioBroker ebus Adapter",
   "author": {
     "name": "René G.",
@@ -21,31 +21,31 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "2.6.0",
-    "@sentry/node": "6.19.3",
     "flat": "5.0.2",
     "net": "1.0.2",
     "promise-socket": "7.0.0",
-    "cron": "1.8.2"
+    "cron": "2.1.0",
+    "axios": "0.27.2"
   },
   "devDependencies": {
-    "@iobroker/testing": "2.5.6",
-    "@types/chai": "4.3.0",
+    "@iobroker/testing": "3.0.2",
+    "@types/chai": "4.3.3",
     "@types/chai-as-promised": "7.1.5",
     "@types/gulp": "4.0.9",
-    "@types/mocha": "9.1.0",
-    "@types/node": "17.0.23",
+    "@types/mocha": "9.1.1",
+    "@types/node": "18.7.3",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
-    "@types/sinon": "10.0.11",
+    "@types/sinon": "10.0.13",
     "@types/sinon-chai": "3.2.8",
-    "axios": "0.26.1",
+    "axios": "0.27.2",
     "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.12.0",
+    "eslint": "8.22.0",
     "gulp": "4.0.2",
-    "mocha": "9.2.2",
+    "mocha": "10.0.0",
     "proxyquire": "2.1.3",
-    "sinon": "13.0.1",
+    "sinon": "14.0.0",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",

package/widgets/ebus/lib/js/flot/jquery.canvaswrapper.js

@@ -372,8 +372,6 @@ don't work unless the canvas is attached to the DOM.
 
         // Tweak the div's position to match the text's alignment
 
-        console.log('add text ' + text);
-
         if (halign === 'center') {
             x -= info.width / 2;
         } else if (halign === 'right') {

package/widgets/ebus/lib/js/flot/jquery.flot.axislabels.js

@@ -144,10 +144,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     };
 
     function init(plot) {
-        plot.hooks.processOptions.push(function (plot, options) {
-
-            console.log('??????? ');
-
+        plot.hooks.processOptions.push(function(plot, options) {
             if (!options.axisLabels.show) {
                 return;
             }

package/widgets/ebus/lib/js/flot/jquery.flot.hover.js

@@ -45,6 +45,8 @@ the tooltip from webcharts).
         var lastMouseMoveEvent;
         var highlights = [];
 
+        console.log("hover init");
+
         function bindEvents(plot, eventHolder) {
             var o = plot.getOptions();
 

package/widgets/ebus/lib/js/flot/jquery.flot.js

@@ -99,6 +99,8 @@ Licensed under the MIT license.
         // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
         // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
 
+        console.log("xxx Plot started...");
+
         var series = [],
             options = {
                 // the color theme used for graphs
@@ -380,6 +382,8 @@ Licensed under the MIT license.
                 Canvas: Canvas
             };
 
+            console.log("init plugins " + plugins.length);
+
             for (var i = 0; i < plugins.length; ++i) {
                 var p = plugins[i];
                 p.init(plot, classes);
@@ -1520,7 +1524,7 @@ Licensed under the MIT license.
             var magn = parseFloat('1e' + (-dec)),
                 norm = delta / magn;
 
-            if (norm > 2.25 && norm < 3 && (dec + 1) <= tickDecimals) {
+            if (norm > 2.25 && norm < 3 && (tickDecimals == null || (dec + 1) <= tickDecimals)) {
                 //we need an extra decimals when tickSize is 2.5
                 ++dec;
             }
@@ -1777,37 +1781,35 @@ Licensed under the MIT license.
             surface.clear();
             executeHooks(hooks.drawBackground, [ctx]);
 
-           
             var grid = options.grid;
-            
+
             // draw background, if any
             if (grid.show && grid.backgroundColor) {
                 drawBackground();
             }
-            
+
             if (grid.show && !grid.aboveData) {
                 drawGrid();
             }
-            
+
             for (var i = 0; i < series.length; ++i) {
                 executeHooks(hooks.drawSeries, [ctx, series[i], i, getColorOrGradient]);
                 drawSeries(series[i]);
             }
-            
+
             executeHooks(hooks.draw, [ctx]);
-            
+
             if (grid.show && grid.aboveData) {
                 drawGrid();
             }
-            
+
             surface.render();
-            
+
             // A draw implies that either the axes or data have changed, so we
             // should probably update the overlay highlights as well.
             triggerRedrawOverlay();
-            
-            ShowTickLabels();
 
+            ShowTickLabels();
         }
 
         //*******************************************************************
@@ -2447,9 +2449,9 @@ Licensed under the MIT license.
                         //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], labelBoxes));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
-                        for (i = 1; i < axis.ticks.length - 1; ++i) {
-                            //labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
-                        }
+                        //for (i = 1; i < axis.ticks.length - 1; ++i) {
+                        //    labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
+                        //}
                         break;
                     case 'all':
                         //*******************************************************************
@@ -2458,9 +2460,9 @@ Licensed under the MIT license.
                         //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], []));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
-                        for (i = 1; i < axis.ticks.length - 1; ++i) {
-                            //labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
-                        }
+                        //for (i = 1; i < axis.ticks.length - 1; ++i) {
+                        //    labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
+                        //}
                         break;
                 }
             });

package/widgets/ebus/lib/js/flot/jquery.flot.time.js

@@ -31,11 +31,11 @@ API.txt for details.
 
         var oldSetTime = newDate.setTime.bind(newDate);
         newDate.update = function(microEpoch) {
-            oldSetTime(microEpoch);
-
             // Round epoch to 3 decimal accuracy
             microEpoch = Math.round(microEpoch * 1000) / 1000;
 
+            oldSetTime(microEpoch);
+
             // Microseconds are stored as integers
             this.microseconds = 1000 * (microEpoch - Math.floor(microEpoch));
         };
@@ -395,11 +395,10 @@ API.txt for details.
         // reset smaller components
 
         if (step >= timeUnitSize.millisecond) {
-            if (step >= timeUnitSize.second) {
-                d.setMicroseconds(0);
-            } else {
-                d.setMicroseconds(d.getMilliseconds() * 1000);
-            }
+            d.setMicroseconds(0);
+        }
+        if (step >= timeUnitSize.second) {
+            d.setMilliseconds(0);
         }
         if (step >= timeUnitSize.minute) {
             d.setSeconds(0);

package/widgets/ebus/lib/js/lib/globalize.culture.en-US.js

@@ -0,0 +1,33 @@
+/*
+ * Globalize Culture en-US
+ *
+ * http://github.com/jquery/globalize
+ *
+ * Copyright Software Freedom Conservancy, Inc.
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * This file was generated by the Globalize Culture Generator
+ * Translation: bugs found in this file need to be fixed in the generator
+ */
+
+(function( window, undefined ) {
+
+var Globalize;
+
+if ( typeof require !== "undefined" &&
+	typeof exports !== "undefined" &&
+	typeof module !== "undefined" ) {
+	// Assume CommonJS
+	Globalize = require( "globalize" );
+} else {
+	// Global variable
+	Globalize = window.Globalize;
+}
+
+Globalize.addCultureInfo( "en-US", "default", {
+	name: "en-US",
+	englishName: "English (United States)"
+});
+
+}( this ));