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

package/src/device/contact.ts

@@ -57,12 +57,14 @@ export class Contact extends deviceBase {
     this.doContactUpdate = new Subject();
     this.contactUpdateInProgress = false;
 
-    // Initialize Contact Sensor property
+    // Initialize Contact Sensor Service
+    accessory.context.ContactSensor = accessory.context.ContactSensor ?? {};
     this.ContactSensor = {
-      Name: accessory.context.ContactSensorName ?? accessory.displayName,
+      Name: accessory.context.ContactSensor.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.ContactSensor) ?? 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 ContactSensor Characteristics
     this.ContactSensor.Service
@@ -72,15 +74,16 @@ export class Contact extends deviceBase {
       .onGet(() => {
         return this.ContactSensor.ContactSensorState;
       });
-    accessory.context.ContactSensorName = this.ContactSensor.Name;
 
-    // Initialize Battery property
+    // 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
@@ -97,7 +100,6 @@ export class Contact extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize Motion Sensor Service
     if (this.device.contact?.hide_motionsensor) {
@@ -105,11 +107,13 @@ export class Contact extends deviceBase {
       this.MotionSensor!.Service = accessory.getService(this.hap.Service.MotionSensor) as Service;
       accessory.removeService(this.MotionSensor!.Service);
     } else {
+      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;
 
       // Motion Sensor Characteristics
       this.MotionSensor.Service
@@ -119,7 +123,6 @@ export class Contact extends deviceBase {
         .onGet(() => {
           return this.MotionSensor!.MotionDetected;
         });
-      accessory.context.MotionSensorName = this.MotionSensor.Name;
     }
 
     // Initialize Light Sensor Service
@@ -128,11 +131,13 @@ export class Contact extends deviceBase {
       this.LightSensor!.Service = 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) ?? accessory.addService(this.hap.Service.LightSensor) as Service,
         CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
       };
+      accessory.context.LightSensor = this.LightSensor as object;
 
       // Light Sensor Characteristics
       this.LightSensor.Service
@@ -142,7 +147,6 @@ export class Contact extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel;
         });
-      accessory.context.LightSensorName = this.LightSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -305,12 +309,15 @@ export class Contact 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/curtain.ts

@@ -422,10 +422,8 @@ export class Curtain extends deviceBase {
     } else {
       this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
     }
-    this.debugLog(
-      `${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
-      + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`,
-    );
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+      + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
   }
 
   async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
@@ -505,12 +503,15 @@ export class Curtain 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/device.ts

@@ -68,10 +68,10 @@ export abstract class deviceBase {
     accessory
       .getService(this.hap.Service.AccessoryInformation)!
       .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-      .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
-      .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.context.name)
-      .setCharacteristic(this.hap.Characteristic.Model, accessory.context.model)
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, accessory.context.deviceId);
+      .setCharacteristic(this.hap.Characteristic.Name, device.deviceName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, device.deviceName)
+      .setCharacteristic(this.hap.Characteristic.Model, device.model!)
+      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
   }
 
   async getDeviceLogSettings(device: device & devicesConfig): Promise<void> {
@@ -539,29 +539,55 @@ export abstract class deviceBase {
         device.bleModel = SwitchBotBLEModel.Unknown;
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Model: ${device.model}, BLE Model: ${device.bleModel}`);
     }
-    accessory.context.name = device.deviceName;
     accessory.context.model = device.model;
-    accessory.context.deviceId = device.deviceId;
-    accessory.context.deviceType = device.deviceType;
 
+    let deviceFirmwareVersion: string;
     if (device.firmware) {
-      accessory.context.version = device.firmware;
-    } else if (device.firmware === undefined && device.version === undefined && accessory.context.version === undefined) {
-      device.version = this.platform.version;
-      accessory.context.version = this.platform.version;
+      deviceFirmwareVersion = device.firmware;
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 1 FirmwareRevision: ${device.firmware}`);
+    } else if (device.version) {
+      deviceFirmwareVersion = device.version;
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 2 FirmwareRevision: ${device.version}`);
+    } else if (accessory.context.deviceVersion) {
+      deviceFirmwareVersion = accessory.context.deviceVersion;
+      this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 3 FirmwareRevision: ${accessory.context.deviceVersion}`);
     } else {
-      accessory.context.version = device.version?.replace(/^V|-.*$/g, '');
+      deviceFirmwareVersion = this.platform.version ?? '0.0.0';
+      if (this.platform.version) {
+        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 4 FirmwareRevision: ${this.platform.version}`);
+      } else {
+        this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} 5 FirmwareRevision: ${deviceFirmwareVersion}`);
+      }
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${accessory.context.version}`);
-    if (accessory.context.version) {
+    if (device.deviceType === 'Blind Tilt') {
+      // Firmware Version
+      const version = deviceFirmwareVersion.toString();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+      const replace = version?.replace(/^V|-.*$/g, '');
+      const match = replace?.match(/.{1,1}/g);
+      const blindTiltVersion = match?.join('.') ?? '0.0.0';
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.HardwareRevision, blindTiltVersion)
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, blindTiltVersion)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(blindTiltVersion);
+      this.accessory.context.deviceVersion = blindTiltVersion;
+      this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
+    } else {
+      // Firmware Version
+      const version = deviceFirmwareVersion.toString();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware 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.HardwareRevision, accessory.context.version)
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, 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}`);
     }
