Merge pull request #2356 from asgothian/master

Update zbDeviceEvent.js
ioBroker · Jan 10, 2025 · 2f5bb8d · 2f5bb8d
2 parents e1024ce + 9adebc5
commit 2f5bb8d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/zbDeviceEvent.js b/lib/zbDeviceEvent.js
@@ -36,11 +36,22 @@ class DeviceEvent extends BaseExtension {
 
     async callOnEvent(device, type, data, mappedDevice) {
         if (!mappedDevice) {
-            mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
+            try {
+                mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
+            }
+            catch (error) {
+                this.log.error(`onEvent: unable to find mapped device for ${JSON.stringify(device)} `);
+                return;
+            }
         }
 
         if (mappedDevice && mappedDevice.onEvent) {
-            mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
+            try {
+                mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
+            }
+            catch (error) {
+                this.log.error(`onEvent for ${JSON.stringify(device)} failed with error ${error.message}`);
+            }
         }
     }
 }