iobroker.zigbee 1.10.14 → 2.0.1

package/lib/utils.js

@@ -157,7 +157,7 @@ exports.decimalToHex            = decimalToHex;
 exports.getZbId                 = getZbId;
 exports.getAdId                 = getAdId;
 exports.getModelRegEx           = getModelRegEx;
-exports.isRouter                = device => device.type === 'Router' && !forceEndDevice.includes(device.modelID);
+exports.isRouter                = device => (device.type === 'Router' || (typeof device.powerSource == 'string' && device.powerSource.startsWith('Mains'))) && !forceEndDevice.includes(device.modelID);
 exports.isBatteryPowered        = device => device.powerSource && device.powerSource === 'Battery';
 exports.isXiaomiDevice          = device =>
     device.modelID !== 'lumi.router' &&

package/lib/zbDeviceAvailability.js

@@ -49,9 +49,10 @@ class DeviceAvailability extends BaseExtension {
         });
         this.startDevicePingQueue = []; // simple fifo array for starting device pings
         this.startDevicePingTimeout = null; // handle for the timeout which empties the queue
-        this.startDevicePingDelay = 200; // 200 ms delay between starting the ping timeout
+        this.startDevicePingDelay = 500; // 200 ms delay between starting the ping timeout
         this.name = 'DeviceAvailability';
         this.elevate_debug = false;
+        this.isStarted = false;
     }
 
     setOptions(options) {
@@ -74,6 +75,7 @@ class DeviceAvailability extends BaseExtension {
     }
 
     isPingable(device) {
+
         if (this.active_ping) {
             if (this.forced_ping && forcedPingable.find(d => d && d.hasOwnProperty('zigbeeModel') && d.zigbeeModel.includes(device.modelID))) {
                 return true;
@@ -90,6 +92,7 @@ class DeviceAvailability extends BaseExtension {
     }
 
     async registerDevicePing(device, entity) {
+        if (!this.isStarted) return;
         this.debug(`register device Ping for ${JSON.stringify(device.ieeeAddr)}`);
         this.forcedNonPingable[device.ieeeAddr] = false;
         //        this.warn(`Called registerDevicePing for '${device}' of '${entity}'`);
@@ -104,6 +107,7 @@ class DeviceAvailability extends BaseExtension {
             }
         });
         this.number_of_registered_devices++;
+        this.debug(`registering device Ping (${this.number_of_registered_devices}) for ${device.ieeeAddr} (${device.modelID})`);
         this.availability_timeout = Math.max(Math.min(this.number_of_registered_devices * AverageTimeBetweenPings, MaxAvailabilityTimeout), MinAvailabilityTimeout);
         this.startDevicePingQueue.push({device, entity});
         if (this.startDevicePingTimeout == null) {
@@ -113,7 +117,7 @@ class DeviceAvailability extends BaseExtension {
     }
 
     async deregisterDevicePing(device) {
-        this.info(`deregister device Ping for deactivated device ${JSON.stringify(device.ieeeAddr)}`);
+        this.debug(`deregister device Ping for deactivated device ${JSON.stringify(device.ieeeAddr)}`);
         this.forcedNonPingable[device.ieeeAddr] = true;
         if (this.timers[device.ieeeAddr]) {
             clearTimeout(this.timers[device.ieeeAddr]);
@@ -122,6 +126,7 @@ class DeviceAvailability extends BaseExtension {
 
     async startDevicePing() {
         //        this.warn(JSON.stringify(this));
+        if (!this.isStarted) return;
         this.startDevicePingTimeout = null;
         const item = this.startDevicePingQueue.shift();
         if (this.startDevicePingQueue.length > 0) {
@@ -140,6 +145,7 @@ class DeviceAvailability extends BaseExtension {
         // triggered by the 'new device' event to ensure that they are handled
         // identically on reconnect, disconnect and new pair (as)
         const clients = await this.zigbee.getClients();
+        this.isStarted = true;
         //        this.warn('onZigbeeStarted called');
         for (const device of clients) {
             if (this.isPingable(device)) {
@@ -154,10 +160,11 @@ class DeviceAvailability extends BaseExtension {
     }
 
     async handleIntervalPingable(device, entity) {
+        if (!this.isStarted) return;
         const ieeeAddr = device.ieeeAddr;
         const resolvedEntity = entity ? entity : await this.zigbee.resolveEntity(ieeeAddr);
         if (!resolvedEntity) {
-            this.debug(`Stop pinging '${ieeeAddr}' ${device.modelID}, device is not known anymore`);
+            this.warn(`Stop pinging '${ieeeAddr}' ${device.modelID}, device is not known anymore`);
             return;
         }
         if (this.isPingable(device)) {
@@ -166,29 +173,11 @@ class DeviceAvailability extends BaseExtension {
                 this.ping_counters[device.ieeeAddr] = {failed: 0, reported: 0};
                 pingCount = {failed: 0, reported: 0};
             }
-
-            // first see if we can "ping" the device by reading a Status
-            try {
-                for (const key of toZigbeeCandidates) {
-                    const converter = resolvedEntity.mapped.toZigbee.find((tz) => tz.key.includes(key));
-                    if (converter) {
-                        await converter.convertGet(device.endpoints[0], key, {});
-                        this.debug(`Successful read state '${key}' of '${device.ieeeAddr}' in stead of pinging`);
-                        this.setTimerPingable(device, 1);
-                        this.ping_counters[device.ieeeAddr].failed = 0;
-                        return;
-                    }
-                }
-            } catch (error) {
-                this.sendError(error);
-                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${error}'`);
-                // intentionally empty: Just present to ensure we cause no harm
-                // when reading the state fails. => fall back on standard Ping function
-            }
             try {
+                //this.warn(`Pinging '${ieeeAddr}' (${device.modelID})`)
                 await device.ping();
                 this.publishAvailability(device, true);
-                this.debug(`Successfully pinged ${ieeeAddr} ${device.modelID}`);
+                //this.warn(`Successfully pinged ${ieeeAddr} (${device.modelID})`);
                 this.setTimerPingable(device, 1);
                 this.ping_counters[device.ieeeAddr].failed = 0;
             } catch (error) {
@@ -210,6 +199,7 @@ class DeviceAvailability extends BaseExtension {
     }
 
     async handleIntervalNotPingable(device) {
+        if (!this.isStarted) return;
         const entity = await this.zigbee.resolveEntity(device.ieeeAddr);
         if (!entity || !device.lastSeen) {
             return;
@@ -224,6 +214,7 @@ class DeviceAvailability extends BaseExtension {
     }
 
     setTimerPingable(device, factor) {
+        if (!this.isStarted) return;
         if (factor === undefined || factor < 1) {
             factor = 1;
         }
@@ -235,6 +226,7 @@ class DeviceAvailability extends BaseExtension {
     }
 
     async stop() {
+        this.isStarted = false;
         for (const timer of Object.values(this.timers)) {
             clearTimeout(timer);
         }