BaseAccessory -> HomeKitAccessory

Author: mpatfield

src/homebridge/platform.ts

@@ -2,7 +2,7 @@ import { API, DynamicPlatformPlugin, Logger, PlatformAccessory } from 'homebridg
 
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
 
-import { BaseAccessory } from '../homekit/abstract/base.js';
+import { HomeKitAccessory } from '../homekit/abstract/base.js';
 import { GroupAccessory } from '../homekit/abstract/group.js';
 import { createAccessory, createIdentifier } from '../homekit/abstract/helper.js';
 
@@ -23,7 +23,7 @@ export class HomebridgeEasyMQTT implements DynamicPlatformPlugin {
   private readonly log: Log;
 
   private readonly platformAccessories: Map<string, PlatformAccessory> = new Map();
-  private readonly accessories: (BaseAccessory<BaseAccessoryConfig> | GroupAccessory)[] = [];
+  private readonly accessories: (HomeKitAccessory<BaseAccessoryConfig> | GroupAccessory)[] = [];
 
   constructor(
     logger: Logger,

src/homekit/abstract/base.ts

@@ -13,7 +13,7 @@ import { BaseAccessoryConfig, MQTTAccessoryDependency } from '../../model/types.
 
 import getVersion from '../../tools/version.js';
 
-export abstract class BaseAccessory<C extends BaseAccessoryConfig = BaseAccessoryConfig> extends MQTTAccessory<C> {
+export abstract class HomeKitAccessory<C extends BaseAccessoryConfig = BaseAccessoryConfig> extends MQTTAccessory<C> {
 
   constructor(dependency: MQTTAccessoryDependency<C>) {
     super(dependency);

src/homekit/abstract/group.ts

@@ -1,4 +1,4 @@
-import { BaseAccessory } from './base.js';
+import { HomeKitAccessory } from './base.js';
 
 import { AccessoryDependency, BaseAccessoryConfig } from '../../model/types.js';
 
@@ -8,7 +8,7 @@ import getVersion from '../../tools/version.js';
 
 export class GroupAccessory {
 
-  private readonly accessories: (BaseAccessory<BaseAccessoryConfig>)[] = [];
+  private readonly accessories: (HomeKitAccessory<BaseAccessoryConfig>)[] = [];
 
   constructor(
     dependency: AccessoryDependency,

src/homekit/abstract/helper.ts

@@ -1,4 +1,4 @@
-import { BaseAccessory } from './base.js';
+import { HomeKitAccessory } from './base.js';
 
 import { strings } from '../../i18n/i18n.js';
 
@@ -47,7 +47,7 @@ export function createAccessory(
   dependency: Types.AccessoryDependency,
   config: Types.BaseAccessoryConfig,
   isGrouped: boolean = false,
-): BaseAccessory | undefined {
+): HomeKitAccessory | undefined {
 
   const mqttDependency: Types.MQTTAccessoryDependency<Types.BaseAccessoryConfig> =
   { ...dependency, config, isGrouped };

src/homekit/button/button.ts

@@ -1,6 +1,6 @@
 import { PrimitiveTypes, Service } from 'homebridge';
 
-import { BaseAccessory } from '../abstract/base.js';
+import { HomeKitAccessory } from '../abstract/base.js';
 
 import { strings } from '../../i18n/i18n.js';
 
@@ -19,7 +19,7 @@ class Button {
   ) { }
 }
 
-export abstract class ButtonAccessory<C extends ButtonConfig = ButtonConfig> extends BaseAccessory<C> {
+export abstract class ButtonAccessory<C extends ButtonConfig = ButtonConfig> extends HomeKitAccessory<C> {
 
   private _singlePressValues?: PrimitiveTypes[];
   private _doublePressValues?: PrimitiveTypes[];

src/homekit/climate/temperatureControl.ts

@@ -1,6 +1,7 @@
 import { CharacteristicValue } from 'homebridge';
 
-import { BaseAccessory } from '../abstract/base.js';
+import { HomeKitAccessory } from '../abstract/base.js';
+
 import { strings } from '../../i18n/i18n.js';
 
 import { HKCharacteristicKey } from '../../model/enums.js';
@@ -13,7 +14,7 @@ export const DEFAULT_TEMPERATURE = 10;
 const DEFAULT_COOLING_THRESHOLD = 25;
 const DEFAULT_HEATING_THRESHOLD = 20;
 
-export abstract class TemperatureControlAccessory<C extends TemperatureControlConfig = TemperatureControlConfig> extends BaseAccessory<C> {
+export abstract class TemperatureControlAccessory<C extends TemperatureControlConfig = TemperatureControlConfig> extends HomeKitAccessory<C> {
 
   constructor(dependency: MQTTAccessoryDependency<C>) {
     super(dependency);

src/homekit/lock.ts

@@ -1,6 +1,6 @@
 import { CharacteristicValue, PrimitiveTypes } from 'homebridge';
 
-import { BaseAccessory } from './abstract/base.js';
+import { HomeKitAccessory } from './abstract/base.js';
 
 import { strings } from '../i18n/i18n.js';
 
@@ -9,7 +9,7 @@ import { LockConfig, MQTTAccessoryDependency } from '../model/types.js';
 
 import { LogType } from '../tools/log.js';
 
-export class LockMechanismAccessory<C extends LockConfig = LockConfig> extends BaseAccessory<C> {
+export class LockMechanismAccessory<C extends LockConfig = LockConfig> extends HomeKitAccessory<C> {
 
   protected getAccessoryType(): AccessoryType {
     return AccessoryType.LockMechanism;

src/homekit/onoff/onoff.ts

@@ -1,4 +1,4 @@
-import { BaseAccessory } from '../abstract/base.js';
+import { HomeKitAccessory } from '../abstract/base.js';
 
 import { EVE_EPOCH, EveCharacteristic } from '../characteristic/eve.js';
 
@@ -12,7 +12,7 @@ import { HOUR, SECOND } from '../../tools/time.js';
 
 type LastConsumption = { time: number, value: number};
 
-export abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends BaseAccessory<C> {
+export abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends HomeKitAccessory<C> {
 
   private lastConsumption?: LastConsumption;
 

src/homekit/position/position.ts

@@ -1,12 +1,13 @@
-import { BaseAccessory } from '../abstract/base.js';
+import { HomeKitAccessory } from '../abstract/base.js';
+
 import { strings } from '../../i18n/i18n.js';
 
 import { HKCharacteristicKey } from '../../model/enums.js';
 import { MQTTAccessoryDependency, PositionConfig } from '../../model/types.js';
 
 import { LogType } from '../../tools/log.js';
 
-export abstract class PositionAccessory<C extends PositionConfig = PositionConfig> extends BaseAccessory<C> {
+export abstract class PositionAccessory<C extends PositionConfig = PositionConfig> extends HomeKitAccessory<C> {
 
   constructor(dependency: MQTTAccessoryDependency<C>) {
     super(dependency);

src/homekit/security.ts

@@ -1,6 +1,6 @@
 import { CharacteristicValue, PrimitiveTypes } from 'homebridge';
 
-import { BaseAccessory } from './abstract/base.js';
+import { HomeKitAccessory } from './abstract/base.js';
 
 import { strings } from '../i18n/i18n.js';
 
@@ -9,7 +9,7 @@ import { MQTTAccessoryDependency, SecurityConfig } from '../model/types.js';
 
 import { LogType } from '../tools/log.js';
 
-export class SecuritySystemAccessory extends BaseAccessory<SecurityConfig> {
+export class SecuritySystemAccessory extends HomeKitAccessory<SecurityConfig> {
 
   private readonly STATES: Map<keyof SecurityConfig, number>;
   private readonly CURRENT_STRINGS: Map<CharacteristicValue, string>;