@switchbot/homebridge-switchbot 3.5.0-beta.63 → 3.5.0-beta.65

package/src/device/lock.ts

@@ -51,12 +51,14 @@ export class Lock extends deviceBase {
     this.lockUpdateInProgress = false;
 
     // Initialize LockMechanism Service
+    accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
     this.LockMechanism = {
-      Name: accessory.context.LockMechanismName ?? accessory.displayName,
+      Name: accessory.context.LockMechanism.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.LockMechanism) ?? accessory.addService(this.hap.Service.LockMechanism) as Service,
       LockTargetState: accessory.context.LockTargetState ?? this.hap.Characteristic.LockTargetState.SECURED,
       LockCurrentState: accessory.context.LockCurrentState ?? this.hap.Characteristic.LockCurrentState.SECURED,
     };
+    accessory.context.LockMechanism = this.LockMechanism as object;
 
     // Initialize LockMechanism Characteristics
     this.LockMechanism.Service
@@ -66,15 +68,16 @@ export class Lock extends deviceBase {
         return this.LockMechanism.LockTargetState;
       })
       .onSet(this.LockTargetStateSet.bind(this));
-    accessory.context.LockMechanismName = this.LockMechanism.Name;
 
     // Initialize Battery property
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Characteristics
     this.Battery.Service
