iobroker.zigbee 1.8.9 → 1.8.10

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2022 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2023 Kirov Ilya <kirovilya@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -133,6 +133,21 @@ You can thank the authors by these links:
 
 
 ## Changelog
+### 1.8.10 (2023-01-04) (2022-12-12)
+* (asgothian) fix group access
+* (asgothian) add option for pairing code:
+   A new icon allows to open the networ after first entering a pairing code
+   listed on the device
+* (asgothian) easier use of external converters
+   - external converters can now be placed in the zigbee adapter data folder
+   - no absolite path is required to access them
+   - external converters posted on the github for zigbee-herdsman-converters
+     should work as they are - folders for libraries are rewritten to match
+     the expected location when 'required' from within the zigbee adapter
+   - Log entries will identify which files are entered as converters. Errors
+     in these files should not cause the adapter to crash - instead, use of
+     external converters may be unavailable.
+
 ### 1.8.9 (2022-12-10)
 * (arteck) fix lidl plug
 
@@ -159,7 +174,7 @@ You can thank the authors by these links:
 ### 1.7.5 (2022-06-01)
 * (arteck) error message for undefined devices or icons
 
-### 1.7.4 (2022-05-30) 
+### 1.7.4 (2022-05-30)
 * (arteck) missing icons with multiple description
 
 ### 1.7.2 (2022-05-28)
@@ -168,7 +183,7 @@ You can thank the authors by these links:
 ### 1.7.1 (2022-05-28)
 * (arteck) available status in admin is colored
 * (arteck) disable Backups checkbox in settings
-* (arteck) we keep last 10 backup files 
+* (arteck) we keep last 10 backup files
 * (arteck) download missing icons automatically (manual upload needed)
 
 ### 1.6.18 (2022-04-21)
@@ -448,7 +463,7 @@ new Zigbee-herdsman features:
 ## License
 The MIT License (MIT)
 
-Copyright (c) 2018-2022 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2023 Kirov Ilya <kirovilya@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/admin/admin.js

@@ -683,6 +683,18 @@ function checkFwUpdate() {
     }
 }
 
