iobroker.lovelace 4.1.5 → 4.1.8

package/README.md

@@ -473,6 +473,14 @@ After that checkout modified version in `./build` folder. Then.
 	PLACEHOLDER for the next version:
 	### **WORK IN PROGRESS**
 -->
+### 4.1.8 (2024-03-11)
+* (Garfonso) prevent even more possible crashes
+* (smarthomejoey) fixed: tilt level and inversion
+
+### 4.1.6 (2024-03-07)
+* (Garfonso) remove exessive logging
+* (Garfonso) improve fix for crash again.
+
 ### 4.1.5 (2024-03-05)
 * (Garfonso) fixed: possible crashes during startup
 
@@ -484,15 +492,6 @@ After that checkout modified version in `./build` folder. Then.
 * (Garfonso) fix: lamp icons now turn gray on switch off.
 * (Garfonso) fix: notifications via sendTo work again.
 
-### 4.1.2 (2024-01-09)
-* (Garfonso) fix: time in timestamp display
-
-### 4.1.1 (2024-01-02)
-* (Garfonso) changed: determining user id
-* (Garfosno) changed: history attributes handling
-* (Garfonso) added: handle browser_mod/recall_id service call.
-* (Garfonso) changed: all states are strings (fixes #483)
-
 ## License
 
 Copyright 2019-2024, bluefox <dogafox@gmail.com>

package/io-package.json

@@ -1,8 +1,29 @@
 {
   "common": {
     "name": "lovelace",
-    "version": "4.1.5",
+    "version": "4.1.8",
     "news": {
+      "4.1.8": {
+        "en": "prevent even more possible crashes\nfixed: tilt level and inversion",
+        "de": "noch mehr mögliche abstürzen verhindern\nfixed: tilt level und inversion"
+      },
+      "4.1.7": {
+        "en": "prevent even more possible crashes\nfixed: tilt level and inversion",
+        "de": "noch mehr mögliche abstürzen verhindern\nfixed: tilt level und inversion"
+      },
+      "4.1.6": {
+        "en": "remove exessive logging\nimprove fix for crash again.",
+        "de": "exessive log ausgabe entfernen\nverbesserung der reparatur für crash.",
+        "ru": "удалить exessive logging\nулучшить исправление для аварии снова.",
+        "pt": "remover registro exessivo\nmelhorar a correção para acidente novamente.",
+        "nl": "exessieve logging verwijderen\nverbeteren fix voor crash opnieuw.",
+        "fr": "supprimer l'exploitation exessive\naméliorer la correction pour le crash à nouveau.",
+        "it": "rimuovere logging exessive\nmigliorare la correzione per crash di nuovo.",
+        "es": "remove exessive logging\nmejorar la solución para el accidente de nuevo.",
+        "pl": "usunięcie nadmiernego logowania\npoprawić naprawić ponownie awarii.",
+        "uk": "видалити есенціальний журнал\nзнову поліпшуйте фіксацію.",
+        "zh-cn": "删除 exessive 日志\n改善再次崩溃的修复."
+      },
       "4.1.5": {
         "en": "fixed: possible crashes during startup",
         "de": "behoben: mögliche abstürzen beim start",
@@ -36,27 +57,6 @@
         "pl": "fix: czas wyświetlania znacznika czasu",
         "uk": "виправити: час в часовому режимі відображення",
         "zh-cn": "修正:时间戳显示的时间"
-      },
-      "4.1.1": {
-        "en": "changed: determining user id\nchanged: history attributes handling\nadded: handle browser_mod/recall_id service call.\nchanged: all states are strings!",
-        "de": "geändert: bestimmung der benutzer-id\ngeändert: historie für attribute\nhinzugefügt: handle browser_mod/recall_id service call.\ngeändert: alle zustände sind strings!"
-      },
-      "4.1.0": {
-        "en": "add an option to show users on login screen (off by default)",
-        "de": "Neu Option um Benutzer auf dem Login-Bildschirm anzuzeigen"
-      },
-      "4.0.12": {
-        "en": "fix lint errors",
-        "de": "lint fehler beheben",
-        "ru": "исправить ошибки lint",
-        "pt": "corrigir erros de lint",
-        "nl": "lint fouten",
-        "fr": "corriger les erreurs lint",
-        "it": "correggere gli errori di lintuizione",
-        "es": "corregir errores lint",
-        "pl": "błędy lintowe",
-        "uk": "виправлено помилки в розмітці",
-        "zh-cn": "f 固定错误"
       }
     },
     "title": "Visualization with Lovelace-UI",

package/lib/converters/cover.js

@@ -175,7 +175,7 @@ function addTiltLevel(entity, control, objects, name) {
 
         const getState = control.states.find(s => s.id && s.name === name.replace('SET', 'ACTUAL'));
         if (getState && getState.id) {
-            entity.context.STATE.getId = getState.id;
+            entity.context.ATTRIBUTES.find(a => a.attribute === 'tilt').getId = getState.id;
             utils.addID2entity(getState.id, entity);
         }
         return true;
@@ -230,7 +230,7 @@ exports.processBlind = function(id, control, name, room, func, _obj, objects, fo
 
     if(addTiltLevel(entity, control, objects, 'TILT_SET')) {
         const attr = entity.context.ATTRIBUTES.find(a => a.attribute === 'tilt');
-        attr.invert = false;
+        attr.invert = !!adapterData.adapter.config.blindsInvert;
     }
 
     //add commands, if present:

package/lib/converters/light.js

@@ -51,7 +51,7 @@ function clearOrRestoreAttributes(entity) {
                 entity.attributes[attr] = entity.context.STATE.storedValues[attr];
             }
         }
-        adapterData.log.info(`Stored old values for next switch on: ${JSON.stringify(entity.context.STATE.storedValues)}`);
+        //adapterData.log.debug(`Stored old values for next switch on: ${JSON.stringify(entity.context.STATE.storedValues)}`);
     } else {
         for (const attr of attributesToNullOnOff) {
             if (entity.attributes[attr] !== undefined) {
@@ -59,7 +59,7 @@ function clearOrRestoreAttributes(entity) {
                 entity.attributes[attr] = null;
             }
         }
-        adapterData.log.info(`Restored old values from previous switch off: ${JSON.stringify(entity.attributes)}`);
+        //adapterData.log.debug(`Restored old values from previous switch off: ${JSON.stringify(entity.attributes)}`);
     }
 }
 
@@ -208,6 +208,9 @@ function _lightAdvancedAddHueAndSat(states, objects, entity) {
             }
 
             state = state || {val: 0};
+            if (!targetAttributes.hs_color) {
+                targetAttributes.hs_color = [0, 100];
+            }
             targetAttributes.hs_color[0] = state.val / attr.max * 360;
             targetAttributes.color_mode = HS;
         };
@@ -231,6 +234,9 @@ function _lightAdvancedAddHueAndSat(states, objects, entity) {
                     targetAttributes = entity.context.STATE.storedValues;
                 }
                 state = state || {val: 0};
+                if (!targetAttributes.hs_color) {
+                    targetAttributes.hs_color = [0, 100];
+                }
                 targetAttributes.hs_color[1] = state.val / attr.max * 100;
                 targetAttributes.color_mode = HS;
             };
@@ -274,6 +280,9 @@ async function _lightAdvancedAddRGBSingle(states, objects, entity) {
             targetAttributes.color_mode = RGB;
             if (states.white) {
                 targetAttributes.color_mode = RGBW;
+                if (!targetAttributes.rgbw_color) {
+                    targetAttributes.rgbw_color = [r,g,b,0];
+                }
                 targetAttributes.rgbw_color[0] = r;
                 targetAttributes.rgbw_color[1] = g;
                 targetAttributes.rgbw_color[2] = b;
@@ -549,6 +558,12 @@ async function fillLightEntityFromStates(states, objects, entity) {
                 if (entity.state !== 'on') {
                     targetAttributes = entity.context.STATE.storedValues;
                 }
+                if (!targetAttributes.rgbw_color) {
+                    targetAttributes.rgbw_color = [
+                        targetAttributes.rgb_color ? targetAttributes.rgb_color[0] : 0,
+                        targetAttributes.rgb_color ? targetAttributes.rgb_color[1] : 0,
+                        targetAttributes.rgb_color ? targetAttributes.rgb_color[2] : 0];
+                }
                 targetAttributes.rgbw_color[3] = val / attr.max * 255;
                 targetAttributes.color_mode = RGBW;
             };

package/lib/modules/entityRegistry.js

@@ -0,0 +1,106 @@
+const entityData = require('../dataSingleton');
+const {iobState2EntityState} = require('../converters/genericConverter');
+const WebSocket = require('ws').WebSocket;
+
+/**
+ * Class to handle the entity registry.
+ * i.e. it needs to keep an array of entities, both manually configured and automatically detected.
+ * It needs to send the list upon request from the frontend.
+ * It has to store additional settings for each entity, like the history parser, the icon, the friendly name, etc.
+ *
+ * TODO: It should deprecate the dataSingleton.js file.
+ */
+
+class EntityRegistry {
+    constructor(options) {
+        this.adapter = options.adapter;
+    }
+
+    sendLogbookResponse(ws, id, startTime = undefined, endTime = undefined, results = [], partial = false) {
+        const message = {
+            id: Number(id),
+            type: 'event',
+            event: {
+                events: []
+            }
+        };
+        if (startTime) {
+            message.event.start_time = startTime / 1000;
+        }
+        if (endTime) {
+            message.event.end_time = endTime / 1000;
+        }
+        if (partial) {
+            message.event.partial = true;
+        }
+
+        for (const result of results) {
+            let from = undefined;
+            if (this.adapter.config.logbookSource === 'user') {
+                from = result.state.user;
+            }
+            if (this.adapter.config.logbookSource === 'adapter') {
+                from = result.state.from;
+            }
+            message.event.events.push({
+                when: result.state.ts / 1000,
+                state: typeof result.entity.context.STATE.historyParser === 'function' ?
+                    result.entity.context.STATE.historyParser(id, result.state.val).toString() :
+                    iobState2EntityState(result.entity, result.state.val).toString(),
+                entity_id: result.entity.entity_id,
+                context_user_id: from
+            });
+        }
+        //sort by time:
+        message.event.events.sort((a, b) => a.when - b.when);
+        console.dir(message, {depth: 8});
+        ws.send(JSON.stringify(message));
+    }
+
+    //event_stream -> means implicit subscription (AAAAHHH) -> remember id here and update. Will call unsubscribe message if page is left.
+    //unsubscribe is very unspecific: {"type":"unsubscribe_events","subscription":288,"id":289} -> how to pipe that here?
+    async processMessage(ws, message) {
+        if (message.type === 'config/entity_registry/list_for_display') {
+            this._sendResponse(ws, message.id, {entities: entityData.entities, entity_categories: {'0': 'config', '1': 'diagnostic'}});
+        } else if (message.type === 'config/entity_registry/get') {
+            // config/entity_registry/get
+        }
+    }
+
+    onStateChange(id, state, websocketServer) {
+        if (state) {
+            //check if the state update needs to be added to any logbook:
+            for (const [msgId, idsToWatch] of Object.entries(this.subscribesToIds)) {
+                let active = false;
+                if (websocketServer) {
+                    for (const client of websocketServer.clients) {
+                        if (client._subscribes.logbook && client.readyState === WebSocket.OPEN) {
+                            if (client._subscribes.logbook.includes(Number(msgId))) {
+                                active = true;
+                                //found a client with active subscription -> update.
+                                this.adapter.log.debug('Logbook subscription ' + msgId + ' found.');
+
+                                const idAndEntity = idsToWatch.find(entry => id === entry.iobStateId);
+                                if (idAndEntity) {
+                                    this.adapter.log.debug('Logbook subscription ' + msgId + ' is for right id, sending update.');
+                                    this.sendLogbookResponse(client, msgId, undefined, undefined, [{
+                                        state,
+                                        entity: idAndEntity.entity
+                                    }]);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                //clean up not found conversations.
+                if (!active) {
+                    this.adapter.log.debug('Logbook subscription ' + msgId + ' deleted.');
+                    delete this.subscribesToIds[msgId];
+                }
+            }
+        }
+    }
+}
+
+module.exports = EntityRegistry;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lovelace",
-  "version": "4.1.5",
+  "version": "4.1.8",
   "description": "With this adapter you can build visualization for ioBroker with Home Assistant Lovelace UI",
   "author": {
     "name": "bluefox",
@@ -39,7 +39,7 @@
     "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/adapter-dev": "^1.2.0",
+    "@iobroker/adapter-dev": "^1.3.0",
     "@iobroker/testing": "^4.1.0",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.8",
@@ -49,11 +49,11 @@
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
-    "chai": "^4.3.10",
+    "chai": "^4.4.1",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.56.0",
     "gulp": "^4.0.2",
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "proxyquire": "^2.1.3",
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"