@switchbot/homebridge-switchbot 3.6.1-beta.9 → 3.7.0

package/src/device/contact.ts

@@ -75,7 +75,7 @@ export class Contact extends deviceBase {
     // Initialize Contact Sensor Service
     accessory.context.ContactSensor = accessory.context.ContactSensor ?? {};
     this.ContactSensor = {
-      Name: accessory.context.ContactSensor.Name ?? accessory.displayName,
+      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,
     };
@@ -93,7 +93,7 @@ export class Contact extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -126,7 +126,7 @@ export class Contact extends deviceBase {
     } else {
       accessory.context.MotionSensor = accessory.context.MotionSensor ?? {};
       this.MotionSensor = {
-        Name: accessory.context.MotionSensor.Name ?? `${accessory.displayName} Motion Sensor`,
+        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,
       };
@@ -152,7 +152,7 @@ export class Contact extends deviceBase {
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {
-        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        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,
       };

package/src/device/curtain.ts

@@ -74,7 +74,7 @@ export class Curtain extends deviceBase {
     // Initialize WindowCovering Service
     accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
     this.WindowCovering = {
-      Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
+      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,
@@ -130,7 +130,7 @@ export class Curtain extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -169,7 +169,7 @@ export class Curtain extends deviceBase {
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {
-        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        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,
       };

package/src/device/device.ts

@@ -79,20 +79,13 @@ export abstract class deviceBase {
       .getService(this.hap.Service.AccessoryInformation)!
       .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
       .setCharacteristic(this.hap.Characteristic.AppMatchingIdentifier, 'id1087374760')
-      .setCharacteristic(this.hap.Characteristic.Name, this.validName(accessory, device))
-      .setCharacteristic(this.hap.Characteristic.ConfiguredName, this.validName(accessory, device))
-      .setCharacteristic(this.hap.Characteristic.Model, device.model ?? accessory.context.model)
-      .setCharacteristic(this.hap.Characteristic.ProductData, device.deviceId ?? accessory.context.deviceId)
+      .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.Model, device.model)
+      .setCharacteristic(this.hap.Characteristic.ProductData, device.deviceId)
       .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
   }
 
-  public validName(accessory: PlatformAccessory, device: device & devicesConfig) {
-    const Name = device.configDeviceName ?? device.deviceName ?? accessory.displayName;
-    const NameOfName = device.configDeviceName ? 'configDeviceName' : device.deviceName ? 'deviceName' : 'displayName';
-    const validName = this.validateAndCleanString(Name, NameOfName, Name);
-    return validName;
-  }
-
   async getDeviceLogSettings(accessory: PlatformAccessory, device: device & devicesConfig): Promise<void> {
     this.deviceLogging = this.platform.debugMode ? 'debugMode' : device.logging ?? this.config.logging ?? 'standard';
     const logging = this.platform.debugMode ? 'Debug Mode' : device.logging ? 'Device Config' : this.config.logging ? 'Platform Config' : 'Default';
@@ -444,9 +437,9 @@ export abstract class deviceBase {
       }
       Service.updateCharacteristic(Characteristic, CharacteristicValue);
       this.debugLog(`updateCharacteristic ${CharacteristicName}: ${CharacteristicValue}`);
-      this.debugWarnLog(`context before: ${this.accessory.context[CharacteristicName]}`);
+      this.debugWarnLog(`${CharacteristicName} context before: ${this.accessory.context[CharacteristicName]}`);
       this.accessory.context[CharacteristicName] = CharacteristicValue;
-      this.debugWarnLog(`context after: ${this.accessory.context[CharacteristicName]}`);
+      this.debugWarnLog(`${CharacteristicName} context after: ${this.accessory.context[CharacteristicName]}`);
     }
   }
 
@@ -772,32 +765,6 @@ export abstract class deviceBase {
     }
   }
 
-  /**
-   * Validate and clean a string value for a Name Characteristic.
- * @param displayName
- * @param name
- * @param value
- * @returns string value
- */
-  validateAndCleanString(displayName: string, name: string, value: string): string {
-    const validPattern = /^[a-zA-Z0-9][a-zA-Z0-9 ']*[a-zA-Z0-9]$/;
-    const invalidCharsPattern = /[^a-zA-Z0-9 ']/g;
-
-    if (!validPattern.test(value)) {
-      this.warnLog(`WARNING: The accessory '${displayName}' has an invalid '${name}' characteristic ('${value}'). Please use only alphanumeric,`
-              + ' space, and apostrophe characters. Ensure it starts and ends with an alphabetic or numeric character, and avoid emojis. This may'
-              + ' prevent the accessory from being added in the Home App or cause unresponsiveness.');
-
-      // Remove invalid characters
-      value = value.replace(invalidCharsPattern, '');
-
-      // Ensure it starts and ends with an alphanumeric character
-      value = value.replace(/^[^a-zA-Z0-9]+|[^a-zA-Z0-9]+$/g, '');
-    }
-
-    return value;
-  }
-
   /**
    * Logging for Device
    */
@@ -815,7 +782,7 @@ export abstract class deviceBase {
 
   async debugSuccessLog(...log: any[]): Promise<void> {
     if (await this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
+      if (await this.loggingIsDebug()) {
         this.log.success(`[DEBUG] ${this.device.deviceType}: ${this.accessory.displayName}`, String(...log));
       }
     }
@@ -829,7 +796,7 @@ export abstract class deviceBase {
 
   async debugWarnLog(...log: any[]): Promise<void> {
     if (await this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
+      if (await this.loggingIsDebug()) {
         this.log.warn(`[DEBUG] ${this.device.deviceType}: ${this.accessory.displayName}`, String(...log));
       }
     }
@@ -843,7 +810,7 @@ export abstract class deviceBase {
 
   async debugErrorLog(...log: any[]): Promise<void> {
     if (await this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
+      if (await this.loggingIsDebug()) {
         this.log.error(`[DEBUG] ${this.device.deviceType}: ${this.accessory.displayName}`, String(...log));
       }
     }
@@ -853,13 +820,17 @@ export abstract class deviceBase {
     if (await this.enablingDeviceLogging()) {
       if (this.deviceLogging === 'debug') {
         this.log.info(`[DEBUG] ${this.device.deviceType}: ${this.accessory.displayName}`, String(...log));
-      } else {
+      } else if (this.deviceLogging === 'debugMode') {
         this.log.debug(`${this.device.deviceType}: ${this.accessory.displayName}`, String(...log));
       }
     }
   }
 
+  async loggingIsDebug(): Promise<boolean> {
+    return this.deviceLogging === 'debugMode' || this.deviceLogging === 'debug';
+  }
+
   async enablingDeviceLogging(): Promise<boolean> {
-    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
+    return this.deviceLogging === 'debugMode' || this.deviceLogging === 'debug' || this.deviceLogging === 'standard';
   }
 }

package/src/device/fan.ts

@@ -68,7 +68,7 @@ export class Fan extends deviceBase {
     // Initialize Fan Service
     accessory.context.Fan = accessory.context.Fan ?? {};
     this.Fan = {
-      Name: accessory.context.Fan.Name ?? accessory.displayName,
+      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,
@@ -103,7 +103,7 @@ export class Fan extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? accessory.displayName,
+      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,
@@ -136,7 +136,7 @@ export class Fan extends deviceBase {
     // Initialize LightBulb Service
     accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     this.LightBulb = {
-      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      Name:   `${accessory.displayName} Night Light`,
       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,

package/src/device/hub.ts

@@ -72,7 +72,7 @@ export class Hub extends deviceBase {
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        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,
       };
@@ -104,7 +104,7 @@ export class Hub extends deviceBase {
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        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,
       };
@@ -132,7 +132,7 @@ export class Hub extends deviceBase {
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {
-        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        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,
       };

package/src/device/humidifier.ts

@@ -68,7 +68,7 @@ export class Humidifier extends deviceBase {
     // Initialize the HumidifierDehumidifier Service
     accessory.context.HumidifierDehumidifier = accessory.context.HumidifierDehumidifier ?? {};
     this.HumidifierDehumidifier = {
-      Name: accessory.context.HumidifierDehumidifier.Name ?? accessory.displayName,
+      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,
@@ -129,7 +129,7 @@ export class Humidifier extends deviceBase {
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        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,
       };

package/src/device/iosensor.ts

@@ -71,7 +71,7 @@ export class IOSensor extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -104,7 +104,7 @@ export class IOSensor extends deviceBase {
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        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,
       };
@@ -136,7 +136,7 @@ export class IOSensor extends deviceBase {
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        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,
       };

package/src/device/lightstrip.ts

@@ -69,7 +69,7 @@ export class StripLight extends deviceBase {
     // Initialize the LightBulb Service
     accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     this.LightBulb = {
-      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      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,

package/src/device/lock.ts

@@ -71,7 +71,7 @@ export class Lock extends deviceBase {
     // Initialize LockMechanism Service
     accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
     this.LockMechanism = {
-      Name: accessory.context.LockMechanism.Name ?? accessory.displayName,
+      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,
@@ -90,7 +90,7 @@ export class Lock extends deviceBase {
     // Initialize Battery property
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -122,7 +122,7 @@ export class Lock extends deviceBase {
     } else {
       accessory.context.ContactSensor = accessory.context.ContactSensor ?? {};
       this.ContactSensor = {
-        Name: accessory.context.ContactSensor.Name ?? `${accessory.displayName} Contact Sensor`,
+        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,
       };
@@ -148,7 +148,7 @@ export class Lock extends deviceBase {
     } else {
       accessory.context.Switch = accessory.context.Switch ?? {};
       this.Switch = {
-        Name: accessory.context.Switch.Name ?? `${accessory.displayName} Latch`,
+        Name: `${accessory.displayName} Latch`,
         Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
         On: accessory.context.On ?? false,
       };

package/src/device/meter.ts

@@ -66,7 +66,7 @@ export class Meter extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -98,7 +98,7 @@ export class Meter extends deviceBase {
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        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,
       };
@@ -129,14 +129,14 @@ export class Meter extends deviceBase {
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
+        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
+      this.HumiditySensor.Service
         .setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
         .setProps({

package/src/device/meterplus.ts

@@ -71,7 +71,7 @@ export class MeterPlus extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -103,7 +103,7 @@ export class MeterPlus extends deviceBase {
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
       this.TemperatureSensor = {
-        Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+        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,
       };
@@ -134,14 +134,14 @@ export class MeterPlus extends deviceBase {
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor.Name ?? `${accessory.displayName} Humidity Sensor`,
+        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
+      this.HumiditySensor.Service
         .setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
         .setProps({

package/src/device/motion.ts

@@ -70,7 +70,7 @@ export class Motion extends deviceBase {
     // Initialize Motion Sensor property
     accessory.context.MotionSensor = accessory.context.MotionSensor ?? {};
     this.MotionSensor = {
-      Name: accessory.context.MotionSensor.Name ?? `${accessory.displayName} Motion Sensor`,
+      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,
     };
@@ -78,18 +78,17 @@ export class Motion extends deviceBase {
 
     // Initialize Motion Sensor Characteristics
     this.MotionSensor.Service
-      .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.Name, this.MotionSensor.Name)
       .setCharacteristic(this.hap.Characteristic.StatusActive, true)
       .getCharacteristic(this.hap.Characteristic.MotionDetected)
       .onGet(() => {
         return this.MotionSensor.MotionDetected;
       });
-    accessory.context.MotionSensorName = this.MotionSensor.Name;
 
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -122,15 +121,15 @@ export class Motion extends deviceBase {
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
       this.LightSensor = {
-        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        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
-        .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor!.Name)
+      this.LightSensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name)
         .setCharacteristic(this.hap.Characteristic.StatusActive, true)
         .getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel)
         .onGet(() => {

package/src/device/plug.ts

@@ -50,7 +50,7 @@ export class Plug extends deviceBase {
     // Initialize Outlet Service
     accessory.context.Outlet = accessory.context.Outlet ?? {};
     this.Outlet = {
-      Name: accessory.context.Outlet.Name ?? accessory.displayName,
+      Name: accessory.displayName,
       Service: accessory.getService(this.hap.Service.Outlet) ?? accessory.addService(this.hap.Service.Outlet) as Service,
       On: accessory.context.On || false,
     };
@@ -58,7 +58,7 @@ export class Plug extends deviceBase {
 
     // Initialize Outlet Characteristics
     this.Outlet.Service
-      .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.Name, this.Outlet.Name)
       .getCharacteristic(this.hap.Characteristic.On)
       .onGet(() => {
         return this.Outlet.On;

package/src/device/robotvacuumcleaner.ts

@@ -64,7 +64,7 @@ export class RobotVacuumCleaner extends deviceBase {
     // Initialize Lightbulb Service
     accessory.context.LightBulb = accessory.context.LightBulb ?? {};
     this.LightBulb = {
-      Name: accessory.context.LightBulb.Name ?? accessory.displayName,
+      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,
@@ -73,7 +73,7 @@ export class RobotVacuumCleaner extends deviceBase {
 
     // Initialize LightBulb Characteristics
     this.LightBulb.Service
-      .setCharacteristic(this.hap.Characteristic.Name, accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.Name, this.LightBulb.Name)
       .getCharacteristic(this.hap.Characteristic.On)
       .onGet(() => {
         return this.LightBulb.On;
@@ -98,7 +98,7 @@ export class RobotVacuumCleaner extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,

package/src/device/waterdetector.ts

@@ -65,7 +65,7 @@ export class WaterDetector extends deviceBase {
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
     this.Battery = {
-      Name: accessory.context.Battery.Name ?? `${accessory.displayName} 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,
@@ -100,7 +100,7 @@ export class WaterDetector extends deviceBase {
     } else {
       accessory.context.LeakSensor = accessory.context.LeakSensor ?? {};
       this.LeakSensor = {
-        Name: accessory.context.LeakSensor.Name ?? `${accessory.displayName} Leak Sensor`,
+        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,

package/src/irdevice/airconditioner.ts

@@ -67,7 +67,7 @@ export class AirConditioner extends irdeviceBase {
     // Initialize HeaterCooler Service
     accessory.context.HeaterCooler = accessory.context.HeaterCooler ?? {};
     this.HeaterCooler = {
-      Name: accessory.context.HeaterCooler.Name ?? `${accessory.displayName} ${device.remoteType}`,
+      Name: accessory.displayName,
       Service: accessory.getService(this.hap.Service.HeaterCooler) ?? accessory.addService(this.hap.Service.HeaterCooler) as Service,
       Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
       CurrentHeaterCoolerState: accessory.context.CurrentHeaterCoolerState ?? this.hap.Characteristic.CurrentHeaterCoolerState.IDLE,
@@ -152,7 +152,7 @@ export class AirConditioner extends irdeviceBase {
       this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
       this.HumiditySensor = {
-        Name: accessory.context.HumiditySensor ?? this.meter!.displayName,
+        Name: 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,
       };
@@ -164,8 +164,9 @@ export class AirConditioner extends irdeviceBase {
       this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
     }
 
-    if (this.meter) {
-      this.HumiditySensor!.Service
+    if (this.meter && this.HumiditySensor) {
+      this.HumiditySensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
         .getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
         .onGet(async () => {
           return await this.CurrentRelativeHumidityGet();

package/src/irdevice/airpurifier.ts

@@ -60,7 +60,7 @@ export class AirPurifier extends irdeviceBase {
     // Initialize AirPurifier Service
     accessory.context.AirPurifier = accessory.context.AirPurifier ?? {};
     this.AirPurifier = {
-      Name: accessory.context.AirPurifier.Name ?? `${accessory.displayName} Air Purifier`,
+      Name: accessory.displayName,
       Service: accessory.getService(this.hap.Service.AirPurifier) ?? accessory.addService(this.hap.Service.AirPurifier) as Service,
       Active: accessory.context.Active ?? this.hap.Characteristic.Active.INACTIVE,
       RotationSpeed: accessory.context.RotationSpeed ?? 0,
@@ -94,7 +94,7 @@ export class AirPurifier extends irdeviceBase {
     // Initialize TemperatureSensor Service
     accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
     this.TemperatureSensor = {
-      Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
+      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,
     };

package/src/irdevice/camera.ts

@@ -34,7 +34,7 @@ export class Camera extends irdeviceBase {
     // Initialize Switch Service
     accessory.context.Switch = accessory.context.Switch ?? {};
     this.Switch = {
-      Name: accessory.context.Switch.Name ?? `${accessory.displayName} Camera`,
+      Name: accessory.displayName,
       Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch) as Service,
       On: accessory.context.On ?? false,
     };

package/src/irdevice/fan.ts

@@ -37,7 +37,7 @@ export class IRFan extends irdeviceBase {
     // Initialize Switch Service
     accessory.context.Fan = accessory.context.Fan ?? {};
     this.Fan = {
-      Name: accessory.context.Fan.Name ?? `${accessory.displayName} 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,