@switchbot/homebridge-switchbot 3.5.0-beta.62 → 3.5.0-beta.64

package/src/device/blindtilt.ts

@@ -67,8 +67,9 @@ export class BlindTilt extends deviceBase {
     this.setNewTarget = false;
 
     // Initialize WindowCovering Service
+    accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
     this.WindowCovering = {
-      Name: accessory.context.WindowCoveringName ?? accessory.displayName,
+      Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering) as Service,
       PositionState: accessory.context.PositionState ?? this.hap.Characteristic.PositionState.STOPPED,
       TargetPosition: accessory.context.TargetPosition ?? 100,
@@ -76,6 +77,7 @@ export class BlindTilt extends deviceBase {
       TargetHorizontalTiltAngle: accessory.context.TargetHorizontalTiltAngle ?? 90,
       CurrentHorizontalTiltAngle: accessory.context.CurrentHorizontalTiltAngle ?? 90,
     };
+    accessory.context.WindowCovering = this.WindowCovering as object;
 
     // Initialize WindowCovering Characteristics
     this.WindowCovering.Service
@@ -117,7 +119,6 @@ export class BlindTilt extends deviceBase {
         return this.WindowCovering.TargetHorizontalTiltAngle;
       })
       .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
-    accessory.context.WindowCoveringName = this.WindowCovering.Name;
 
     // Initialize WindowCovering CurrentHorizontalTiltAngle Characteristic
     this.WindowCovering.Service
@@ -132,19 +133,20 @@ export class BlindTilt extends deviceBase {
       });
 
     // 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: 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 Name Characteristic
     this.Battery.Service
       .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
       .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
-    accessory.context.BatteryName = this.Battery.Name;
 
     // Initialize LightSensor Service
     if (device.blindTilt?.hide_lightsensor) {
@@ -152,11 +154,13 @@ export class BlindTilt 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;
 
       // Initialize LightSensor Characteristics
       this.LightSensor.Service
@@ -166,7 +170,6 @@ export class BlindTilt extends deviceBase {
         .onGet(() => {
           return this.LightSensor?.CurrentAmbientLightLevel ?? 0.0001;
         });
-      accessory.context.LightSensorName = this.LightSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/bot.ts

@@ -111,29 +111,32 @@ export class Bot extends deviceBase {
     this.doBotUpdate = new Subject();
     this.botUpdateInProgress = false;
 
+    accessory.context.Battery = accessory.context.Battery ?? {};
     // Initialize Battery property
     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
       .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
       .setCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery)
       .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
-    accessory.context.BatteryName = this.Battery.Name;
 
     // deviceType
     if (this.botDeviceType === 'switch') {
       // Initialize Switch Service
+      accessory.context.Switch = accessory.context.Switch ?? {};
       this.Switch = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.Switch.Name ?? accessory.displayName,
         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.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Switch`);
 
       // Initialize Switch Characteristics
@@ -145,7 +148,6 @@ export class Bot extends deviceBase {
           return this.Switch!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.Switch.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -159,11 +161,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'garagedoor') {
       // Initialize GarageDoor Service
+      accessory.context.GarageDoor = accessory.context.GarageDoor ?? {};
       this.GarageDoor = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.GarageDoor.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.GarageDoorOpener) ?? accessory.addService(this.hap.Service.GarageDoorOpener) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.GarageDoor = this.GarageDoor as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Garage Door Opener`);
 
       // Initialize GarageDoor Characteristics
@@ -180,7 +184,6 @@ export class Bot extends deviceBase {
           return this.GarageDoor!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.GarageDoor.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -194,11 +197,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'door') {
       // Initialize Door Service
+      accessory.context.Door = accessory.context.Door ?? {};
       this.Door = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.Door.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.Door) ?? accessory.addService(this.hap.Service.Door) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.Door = this.Door as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Door`);
 
       // Initialize Door Characteristics
@@ -215,7 +220,6 @@ export class Bot extends deviceBase {
           return this.Door!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.Door.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -229,11 +233,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'window') {
       // Initialize Window Service
+      accessory.context.Window = accessory.context.Window ?? {};
       this.Window = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.Window.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.Window) ?? accessory.addService(this.hap.Service.Window) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.Window = this.Window as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window`);
 
       // Initialize Window Characteristics
@@ -250,7 +256,6 @@ export class Bot extends deviceBase {
           return this.Window!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.Window.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -264,11 +269,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'windowcovering') {
       // Initialize WindowCovering Service
+      accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
       this.WindowCovering = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.WindowCovering = this.WindowCovering as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Window Covering`);
 
       // Initialize WindowCovering Characteristics
@@ -285,7 +292,6 @@ export class Bot extends deviceBase {
           return this.WindowCovering!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.WindowCovering.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -299,11 +305,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'lock') {
       // Initialize Lock Service
+      accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
       this.LockMechanism = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.LockMechanism.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.LockMechanism) ?? accessory.addService(this.hap.Service.LockMechanism) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.LockMechanism = this.LockMechanism as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Lock`);
 
       // Initialize Lock Characteristics
@@ -314,7 +322,6 @@ export class Bot extends deviceBase {
           return this.LockMechanism!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.LockMechanism.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -328,11 +335,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'faucet') {
       // Initialize Faucet Service
+      accessory.context.Faucet = accessory.context.Faucet ?? {};
       this.Faucet = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.Faucet.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.Faucet) ?? accessory.addService(this.hap.Service.Faucet) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.Faucet = this.Faucet as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Faucet`);
 
       // Initialize Faucet Characteristics
@@ -343,7 +352,6 @@ export class Bot extends deviceBase {
           return this.Faucet!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.Faucet.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -357,11 +365,13 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'fan') {
       // Initialize Fan Service
+      accessory.context.Fan = accessory.context.Fan ?? {};
       this.Fan = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.Fan.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.Fanv2) ?? accessory.addService(this.hap.Service.Fanv2) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.Fan = this.Fan as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Fan`);
 
       // Initialize Fan Characteristics
