iobroker.zigbee 1.8.5 → 1.8.9

package/README.md

@@ -133,6 +133,12 @@ You can thank the authors by these links:
 
 
 ## Changelog
+### 1.8.9 (2022-12-10)
+* (arteck) fix lidl plug
+
+### 1.8.7 (2022-12-01)
+* (arteck) fix exposes
+
 ### 1.8.5 (2022-11-30)
 * (arteck) fix for new code
 

package/admin/adapter-settings.js

@@ -0,0 +1,244 @@
+/*global $, location, socket, document, window, io, alert, load, systemDictionary, systemLang, translateAll*/
+const path = location.pathname;
+const parts = path.split('/');
+parts.splice(-3);
+
+const socket = io.connect('/', { path: parts.join('/') + '/socket.io' });
+var query = (window.location.search || '').replace(/^\?/, '').replace(/#.*$/, '');
+var args = {};
+let theme = null;
+
+// parse parameters
+query.trim().split('&').filter(function (t) { return t.trim(); }).forEach(function (b, i) {
+    const parts = b.split('=');
+    if (!i && parts.length === 1 && !isNaN(parseInt(b, 10))) {
+        args.instance = parseInt(b, 10);
+    }
+    var name = parts[0];
+    args[name] = parts.length === 2 ? parts[1] : true;
+
+    if (name === 'instance') {
+        args.instance = parseInt(args.instance, 10) || 0;
+    }
+
+    if (args[name] === 'true') {
+        args[name] = true;
+    } else if (args[name] === 'false') {
+        args[name] = false;
+    }
+});
+
+var instance = args.instance;
+
+let common   = null; // common information of adapter
+const host     = null; // host object on which the adapter runs
+const changed  = false;
+let systemConfig;
+let certs    = [];
+let adapter  = '';
+const onChangeSupported = false;
+
+const tmp = window.location.pathname.split('/');
+adapter = tmp[tmp.length - 2];
+const _adapterInstance = 'system.adapter.' + adapter + '.' + instance;
+
+$(document).ready(function () {
+    'use strict';
+    loadSystemConfig(function () {
+        if (typeof translateAll === 'function') translateAll();
+        loadSettings(prepareTooltips);
+    });
+});
+
+
+// Read language settings
+function loadSystemConfig(callback) {
+    socket.emit('getObject', 'system.config', function (err, res) {
+        if (!err && res && res.common) {
+            systemLang   = res.common.language || systemLang;
+            systemConfig = res;
+        }
+        socket.emit('getObject', 'system.certificates', function (err, res) {
+            if (!err && res) {
+                if (res.native && res.native.certificates) {
+                    certs = [];
+                    for (const c in res.native.certificates) {
+                        if (res.native.certificates.hasOwnProperty(c) && !res.native.certificates[c]) continue;
+                        const _cert = {
+                            name: c,
+                            type: (res.native.certificates[c].substring(0, '-----BEGIN RSA PRIVATE KEY'.length) === '-----BEGIN RSA PRIVATE KEY' || res.native.certificates[c].substring(0, '-----BEGIN PRIVATE KEY'.length) === '-----BEGIN PRIVATE KEY') ? 'private' : 'public'
+                        };
+                        if (_cert.type === 'public') {
+                            const m = res.native.certificates[c].split('-----END CERTIFICATE-----');
+                            let count = 0;
+                            for (let _m = 0; _m < m.length; _m++) {
+                                if (m[_m].replace(/[\r\n|\r|\n]+/, '').trim()) count++;
+                            }
+                            if (count > 1) _cert.type = 'chained';
+                        }
+
+                        certs.push(_cert);
+                    }
+                }
+            }
+            if (callback) callback();
+        });
+    });
+}
+
+function loadSettings(callback) {
+    socket.emit('getObject', _adapterInstance, function (err, res) {
+        if (!err && res && res.native) {
+            $('.adapter-instance').html(adapter + '.' + instance);
+            $('.adapter-config').html('system.adapter.' + adapter + '.' + instance);
+            common = res.common;
+            if (res.common && res.common.name) $('.adapter-name').html(res.common.name);
+            if (typeof load === 'undefined') {
+                alert('Please implement save function in your admin/index.html');
+            } else {
+				// detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light'])
+
+				const _query = query.split('&');
+
+				for (var q = 0; q < _query.length; q++) {
+					if (_query[q].indexOf('react=') !== -1) {
+						$('.adapter-container').addClass('react-' + _query[q].substring(6));
+						theme = 'react-' + _query[q].substring(6);
+					}
+                }
+
+                load(res.native, onChange);
+            }
+            if (typeof callback === 'function') {
+                callback();
+            }
+        } else {
+            if (typeof callback === 'function') {
+                callback();
+            }
+            alert('error loading settings for ' + _adapterInstance + '\n\n' + err);
+        }
+    });
+}
+
+function prepareTooltips() {
+    $('.admin-icon').each(function () {
+        let id = $(this).data('id');
+        if (!id) {
+            let $prev = $(this).prev();
+            let $input = $prev.find('input');
+            if (!$input.length) $input = $prev.find('select');
+            if (!$input.length) $input = $prev.find('textarea');
+
+            if (!$input.length) {
+                $prev = $prev.parent();
+                $input = $prev.find('input');
+                if (!$input.length) $input = $prev.find('select');
+                if (!$input.length) $input = $prev.find('textarea');
+            }
+            if ($input.length) id = $input.attr('id');
+        }
+
+        if (!id) return;
+
+        let tooltip = '';
+        if (systemDictionary['tooltip_' + id]) {
+            tooltip = systemDictionary['tooltip_' + id][systemLang] || systemDictionary['tooltip_' + id].en;
+        }
+
+        let icon = '';
+        let link = $(this).data('link');
+        if (link) {
+            if (link === true) {
+                if (common.readme) {
+                    link = common.readme + '#' + id;
+                } else {
+                    link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + id;
+                }
+            }
+            if (!link.match('^https?:\/\/')) {
+                if (common.readme) {
+                    link = common.readme + '#' + link;
+                } else {
+                    link = 'https://github.com/ioBroker/ioBroker.' + common.name + '#' + link;
+                }
+            }
+            icon += '<a class="admin-tooltip-link" target="config_help" href="' + link + '" title="' + (tooltip || systemDictionary.htooltip[systemLang]) + '"><img class="admin-tooltip-icon" src="../../img/info.png" /></a>';
+        } else if (tooltip) {
+            icon += '<img class="admin-tooltip-icon" title="' + tooltip + '" src="../../img/info.png"/>';
+        }
+
+        if (icon) {
+            $(this).html(icon);
+        }
+    });
+    $('.admin-text').each(function () {
+        let id = $(this).data('id');
+        if (!id) {
+            let $prev = $(this).prev();
+            let $input = $prev.find('input');
+            if (!$input.length) $input = $prev.find('select');
+            if (!$input.length) $input = $prev.find('textarea');
+            if (!$input.length) {
+                $prev = $prev.parent();
+                $input = $prev.find('input');
+                if (!$input.length) $input = $prev.find('select');
+                if (!$input.length) $input = $prev.find('textarea');
+            }
+            if ($input.length) id = $input.attr('id');
+        }
+
+        if (!id) return;
+
+        // check if translation for this exist
+        if (systemDictionary['info_' + id]) {
+            $(this).html('<span class="admin-tooltip-text">' + (systemDictionary['info_' + id][systemLang] || systemDictionary['info_' + id].en) + '</span>');
+        }
+    });
+}
+
+
+function sendTo(_adapter_instance, command, message, callback) {
+    socket.emit('sendTo', (_adapter_instance || adapter + '.' + instance), command, message, callback);
+}
+
+function sendToHost(host, command, message, callback) {
+    socket.emit('sendToHost', host || common.host, command, message, callback);
+}
+
+function onChange(isChanged) {
+    //
+}
+
+function showMessage(message, title, icon) {
+    var $dialogMessage;
+    // noinspection JSJQueryEfficiency
+    $dialogMessage = $('#dialog-message');
+    if (!$dialogMessage.length) {
+        $('body').append(
+            '<div class="m"><div id="dialog-message" class="modal modal-fixed-footer">' +
+            '    <div class="modal-content">' +
+            '        <h6 class="dialog-title title"></h6>' +
+            '        <p><i class="large material-icons dialog-icon"></i><span class="dialog-text"></span></p>' +
+            '    </div>' +
+            '    <div class="modal-footer">' +
+            '        <a class="modal-action modal-close waves-effect waves-green btn-flat translate">Ok</a>' +
+            '    </div>' +
+            '</div></div>');
+        $dialogMessage = $('#dialog-message');
+    }
+    if (icon) {
+        $dialogMessage.find('.dialog-icon')
+            .show()
+            .html(icon);
+    } else {
+        $dialogMessage.find('.dialog-icon').hide();
+    }
+    if (title) {
+        $dialogMessage.find('.dialog-title').html(title).show();
+    } else {
+        $dialogMessage.find('.dialog-title').hide();
+    }
+    $dialogMessage.find('.dialog-text').html(message);
+    $dialogMessage.modal().modal('open');
+}

package/admin/admin.js

@@ -767,20 +767,27 @@ function getMap() {
 // the function loadSettings has to exist ...
 // eslint-disable-next-line no-unused-vars
 function load(settings, onChange) {
-    settings.panID = settings.panID || 6754;
-    settings.extPanID = settings.extPanID || 'DDDDDDDDDDDDDDDD';
+    if (settings.panID === undefined) {
+        settings.panID = 6754;
+    }
+    if (settings.extPanID === undefined) {
+        settings.extPanID = 'DDDDDDDDDDDDDDDD';
+    }
     // fix for previous wrong value
     if (settings.extPanID === 'DDDDDDDDDDDDDDD') {
         settings.extPanID = 'DDDDDDDDDDDDDDDD';
     }
-    settings.precfgkey = settings.precfgkey || '01030507090B0D0F00020406080A0C0D';
-    if (settings.channel === undefined){
+    
+    if (settings.precfgkey === undefined) {
+        settings.precfgkey = '01030507090B0D0F00020406080A0C0D';
+    }
+    if (settings.channel === undefined) {
         settings.channel = 11;
     }
     if (settings.disablePing === undefined) {
         settings.disablePing = false;
     }
-
+    
     // example: select elements with id=key and class=value and insert value
     for (const key in settings) {
         if (savedSettings.indexOf(key) === -1) {
@@ -2803,7 +2810,7 @@ function getDashCard(dev, groupImage) {
                     options.push(`<option value="${key}" ${(val == key) ? 'selected' : ''}>${value}</option>`);
                 }
             }
-            val = `<select class="browser-default enum" style="height: 16px; padding: 0; width: auto; display: inline-block">${options.join('')}</select>`;
+            val = `<select class="browser-default enum" style="color : white; background-color: grey; height: 16px; padding: 0; width: auto; display: inline-block">${options.join('')}</select>`;
         } else {
             val = `<span class="dash value">${val} ${(stateDef.unit) ? stateDef.unit : ''}</span>`;
         }

package/admin/tab_m.html

@@ -15,7 +15,8 @@
 <script type="text/javascript" src="../../js/translate.js"></script>
 <script type="text/javascript" src="../../lib/js/materialize.js"></script>
 <script type="text/javascript" >var noConfigDialog = true;</script><!-- Deactivate buttons -->
-<script type="text/javascript" src="../../js/adapter-settings.js"></script>
+<script type="text/javascript" src="adapter-settings.js"></script>
+    
 <script>
     // overload showMessage
     function showMessage(message, title, icon) {

package/io-package.json

@@ -1,8 +1,42 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.8.5",
+    "version": "1.8.9",
     "news": {
+      "1.8.9": {
+        "en": "fix lidl plug",
+        "de": "deckelstecker",
+        "ru": "исправить lidl plug",
+        "pt": "fixar tampa",
+        "nl": "los deksel",
+        "fr": "fixer le couvercle",
+        "it": "correzione della spina del coperchio",
+        "es": "enchufe de tapa fija",
+        "pl": "naprawiony plug",
+        "uk": "фіксувати роз'єм",
+        "zh-cn": "fix 滑坡"
+      },
+      "1.8.8": {
+        "en": "fix lidl plug",
+        "de": "fix lidl plug"
+      },
+      "1.8.7": {
+        "en": "fix exposes",
+        "de": "belichtet fix",
+        "ru": "исправить экспозиции",
+        "pt": "corrigir expões",
+        "nl": "vertaling:",
+        "fr": "fix expose",
+        "it": "fix espone",
+        "es": "arreglar expone",
+        "pl": "naprawić",
+        "uk": "фіксувати висадки",
+        "zh-cn": "fix 暴露"
+      },
+      "1.8.6": {
+        "en": "fix exposes",
+        "de": "fix exposes"
+      },
       "1.8.5": {
         "en": "fix for new code",
         "de": "fix für neuen code",
@@ -31,31 +65,6 @@
         "pl": "tył",
         "uk": "назад до старого джерела",
         "zh-cn": "背 景"
-      },
-      "1.8.2": {
-        "en": "back to old source",
-        "de": "back to old source"
-      },
-      "1.8.1": {
-        "en": "Packages updated\nAdded names of serial ports in configuration dialog",
-        "de": "Pakete aktualisiert\nNamen der seriellen Ports im Konfigurationsdialog hinzugefügt",
-        "ru": "Пакеты обновлены\nДобавлены имена серийных портов в диалоге конфигурации",
-        "pt": "Pacotes atualizados\nNomes adicionados de portas seriais na caixa de diálogo de configuração",
-        "nl": "Verpakking geüpload\nNamen van serie havens in configuration dialog",
-        "fr": "Packages updated\nAjout de noms de ports série dans le dialogue de configuration",
-        "it": "Pacchetti aggiornati\nAggiunto i nomi delle porte seriali nella finestra di dialogo di configurazione",
-        "es": "Paquetes actualizados\nNombres añadidos de los puertos serie en el diálogo de configuración",
-        "pl": "Pakiet\nDodane nazwy portów seryjnych w dialogach konfiguracyjnych",
-        "uk": "Пакети оновлені\nДодано імена серійних портів у діалоговому вікні конфігурації",
-        "zh-cn": "更新的包装\n加 口号港口"
-      },
-      "1.7.7": {
-        "en": "Update dependencies",
-        "de": "Update dependencies"
-      },
-      "1.7.6": {
-        "en": "ikea fix ",
-        "de": "ikea fix "
       }
     },
     "title": "Zigbee",

package/lib/exposes.js

@@ -803,16 +803,17 @@ function applyExposes(mappedDevices, byModel, allExcludesObj) {
     const allExcludesStr = JSON.stringify(allExcludesObj);
     // create or update device from exposes
     for (const deviceDef of zigbeeHerdsmanConverters.definitions) {
-        const strippedModel = (deviceDef.model) ? deviceDef.model.replace(/0.*$/g, '').trim() : '';
+
+        const stripModel = utils.getModelRegEx(deviceDef.model);
         // check if device is mapped
-        const existsMap = byModel.get(strippedModel);
+        const existsMap = byModel.get(stripModel);
 
-        if ((deviceDef.hasOwnProperty('exposes') && (!existsMap || !existsMap.hasOwnProperty('states'))) || allExcludesStr.indexOf(strippedModel) > 0) {
+        if ((deviceDef.hasOwnProperty('exposes') && (!existsMap || !existsMap.hasOwnProperty('states'))) || allExcludesStr.indexOf(stripModel) > 0) {
             try {
-                const newDevice = createFromExposes(strippedModel, deviceDef);
+                const newDevice = createFromExposes(stripModel, deviceDef);
                 if (!existsMap) {
                     mappedDevices.push(newDevice);
-                    byModel.set(strippedModel, newDevice);
+                    byModel.set(stripModel, newDevice);
                 } else {
                     existsMap.states = newDevice.states;
                     existsMap.exposed = true;