@@ -90,7 +93,6 @@ export class Lock extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Contact Sensor Service
     if (device.lock?.hide_contactsensor) {
@@ -98,11 +100,13 @@ export class Lock extends deviceBase {
       this.ContactSensor!.Service = this.accessory.getService(this.hap.Service.ContactSensor) as Service;
       accessory.removeService(this.ContactSensor!.Service);
     } else {
+      accessory.context.ContactSensor = accessory.context.ContactSensor ?? {};
       this.ContactSensor = {
-        Name: accessory.context.ContactSensorName ?? `${accessory.displayName} Contact Sensor`,
+        Name: accessory.context.ContactSensor.Name ?? `${accessory.displayName} Contact Sensor`,
         Service: accessory.getService(this.hap.Service.ContactSensor) ?? this.accessory.addService(this.hap.Service.ContactSensor) as Service,
         ContactSensorState: accessory.context.ContactSensorState ?? this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
       };
+      accessory.context.ContactSensor = this.ContactSensor as object;
 
       // Initialize Contact Sensor Characteristics
       this.ContactSensor.Service
@@ -112,7 +116,6 @@ export class Lock extends deviceBase {
         .onGet(() => {
           return this.ContactSensor!.ContactSensorState;
         });
-      accessory.context.ContactSensorName = this.ContactSensor.Name;
     }
 
     // Initialize Latch Button Service
@@ -121,11 +124,13 @@ export class Lock extends deviceBase {
       this.Switch!.Service = accessory.getService(this.hap.Service.Switch) as Service;
       accessory.removeService(this.Switch!.Service);
     } else {
+      accessory.context.Switch = accessory.context.Switch ?? {};
       this.Switch = {
-        Name: accessory.context.SwitchName ?? `${accessory.displayName} Latch`,
+        Name: accessory.context.Switch.Name ?? `${accessory.displayName} Latch`,
         Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.Switch = this.Switch as object;
 
       // Initialize Latch Button Characteristics
       this.Switch.Service
@@ -135,7 +140,6 @@ export class Lock extends deviceBase {
           return this.Switch!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.SwitchName = this.Switch.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -270,12 +274,15 @@ export class Lock extends deviceBase {
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/device/meter.ts

@@ -48,12 +48,14 @@ export class Meter extends deviceBase {
     this.meterUpdateInProgress = false;
 
     // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Characteristics
     this.Battery.Service
@@ -69,7 +71,6 @@ export class Meter extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
@@ -77,11 +78,13 @@ export class Meter extends deviceBase {
       this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
+      accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
       };
+      accessory.context.TemperatureSensor = this.TemperatureSensor as object;
 
       // Initialize Temperature Sensor Characteristics
       this.TemperatureSensor.Service
@@ -97,7 +100,6 @@ export class Meter extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature!;
         });
-      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
     // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
@@ -105,11 +107,13 @@ export class Meter extends deviceBase {
       this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
       accessory.removeService(this.HumiditySensor!.Service);
     } else {
+      accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
         Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
         Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
       };
+      accessory.context.HumiditySensor = this.HumiditySensor as object;
 
       // Initialize Humidity Sensor Characteristics
       this.HumiditySensor!.Service
@@ -121,7 +125,6 @@ export class Meter extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity!;
         });
-      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -227,12 +230,15 @@ export class Meter extends deviceBase {
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/device/meterplus.ts

@@ -52,12 +52,14 @@ export class MeterPlus extends deviceBase {
     this.meterUpdateInProgress = false;
 
     // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Characteristics
     this.Battery.Service
@@ -73,7 +75,6 @@ export class MeterPlus extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Temperature Sensor Service
     if (device.meter?.hide_temperature) {
@@ -81,11 +82,13 @@ export class MeterPlus extends deviceBase {
       this.TemperatureSensor!.Service = this.accessory.getService(this.hap.Service.TemperatureSensor) as Service;
       accessory.removeService(this.TemperatureSensor!.Service);
     } else {
+      accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensorName ?? `${accessory.displayName} Temperature Sensor`,
+        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
         Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor) as Service,
         CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
       };
+      accessory.context.TemperatureSensor = this.TemperatureSensor as object;
 
       // Initialize Temperature Sensor Characteristics
       this.TemperatureSensor.Service
@@ -101,7 +104,6 @@ export class MeterPlus extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature!;
         });
-      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
     // Initialize Humidity Sensor Service
     if (device.meter?.hide_humidity) {
@@ -109,11 +111,13 @@ export class MeterPlus extends deviceBase {
       this.HumiditySensor!.Service = this.accessory.getService(this.hap.Service.HumiditySensor) as Service;
       accessory.removeService(this.HumiditySensor!.Service);
     } else {
+      accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
+        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
         Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
       };
+      accessory.context.HumiditySensor = this.HumiditySensor as object;
 
       // Initialize Humidity Sensor Characteristics
       this.HumiditySensor!.Service
@@ -125,7 +129,6 @@ export class MeterPlus extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity!;
         });
-      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -224,16 +227,20 @@ export class MeterPlus extends deviceBase {
       this.TemperatureSensor!.CurrentTemperature = deviceStatus.body.temperature!;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor!.CurrentTemperature}°c`);
     }
+
     // Firmware Version
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/device/motion.ts

@@ -52,11 +52,13 @@ export class Motion extends deviceBase {
     this.motionUbpdateInProgress = false;
 
     // Initialize Motion Sensor property
+    accessory.context.MotionSensor = accessory.context.MotionSensor ?? {};
     this.MotionSensor = {
-      Name: accessory.context.MotionSensorName ?? `${accessory.displayName} Motion Sensor`,
+      Name: accessory.context.MotionSensor.Name ?? `${accessory.displayName} Motion Sensor`,
       Service: accessory.getService(this.hap.Service.MotionSensor) ?? accessory.addService(this.hap.Service.MotionSensor) as Service,
       MotionDetected: accessory.context.MotionDetected ?? false,
     };
+    accessory.context.MotionSensor = this.MotionSensor as object;
 
     // Initialize Motion Sensor Characteristics
     this.MotionSensor.Service
@@ -69,12 +71,14 @@ export class Motion extends deviceBase {
     accessory.context.MotionSensorName = this.MotionSensor.Name;
 
     // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Characteristics
     this.Battery.Service
@@ -91,7 +95,6 @@ export class Motion extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Light Sensor Service
     if (device.motion?.hide_lightsensor) {
@@ -99,11 +102,13 @@ export class Motion extends deviceBase {
       this.LightSensor!.Service = this.accessory.getService(this.hap.Service.LightSensor) as Service;
       accessory.removeService(this.LightSensor!.Service);
     } else {
+      accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {
-        Name: accessory.context.LightSensorName ?? `${accessory.displayName} Light Sensor`,
+        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
         Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
       };
+      accessory.context.LightSensor = this.LightSensor as object;
 
       // Initialize LightSensor Characteristics
       this.LightSensor!.Service
@@ -113,7 +118,6 @@ export class Motion extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel;
         });
-      accessory.context.LightSensorName = this.LightSensor.Name;
     };
 
 
@@ -234,12 +238,15 @@ export class Motion extends deviceBase {
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/device/plug.ts

@@ -33,11 +33,13 @@ export class Plug extends deviceBase {
     this.plugUpdateInProgress = false;
 
     // Initialize Outlet Service
+    accessory.context.Outlet = accessory.context.Outlet ?? {};
     this.Outlet = {
-      Name: accessory.context.OutletName ?? accessory.displayName,
+      Name: accessory.context.Outlet.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Outlet) ?? accessory.addService(this.hap.Service.Outlet) as Service,
       On: accessory.context.On || false,
     };
+    accessory.context.Outlet = this.Outlet as object;
 
     // Initialize Outlet Characteristics
     this.Outlet.Service
@@ -47,7 +49,6 @@ export class Plug extends deviceBase {
         return this.Outlet.On;
       })
       .onSet(this.OnSet.bind(this));
-    accessory.context.OutletName = this.Outlet.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
@@ -134,12 +135,15 @@ export class Plug extends deviceBase {
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/device/robotvacuumcleaner.ts

@@ -44,12 +44,14 @@ export class RobotVacuumCleaner extends deviceBase {
     this.robotVacuumCleanerUpdateInProgress = false;
 
     // Initialize Lightbulb Service
+    accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     this.LightBulb = {
-      Name: accessory.context.LightBulbName ?? accessory.displayName,
+      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
       On: accessory.context.On ?? false,
       Brightness: accessory.context.Brightness ?? 0,
     };
+    accessory.context.LightBulb = this.LightBulb as object;
 
     // Initialize LightBulb Characteristics
     this.LightBulb.Service
@@ -74,16 +76,17 @@ export class RobotVacuumCleaner extends deviceBase {
         return this.LightBulb.Brightness;
       })
       .onSet(this.BrightnessSet.bind(this));
-    accessory.context.LightBulbName = this.LightBulb.Name;
 
     // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
       BatteryLevel: accessory.context.BatteryLevel ?? 100,
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
       ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGING,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Characteristics
     this.Battery.Service
@@ -104,7 +107,6 @@ export class RobotVacuumCleaner extends deviceBase {
       .onGet(() => {
         return this.Battery.ChargingState;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
@@ -227,12 +229,15 @@ export class RobotVacuumCleaner extends deviceBase {
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/device/waterdetector.ts

@@ -51,6 +51,7 @@ export class WaterDetector extends deviceBase {
     this.WaterDetectorUpdateInProgress = false;
 
     // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
       Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
       Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
@@ -58,6 +59,7 @@ export class WaterDetector extends deviceBase {
       StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
       ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGEABLE,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Characteristic
     this.Battery.Service
@@ -73,7 +75,6 @@ export class WaterDetector extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.Battery.Name = this.Battery.Name;
 
     // Initialize Leak Sensor Service
     if (device.waterdetector?.hide_leak) {
@@ -81,12 +82,14 @@ export class WaterDetector extends deviceBase {
       this.LeakSensor!.Service = this.accessory.getService(this.hap.Service.LeakSensor) as Service;
       accessory.removeService(this.LeakSensor!.Service);
     } else {
+      accessory.context.LeakSensor = accessory.context.LeakSensor ?? {};
       this.LeakSensor = {
         Name: accessory.context.LeakSensor.Name ?? `${accessory.displayName} Leak Sensor`,
         Service: accessory.getService(this.hap.Service.LeakSensor) ?? this.accessory.addService(this.hap.Service.LeakSensor) as Service,
         StatusActive: accessory.context.StatusActive ?? false,
         LeakDetected: accessory.context.LeakDetected ?? this.hap.Characteristic.LeakDetected.LEAK_NOT_DETECTED,
       };
+      accessory.context.LeakSensor = this.LeakSensor as object;
 
       // Initialize LeakSensor Characteristic
       this.LeakSensor!.Service
@@ -96,7 +99,6 @@ export class WaterDetector extends deviceBase {
         .onGet(() => {
           return this.LeakSensor!.LeakDetected;
         });
-      accessory.context.LeakSensor.Name = this.LeakSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -181,12 +183,15 @@ export class WaterDetector extends deviceBase {
     const version = deviceStatus.body.version?.toString();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
     if (deviceStatus.body.version) {
-      this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+      const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
+        .updateValue(deviceVersion);
+      this.accessory.context.deviceVersion = deviceVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
     }
   }
 

package/src/irdevice/airconditioner.ts

@@ -64,9 +64,7 @@ export class AirConditioner extends irdeviceBase {
 
 
     // Initialize HeaterCooler Service
-    if (!accessory.context.HeaterCooler) {
-      accessory.context.HeaterCooler = {};
-    }
+    accessory.context.HeaterCooler = accessory.context.HeaterCooler ?? {};
     this.HeaterCooler = {
       Name: accessory.context.HeaterCooler.Name ?? `${accessory.displayName} ${device.remoteType}`,
       Service: accessory.getService(this.hap.Service.HeaterCooler) ?? accessory.addService(this.hap.Service.HeaterCooler) as Service,
@@ -77,7 +75,7 @@ export class AirConditioner extends irdeviceBase {
       ThresholdTemperature: accessory.context.ThresholdTemperature ?? 24,
       RotationSpeed: accessory.context.RotationSpeed ?? 4,
     };
-
+    accessory.context.HeaterCooler = this.HeaterCooler as object;
 
     this.HeaterCooler.Service
       .setCharacteristic(this.hap.Characteristic.Name, this.HeaterCooler.Name)
@@ -145,18 +143,19 @@ export class AirConditioner extends irdeviceBase {
         return await this.RotationSpeedGet();
       })
       .onSet(this.RotationSpeedSet.bind(this));
-    accessory.context.HeaterCooler.Name = this.HeaterCooler.Name;
 
     // Initialize HumiditySensor property
 
     if (this.device.irair?.meterType && this.device.irair?.meterId) {
       const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
       this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
+      accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name:  this.meter!.displayName,
+        Name:  accessory.context.HumiditySensor ?? this.meter!.displayName,
         Service: this.meter!.getService(this.hap.Service.HumiditySensor) ?? this.meter!.addService(this.hap.Service.HumiditySensor) as Service,
         CurrentRelativeHumidity: this.meter!.context.CurrentRelativeHumidity || 0,
       };
+      accessory.context.HumiditySensor = this.HumiditySensor as object;
     }
 
     if (this.device.irair?.meterType && this.device.irair?.meterId) {

package/src/irdevice/airpurifier.ts

@@ -56,11 +56,8 @@ export class AirPurifier extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
-    if (!accessory.context.AirPurifier) {
-      accessory.context.AirPurifier = {};
-    }
-
-    // Initialize AirPurifier property
+    // Initialize AirPurifier Service
+    accessory.context.AirPurifier = accessory.context.AirPurifier ?? {};
     this.AirPurifier = {
       Name: accessory.context.AirPurifier.Name ?? `${accessory.displayName} Air Purifier`,
       Service: accessory.getService(this.hap.Service.AirPurifier) ?? accessory.addService(this.hap.Service.AirPurifier) as Service,
@@ -69,6 +66,7 @@ export class AirPurifier extends irdeviceBase {
       CurrentAirPurifierState: accessory.context.CurrentAirPurifierState ?? this.hap.Characteristic.CurrentAirPurifierState.INACTIVE,
       TargetAirPurifierState: accessory.context.TargetAirPurifierState ?? this.hap.Characteristic.TargetAirPurifierState.AUTO,
     };
+    accessory.context.AirPurifier = this.AirPurifier as object;
 
     this.AirPurifier.Service
       .setCharacteristic(this.hap.Characteristic.Name, this.AirPurifier.Name)
@@ -90,17 +88,15 @@ export class AirPurifier extends irdeviceBase {
         return this.AirPurifier.TargetAirPurifierState;
       })
       .onSet(this.TargetAirPurifierStateSet.bind(this));
-    accessory.context.AirPurifier.Name = this.AirPurifier.Name;
 
-    if (!accessory.context.TemperatureSensor) {
-      accessory.context.TemperatureSensor = {};
-    }
-    // Initialize TemperatureSensor property
+    // Initialize TemperatureSensor Service
+    accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
     this.TemperatureSensor = {
       Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
       Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? accessory.addService(this.hap.Service.TemperatureSensor) as Service,
       CurrentTemperature: accessory.context.CurrentTemperature || 24,
     };
+    accessory.context.TemperatureSensor = this.TemperatureSensor as object;
 
     this.TemperatureSensor.Service
       .setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
@@ -108,7 +104,6 @@ export class AirPurifier extends irdeviceBase {
       .onGet(() => {
         return this.TemperatureSensor.CurrentTemperature;
       });
-    accessory.context.TemperatureSensor.Name = this.TemperatureSensor.Name;
   }
 
   async ActiveSet(value: CharacteristicValue): Promise<void> {

package/src/irdevice/camera.ts

@@ -30,15 +30,14 @@ export class Camera extends irdeviceBase {
   ) {
     super(platform, accessory, device);
 
-    if (!accessory.context.Switch) {
-      accessory.context.Switch = {};
-    }
-    // Initialize Switch property
+    // Initialize Switch Service
+    accessory.context.Switch = accessory.context.Switch ?? {};
     this.Switch = {
       Name: accessory.context.Switch.Name ?? `${accessory.displayName} Camera`,
       Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
       On: accessory.context.On ?? false,
     };
+    accessory.context.Switch = this.Switch as object;
 
     this.Switch.Service
       .setCharacteristic(this.hap.Characteristic.Name, this.Switch.Name)
@@ -47,7 +46,6 @@ export class Camera extends irdeviceBase {
         return this.Switch.On;
       })
       .onSet(this.OnSet.bind(this));
-    accessory.context.Switch.Name = this.Switch.Name;
   }
 
   async OnSet(value: CharacteristicValue): Promise<void> {