hoffmation-base 2.18.3 → 2.18.5

package/lib/server/devices/deviceUpdater.js

@@ -19,7 +19,7 @@ class DeviceUpdater {
         }
     }
     updateState(id, state, initial = false) {
-        var _a, _b;
+        var _a;
         if (state === null) {
             // Ignore null states
             return;
@@ -27,10 +27,16 @@ class DeviceUpdater {
         const idSplit = IoBrokerDeviceInfo_1.IoBrokerDeviceInfo.idSplitter(id);
         if (idSplit.length < 2)
             return;
+        let classifier = idSplit[0];
+        let devId = idSplit[2];
         if (idSplit[0] == 'mqtt') {
             mqtt_1.MqttCoordinator.update(idSplit, state);
         }
-        const device = (_a = devices_1.Devices.alLDevices[`${idSplit[0]}-${idSplit[2]}`]) !== null && _a !== void 0 ? _a : devices_1.Devices.alLDevices[`${idSplit[0]}-${idSplit[2].substring(2)}`];
+        else if (idSplit[0] == devices_1.Devices.IDENTIFIER_ZIGBEE2MQTT) {
+            classifier = devices_1.Devices.IDENTIFIER_ZIGBEE;
+            devId = idSplit[2].substring(2);
+        }
+        const device = devices_1.Devices.alLDevices[`${classifier}-${devId}`];
         if (typeof device === 'undefined' || device.update === undefined) {
             return;
         }
@@ -38,7 +44,7 @@ class DeviceUpdater {
             device.update(idSplit, state, initial, false);
         }
         catch (e) {
-            services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${(_b = e === null || e === void 0 ? void 0 : e.stack) !== null && _b !== void 0 ? _b : ''}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${(_a = e === null || e === void 0 ? void 0 : e.stack) !== null && _a !== void 0 ? _a : ''}`);
         }
     }
 }

package/lib/server/devices/devices.d.ts

@@ -8,6 +8,7 @@ export declare class Devices {
     static IDENTIFIER_Shelly: string;
     static IDENTIFIER_TUYA: string;
     static IDENTIFIER_ZIGBEE: string;
+    static IDENTIFIER_ZIGBEE2MQTT: string;
     static IDENTIFIER_WLED: string;
     static alLDevices: {
         [id: string]: iBaseDevice;

package/lib/server/devices/devices.js

@@ -132,7 +132,7 @@ class Devices {
     static processZigbeeDevice(cDevConf) {
         const zigbeeInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf);
         const apiDevId = zigbeeInfo.devID.startsWith('0x') ? zigbeeInfo.devID.substring(2) : zigbeeInfo.devID;
-        const fullName = `${Devices.IDENTIFIER_ZIGBEE}-${apiDevId}`;
+        const fullName = `zigbee-${apiDevId}`;
         zigbeeInfo.allDevicesKey = fullName;
         if (typeof Devices.alLDevices[fullName] !== 'undefined') {
             return;
@@ -301,6 +301,7 @@ Devices.IDENTIFIER_JS = 'javascript';
 Devices.IDENTIFIER_Shelly = 'shelly';
 Devices.IDENTIFIER_TUYA = 'tuya';
 Devices.IDENTIFIER_ZIGBEE = 'zigbee';
+Devices.IDENTIFIER_ZIGBEE2MQTT = 'zigbee2mqtt';
 Devices.IDENTIFIER_WLED = 'wled';
 Devices.alLDevices = {};
 Devices.energymanager = undefined;

package/lib/server/devices/zigbee/zigbeeAqaraOpple3Switch.js

@@ -79,7 +79,7 @@ class ZigbeeAqaraOpple3Switch extends BaseDevices_1.ZigbeeSwitch {
         }
         let pressType = undefined;
         switch (parts[2]) {
-            case 'click':
+            case 'single':
                 pressType = button_1.ButtonPressType.short;
                 break;
             case 'hold':