Lazy load history and eve characteristics

Author: mpatfield

src/accessory/abstract/mqtt.ts

@@ -160,6 +160,6 @@ export abstract class MQTTAccessory<C extends MQTTAccessoryConfig> extends Commo
   }
 
   protected recordHistory(type: HistoryType, entry: HistoryEntry, updateLastActivation: boolean = false): boolean {
-    return this.dependency.history.record(this, this.config.history, type, entry, updateLastActivation);
+    return this.dependency.history?.record(this, this.config.history, type, entry, updateLastActivation) === true;
   }
 }

src/homebridge/platform.ts

@@ -48,8 +48,6 @@ export class HomebridgeEasyMQTT implements DynamicPlatformPlugin {
       api.isMatterEnabled?.() === true ? 'Enabled' : 'Disabled',
     );
 
-    initEveCharacteristics(api);
-
     this.api.on('didFinishLaunching', () => {
       this.setup();
     });
@@ -88,12 +86,6 @@ export class HomebridgeEasyMQTT implements DynamicPlatformPlugin {
 
     const groups = new Map<string, BaseAccessoryConfig[]>();
 
-    const Service = this.api.hap.Service;
-    const Characteristic = this.api.hap.Characteristic;
-    const HapStatusError = this.api.hap.HapStatusError;
-
-    const history = new History(this.api, this.log);
-
     for (const accessoryConfig of this.config.accessories) {
 
       if (!assert(this.log, PLATFORM_NAME, accessoryConfig, 'info') ||
@@ -107,6 +99,8 @@ export class HomebridgeEasyMQTT implements DynamicPlatformPlugin {
 
       if (accessoryConfig.info.protocol === Protocol.HomeKit) {
 
+        initEveCharacteristics(this.api);
+
         const groupName = accessoryConfig.info.group;
         if (groupName !== undefined) {
 
@@ -121,12 +115,17 @@ export class HomebridgeEasyMQTT implements DynamicPlatformPlugin {
         const uuid = this.api.hap.uuid.generate(id);
 
         const homekitAccessory = this.createHomeKitAccessory(accessoryConfig.info.name, uuid);
+
+        const Service = this.api.hap.Service;
+        const Characteristic = this.api.hap.Characteristic;
+        const HapStatusError = this.api.hap.HapStatusError;
+
         const dependency: AccessoryDependency = {
-          protocol: Protocol.HomeKit,
+          protocol: accessoryConfig.info.protocol,
           getHomeKit: () => ({ Service, Characteristic, HapStatusError, accessory: homekitAccessory }),
           getMatter: () => undefined,
           log: this.log,
-          history: history,
+          history: History.instance(this.api, this.log),
         };
 
         const accessory = createAccessory(dependency, accessoryConfig);
@@ -165,12 +164,17 @@ export class HomebridgeEasyMQTT implements DynamicPlatformPlugin {
 
       const uuid = this.api.hap.uuid.generate(groupName);
       const homekitAccessory = this.createHomeKitAccessory(groupName, uuid);
+
+      const Service = this.api.hap.Service;
+      const Characteristic = this.api.hap.Characteristic;
+      const HapStatusError = this.api.hap.HapStatusError;
+
       const dependency: AccessoryDependency = {
         protocol: Protocol.HomeKit,
         getHomeKit: () => ({ Service, Characteristic, HapStatusError, accessory: homekitAccessory }),
         getMatter: () => undefined,
         log: this.log,
-        history: history,
+        history: History.instance(this.api, this.log),
       };
 
       const configs = groups.get(groupName)!;

src/model/eve.ts

@@ -22,7 +22,7 @@ let _EveHomeKitTypes: EveHomeKitTypes | undefined;
 export function initEveCharacteristics(api: API) {
 
   if (_EveHomeKitTypes) {
-    throw new Error('EveHomeKitTypes already initialized');
+    return;
   }
 
   _EveHomeKitTypes = new EveHomeKitTypes(api);

src/model/history.ts

@@ -55,12 +55,20 @@ function HistoryService(type: HistoryType, accessory: HomeKitAccessory, options?
 
 export class History {
 
+  private static _instance: History | undefined;
+  public static instance(api: API, log: Log) : History {
+    if (History._instance === undefined) {
+      History._instance = new History(api, log);
+    }
+    return History._instance;
+  }
+
   private readonly historyServices = new Map<string, HistoryService>();
   private readonly persistPath: string;
 
   private readonly cleanedUp = new Set<string>();
 
-  constructor(private readonly api: API, private readonly log: Log) {
+  private constructor(private readonly api: API, private readonly log: Log) {
 
     if (ServiceProvider) {
       throw new Error('HistoryServiceProvider already initialized');

src/model/types.ts

@@ -24,7 +24,7 @@ export type AccessoryDependency = {
   getHomeKit: GetHomeKit;
   getMatter: GetMatter,
   log: Log,
-  history: History,
+  history?: History,
 }
 
 export type MQTTAccessoryDependency<C extends MQTTAccessoryConfig> = AccessoryDependency & {