npm - iobroker.zigbee - Versions diffs - 3.0.5 → 3.1.4 - Mend

iobroker.zigbee 3.0.5 → 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

package/README.md +34 -0
package/admin/admin.js +475 -230
package/admin/i18n/de/translations.json +16 -16
package/admin/index_m.html +84 -91
package/admin/tab_m.html +38 -16
package/docs/de/readme.md +1 -1
package/docs/en/readme.md +4 -2
package/io-package.json +35 -28
package/lib/DeviceDebug.js +25 -2
package/lib/binding.js +8 -8
package/lib/commands.js +386 -326
package/lib/developer.js +2 -2
package/lib/devices.js +13 -9
package/lib/exclude.js +1 -1
package/lib/exposes.js +56 -24
package/lib/groups.js +408 -73
package/lib/localConfig.js +23 -12
package/lib/networkmap.js +10 -2
package/lib/states.js +32 -2
package/lib/statescontroller.js +361 -209
package/lib/utils.js +7 -5
package/lib/zbDelayedAction.js +4 -4
package/lib/zbDeviceAvailability.js +102 -46
package/lib/zbDeviceConfigure.js +7 -0
package/lib/zbDeviceEvent.js +40 -7
package/lib/zigbeecontroller.js +552 -75
package/main.js +168 -505
package/package.json +8 -11
package/lib/tools.js +0 -55

package/lib/DeviceDebug.js CHANGED Viewed

@@ -39,7 +39,7 @@ class DeviceDebug extends EventEmitter {
             let flag='NONE';
             if (message.hasOwnProperty('data')) {
                 const dataId = message.ID;
-                const item = this.dataByID[dataId] ? this.dataByID[dataId] : { dataID: dataId, deviceID:'unknown', states:[],flags:[], errors:[], IO:message.IO };
+                const item = this.dataByID[dataId] ? this.dataByID[dataId] : { dataID: dataId, deviceID:'unknown', states:[],flags:[], errors:[], IO:message.IO, messages:{} };
                 this.dataByID[dataId] = item;
                 const data = message.data;
                 if (data.error && item.errors.indexOf(data.error)<0) item.errors.push(data.error);
@@ -53,6 +53,11 @@ class DeviceDebug extends EventEmitter {
                     else flag = item.IO ? 'I'+data.flag : 'O'+data.flag;
                 else
                     flag = item.IO ? 'IN' : 'OUT';
+                if (message.message) {
+                    let msgIdx = 0;
+                    while (item.messages.hasOwnProperty(`${flag}${msgIdx ? '-'+msgIdx : ''}`)) msgIdx++;
+                    item.messages[`${flag}${msgIdx ? '-'+msgIdx : ''}`] = message.message;
+                }
                 if (data.ID && data.ID !== item.deviceID) {
                     item.deviceID = data.ID;
                     const DevData = this.dataByDevice[item.deviceID] ? this.dataByDevice[item.deviceID] : { IN:[], OUT:[] };
@@ -73,9 +78,27 @@ class DeviceDebug extends EventEmitter {
         }
     }
-    collectDebugData(logStatus) {
+    deleteMessagesFor(item) {
+        if (item == 'all') {
+            this.dataByDevice = {};
+            this.dataByID = {};
+            return;
+        }
+        delete this.dataByDevice[item];
+        const obsoleteIDs = [];
+        for (const id in this.dataByID) {
+            if (this.dataByID[id].deviceID === item) obsoleteIDs.push(id)
+        }
+        for (const id of obsoleteIDs) delete this.dataByID[id];
+    }
+    collectDebugData(logStatus, del) {
+        this.warn('collectingData')
         if (logStatus != undefined)
             this.logStatus = logStatus;
+        if (del) {
+            this.deleteMessagesFor(del);
+        }
         return this.dataByDevice;
     }
 }

package/lib/binding.js CHANGED Viewed

@@ -153,7 +153,7 @@ class Binding {
                     if (source.endpoint.supportsOutputCluster(cluster) && targetValid) {
                         this.debug(`${type}ing cluster '${cluster}' from '${sourceName}' to '${targetName}'`);
                         try {
-                            const bindTarget = target.type === 'group' ? target.group : target.endpoint;
+                            const bindTarget = target.type === 'group' ? target.device : target.endpoint;
                             if (type === 'bind') {
                                 await source.endpoint.bind(cluster, bindTarget);
                             } else {
@@ -260,18 +260,18 @@ class Binding {
                         bind_target_ep = params.bind_target_ep;
                     await this.doBindUnbind('unbind', bind_source, bind_source_ep, bind_target, bind_target_ep, async err => {
                         if (err) {
-                            callback({error: err});
+                            if (callback) callback({error: err});
                         } else {
-                            this.adapter.deleteState(null, 'info', bind_id, async () => {
-                                // if (err) {
-                                //     callback({error: err});
-                                // } else {
+                            this.adapter.delObject(`info.${bind_id}`,{}, async (err) => {
+                                if (err) {
+                                    if (callback) callback({error: err});
+                                    return;
+                                }
                                 if (params.unbind_from_coordinator) {
                                     await this.doBindUnbind('bind', bind_source, bind_source_ep, 'coordinator', '1', callback);
                                 } else {
-                                    callback();
+                                    if (callback) callback();
                                 }
-                                //}
                             });
                         }
                     });