iobroker.zigbee 1.6.0 → 1.6.12

package/README.md

@@ -97,7 +97,7 @@ Works with devices from this list https://github.com/ioBroker/ioBroker.zigbee/wi
 
 You can thank the authors by these links:
 * to Kirov Ilya https://www.paypal.me/goofyk
-* to Arthur Rupp https://paypal.me/pools/c/8gWlKqAfIF
+* to Arthur Rupp https://paypal.me/ArthurRupp
 
 <!--
     Placeholder for the next version (at the beginning of the line):
@@ -112,8 +112,22 @@ You can thank the authors by these links:
 
 ## Changelog
 
+### 1.6.12 (2022-01)
+* (asgothian) Groups were newly revised (read here https://github.com/ioBroker/ioBroker.zigbee/pull/1327)
+
+
+### 1.6.9 (2021-12)
+* (simatec) fix admin Dark-Mode
+* (asgothian) Expose Access Handling
+* (arteck) translations
+* (asgothian) fix groups
+* (agross) use different normalization rules
+
+### 1.6.1 (2021-08)
+* (kirovilya) herdsman compatibility
+
 ### 1.6.0 (2021-08-09)
-Attention!
+## Attention! Attention! Attention! Attention! Attention! Attention! Attention!
 
 After introducing a new z-stack startup procedure into zigbee-herdsman, we got some problems with our adapter in version 1.5.6.
 This was discussed [here](https://github.com/ioBroker/ioBroker.zigbee/issues/1110) and [here](https://github.com/Koenkk/zigbee-herdsman/issues/376)

package/admin/adapter-settings.js

@@ -3,8 +3,33 @@ const path = location.pathname;
 const parts = path.split('/');
 parts.splice(-3);
 
-const socket   = io.connect('/', {path: parts.join('/') + '/socket.io'});
-const instance = window.location.search.slice(-1) || 0;
+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;
@@ -71,6 +96,17 @@ function loadSettings(callback) {
             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') {
@@ -205,4 +241,4 @@ function showMessage(message, title, icon) {
     }
     $dialogMessage.find('.dialog-text').html(message);
     $dialogMessage.modal().modal('open');
-}
+}

package/admin/admin.js

@@ -146,7 +146,7 @@ function getGroupCard(dev) {
         info = info.concat(`<li><span class="labelinfo">No devices in group</span></li>`);
     } else {
         for (let m=0;m < dev.memberinfo.length; m++) {
-            info = info.concat(`<li><span class="labelinfo">${dev.memberinfo[m].name}</span><span> ...${dev.memberinfo[m].ieee.slice(-4)}</span></li>`);
+            info = info.concat(`<li><span align:"left">${dev.memberinfo[m].device}.${dev.memberinfo[m].epid}</span><span align:"right"> ...${dev.memberinfo[m].ieee.slice(-4)}</span></li>`);
         }
         memberCount = (dev.memberinfo.length<8?dev.memberinfo.length:7);
     };
@@ -154,7 +154,7 @@ function getGroupCard(dev) {
                 </div>`);
     const image = `<img src="img/group_${memberCount}.png" width="80px" onerror="this.onerror=null;this.src='img/unavailable.png';">`;
     const dashCard = getDashCard(dev,`img/group_${memberCount}.png` );
-    const card = `<div id="${id}" class="device">
+    const card = `<div id="${id}" class="device group">
                   <div class="card hoverable flipable">
                     <div class="front face">${dashCard}</div>
                     <div class="back face">
@@ -187,12 +187,16 @@ function getGroupCard(dev) {
     return card;
 }
 
-
+function sanitizeModelParameter(parameter) {
+    const replaceByUnderscore = /[\s/]/g;
+    return parameter.replace(replaceByUnderscore, '_');
+}
 
 function getCard(dev) {
     const title = dev.common.name,
         id = dev._id,
-        type = (dev.common.type ? dev.common.type.replace('/','_'):'unknown'),
+        type = (dev.common.type ? dev.common.type : 'unknown'),
+        type_url = (dev.common.type ? sanitizeModelParameter(dev.common.type) : 'unknown'),
         img_src = dev.icon || dev.common.icon,
         rooms = [],
         lang = systemLang  || 'en';
@@ -206,7 +210,7 @@ function getCard(dev) {
     const room = rooms.join(',') || '&nbsp';
     const paired = (dev.paired) ? '' : '<i class="material-icons right">leak_remove</i>';
     const rid = id.split('.').join('_');
-    const modelUrl = (!type) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${type}.html" target="_blank" rel="noopener noreferrer">${type}</a>`;
+    const modelUrl = (!type) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${type_url}.html" target="_blank" rel="noopener noreferrer">${type}</a>`;
     const image = `<img src="${img_src}" width="80px" onerror="this.onerror=null;this.src='img/unavailable.png';">`,
         nwk = (dev.info && dev.info.device) ? dev.info.device._networkAddress : undefined,
         battery_cls = getBatteryCls(dev.battery),
@@ -254,6 +258,9 @@ function getCard(dev) {
                                 <button name="edit" class="right btn-flat btn-small">
                                     <i class="material-icons icon-green">edit</i>
                                 </button>
+                                <button name="reconfigure" class="right btn-flat btn-small tooltipped" title="Reconfigure">
+                                    <i class="material-icons icon-red">sync</i>
+                                </button>
                                 ${permitJoinBtn}
                             </div>
                         </div>
@@ -344,25 +351,96 @@ function cleanConfirmation() {
     Materialize.updateTextFields();
 }
 
+function EndPointIDfromEndPoint(ep)
+{
+  if (ep && ep.deviceIeeeAddress && ep.ID)
+    return `${ep.deviceIeeeAddress}:${ep.ID}`;
+  return 'unidentified';
+}
+
 function editName(id, name) {
+  console.log('editName called with '+name);
     const dev = devices.find((d) => d._id == id);
     $('#modaledit').find("input[id='d_name']").val(name);
-    if (dev.info && dev.info.device._type == 'Router') {
-        list2select('#d_groups', groups, devGroups[id] || []);
-        $('#modaledit').find('.input-field.groups').removeClass('hide');
-    } else {
-        $('#modaledit').find('.input-field.groups').addClass('hide');
-    }
+//    if (dev.info && dev.info.device._type == 'Router') {
+      const groupables = [];
+      if (dev && dev.info && dev.info.endpoints) {
+        for (const ep of dev.info.endpoints) {
+          if (ep.inputClusters.includes(4)) {
+            groupables.push({ epid:EndPointIDfromEndPoint(ep), ep:ep, memberOf:[]});
+          }
+        }
+      }
+      const numEP = groupables.length;
+//      console.log('groupables: '+JSON.stringify(groupables));
+      $('#modaledit').find('.row.epid0').addClass('hide');
+      $('#modaledit').find('.row.epid1').addClass('hide');
+      $('#modaledit').find('.row.epid2').addClass('hide');
+      $('#modaledit').find('.row.epid3').addClass('hide');
+      if (numEP > 0) {
+        // go through all the groups. Find the ones to list for each groupable
+        if (numEP == 1) {
+          $('#modaledit').find('.endpointid').addClass('hide');
+        }
+        else {
+          $('#modaledit').find('.endpointid').removeClass('hide');
+        }
+        for (const d of devices) {
+          if (d && d.common && d.common.type == 'group') {
+            if (d.hasOwnProperty("memberinfo")) {
+              for (const member of d.memberinfo) {
+                const epid = EndPointIDfromEndPoint(member.ep)
+                for (var i=0;i<groupables.length;i++) {
+                  if (groupables[i].epid == epid) {
+                    groupables[i].memberOf.push(d.native.id.replace('group_', ''));
+                  }
+                }
+              }
+            }
+          }
+        }
+        console.log("groupables: " + JSON.stringify(groupables));
+        for (var i = 0;i<groupables.length;i++)
+        {
+          if (i > 1) {
+            $('#modaledit').find("translate.device_with_endpoint").innerHtml = name + ' ' + groupables[i].epid;
+          }
+          $('#modaledit').find('.row.epid'+i).removeClass('hide');
+          list2select('#d_groups_ep'+i, groups, groupables[i].memberOf || []);
+        }
+      }
+//    } else {
+//        $('#modaledit').find('.input-field.endpoints').addClass('hide');
+//        $('#modaledit').find('.input-field.groups').addClass('hide');
+//    }
     $("#modaledit a.btn[name='save']").unbind('click');
     $("#modaledit a.btn[name='save']").click(() => {
-        const newName = $('#modaledit').find("input[id='d_name']").val(),
-            newGroups = $('#d_groups').val();
-        updateDev(id, newName, newGroups);
+        const newName = $('#modaledit').find("input[id='d_name']").val();
+        const groupsbyid = {};
+        if (groupables.length  > 0) {
+          for (var i = 0;i<groupables.length;i++) {
+            const ng = $('#d_groups_ep'+i).val();
+            if (ng.toString() != groupables[i].memberOf.toString())
+            groupsbyid[groupables[i].ep.ID] = GenerateGroupChange(groupables[i].memberOf, ng);
+          }
+        }
+        console.log('grpid ' + JSON.stringify(groupsbyid));
+        updateDev(id, newName, groupsbyid);
     });
     $('#modaledit').modal('open');
     Materialize.updateTextFields();
 }
 
+function GenerateGroupChange(oldmembers, newmembers)
+{
+  let grpchng = [];
+  for (const oldg of oldmembers)
+    if (!newmembers.includes(oldg)) grpchng.push('-'+oldg);
+  for (const newg of newmembers)
+    if (!oldmembers.includes(newg)) grpchng.push(newg)
+  return grpchng;
+}
+
 function deleteDevice(id, force) {
     sendTo(namespace, 'deleteDevice', {id: id, force: force}, function (msg) {
         closeWaitingDialog();
@@ -525,7 +603,7 @@ function showDevices() {
         const dev_block = $(this).parents('div.device'),
             id = dev_block.attr('id').replace(namespace+'.group_', ''),
             name = getDevName(dev_block);
-        editGroupName(id, name);
+        editGroupName(id, name, false);
     });
     $("button.btn-floating[name='join']").click(function() {
         const dev_block = $(this).parents('div.device');
@@ -544,6 +622,10 @@ function showDevices() {
     $("a.btn-flat[name='close']").click((e) => {
         closeReval(e);
     });
+    $(".card-reveal-buttons button[name='reconfigure']").click(function() {
+        const dev_block = $(this).parents('div.device');
+        reconfigureDlg(getDevId(dev_block));
+    });
 
     showNetworkMap(devices, map);
     translateAll();
@@ -656,7 +738,7 @@ function getDevices() {
 }
 
 function getDeviceCards() {
-    return $('#devices .device');
+    return $('#devices .device').not(".group");
 }
 
 function getDeviceCard(devId) {
@@ -759,11 +841,11 @@ function load(settings, onChange) {
 
     $('#add_group').click(function() {
         const maxind = parseInt(Object.getOwnPropertyNames(groups).reduce((a,b) => a>b ? a : b, 0));
-        editGroupName(maxind+1, '');
+        editGroupName(maxind+1, 'Group ' + maxind+1, true);
     });
     $('#add_grp_btn').click(function() {
         const maxind = parseInt(Object.getOwnPropertyNames(groups).reduce((a,b) => a>b ? a : b, 0));
-        editGroupName(maxind+1, '');
+        editGroupName(maxind+1, 'Group ' + maxind+1, true);
         getDevices();
     });
 
@@ -1702,7 +1784,7 @@ function showGroups() {
     $("a.btn-floating[name='groupedit']").click(function() {
         const index = $(this).attr('id'),
             name = groups[index];
-        editGroupName(index, name);
+        editGroupName(index, name, false);
     });
     $("a.btn-floating[name='groupdelete']").click(function() {
         const index = $(this).attr('id'),
@@ -1711,8 +1793,35 @@ function showGroups() {
     });
 }
 
-function editGroupName(id, name) {
+function editGroupName(id, name, isnew) {
+    //const dev = devices.find((d) => d._id == id);
+    //console.log('devices: '+ JSON.stringify(devices));
+    const groupables = [];
+    for (const d of devices) {
+      if (d && d.info && d.info.endpoints) {
+        for (const ep of d.info.endpoints) {
+          if (ep.inputClusters.includes(4))
+          {
+            groupables.push(ep);
+          }
+        }
+      }
+      //console.log('device ' + JSON.stringify(d));
+    }
+
     //var text = 'Enter new name for "'+name+'" ('+id+')?';
+    if (isnew) {
+          $('#groupedit').find('.editgroup').addClass('hide');
+          $('#groupedit').find('.addgroup').removeClass('hide');
+          $('#groupedit').find('.input-field.members').addClass('hide');
+          $('#groupedit').find('.input-field.groupid').removeClass('hide');
+    }
+    else {
+          $('#groupedit').find('.editgroup').removeClass('hide');
+          $('#groupedit').find('.addgroup').addClass('hide');
+          $('#groupedit').find('.input-field.members').removeClass('hide');
+          $('#groupedit').find('.input-field.groupid').addClass('hide');
+    }
     $('#groupedit').find("input[id='g_index']").val(id);
     $('#groupedit').find("input[id='g_name']").val(name);
     $("#groupedit a.btn[name='save']").unbind('click');
@@ -1756,6 +1865,21 @@ function updateDev(id, newName, newGroups) {
     if (dev && dev.common.name != newName) {
         renameDevice(id, newName);
     }
+    const keys = Object.keys(newGroups)
+    if (keys && keys.length)
+    {
+      sendTo(namespace, 'updateGroupMembership', { id: id, groups: newGroups }, function (msg) {
+          if (msg && msg.error) {
+                  showMessage(msg.error, _('Error'));
+              }
+              else {
+              // save dev-groups on success
+                  dev.groups = newGroups;
+              }
+          showDevices();
+      });
+    }
+/*
     if (dev.info.device._type == 'Router') {
         const oldGroups = devGroups[id] || [];
         if (oldGroups.toString() != newGroups.toString()) {
@@ -1772,6 +1896,7 @@ function updateDev(id, newName, newGroups) {
             });
         }
     }
+*/
 }
 
 function resetConfirmation() {
@@ -2166,7 +2291,7 @@ function genDevInfo(device) {
     const dev = (device && device.info) ? device.info.device : undefined;
     const mapped = (device && device.info) ? device.info.mapped : undefined;
     if (!dev) return `<div class="truncate">No info</div>`;
-    const genRow = function(name, value) {
+    const genRow = function(name, value, refresh) {
         if (value === undefined) {
             return '';
         } else {
@@ -2185,7 +2310,7 @@ function genDevInfo(device) {
             }).join('');
         }
     };
-    const modelUrl = (!mapped) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${mapped.model}.html" target="_blank" rel="noopener noreferrer">${mapped.model}</a>`;
+    const modelUrl = (!mapped) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${sanitizeModelParameter(mapped.model)}.html" target="_blank" rel="noopener noreferrer">${mapped.model}</a>`;
     const mappedInfo = (!mapped) ? '' :
         `<div style="font-size: 0.9em">
             <ul>
@@ -2230,7 +2355,7 @@ function genDevInfo(device) {
                     ${genRow('date code', dev._dateCode)}
                     ${genRow('build', dev._softwareBuildID)}
                     ${genRow('interviewed', dev._interviewCompleted)}
-                    ${genRow('configured', (dev.meta.configured === 1))}
+                    ${genRow('configured', (dev.meta.configured === 1), true)}
                 </ul>
             </div>
         </div>
@@ -2246,17 +2371,19 @@ function showDevInfo(id){
     $('#modaldevinfo').modal('open');
 }
 
+let waitingTimeout, waitingInt;
 
 function showWaitingDialog(text, timeout){
     let countDown = timeout;
-    const waitingInt = setInterval(function() {
+    waitingInt = setInterval(function() {
         countDown -= 1;
         const percent = 100-100*countDown/timeout;
         $('#waiting_progress_line').css('width', `${percent}%`);
     }, 1000);
-    setTimeout(function() {
+    waitingTimeout = setTimeout(function() {
         $('#waiting_progress_line').css('width', `0%`);
         clearTimeout(waitingInt);
+        clearTimeout(waitingTimeout);
         $('#modalWaiting').modal('close');
     }, timeout*1000);
     $('#waiting_message').text(text);
@@ -2264,6 +2391,8 @@ function showWaitingDialog(text, timeout){
 }
 
 function closeWaitingDialog(){
+    if (waitingInt) clearTimeout(waitingInt);
+    if (waitingTimeout) clearTimeout(waitingTimeout);
     $('#modalWaiting').modal('close');
 }
 
@@ -2427,10 +2556,10 @@ function showExclude() {
         const exclude_dev = devices.find((d) => d.common.type == exclude_id) || {common: {name: exclude_id}};
         // exclude_icon = (exclude_dev.icon) ? `<img src="${exclude_dev.icon}" width="64px">` : '';
 
-        const modelUrl = (!exclude_id) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${exclude_id}.html" target="_blank" rel="noopener noreferrer">${exclude_id}</a>`;
+        const modelUrl = (!exclude_id) ? '' : `<a href="https://www.zigbee2mqtt.io/devices/${sanitizeModelParameter(exclude_id)}.html" target="_blank" rel="noopener noreferrer">${exclude_id}</a>`;
 
         const card = `
-                    <div id="${exclude_id}" class="exclude col s12 m6 l4 xl3">
+                    <div id="${exclude_id}" class="exclude col s12 m6 l4 xl3" style="height: 135px;padding-bottom: 10px;">
                         <div class="card hoverable">
                             <div class="card-content zcard">
                                 <i class="left"><img src="${exclude_dev.icon}" width="64px" onerror="this.onerror=null;this.src='img/unavailable.png';"></i>
@@ -2698,3 +2827,26 @@ function removeDevice(id) {
         }
     }
 }
+
+function reconfigureDlg(id) {
+    const text = translateWord(`Do you really want to reconfigure device?`);
+    $('#modalreconfigure').find('p').text(text);
+    $("#modalreconfigure a.btn[name='yes']").unbind('click');
+    $("#modalreconfigure a.btn[name='yes']").click(() => {
+        reconfigureDevice(id, force);
+    });
+    $('#modalreconfigure').modal('open');
+    Materialize.updateTextFields();
+}
+
+function reconfigureDevice(id) {
+    sendTo(namespace, 'reconfigure', {id: id}, function (msg) {
+        closeWaitingDialog();
+        if (msg) {
+            if (msg.error) {
+                showMessage(msg.error, _('Error'));
+            }
+        }
+    });
+    showWaitingDialog('Device is being reconfigure', 30);
+}