@switchbot/homebridge-switchbot 3.6.1-beta.13 → 3.6.1-beta.15

package/src/device/lock.ts

@@ -70,12 +70,8 @@ export class Lock extends deviceBase {
 
     // Initialize LockMechanism Service
     accessory.context.LockMechanism = accessory.context.LockMechanism ?? {};
-    if (accessory.context.LockMechanism.Name) {
-      accessory.context.LockMechanism.Name = this.validateAndCleanString(accessory.context.LockMechanism.Name,
-        'LockMechanism Name', accessory.context.LockMechanism.Name);
-    }
     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,
@@ -93,12 +89,8 @@ export class Lock extends deviceBase {
 
     // Initialize Battery property
     accessory.context.Battery = accessory.context.Battery ?? {};
-    if (accessory.context.Battery.Name) {
-      accessory.context.Battery.Name = this.validateAndCleanString(accessory.context.Battery.Name,
-        'Battery Name', accessory.context.Battery.Name);
-    }
     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,
@@ -129,12 +121,8 @@ export class Lock extends deviceBase {
       }
     } else {
       accessory.context.ContactSensor = accessory.context.ContactSensor ?? {};
-      if (accessory.context.ContactSensor.Name) {
-        accessory.context.ContactSensor.Name = this.validateAndCleanString(accessory.context.ContactSensor.Name,
-          'ContactSensor Name', accessory.context.ContactSensor.Name);
-      }
       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,
       };
@@ -159,12 +147,8 @@ export class Lock extends deviceBase {
       }
     } else {
       accessory.context.Switch = accessory.context.Switch ?? {};
-      if (accessory.context.Switch.Name) {
-        accessory.context.Switch.Name = this.validateAndCleanString(accessory.context.Switch.Name,
-          'Switch Name', accessory.context.Switch.Name);
-      }
       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

@@ -65,12 +65,8 @@ export class Meter extends deviceBase {
 
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
-    if (accessory.context.Battery.Name) {
-      accessory.context.Battery.Name = this.validateAndCleanString(accessory.context.Battery.Name,
-        'Battery Name', accessory.context.Battery.Name);
-    }
     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,
@@ -101,12 +97,8 @@ export class Meter extends deviceBase {
       }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
-      if (accessory.context.TemperatureSensor.Name) {
-        accessory.context.TemperatureSensor.Name = this.validateAndCleanString(accessory.context.TemperatureSensor.Name,
-          'TemperatureSensor Name', accessory.context.TemperatureSensor.Name);
-      }
       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,19 +128,15 @@ export class Meter extends deviceBase {
       }
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
-      if (accessory.context.HumiditySensor.Name) {
-        accessory.context.HumiditySensor.Name = this.validateAndCleanString(accessory.context.HumiditySensor.Name,
-          'HumiditySensor Name', accessory.context.HumiditySensor.Name);
-      }
       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

@@ -70,12 +70,8 @@ export class MeterPlus extends deviceBase {
 
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
-    if (accessory.context.Battery.Name) {
-      accessory.context.Battery.Name = this.validateAndCleanString(accessory.context.Battery.Name,
-        'Battery Name', accessory.context.Battery.Name);
-    }
     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,
@@ -106,12 +102,8 @@ export class MeterPlus extends deviceBase {
       }
     } else {
       accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
-      if (accessory.context.TemperatureSensor.Name) {
-        accessory.context.TemperatureSensor.Name = this.validateAndCleanString(accessory.context.TemperatureSensor.Name,
-          'TemperatureSensor Name', accessory.context.TemperatureSensor.Name);
-      }
       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,
       };
@@ -141,19 +133,15 @@ export class MeterPlus extends deviceBase {
       }
     } else {
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
-      if (accessory.context.HumiditySensor.Name) {
-        accessory.context.HumiditySensor.Name = this.validateAndCleanString(accessory.context.HumiditySensor.Name,
-          'HumiditySensor Name', accessory.context.HumiditySensor.Name);
-      }
       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

@@ -69,12 +69,8 @@ export class Motion extends deviceBase {
 
     // Initialize Motion Sensor property
     accessory.context.MotionSensor = accessory.context.MotionSensor ?? {};
-    if (accessory.context.MotionSensor.Name) {
-      accessory.context.MotionSensor.Name = this.validateAndCleanString(accessory.context.MotionSensor.Name,
-        'MotionSensor Name', accessory.context.MotionSensor.Name);
-    }
     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,
     };
@@ -88,16 +84,11 @@ export class Motion extends deviceBase {
       .onGet(() => {
         return this.MotionSensor.MotionDetected;
       });
-    accessory.context.MotionSensorName = this.MotionSensor.Name;
 
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
-    if (accessory.context.Battery.Name) {
-      accessory.context.Battery.Name = this.validateAndCleanString(accessory.context.Battery.Name,
-        'Battery Name', accessory.context.Battery.Name);
-    }
     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,
@@ -129,19 +120,15 @@ export class Motion extends deviceBase {
       }
     } else {
       accessory.context.LightSensor = accessory.context.LightSensor ?? {};
-      if (accessory.context.LightSensor.Name) {
-        accessory.context.LightSensor.Name = this.validateAndCleanString(accessory.context.LightSensor.Name,
-          'LightSensor Name', accessory.context.LightSensor.Name);
-      }
       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
+      this.LightSensor.Service
         .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name)
         .setCharacteristic(this.hap.Characteristic.StatusActive, true)
         .getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel)

package/src/device/plug.ts

@@ -49,12 +49,8 @@ export class Plug extends deviceBase {
 
     // Initialize Outlet Service
     accessory.context.Outlet = accessory.context.Outlet ?? {};
-    if (accessory.context.Outlet.Name) {
-      accessory.context.Outlet.Name = this.validateAndCleanString(accessory.context.Outlet.Name,
-        'Outlet Name', accessory.context.Outlet.Name);
-    }
     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,
     };

package/src/device/robotvacuumcleaner.ts

@@ -63,12 +63,8 @@ export class RobotVacuumCleaner extends deviceBase {
 
     // Initialize Lightbulb Service
     accessory.context.LightBulb = accessory.context.LightBulb ?? {};
-    if (accessory.context.LightBulb.Name) {
-      accessory.context.LightBulb.Name = this.validateAndCleanString(accessory.context.LightBulb.Name,
-        'LightBulb Name', accessory.context.LightBulb.Name);
-    }
     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,
@@ -101,12 +97,8 @@ export class RobotVacuumCleaner extends deviceBase {
 
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
-    if (accessory.context.Battery.Name) {
-      accessory.context.Battery.Name = this.validateAndCleanString(accessory.context.Battery.Name,
-        'Battery Name', accessory.context.Battery.Name);
-    }
     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

@@ -64,12 +64,8 @@ export class WaterDetector extends deviceBase {
 
     // Initialize Battery Service
     accessory.context.Battery = accessory.context.Battery ?? {};
-    if (accessory.context.Battery.Name) {
-      accessory.context.Battery.Name = this.validateAndCleanString(accessory.context.Battery.Name,
-        'Battery Name', accessory.context.Battery.Name);
-    }
     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,12 +99,8 @@ export class WaterDetector extends deviceBase {
       }
     } else {
       accessory.context.LeakSensor = accessory.context.LeakSensor ?? {};
-      if (accessory.context.LeakSensor.Name) {
-        accessory.context.LeakSensor.Name = this.validateAndCleanString(accessory.context.LeakSensor.Name,
-          'LeakSensor Name', accessory.context.LeakSensor.Name);
-      }
       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

@@ -66,12 +66,8 @@ export class AirConditioner extends irdeviceBase {
 
     // Initialize HeaterCooler Service
     accessory.context.HeaterCooler = accessory.context.HeaterCooler ?? {};
-    if (accessory.context.HeaterCooler.Name) {
-      accessory.context.HeaterCooler.Name = this.validateAndCleanString(accessory.context.HeaterCooler.Name,
-        'HeaterCooler Name', accessory.context.HeaterCooler.Name);
-    }
     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,
@@ -155,12 +151,8 @@ export class AirConditioner extends irdeviceBase {
       const meterUuid = this.platform.api.hap.uuid.generate(`${this.device.irair.meterId}-${this.device.irair.meterType}`);
       this.meter = this.platform.accessories.find((accessory) => accessory.UUID === meterUuid);
       accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
-      if (accessory.context.HumiditySensor.Name) {
-        accessory.context.HumiditySensor.Name = this.validateAndCleanString(accessory.context.HumiditySensor.Name,
-          'HumiditySensor Name', accessory.context.HumiditySensor.Name);
-      }
       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,
       };

package/src/irdevice/airpurifier.ts

@@ -59,12 +59,8 @@ export class AirPurifier extends irdeviceBase {
 
     // Initialize AirPurifier Service
     accessory.context.AirPurifier = accessory.context.AirPurifier ?? {};
-    if (accessory.context.AirPurifier.Name) {
-      accessory.context.AirPurifier.Name = this.validateAndCleanString(accessory.context.AirPurifier.Name,
-        'AirPurifier Name', accessory.context.AirPurifier.Name);
-    }
     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,
@@ -97,12 +93,8 @@ export class AirPurifier extends irdeviceBase {
 
     // Initialize TemperatureSensor Service
     accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
-    if (accessory.context.TemperatureSensor.Name) {
-      accessory.context.TemperatureSensor.Name = this.validateAndCleanString(accessory.context.TemperatureSensor.Name,
-        'TemperatureSensor Name', accessory.context.TemperatureSensor.Name);
-    }
     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

@@ -33,12 +33,8 @@ export class Camera extends irdeviceBase {
 
     // Initialize Switch Service
     accessory.context.Switch = accessory.context.Switch ?? {};
-    if (accessory.context.Switch.Name) {
-      accessory.context.Switch.Name = this.validateAndCleanString(accessory.context.Switch.Name,
-        'Switch Name', accessory.context.Switch.Name);
-    }
     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

@@ -36,12 +36,8 @@ export class IRFan extends irdeviceBase {
 
     // Initialize Switch Service
     accessory.context.Fan = accessory.context.Fan ?? {};
-    if (accessory.context.Fan.Name) {
-      accessory.context.Fan.Name = this.validateAndCleanString(accessory.context.Fan.Name,
-        'Fan Name', accessory.context.Fan.Name);
-    }
     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,

package/src/irdevice/irdevice.ts

@@ -43,18 +43,11 @@ export abstract class irdeviceBase {
       .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.Name, accessory.displayName)
+      .setCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName)
       .setCharacteristic(this.hap.Characteristic.Model, accessory.context.model ?? 'Unknown')
-      .setCharacteristic(this.hap.Characteristic.ProductData, accessory.context.deviceId)
-      .setCharacteristic(this.hap.Characteristic.SerialNumber, accessory.context.deviceId);
-  }
-
-  public validName(accessory: PlatformAccessory, device: irdevice & irDevicesConfig) {
-    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;
+      .setCharacteristic(this.hap.Characteristic.ProductData, device.deviceId)
+      .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId);
   }
 
   async getDeviceLogSettings(device: irdevice & irDevicesConfig): Promise<void> {
@@ -206,9 +199,9 @@ export abstract class irdeviceBase {
     } else {
       Service.updateCharacteristic(Characteristic, CharacteristicValue);
       await this.debugLog(`updateCharacteristic ${CharacteristicName}: ${CharacteristicValue}`);
-      await this.debugWarnLog(`context before: ${this.accessory.context[CharacteristicName]}`);
+      await this.debugWarnLog(`${CharacteristicName} context before: ${this.accessory.context[CharacteristicName]}`);
       this.accessory.context[CharacteristicName] = CharacteristicValue;
-      await this.debugWarnLog(`context after: ${this.accessory.context[CharacteristicName]}`);
+      await this.debugWarnLog(`${CharacteristicName} context after: ${this.accessory.context[CharacteristicName]}`);
     }
   }
 
@@ -353,32 +346,6 @@ export abstract class irdeviceBase {
     }
   }
 
-  /**
-   * 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
    */

package/src/irdevice/light.ts

@@ -48,12 +48,8 @@ export class Light extends irdeviceBase {
     if (!device.irlight?.stateless) {
       // Initialize LightBulb Service
       accessory.context.LightBulb = accessory.context.LightBulb ?? {};
-      if (accessory.context.LightBulb.Name) {
-        accessory.context.LightBulb.Name = this.validateAndCleanString(accessory.context.LightBulb.Name,
-          'LightBulb Name', accessory.context.LightBulb.Name);
-      }
       this.LightBulb = {
-        Name: accessory.context.LightBulb.Name ?? `${accessory.displayName} ${device.remoteType}`,
+        Name: accessory.displayName,
         Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb) as Service,
         On: accessory.context.On || false,
       };
@@ -69,12 +65,8 @@ export class Light extends irdeviceBase {
     } else {
       // Initialize ProgrammableSwitchOn Service
       accessory.context.ProgrammableSwitchOn = accessory.context.ProgrammableSwitchOn ?? {};
-      if (accessory.context.ProgrammableSwitchOn.Name) {
-        accessory.context.ProgrammableSwitchOn.Name = this.validateAndCleanString(accessory.context.ProgrammableSwitchOn.Name,
-          'ProgrammableSwitchOn Name', accessory.context.ProgrammableSwitchOn.Name);
-      }
       this.ProgrammableSwitchOn = {
-        Name: accessory.context.ProgrammableSwitchOn.Name ?? `${accessory.displayName} ${device.remoteType} On`,
+        Name: `${accessory.displayName} On`,
         Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
         ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch) as Service,
         ProgrammableSwitchEvent: accessory.context.ProgrammableSwitchEvent ?? this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,
@@ -104,12 +96,8 @@ export class Light extends irdeviceBase {
 
       // Initialize ProgrammableSwitchOff Service
       accessory.context.ProgrammableSwitchOff = accessory.context.ProgrammableSwitchOff ?? {};
-      if (accessory.context.ProgrammableSwitchOff.Name) {
-        accessory.context.ProgrammableSwitchOff.Name = this.validateAndCleanString(accessory.context.ProgrammableSwitchOff.Name,
-          'ProgrammableSwitchOff Name', accessory.context.ProgrammableSwitchOff.Name);
-      }
       this.ProgrammableSwitchOff = {
-        Name: accessory.context.ProgrammableSwitchOff.Name ?? `${accessory.displayName} ${device.remoteType} Off`,
+        Name: `${accessory.displayName} Off`,
         Service: accessory.getService(this.hap.Service.StatefulProgrammableSwitch)
         ?? accessory.addService(this.hap.Service.StatefulProgrammableSwitch) as Service,
         ProgrammableSwitchEvent: accessory.context.ProgrammableSwitchEvent ?? this.hap.Characteristic.ProgrammableSwitchEvent.SINGLE_PRESS,