Pass protocol down to common

Author: mpatfield

src/accessory/abstract/common.ts

@@ -5,7 +5,7 @@ import {
 
 import { strings } from '../../i18n/i18n.js';
 
-import { CharacteristicKey, TimeUnits } from '../../model/enums.js';
+import { CharacteristicKey, Protocol, TimeUnits } from '../../model/enums.js';
 import { EveCharacteristic, isEveCharacteristic } from '../../model/eve.js';
 import { CharacteristicType, HapStatusErrorType, TemperatureConfig, TimeoutConfig } from '../../model/types.js';
 
@@ -34,6 +34,7 @@ export abstract class Common<C extends Assertable> {
 
   constructor(
     public readonly displayName: string,
+    private readonly protocol: Protocol,
   ) {}
 
   public teardown() {
@@ -69,6 +70,21 @@ export abstract class Common<C extends Assertable> {
     return assertType(this.log, this.displayName, expectedType, this.config, ...keys);
   }
 
+  protected ifHomeKit(perform: () => (void)) {
+    if (this.protocol === Protocol.HomeKit) {
+      perform();
+    }
+  }
+
+  protected bifurcate(homekit?: () => (void), matter?: () => (void)) {
+    switch (this.protocol) {
+    case Protocol.HomeKit:
+      return homekit?.();
+    case Protocol.Matter:
+      return matter?.();
+    }
+  }
+
   protected getRawValue(property: keyof C, assert: boolean = true): string | undefined {
 
     if (!property.toString().startsWith('value')) {

src/accessory/abstract/mqtt.ts

@@ -22,7 +22,7 @@ export abstract class MQTTAccessory<C extends MQTTAccessoryConfig> extends Commo
   constructor(
     protected readonly dependency: MQTTAccessoryDependency<C>,
   ) {
-    super(dependency.config.info.name);
+    super(dependency.config.info.name, dependency.protocol);
 
     this.mqttClient = MQTT.connect(dependency.log, dependency.config.mqtt, this.identifier, this.displayName, (client: MQTT) => {
       this.topicHandlers.forEach( topicHandler => {

src/accessory/addons/addon.ts

@@ -3,6 +3,7 @@ import { PrimitiveTypes, Service } from 'homebridge';
 import { Common } from '../abstract/common.js';
 import { MQTTAccessory } from '../abstract/mqtt.js';
 
+import { Protocol } from '../../model/enums.js';
 import { HomeKitAddonType } from '../../model/homekit.js';
 import { AddonConfig, CharacteristicType, HapStatusErrorType, MQTTAccessoryConfig } from '../../model/types.js';
 
@@ -50,7 +51,7 @@ export abstract class Addon<C extends AddonConfig> extends Common<C> {
     private readonly addonService: Service,
     private readonly addonConfig: C,
   ) {
-    super(parentAccessory.displayName);
+    super(parentAccessory.displayName, Protocol.HomeKit);
   }
 
   protected get service(): Service {