@@ -372,7 +382,6 @@ export class Bot extends deviceBase {
           return this.Fan!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.Fan.Name;
 
       // Remove other services
       this.removeLockService(accessory);
@@ -386,12 +395,14 @@ export class Bot extends deviceBase {
       this.removeStatefulProgrammableSwitchService(accessory);
     } else if (this.botDeviceType === 'stateful') {
       // Initialize StatefulProgrammableSwitch Service
+      accessory.context.StatefulProgrammableSwitch = accessory.context.StatefulProgrammableSwitch ?? {};
       this.StatefulProgrammableSwitch = {
-        Name: accessory.context.Name ?? accessory.displayName,
+        Name: accessory.context.StatefulProgrammableSwitch.Name ?? accessory.displayName,
         Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
           ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch) as Service,
         On: accessory.context.On ?? false,
       };
+      accessory.context.StatefulProgrammableSwitch = this.StatefulProgrammableSwitch as object;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Stateful Programmable Switch`);
 
       // Initialize StatefulProgrammableSwitch Characteristics
@@ -402,7 +413,6 @@ export class Bot extends deviceBase {
           return this.StatefulProgrammableSwitch!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.StatefulProgrammableSwitch.Name;
 
       // Remove other services
       this.removeFanService(accessory);
@@ -416,11 +426,13 @@ export class Bot extends deviceBase {
       this.removeWindowCoveringService(accessory);
     } else {
       // Initialize Switch property
+      accessory.context.Outlet = accessory.context.Outlet ?? {};
       this.Outlet = {
-        Name: accessory.context.Name ?? 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;
       this.debugWarnLog(`${this.device.deviceType}: ${accessory.displayName} Displaying as Outlet`);
 
       // Initialize Outlet Characteristics
@@ -431,7 +443,6 @@ export class Bot extends deviceBase {
           return this.Outlet!.On;
         })
         .onSet(this.OnSet.bind(this));
-      accessory.context.Name = this.Outlet.Name;
 
       // Remove other services
       this.removeFanService(accessory);

package/src/device/ceilinglight.ts

@@ -51,9 +51,10 @@ export class CeilingLight extends deviceBase {
     this.doCeilingLightUpdate = new Subject();
     this.ceilingLightUpdateInProgress = false;
 
-    // Initialize LightBulb property
+    // Initialize LightBulb Service
+    accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     this.LightBulb = {
-      Name: accessory.context.LightBulbName ?? accessory.displayName,
+      Name: accessory.context.LightBul.bName ?? 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,
@@ -61,6 +62,7 @@ export class CeilingLight 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 && accessory.context.adaptiveLighting) {
@@ -141,7 +143,6 @@ export class CeilingLight extends deviceBase {
         return this.LightBulb.Saturation;
       })
       .onSet(this.SaturationSet.bind(this));
-    accessory.context.LightBulbName = this.LightBulb.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();

package/src/device/colorbulb.ts

@@ -51,9 +51,8 @@ export class ColorBulb extends deviceBase {
     this.doColorBulbUpdate = new Subject();
     this.colorBulbUpdateInProgress = false;
 
-    accessory.context.LightBulb = {};
-
     // Initialize LightBulb property
+    accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     this.LightBulb = {
       Name: accessory.context.LightBulb.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
@@ -63,6 +62,8 @@ export class ColorBulb extends deviceBase {
       Brightness: accessory.context.Brightness ?? 0,
       ColorTemperature: accessory.context.ColorTemperature ?? 140,
     };
+    accessory.context.LightBulb = this.LightBulb as object;
+    this.errorLog(`${device.deviceType}: ${accessory.displayName} LightBulb Context: ${JSON.stringify(accessory.context.LightBulb)}`);
 
     // Adaptive Lighting
     if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {
@@ -139,7 +140,6 @@ export class ColorBulb extends deviceBase {
         return this.LightBulb.Saturation;
       })
       .onSet(this.SaturationSet.bind(this));
-    accessory.context.LightBulb.Name = this.LightBulb.Name;
 
     // Retrieve initial values and updateHomekit
     this.refreshStatus();

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

package/src/device/curtain.ts

@@ -59,15 +59,17 @@ export class Curtain extends deviceBase {
     this.curtainUpdateInProgress = false;
     this.setNewTarget = false;
 
-    // Initialize LightBulb property
+    // Initialize WindowCovering Service
+    accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
     this.WindowCovering = {
-      Name: accessory.context.WindowCoveringName ?? accessory.displayName,
+      Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
       Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering) as Service,
       PositionState: accessory.context.PositionState ?? this.hap.Characteristic.PositionState.STOPPED,
       TargetPosition: accessory.context.TargetPosition ?? 100,
       CurrentPosition: accessory.context.CurrentPosition ?? 100,
       HoldPosition: accessory.context.HoldPosition ?? false,
     };
+    accessory.context.WindowCovering = this.WindowCovering as object;
 
     // Initialize WindowCovering Service
     this.WindowCovering.Service.
@@ -77,7 +79,6 @@ export class Curtain extends deviceBase {
       .onGet(() => {
         return this.WindowCovering.PositionState;
       });
-    accessory.context.WindowCoveringName = this.WindowCovering.Name;
 
     // Initialize WindowCovering CurrentPosition
     this.WindowCovering.Service
@@ -114,14 +115,16 @@ export class Curtain extends deviceBase {
       })
       .onSet(this.HoldPositionSet.bind(this));
 
-    // 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,
       ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGING,
     };
+    accessory.context.Battery = this.Battery as object;
 
     // Initialize Battery Service
     this.Battery.Service
@@ -130,7 +133,6 @@ export class Curtain extends deviceBase {
       .onGet(() => {
         return this.Battery.BatteryLevel;
       });
-    accessory.context.BatteryName = this.Battery.Name;
 
     this.Battery.Service
       .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
@@ -150,11 +152,13 @@ export class Curtain 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 Characteristic
       this.LightSensor.Service
@@ -164,7 +168,6 @@ export class Curtain extends deviceBase {
         .onGet(() => {
           return this.LightSensor!.CurrentAmbientLightLevel!;
         });
-      accessory.context.LightSensorName = this.LightSensor.Name;
     }
 
     // Retrieve initial values and updateHomekit

package/src/device/device.ts

@@ -549,19 +549,19 @@ export abstract class deviceBase {
     } else if (device.firmware === undefined && device.version === undefined && accessory.context.version === undefined) {
       device.version = this.platform.version;
       accessory.context.version = this.platform.version;
-    } else {
+    } else if (accessory.context.device.version) {
+      accessory.context.version = accessory.context.device.version.replace(/^V|-.*$/g, '');
+    }else {
       accessory.context.version = device.version?.replace(/^V|-.*$/g, '');
     }
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${accessory.context.version}`);
-    if (accessory.context.version) {
-      this.accessory
-        .getService(this.hap.Service.AccessoryInformation)!
-        .setCharacteristic(this.hap.Characteristic.HardwareRevision, accessory.context.version)
-        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.version)
-        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-        .updateValue(this.accessory.context.version);
-    }
-    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} Context: ${JSON.stringify(accessory.context)}`);
+    this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${accessory.context.device.version}`);
+    this.accessory
+      .getService(this.hap.Service.AccessoryInformation)!
+      .setCharacteristic(this.hap.Characteristic.HardwareRevision, accessory.context.version)
+      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.version)
+      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+      .updateValue(accessory.context.version);
+    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} Context: ${JSON.stringify(accessory.context.device)}`);
   }
 
   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();