+function letsPairingWithCode(code) {
+    messages = [];
+    sendTo(namespace, 'letsPairing', {code: code}, function (msg) {
+        if (msg && msg.error) {
+            showMessage(msg.error, _('Error'));
+        }
+        else {
+          showPairingProcess();
+        }
+    });
+}
+
 function letsPairing() {
     messages = [];
     sendTo(namespace, 'letsPairing', {}, function (msg) {
@@ -777,7 +789,7 @@ function load(settings, onChange) {
     if (settings.extPanID === 'DDDDDDDDDDDDDDD') {
         settings.extPanID = 'DDDDDDDDDDDDDDDD';
     }
-    
+
     if (settings.precfgkey === undefined) {
         settings.precfgkey = '01030507090B0D0F00020406080A0C0D';
     }
@@ -787,7 +799,7 @@ function load(settings, onChange) {
     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) {
@@ -857,16 +869,25 @@ function load(settings, onChange) {
     });
 
     $('#add_group').click(function () {
-//        showGroupList(true);
         const maxind = parseInt(Object.getOwnPropertyNames(groups).reduce((a, b) => a > b ? a : b, 0));
         editGroupName(maxind + 1, 'Group ' + maxind + 1, true);
     });
+
     $('#add_grp_btn').click(function () {
-//        showGroupList(true);
         const maxind = parseInt(Object.getOwnPropertyNames(groups).reduce((a, b) => a > b ? a : b, 0));
         editGroupName(maxind + 1, 'Group ' + maxind + 1, true);
     });
 
+    $('#code_pairing').click(function () {
+      if (!$('#pairing').hasClass('pulse')) {
+        $('#codeentry a.btn[name=\'pair\']').click(() => {
+            const code = $('#codeentry').find('input[id=\'qr_code\']').val();
+            letsPairingWithCode(code)
+        });
+        $('#codeentry').modal('open');
+      }
+    });
+
     $(document).ready(function () {
         $('.modal').modal({
             startingTop: '30%',
@@ -1920,9 +1941,8 @@ function updateDev(id, newName, newGroups) {
                 showMessage(msg.error, _('Error'));
             } else {
                 // save dev-groups on success
-                dev.groups = newGroups;
+                getDevices();
             }
-            showDevices();
         });
         showWaitingDialog('Updating group memberships', 10);
 

package/admin/index_m.html

@@ -478,6 +478,12 @@
                            title="Touchlink reset and pairing">
                             <i class="material-icons large">wifi_tethering</i></a>
                     </li>
+                    <li>
+                        <a id="code_pairing"
+                        class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT"
+                        title="Pairing with QR Code">
+                         <i class="material-icons large">select_all</i></a>
+                    </li>
                     <li>
                         <a id="pairing"
                            class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT"
@@ -1079,6 +1085,25 @@
         </div>
     </div>
 
+    <div id="codeentry" class="modal">
+        <div class="modal-content">
+            <div class="addgroup">
+                <h3 class="translate">Enter Pairing Code</h3>
+            </div>
+            <div class="row">
+                <div class="input-field">
+                    <input id="qr_code" type="text" class="value validate">
+                    <label for="qr_code" class="translate">QR Code</label>
+                </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <a name="pair" href="#!"
+               class="modal-action modal-close waves-effect waves-green btn green translate">Start Pairing</a>
+            <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
+        </div>
+    </div>
+
     <div id="modaldelete" class="modal">
         <div class="modal-content">
             <h3 class="translate">Delete confirmation</h3>

package/admin/tab_m.html

@@ -16,7 +16,7 @@
 <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="adapter-settings.js"></script>
-    
+
 <script>
     // overload showMessage
     function showMessage(message, title, icon) {
@@ -437,6 +437,12 @@
                             <a id="touchlink_btn" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Touchlink reset and pairing">
                             <i class="material-icons large">wifi_tethering</i></a>
                         </li>
+                        <li>
+                        <a id="code_pairing"
+                           class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT"
+                           title="Pairing with QR Code">
+                            <i class="material-icons large">select_all</i></a>
+                        </li>
                         <li>
                             <a id="pairing" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Let's pairing!">
                             <i class="material-icons large">leak_add</i></a>
@@ -729,7 +735,24 @@
               <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
           </div>
       </div>
-
+      <div id="codeentry" class="modal">
+          <div class="modal-content">
+              <div class="addgroup">
+                  <h3 class="translate">Enter Pairing Code</h3>
+              </div>
+              <div class="row">
+                  <div class="input-field">
+                      <input id="qr_code" type="text" class="value validate">
+                      <label for="qr_code" class="translate">QR Code</label>
+                  </div>
+              </div>
+          </div>
+          <div class="modal-footer">
+              <a name="pair" href="#!"
+                 class="modal-action modal-close waves-effect waves-green btn green translate">Start Pairing</a>
+              <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
+          </div>
+      </div>
       <div id="groupedit" class="modal">
           <div class="modal-content">
               <div class = "addgroup">

package/admin/words.js

@@ -97,7 +97,7 @@ systemDictionary = {
     "№": {                                           "uk": "№",                                               "en": "№",                                               "de": "Nr.",                                             "ru": "№",                                               "pt": "№",                                               "nl": "№",                                               "fr": "№",                                               "it": "№",                                               "es": "№",                                               "pl": "Nr",                                              "zh-cn": "№"},
     "Excludes": {                                    "uk": "виключити",                                       "en": "to exclude",                                      "de": "ausschließen",                                    "ru": "Исключить",                                       "nl": "uitsluiten",                                      "fr": "d'exclure",                                       "pl": "wyklucz"},
     "ExcludeTextTranslation": {                      "uk": "Тут ви можете додати деякі пристрої, які слід виключити з нашого опису. Вони використовують лише \"викриття (exposes)\" від zigbee-herdsman-converter. Після додавання перезапустіть адаптер.", "en": "Here you can add some devices that should be excluded from our description. They only use \"exposes\" from zigbee-herdsman-converter. After adding, please restart the adapter.", "de": "Sie können hier einige Geräte hinzufügen, die von unserer Verarbeitung ausgeschlossen werden sollten. Sie verwenden dann nur exposes vom ZigBee-Herdsman-Converter. Nach dem Hinzufügen starten Sie bitte den Adapter neu.", "ru": "Здесь вы можете добавить устройства, для которых надо исключить представление заданное адаптером (iobroker.zigbee). В этом случае они будут использовать \"exposes\" из zigbee-herdsman-converter. После добавления перезапустите адаптер.", "nl": "Hier kunt u enkele apparaten toevoegen die moeten worden uitgesloten van onze beschrijving. Ze gebruiken alleen \"exposes\" van zigbee-herdsman-converter. Na het toevoegen moet u de adapter opnieuw opstarten.", "fr": "Ici, vous pouvez ajouter certains dispositifs qui doivent être exclus de notre description. Ils utilisent uniquement les \"exposes\" de zigbee-herdsman-converter. Après l'ajout, veuillez redémarrer l'adaptateur.", "pl": "Możesz dodać tutaj kilka urządzeń, które powinny zostać wyłączone z naszego opisu. Używasz tylko ekspozycji z zigbee-herdsman-converter. Po dodaniu zrestartuj adapter"},
-    "SettingsExclude": {                             "uk": "Примусовий запуск адаптера з не цілісною конфігурацією (не рекомендується). Оновіть адаптер до сумісної версії мікропрограми та перестворіть свою мережу якомога швидше.", "en": "Force start adapter with inconsistent configuration (not recommended). Please update the adapter to compatible firmware and recreate your network as soon as possible.", "de": "Den Start des Adapters mit inkonsistenter Konfiguration erzwingen (nicht empfohlen). Bitte aktualisieren Sie den Adapter auf kompatible Firmware und erstellen Sie Ihr Netzwerk so schnell wie möglich neu.", "ru": "Принудительный запуск адаптера с несовместимой конфигурацией (не рекомендуется). Пожалуйста, обновите адаптер до совместимой прошивки и воссоздайте сеть как можно скорее.", "nl": "Forceer de adapter met een inconsistente configuratie (niet aanbevolen). Update de adapter naar compatibele firmware en maak uw netwerk zo snel mogelijk opnieuw aan.", "fr": "Démarrage forcé de l'adaptateur avec une configuration incohérente (non recommandé). Veuillez mettre à jour l'adaptateur avec un micrologiciel compatible et recréer votre réseau dès que possible.", "pl": "Wystaruj Adapter bez zgodnej konfiguracji (uwaga). Zaktualizuj adapter i jak najszybciej odtwórz sieć."},
+    "SettingsExclude": {                             "uk": "Примусовий запуск адаптера з не цілісною конфігурацією (не рекомендується). Оновіть адаптер до сумісної версії мікропрограми та перестворіть свою мережу якомога швидше.", "en": "Force start adapter with inconsistent configuration (not recommended). Please update the adapter to compatible firmware and recreate your network as soon as possible.", "de": "Den Start des Adapters mit inkonsistenter Konfiguration erzwingen(nicht empfohlen). Bitte aktualisieren Sie den Adapter auf kompatible Firmware und erstellen Sie Ihr Netzwerk so schnell wie möglich neu.", "ru": "Принудительный запуск адаптера с несовместимой конфигурацией (не рекомендуется). Пожалуйста, обновите адаптер до совместимой прошивки и воссоздайте сеть как можно скорее.", "nl": "Forceer de adapter met een inconsistente configuratie (niet aanbevolen). Update de adapter naar compatibele firmware en maak uw netwerk zo snel mogelijk opnieuw aan.", "fr": "Démarrage forcé de l'adaptateur avec une configuration incohérente (non recommandé). Veuillez mettre à jour l'adaptateur avec un micrologiciel compatible et recréer votre réseau dès que possible.", "pl": "Wystaruj Adapter bez zgodnej konfiguracji (uwaga). Zaktualizuj adapter i jak najszybciej odtwórz sieć."},
     "Others": {                                      "uk": "інші налаштування",                               "en": "other settings",                                  "de": "andere Einstellungen",                            "ru": "другие настройки",                                "nl": "andere instellingen",                             "fr": "autres réglages",                                 "pl": "inne ustawienia"},
     "disable internal Backup": {                     "uk": "вимкнути внутрішнє резервне копіювання",          "en": "disable internal Backup",                         "de": "Deaktiviere die interne Sicherung",               "ru": "отключить внутреннее резервное копирование",      "nl": "interne back-up uitschakelen",                    "fr": "désactiver la sauvegarde interne",                "pl": "wyłącz wewnętrzną kopię"},
     "Disable active availability check": {           "uk": "Вимкнути активну перевірку доступності",          "en": "Disable active availability check",               "de": "Aktive Verfügbarkeitsprüfung deaktivieren",       "ru": "Отключить активную проверку доступности",         "nl": "Actieve beschikbaarheidscontrole uitschakelen",   "fr": "Désactiver le contrôle de disponibilité actif",   "pl": "Wyłącz aktywne sprawdzanie dostępności"},

package/docs/de/basedocu.md

@@ -0,0 +1,19 @@
+![Logo](../../admin/zigbee.png)
+# ioBroker.zigbee
+
+![Number of Installations](http://iobroker.live/badges/zigbee-installed.svg)
+![Number of Installations](http://iobroker.live/badges/zigbee-stable.svg)
+[![NPM version](http://img.shields.io/npm/v/iobroker.zigbee.svg)](https://www.npmjs.com/package/iobroker.zigbee)
+
+[![Translation status](https://weblate.iobroker.net/widgets/adapters/-/zigbee/svg-badge.svg)](https://weblate.iobroker.net/engage/adapters/?utm_source=widget)
+[![Downloads](https://img.shields.io/npm/dm/iobroker.zigbee.svg)](https://www.npmjs.com/package/iobroker.zigbee)
+
+Der Zigbee Adapter dient zur Ansteuerung eines Zigbee Netzes unter zu Hilfe nahme eines direkt am ioBroker angeschlossenen Koordinators. Der Koordinator kann dabei über USB, Seriell oder über TCP/IP angeschlossen werden.
+
+Vor dem ersten Start des Adpaters sollten auf der Konfigurationsseite einige Einstellungen vorgenommen werden:
+- Com Anschlussnahme
+- Koordinator Typ
+- Netzwerk verschlüsselung über PanID und extPanID
+- Zigbee Kanal
+
+Nachdem diese Parameter eingestellt wurden kann der Adapter gestartet werden. 

package/io-package.json

@@ -1,8 +1,12 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.8.9",
+    "version": "1.8.10",
     "news": {
+      "1.8.10": {
+        "en": "fix group access and any new functions",
+        "de": "fix group access and any new functions"
+      },
       "1.8.9": {
         "en": "fix lidl plug",
         "de": "deckelstecker",
@@ -52,19 +56,6 @@
       },
       "1.8.4": {
         "en": "fix for new code"
-      },
-      "1.8.3": {
-        "en": "back to old source",
-        "de": "zurück zur alten quelle",
-        "ru": "назад к старому источнику",
-        "pt": "voltar para a velha fonte",
-        "nl": "terug naar de oude bron",
-        "fr": "retour à la vieille source",
-        "it": "torna alla vecchia fonte",
-        "es": "volver a la vieja fuente",
-        "pl": "tył",
-        "uk": "назад до старого джерела",
-        "zh-cn": "背 景"
       }
     },
     "title": "Zigbee",

package/lib/binding.js

@@ -104,7 +104,6 @@ class Binding {
     async doBindUnbind(type, bind_source, bind_source_ep, bind_target, bind_target_ep, callback) {
         try {
             const id = this.getBindingId(bind_source, bind_source_ep, bind_target, bind_target_ep);
-
             const source = await this.zbController.resolveEntity(`0x${this.extractDeviceId(bind_source)}`, this.getBindEp(bind_source_ep));
             this.debug(`source: ${safeJsonStringify(source)}`);
             let target = await this.zbController.resolveEntity(`0x${this.extractDeviceId(bind_target)}`, this.getBindEp(bind_target_ep));

package/lib/commands.js

@@ -112,11 +112,35 @@ class Commands {
         }
     }
 
-    letsPairing(from, command, message, callback) {
+    async letsPairing(from, command, message, callback) {
         if (this.zbController) {
             let devId = '';
-            if (message && message.id) {
-                devId = getZbId(message.id);
+            if (message) {
+              if (message.id) devId = getZbId(message.id);
+              if (message.code) {
+                try {
+                  this.debug(`letsPairing called with code ${message.code}`);
+                  const success = await this.zbController.addPairingCode(message.code)
+                  if (!success) {
+                    this.adapter.sendTo(
+                        from, command,
+                        {error: 'Pairing code rejected by Coordinator!'},
+                        callback
+                    );
+                    return;
+                  };
+                }
+                catch (e) {
+                  this.error(JSON.stringify(e))
+                  this.adapter.sendTo(
+                      from, command,
+                      {error: 'Exception when trying to add QR code'},
+                      callback
+                  );
+                  return;
+
+                }
+              }
             }
             // allow devices to join the network within 60 secs
             this.adapter.logToPairing('Pairing started ' + devId, true);
@@ -257,7 +281,7 @@ class Commands {
                                         memberinfo.push(member);
                                     }
                                     devInfo.memberinfo = memberinfo;
-                                    this.debug(`memberinfo: ${JSON.stringify(devInfo.memberinfo)}`);
+                                    this.debug(`memberinfo for ${match[1]}: ${JSON.stringify(devInfo.memberinfo)}`);
                                 }
                             }
                         } else {
@@ -291,11 +315,11 @@ class Commands {
                 .then(async (devices) => {
                     // fill group info
                     for (const groupdev in groups) {
-                        this.debug(`GetDevices scanning group ${groupdev} ${JSON.stringify(groups[groupdev])}`);
+                        //this.debug(`GetDevices scanning group ${groupdev} ${JSON.stringify(groups[groupdev])}`);
                         const device = devices.find(dev => (groupdev === getZbId(dev._id)));
                         if (device) {
                             device.groups = groups[groupdev];
-                            this.debug(`adding group info to device ${groupdev}`);
+                            //this.debug(`adding group info to device ${groupdev}`);
                         }
                     }
                     // append devices that paired but not created

package/lib/groups.js

@@ -123,6 +123,7 @@ class Groups {
         try {
             const groups = message && message.groups ? message.groups : {};
             const devId = message && message.id ? message.id : undefined;
+            this.warn('updateGroupMembership called with ' + JSON.stringify(devId))
             if (devId === undefined) {
                 this.adapter.sendTo(from, command, {error: 'No device specified'}, callback);
             }
@@ -137,12 +138,15 @@ class Groups {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
+                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` )
                         const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
                             this.error(`remove dev from group Error: ${JSON.stringify(response.error)}`);
                         }
+
                     } else if (gpidn > 0) {
+                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` )
                         const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -154,6 +158,7 @@ class Groups {
                 }
             }
         } catch (e) {
+            this.warn('caught error ' + JSON.stringify(e) + ' in updateGroupMembership')
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
         }

package/lib/utils.js

@@ -137,6 +137,11 @@ function getModelRegEx( model) {
     return stripModel;
 }
 
+function getEntityInfo(entity) {
+  if (entity) return `Type: ${entity.type} Name: ${entity.name}`
+  return `getEntityInfo: Illegal Entity ${JSON.stringify(entity)}`
+}
+
 exports.secondsToMilliseconds   = seconds => seconds * 1000;
 exports.bulbLevelToAdapterLevel = bulbLevelToAdapterLevel;
 exports.adapterLevelToBulbLevel = adapterLevelToBulbLevel;
@@ -155,3 +160,4 @@ exports.isXiaomiDevice          = device =>
     (!device.manufacturerName || !device.manufacturerName.startsWith('Trust'));
 exports.isIkeaTradfriDevice     = device => ikeaTradfriManufacturerID.includes(device.manufacturerID);
 exports.getDeviceIcon           = getDeviceIcon;
+exports.getEntityInfo           = getEntityInfo;

package/lib/zigbeecontroller.js

@@ -9,6 +9,7 @@ const DeviceAvailabilityExt = require('./zbDeviceAvailability');
 const DeviceConfigureExt = require('./zbDeviceConfigure');
 const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
+const utils = require('./utils');
 const groupConverters = [
     zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp,
@@ -311,6 +312,16 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
+    async addPairingCode(code) {
+      this.debug(`calling addPairingCode with ${code}`);
+      if (code) {
+        await this.herdsman.addInstallCode(code)
+        this.info(`added code ${code} for pairing`)
+        return true;
+      }
+      return false;
+    }
+
     async getGroupMembersFromController(id) {
         const members = [];
         try {
@@ -795,26 +806,36 @@ class ZigbeeController extends EventEmitter {
 
     async addDevToGroup(devId, groupId, epid) {
         try {
+            this.debug(`called addDevToGroup with ${devId}, ${groupId}, ${epid}`)
             const entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
-            this.debug(`addDevFromGroup - entity: ${safeJsonStringify(entity)}`);
-            this.debug(`addDevFromGroup - group: ${safeJsonStringify(group)}`);
+            this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
+            // generate group debug info and display it
+            const members = await this.getGroupMembersFromController(groupId)
+            let memberIDs = []
+            for (let member of members) {
+              memberIDs.push(member.ieee)
+            }
+            this.debug(`addDevToGroup ${groupId} with ${memberIDs.length} members ${safeJsonStringify(memberIDs)}`);
             if (epid != undefined) {
                 for (const ep of entity.endpoints) {
-                    if (ep.ID === epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
+                    this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`)
+                    if (ep.ID == epid) {
+                      if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)) {
                         this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`);
                         await (ep.addToGroup(group.mapped));
+                      }
+                      else this.error(`cluster genGroups not supported for endpoint ${epid} of ${devId}`)
                     }
                 }
             } else {
                 if (entity.endpoint.inputClusters.includes(4)) {
-                    this.debug(`adding endpoint ${entity.endpoint.ID} to group`);
+                    this.info(`adding endpoint ${entity.endpoint.ID} of ${devId} to group`);
                     await entity.endpoint.addToGroup(group.mapped);
                 } else {
                     let added = false;
                     for (const ep of entity.endpoints) {
                         if (ep.inputClusters.includes(4)) {
-                            this.debug(`adding endpoint ${ep.ID} to group`);
                             await ep.addToGroup(group.mapped);
                             added = true;
                             break;
@@ -834,20 +855,33 @@ class ZigbeeController extends EventEmitter {
     }
 
     async removeDevFromGroup(devId, groupId, epid) {
+        this.debug(`removeDevFromGroup with ${devId}, ${groupId}, ${epid}`)
         let entity;
         try {
             entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
-            this.debug(`removeDevFromGroup - entity: ${safeJsonStringify(entity)}`);
-            this.debug(`removeDevFromGroup - group: ${safeJsonStringify(group)}`);
+
+            const members = await this.getGroupMembersFromController(groupId)
+            let memberIDs = []
+            for (let member of members) {
+              memberIDs.push(member.ieee)
+            }
+
+            this.debug(`removeDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
+            this.debug(`removeDevFromGroup ${groupId} with ${memberIDs.length} members ${safeJsonStringify(memberIDs)}`);
+
             if (epid != undefined) {
                 for (const ep of entity.endpoints) {
-                    if (ep.ID === epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
-                        this.debug(`removing endpoint ${ep.ID} (${epid}) group ${groupId}`);
+                  this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`)
+                    if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
                         await ep.removeFromGroup(group.mapped);
+                        this.info(`removing endpoint ${ep.ID} of ${devId} from group ${groupId}`);
                     }
                 }
-            } else await entity.endpoint.removeFromGroup(group.mapped);
+            } else {
+              await entity.endpoint.removeFromGroup(group.mapped);
+              this.info(`removing endpoint ${entity.endpoint.ID} of ${devId} from group ${groupId}`);
+            }
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying remove ${devId} (ep ${epid ? epid : (entity ? entity.endpoint.ID : '')}) from group ${devId}`, error);
@@ -865,7 +899,6 @@ class ZigbeeController extends EventEmitter {
                     await ep.removefromAllGroups();
                 }
             }
-            // await entity.endpoint.removeFromAllGroups();
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying remove ${devId} from all groups`, error);

package/main.js

@@ -216,9 +216,64 @@ class Zigbee extends utils.Adapter {
         }
         const extfiles = this.config.external.split(';');
         for (const moduleName of extfiles) {
-            if (!moduleName) {
-                continue;
+            if (!moduleName) continue;
+            const sandbox = {
+                require,
+                module: {},
+            };
+            const mN = (fs.existsSync(moduleName) ? moduleName : this.expandFileName(moduleName).replace('.', '_'));
+            if (!fs.existsSync(mN)) {
+              this.log.warn(`External converter not loaded - neither ${moduleName} nor ${mN} exist.`)
+
             }
+            else {
+                const converterCode = fs.readFileSync(mN, {encoding: 'utf8'}).toString();
+                let converterLoaded = true;
+                if (converterCode.match(/..\/lib\/legacy/gm)) {
+                    this.log.warn(`External converter ${mN} contains an unsupported reference to '/lib/legacy' - external converter not loaded.`)
+                    converterLoaded = false;
+                }
+                else
+                {
+                    // remove the require statements and attempt to place them in the sandbox
+                    const requiredLibraries = converterCode.matchAll(/(\w+) += +require\(['"](\S+)['"]\);/gm);
+                    for (const line of requiredLibraries) {
+                        const movedLine = line[2].replace('..', '../zigbee-herdsman-converters')
+                        try {
+                            sandbox[line[1]] = require(movedLine);
+                        }
+                        catch (e) {
+                            this.log.warn(`error adding ${line[1]} (${movedLine}) to the sandbox: ${e}`);
+                            converterLoaded = false;
+                        }
+                    }
+                }
+                if (converterLoaded) {
+                    this.log.info(`Apply converter from module: ${mN}`);
+                    //this.log.warn(converterCode.replace(/const (\w+) += +require\(['"](\S+)['"]\);/gm, ''));
+                    try {
+                        vm.runInNewContext(converterCode.replace(/const (\w+) += +require\(['"](\S+)['"]\);/gm, ''), sandbox);
+                        const converter = sandbox.module.exports;
+
+                        if (Array.isArray(converter)) for (const item of converter) yield item;
+                        else yield converter;
+                    }
+                    catch (e) {
+                        this.log.error(`Unable to apply converter from module: ${mN} - the code does not run: ${e}`)
+                    }
+                }
+                else
+                    this.log.info(`Ignoring converter from module: ${mN} - see warn messages for reason`);
+
+            }
+        }
+
+    /*    if (this.config.external === undefined) {
+            return;
+        }
+        const extfiles = this.config.external.split(';');
+        for (const moduleName of extfiles) {
+            if (!moduleName) continue;
             this.log.info(`Apply converter from module: ${moduleName}`);
             const sandbox = {
                 require,
@@ -235,14 +290,23 @@ class Zigbee extends utils.Adapter {
                 yield converter;
             }
         }
-    }
+    */
+   }
 
     applyExternalConverters() {
+      try {
         for (const definition of this.getExternalDefinition()) {
             const toAdd = {...definition};
             delete toAdd['homeassistant'];
-            zigbeeHerdsmanConverters.addDeviceDefinition(toAdd);
+            try {
+              zigbeeHerdsmanConverters.addDeviceDefinition(toAdd);
+            }
+            catch { this.log.error(`unable to apply external converter ${JSON.stringfy(toAdd)}`) }
         }
+      }
+      catch(error) {
+         this.log.error('error applying external converters');
+      }
     }
 
     async doConnect() {
@@ -851,6 +915,7 @@ class Zigbee extends utils.Adapter {
 
     onPairing(message, data) {
         if (Number.isInteger(data)) {
+            _pairingMode = true;
             this.setState('info.pairingCountdown', data, true);
             _pairingMode = true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.9",
+  "version": "1.8.10",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -24,8 +24,8 @@
     "@iobroker/adapter-core": "^2.6.7",
     "tar": "^6.1.12",
     "typescript": "^4.9.3",
-    "zigbee-herdsman": "0.14.80",
-    "zigbee-herdsman-converters": "14.0.687"
+    "zigbee-herdsman": "0.14.83",
+    "zigbee-herdsman-converters": "15.0.15"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -36,14 +36,14 @@
     "axios": "^1.2.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.28.0",
+    "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.3",
     "mixin-deep": "^2.0.1",
-    "mocha": "^10.1.0"
+    "mocha": "^10.2.0"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [