iobroker.lovelace 3.0.0 → 3.0.1

package/README.md

@@ -468,6 +468,11 @@ After that checkout modified version in `./build` folder. Then.
 	PLACEHOLDER for next version:
 	### **WORK IN PROGRESS**
 -->
+### 3.0.1 (2022-11-03)
+* (Garfonso) do not crash if no history instance selected.
+* (Garfonso) notifications working again.
+* (Garfonso) repaired color temperature handling.
+
 ### 3.0.0 (2022-10-28)
 * (agross) added: per instance language support
 * (Garfonso) entity_id for devices with only one non english name should be ok again.
@@ -501,9 +506,6 @@ After that checkout modified version in `./build` folder. Then.
 ### 2.1.3 (2022-01-07)
 * (Garfonso) Fixed: remove backup of old frontend (sorry)
 
-### 2.1.2 (2022-01-06)
-* (Garfonso) Fixed: Menu was broken in frontend.
-
 ## License
 
 Copyright 2019-2022, bluefox <dogafox@gmail.com>

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lovelace",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "news": {
+      "3.0.1": {
+        "en": "do not crash if no history instance selected.\nnotifications working again.\nrepaired color temperature handling.",
+        "de": "nicht abstürzen, wenn keine History-Instanz ausgewählt wird.\nBenachrichtigungen funktionieren wieder.\nReparatur der Farbtemperatursteuerung.",
+        "ru": "не мешайте, если не выбрана пример истории.\nуведомления, которые снова работают.\nотремонтированная обработка цветовой температуры.",
+        "pt": "não travar se nenhuma instância do histórico selecionada.\nnotificações trabalhando novamente.\ntratamento de temperatura de cor reparado.",
+        "nl": "niet crashen als geen geschiedenis instance geselecteerd is.\nde berichten werken weer.\ngerepareerde kleurtemperatuur.",
+        "fr": "ne pas s'écraser si aucune instance historique n'est sélectionnée.\nles notifications fonctionnent à nouveau.\nla manipulation de la température de couleur réparée.",
+        "it": "non crash se non viene selezionato un'istanza di storia.\nnotifiche che funzionano di nuovo.\ngestione della temperatura del colore riparato.",
+        "es": "no se estrellen si no se selecciona ningún caso histórico.\nnotificaciones que funcionan de nuevo.\nmanejo de temperatura de color reparado.",
+        "pl": "nie dochodzi do skutku, jeśli nie zostanie wybrana historia.\nponowne wyniki pracują ponownie.\nremontowany kolorową temperaturę.",
+        "uk": "не вдається, якщо вибрано екземпляр історії.\nповідомлення про роботу знову.\nобробка кольорової температури.",
+        "zh-cn": "如果没有选择过历史的事例,就不会发生事故。.\n再次发出通知。.\n修理的气温处理。."
+      },
       "3.0.0": {
         "en": "added: per instance language support\nchanged: updated frontend to 20221027.0. Needs theme adjustment (add code-editor-background-color) and probably card updates\nadded: browser_mod (2.1.3) is now integrated. Please remove manual installed versions of custom browser_mod card.\nadded: 'instances.refresh' can be used to reload page in connected browsers.\nremoved: lovelace_reload and window_reload states\nremoved: name state, not supported by browser_mod anymore\nadded: Support for toasts with action button (either json or ;-string)\nadded: activity state will show if user is currently using a certain browser\nadded: Support for subfolders in /cards/ for images and stuff custom cards load (please keep cards in root folder).",
         "de": "hinzugefügt: per Instanz sprachunterstützung\ngeändert: aktualisiertes Frontend auf 20221027.0 Benötigt Thema Anpassung (z.B. neu code-editor-background-color) und wahrscheinlich Karten-Updates\nadd: browser_mod (2.1.3) ist jetzt integriert. Bitte entfernen Sie manuell installierte Versionen der browser_mod-Karte.\nhinzugefügt: instances.refresh kann verwendet werden, um die Seite in verbundenen Browsern neu zu laden.\nentfernt: lovelace_reload und windows_reload\nentfernt: name-State, nicht mehr von browser_mod unterstützt\nadded: Unterstützung für Toasts mit Aktionsknopf (entweder json oder -;string)\nadded: Aktivitätszustand, der anzeigt, ob der Nutzer derzeit einen bestimmten Browser bedient\nadded: Unterstützung für Unterordner in /cards/ für Bilder und Materialien benutzerdefinierte Karten (bitte die Karten selber im Wurzelordner lassen).",
@@ -75,18 +88,6 @@
         "es": "Corregido: actualización de la entidad en algunos casos.",
         "pl": "Naprawiono: Aktualizacja Entity w niektórych przypadkach.",
         "zh-cn": "修正：在某些情况下实体更新。"
-      },
-      "2.1.0": {
-        "en": "* (Garfonso) Added: support for new things in frontend (like arm_vacation state, currency, ...).\n* (Garfonso) Change: Updated frontent to 20211229.0 (needs update of browser_mod, card_mod)",
-        "de": "* (Garfonso) Hinzugefügt: Unterstützung für neue Dinge im Frontend (wie arm_vacation Zustand, Währung, ...).\n* (Garfonso) Änderung: Frontent auf 20211229.0 aktualisiert (benötigt möglicherweise Update von browser_mod, card_mod)",
-        "ru": "* (Garfonso) Добавлено: поддержка новых вещей во внешнем интерфейсе (например, состояние arm_vacation, валюта, ...).\n* (Garfonso) Изменение: обновлен фронт до 20211229.0 (требуется обновление browser_mod, card_mod)",
-        "pt": "* (Garfonso) Adicionado: suporte para coisas novas no frontend (como arm_vacation state, currency, ...).\n* (Garfonso) Alteração: frontent atualizado para 20211229.0 (precisa de atualização de browser_mod, card_mod)",
-        "nl": "* (Garfonso) Toegevoegd: ondersteuning voor nieuwe dingen in frontend (zoals arm_vacation state, valuta, ...).\n* (Garfonso) Wijziging: frontent bijgewerkt naar 20211229.0 (update nodig van browser_mod, card_mod)",
-        "fr": "* (Garfonso) Ajout : prise en charge de nouvelles choses en frontend (comme l'état arm_vacation, la devise, ...).\n* (Garfonso) Changement : frontent mis à jour vers 20211229.0 (nécessite une mise à jour de browser_mod, card_mod)",
-        "it": "* (Garfonso) Aggiunto: supporto per nuove cose nel frontend (come arm_vacation state, currency, ...).\n* (Garfonso) Modifica: Frontent aggiornato a 20211229.0 (necessita di aggiornamento di browser_mod, card_mod)",
-        "es": "* (Garfonso) Agregado: soporte para cosas nuevas en la interfaz (como estado arm_vacation, moneda, ...).\n* (Garfonso) Cambio: Interfaz actualizada a 20211229.0 (necesita actualización de browser_mod, card_mod)",
-        "pl": "* (Garfonso) Dodano: wsparcie dla nowych rzeczy w interfejsie (takich jak stan arm_vacation, waluta, ...).\n* (Garfonso) Zmiana: Zaktualizowano frontent do 20211229.0 (wymaga aktualizacji browser_mod, card_mod)",
-        "zh-cn": "* (Garfonso) 添加：支持前端的新事物（如 arm_vacation 状态、货币等）。\n* (Garfonso) 更改：将前端更新为 20211229.0（需要更新 browser_mod、card_mod）"
       }
     },
     "title": "Visualization with Lovelace-UI",