-    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} Context: ${JSON.stringify(accessory.context)}`);
   }
 
   async statusCode(statusCode: number): Promise<void> {

package/src/device/fan.ts

@@ -44,13 +44,15 @@ export class Fan extends deviceBase {
     this.plugUpdateInProgress = false;
 
     // Initialize Fan Service
+    accessory.context.Fan = accessory.context.Fan ?? {};
     this.Fan = {
-      Name: accessory.context.FanName ?? accessory.displayName,
+      Name: accessory.context.Fan.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Fanv2) ?? accessory.addService(this.hap.Service.Fanv2) as Service,
       Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
       SwingMode: accessory.context.SwingMode ?? this.hap.Characteristic.SwingMode.SWING_DISABLED,
       RotationSpeed: accessory.context.RotationSpeed ?? 0,
     };
+    accessory.context.Fan = this.Fan as object;
 
     // Initialize Fan Service
     this.Fan.Service
@@ -75,16 +77,17 @@ export class Fan extends deviceBase {
         return this.Fan.SwingMode;
       })
       .onSet(this.SwingModeSet.bind(this));
-    accessory.context.FanName = this.Fan.Name;
 
-    // Initialize Battery property
+    // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.BatteryName ?? accessory.displayName,
+      Name: accessory.context.Battery.Name ?? accessory.displayName,
       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 Service
     this.Battery.Service
@@ -107,7 +110,6 @@ export class Fan extends deviceBase {
       .onGet(() => {
         return this.Battery.StatusLowBattery;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
@@ -243,12 +245,15 @@ export class Fan 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/hub.ts

@@ -52,11 +52,13 @@ export class Hub 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 ?? 0,
       };
+      accessory.context.TemperatureSensor = this.TemperatureSensor as object;
 
       // Initialize Temperature Sensor Characteristic
       this.TemperatureSensor.Service
@@ -72,7 +74,6 @@ export class Hub extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature;
         });
-      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
 
     // Initialize Humidity Sensor Service
@@ -81,11 +82,13 @@ export class Hub 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 ?? 0,
       };
+      accessory.context.HumiditySensor = this.HumiditySensor as object;
 
       // Initialize Humidity Sensor Characteristics
       this.HumiditySensor!.Service
@@ -97,7 +100,6 @@ export class Hub extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity;
         });
-      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Initialize Light Sensor Service
@@ -106,11 +108,13 @@ export class Hub 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 Light Sensor Characteristics
       this.LightSensor!.Service
@@ -122,7 +126,6 @@ export class Hub extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel;
         });
-      accessory.context.LightSensorName = this.LightSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -213,12 +216,15 @@ export class Hub 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/humidifier.ts

@@ -48,8 +48,9 @@ export class Humidifier extends deviceBase {
     this.humidifierUpdateInProgress = false;
 
     // Initialize the HumidifierDehumidifier Service
+    accessory.context.HumidifierDehumidifier = accessory.context.HumidifierDehumidifier ?? {};
     this.HumidifierDehumidifier = {
-      Name: accessory.context.HumidifierDehumidifierName ?? accessory.displayName,
+      Name: accessory.context.HumidifierDehumidifier.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.HumidifierDehumidifier)
         ?? accessory.addService(this.hap.Service.HumidifierDehumidifier) as Service,
       Active: accessory.context.Active ?? this.hap.Characteristic.Active.ACTIVE,
@@ -61,6 +62,7 @@ export class Humidifier extends deviceBase {
         ?? this.hap.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE,
       RelativeHumidityHumidifierThreshold: accessory.context.RelativeHumidityHumidifierThreshold ?? 50,
     };
+    accessory.context.HumidifierDehumidifier = this.HumidifierDehumidifier as object;
 
     // Initialize the HumidifierDehumidifier Characteristics
     this.HumidifierDehumidifier.Service
@@ -98,7 +100,6 @@ export class Humidifier extends deviceBase {
         return this.HumidifierDehumidifier.RelativeHumidityHumidifierThreshold;
       })
       .onSet(this.RelativeHumidityHumidifierThresholdSet.bind(this));
-    accessory.context.HumidifierDehumidifierName = this.HumidifierDehumidifier.Name;
 
     // Initialize the Temperature Sensor Service
     if (device.humidifier?.hide_temperature) {
@@ -106,11 +107,13 @@ export class Humidifier 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 the Temperature Sensor Characteristics
       this.TemperatureSensor.Service
@@ -125,7 +128,6 @@ export class Humidifier extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature;
         });
-      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -269,12 +271,15 @@ export class Humidifier 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/iosensor.ts

@@ -52,13 +52,15 @@ export class IOSensor extends deviceBase {
     this.doIOSensorUpdate = new Subject();
     this.ioSensorUpdateInProgress = false;
 
-    // Initialize Battery property
+    // 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
@@ -82,11 +84,13 @@ export class IOSensor 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
@@ -102,7 +106,6 @@ export class IOSensor extends deviceBase {
         .onGet(() => {
           return this.TemperatureSensor!.CurrentTemperature;
         });
-      accessory.context.TemperatureSensorName = this.TemperatureSensor.Name;
     }
 
     // Initialize Humidity Sensor Service
@@ -111,11 +114,13 @@ export class IOSensor 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
@@ -127,7 +132,6 @@ export class IOSensor extends deviceBase {
         .onGet(() => {
           return this.HumiditySensor!.CurrentRelativeHumidity;
         });
-      accessory.context.HumiditySensorName = this.HumiditySensor.Name;
     }
 
     // Retrieve initial values and updateHomekit
@@ -228,16 +232,20 @@ export class IOSensor 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/lightstrip.ts

@@ -46,8 +46,9 @@ export class StripLight extends deviceBase {
     this.stripLightUpdateInProgress = false;
 
     // Initialize the 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,
       Hue: accessory.context.Hue ?? 0,
@@ -55,6 +56,7 @@ export class StripLight extends deviceBase {
       Brightness: accessory.context.Brightness ?? 0,
       ColorTemperature: accessory.context.ColorTemperature ?? 140,
     };
+    accessory.context.LightBulb = this.LightBulb as object;
 
     // Adaptive Lighting
     if (this.adaptiveLightingShift === -1 && this.accessory.context.adaptiveLighting) {
@@ -137,7 +139,6 @@ export class StripLight extends deviceBase {
         return this.LightBulb.Saturation;
       })
       .onSet(this.SaturationSet.bind(this));
-    accessory.context.LightBulbName = this.LightBulb.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();
@@ -333,12 +334,15 @@ export class StripLight 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}`);
     }
   }