package/lib/converters/light.js

@@ -58,50 +58,54 @@ function _lightAdvancedAddState(states, objects, entity) {
 }
 
 function _lightAdvancedAddColorTemperature(states, objects, entity) {
-    const iobMaxValue = 153;
-    const iobMinValue = 450;
+    const iobMaxValueKelvin = 7000;
+    const iobMinValueKelvin = 1000;
 
     if (states.color_temp) {
         const attribute = entity.context.ATTRIBUTES.find(a => a.attribute === 'color_temp');
         const tempObj = objects[states.color_temp];
-        attribute.convert_to_kelvin = tempObj && tempObj.common ? (tempObj.common.unit === 'K' || tempObj.common.unit === '°K') : false;
+        attribute.convert_to_mired = tempObj && tempObj.common ? (tempObj.common.unit === 'mired') : false;
         attribute.getParser = (entity, attr, state) => {
             if (!state || !state.val) {
-                entity.attributes.color_temp = iobMinValue;
+                entity.attributes.color_temp = iobMinValueKelvin;
                 return;
             }
             let targetCt = state.val;
-            if (targetCt > 1000 && !attr.convert_to_kelvin) {
-                attr.convert_to_kelvin = true;
-                adapterData.log.warn('Need kelvin conversion for ' + states.color_temp + ' and did not detect that in setup. Please set unit to "K" in object settings.');
+            if (targetCt < 1000 && !attr.convert_to_mired) {
+                attr.convert_to_mired = true;
+                //adapterData.log.warn('Need mired conversion for ' + states.color_temp + ' and did not detect that in setup. Please set unit to "K" in object settings.');
             }
-            if (attr.convert_to_kelvin) {
+            if (targetCt > 1000 & attr.convert_to_mired) {
+                attr.convert_to_mired = false;
+            }
+            if (attr.convert_to_mired) {
                 targetCt = 1e6 / targetCt;
             }
-            entity.attributes.color_temp = targetCt;
+            entity.attributes.color_temp_kelvin = targetCt;
+            entity.attributes.color_temp = 1e6 / targetCt;
             entity.attributes.color_mode = COLOR_TEMP;
         };
 
-        entity.attributes.max_mireds = tempObj && tempObj.common && tempObj.common.max || iobMaxValue;
-        entity.attributes.min_mireds = tempObj && tempObj.common && tempObj.common.min || iobMinValue;
-        if (attribute.convert_to_kelvin || entity.attributes.max_mireds > 1000) {
-            attribute.convert_to_kelvin = true;
-            entity.attributes.max_mireds = tempObj && tempObj.common && tempObj.common.max ? 1e6 / tempObj.common.max : iobMaxValue;
-            entity.attributes.min_mireds = tempObj && tempObj.common && tempObj.common.min ? 1e6 / tempObj.common.min : iobMinValue;
+        entity.attributes.max_color_temp_kelvin = tempObj && tempObj.common && tempObj.common.max || iobMaxValueKelvin;
+        entity.attributes.min_color_temp_kelvin = tempObj && tempObj.common && tempObj.common.min || iobMinValueKelvin;
+        if (attribute.convert_to_mired || entity.attributes.max_color_temp_kelvin < 1000) {
+            attribute.convert_to_mired = true;
+            entity.attributes.max_color_temp_kelvin = tempObj && tempObj.common && tempObj.common.min ? 1e6 / tempObj.common.min : iobMaxValueKelvin;
+            entity.attributes.min_color_temp_kelvin = tempObj && tempObj.common && tempObj.common.max ? 1e6 / tempObj.common.max : iobMinValueKelvin;
         }
-        if (!entity.attributes.max_mireds || isNaN(entity.attributes.max_mireds)) {
-            entity.attributes.max_mireds = iobMaxValue;
+        if (!entity.attributes.max_color_temp_kelvin || isNaN(entity.attributes.max_color_temp_kelvin)) {
+            entity.attributes.max_color_temp_kelvin = iobMaxValueKelvin;
         }
-        if (!entity.attributes.min_mireds || isNaN(entity.attributes.min_mireds)) {
-            entity.attributes.min_mireds = iobMinValue;
+        if (!entity.attributes.min_color_temp_kelvin || isNaN(entity.attributes.min_color_temp_kelvin)) {
+            entity.attributes.min_color_temp_kelvin = iobMinValueKelvin;
         }
-        adapterData.log.debug(entity.entity_id + ' ct needs kelvin conversion: ' + attribute.convert_to_kelvin);
+        adapterData.log.debug(entity.entity_id + ' ct needs mired conversion: ' + attribute.convert_to_mired);
 
-        if (entity.attributes.min_mireds > entity.attributes.max_mireds) {
+        if (entity.attributes.min_color_temp_kelvin > entity.attributes.max_color_temp_kelvin) {
             //for kelvin conversion min and max need to be swapped.
-            const max = entity.attributes.min_mireds;
-            entity.attributes.min_mireds = entity.attributes.max_mireds;
-            entity.attributes.max_mireds = max;
+            const max = entity.attributes.min_color_temp_kelvin;
+            entity.attributes.min_color_temp_kelvin = entity.attributes.max_color_temp_kelvin;
+            entity.attributes.max_color_temp_kelvin = max;
         }
 
         entity.attributes.supported_color_modes.push(COLOR_TEMP);
@@ -255,10 +259,21 @@ async function _setLightAdvancedAttributesToIOBStates(data, entity, user) {
     }
 
     if (data.service_data.color_temp) { //will also be false for ct = 0 -> but ct = 0 is not a useful mired value and creates issues with the conversion.
-        let ct = data.service_data.color_temp;
-        entity.attributes.color_temp = ct;
+        let ct = 1e6 / data.service_data.color_temp;
+        entity.attributes.color_temp_kelvin = ct;
+        entity.attributes.color_temp = data.service_data.color_temp;
+        const attr = entity.context.ATTRIBUTES.find(a => a.attribute === 'color_temp');
+        if (attr.convert_to_mired) {
+            ct = data.service_data.color_temp;
+        }
+        entity.attributes.color_mode = COLOR_TEMP;
+        await adapterData.adapter.setForeignStateAsync(attr.getId, ct, false, {user});
+    }
+    if (data.service_data.color_temp_kelvin) { //will also be false for ct = 0 -> but ct = 0 is not a useful mired value and creates issues with the conversion.
+        let ct = data.service_data.color_temp_kelvin;
+        entity.attributes.color_temp_kelvin = ct;
         const attr = entity.context.ATTRIBUTES.find(a => a.attribute === 'color_temp');
-        if (attr.convert_to_kelvin) {
+        if (attr.convert_to_mired) {
             ct = 1e6 / ct;
         }
         entity.attributes.color_mode = COLOR_TEMP;

package/lib/modules/browser_mod.js

@@ -214,7 +214,7 @@ class BrowserModModule {
     }
 
     //store infos about browser instance
-    async _hanldeUpdate(ioBrokerDeviceId, message) {
+    async _handleUpdate(ioBrokerDeviceId, message) {
         if (message.data) {
             if (message.data.browser) {
                 //check if all objects in ioBroker are created.
@@ -254,8 +254,8 @@ class BrowserModModule {
 
     async processBrowserModMessage(ws, message) {
         const method = message.type.split('/')[1];
-        //console.log('Incomming browser_mod message:');
-        //console.dir(message, {depth: null});
+        // console.log('Incoming browser_mod message:');
+        // console.dir(message, {depth: null});
 
         if (!message.browserID) {
             this.adapter.log.warn('No device ID in browser_mod request: ' + JSON.stringify(message));
@@ -264,8 +264,8 @@ class BrowserModModule {
         const ioBrokerDeviceId = instancesPath + message.browserID;
 
         if (method === 'update') {
-            this._hanldeUpdate(ioBrokerDeviceId, message);
-        } else if(method === 'connect') { //similar to 'subscribe'.
+            this._handleUpdate(ioBrokerDeviceId, message);
+        } else if (method === 'connect') { // similar to 'subscribe'.
             ws.on('close', async () => {
                 this.adapter.log.debug(`Instance ${message.browserID} disconnected.`);
                 delete this.clients[message.browserID];
@@ -292,10 +292,10 @@ class BrowserModModule {
                 time_fired: new Date().toISOString()
             }}));
 
-            if (this.objects[this.adapter.namespace + '.' + ioBrokerDeviceId + '.online']) {
+            if (this.objects[`${this.adapter.namespace}.${ioBrokerDeviceId}.online`]) {
                 await this.adapter.setStateAsync(ioBrokerDeviceId + '.online', true, true);
             } else {
-                console.log('No objects for instance, yet..', ioBrokerDeviceId + '.online', this.objects[ioBrokerDeviceId], this.objects);
+                console.log('No objects for instance, yet..', `${ioBrokerDeviceId}.online`, this.objects[ioBrokerDeviceId], this.objects);
             }
         } else if (method === 'log') {
             this.adapter.log.debug('Message from browser_mod: ' + message.message);
@@ -306,7 +306,7 @@ class BrowserModModule {
 
     async onStateChange(id, state) {
         //console.log(id);
-        if (state && !state.ack && id.startsWith(this.adapter.namespace + '.' + instancesPath)) { //ok, is relevant for us.
+        if (state && !state.ack && id.startsWith(`${this.adapter.namespace}.${instancesPath}`)) { //ok, is relevant for us.
             const parts = id.split('.');
             const browserId = parts[3];
             let command = parts[4];

package/lib/modules/history.js

@@ -169,14 +169,16 @@ function convertHistoryResultToWebsocketApi(entities, result) {
         const entity = entities[i];
         if (typeof entity === 'object') {
             const entityHistoryStates = [];
-            for(const res of result[i]) {
-                const entityHistoryState = {
-                    s: res.state,
-                    a: res.attributes,
-                    lc: new Date(res.last_changed).getTime() / 1000,
-                    lu: new Date(res.last_updated).getTime() / 1000
-                };
-                entityHistoryStates.push(entityHistoryState);
+            if (result[i] && result[i] instanceof Array) {
+                for (const res of result[i]) {
+                    const entityHistoryState = {
+                        s: res.state,
+                        a: res.attributes,
+                        lc: new Date(res.last_changed).getTime() / 1000,
+                        lu: new Date(res.last_updated).getTime() / 1000
+                    };
+                    entityHistoryStates.push(entityHistoryState);
+                }
             }
             newResult[entity.entity_id] = entityHistoryStates;
         } else {

package/lib/server.js

@@ -1369,7 +1369,7 @@ class WebServer {
     _getConfig() {
         const tzone = jstz.determine().name();
         //this.log.debug("tz:" + tzone);
-        return {
+        const configObj = {
             latitude: parseFloat(this.systemConfig.latitude),
             longitude: parseFloat(this.systemConfig.longitude),
             elevation: 0,
@@ -1385,12 +1385,18 @@ class WebServer {
             location_name: 'Home',
             time_zone: tzone,
             components: [ //TODO: experiment with notify.html5.
-                'lovelace', 'conversation', 'history', 'shopping_list', 'energy', 'notify.html5'
+                'lovelace', 'conversation', 'shopping_list', 'energy', 'notify.html5'
             ],
             version: VERSION,
             state: 'RUNNING',
             currency: 'EUR'
         };
+
+        if (this.adapter.config.history) {
+            configObj.components.push('history'); //only activate history in frontend if history instance is selected.
+        }
+
+        return configObj;
     }
 
     _getThemes() {
@@ -2058,7 +2064,7 @@ class WebServer {
     }
 
     _sendUpdate(eventType) {
-        if (this._wss && this._wss.clients && this._wss.clients.length) {
+        if (this._wss && this._wss.clients && this._wss.clients.size) {
             this._wss.clients.forEach(ws => {
                 if (ws._subscribes && ws._subscribes[eventType]) {
                     const t = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lovelace",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "With this adapter you can build visualization for ioBroker with Home Assistant Lovelace UI",
   "author": {
     "name": "bluefox",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^2.6.7",
-    "axios": "^0.27.2",
+    "axios": "^1.1.3",
     "body-parser": "^1.20.1",
     "express": "^4.18.1",
     "iobroker.type-detector": "^1.1.0",
@@ -38,22 +38,22 @@
     "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
-    "@iobroker/adapter-dev": "^1.1.0",
+    "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/dev-server": "^0.6.0",
     "@iobroker/testing": "^4.1.0",
     "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
     "@types/gulp": "^4.0.9",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^18.8.3",
+    "@types/node": "^18.11.9",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.8",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "gulp": "^4.0.2",
-    "mocha": "^10.0.0",
+    "mocha": "^10.1.0",
     "proxyquire": "^2.1.3",
     "sinon": "^14.0.1",
     "sinon-chai": "^3.7.0"