refactor: Refactor entity register manager (#1597)

src/camera-manager/browse-media/camera.ts

@@ -1,7 +1,7 @@
 import { HomeAssistant } from '@dermotduffy/custom-card-helpers';
 import { localize } from '../../localize/localize';
-import { EntityRegistryManager } from '../../utils/ha/entity-registry';
-import { Entity } from '../../utils/ha/entity-registry/types';
+import { EntityRegistryManager } from '../../utils/ha/registry/entity';
+import { Entity } from '../../utils/ha/registry/entity/types';
 import { Camera, CameraInitializationOptions } from '../camera';
 import { CameraInitializationError } from '../error';
 

src/camera-manager/browse-media/engine-browse-media.ts

@@ -10,7 +10,7 @@ import {
   MEDIA_CLASS_VIDEO,
   RichBrowseMedia,
 } from '../../utils/ha/browse-media/types';
-import { EntityRegistryManager } from '../../utils/ha/entity-registry';
+import { EntityRegistryManager } from '../../utils/ha/registry/entity';
 import { ResolvedMediaCache, resolveMedia } from '../../utils/ha/resolved-media';
 import { ViewMedia } from '../../view/media';
 import { RequestCache } from '../cache';

src/camera-manager/engine-factory.ts

@@ -4,8 +4,7 @@ import { CameraConfig } from '../config/types';
 import { localize } from '../localize/localize';
 import { BrowseMediaManager } from '../utils/ha/browse-media/browse-media-manager';
 import { BrowseMedia } from '../utils/ha/browse-media/types';
-import { EntityRegistryManager } from '../utils/ha/entity-registry';
-import { Entity } from '../utils/ha/entity-registry/types';
+import { EntityRegistryManager } from '../utils/ha/registry/entity';
 import { ResolvedMediaCache } from '../utils/ha/resolved-media';
 import { MemoryRequestCache, RecordingSegmentsCache, RequestCache } from './cache';
 import { CameraManagerEngine } from './engine';
@@ -81,10 +80,8 @@ export class CameraManagerEngineFactory {
       const cameraEntity = getCameraEntityFromConfig(cameraConfig);
 
       if (cameraEntity) {
-        let entity: Entity | null;
-        try {
-          entity = await this._entityRegistryManager.getEntity(hass, cameraEntity);
-        } catch (e) {
+        const entity = await this._entityRegistryManager.getEntity(hass, cameraEntity);
+        if (!entity) {
           // If the camera is not in the registry, but is in the HA states it is
           // assumed to be a generic camera.
           if (hass.states[cameraEntity]) {

src/camera-manager/frigate/camera.ts

@@ -5,8 +5,8 @@ import { CameraConfig } from '../../config/types';
 import { localize } from '../../localize/localize';
 import { PTZCapabilities, PTZMovementType } from '../../types';
 import { errorToConsole } from '../../utils/basic';
-import { EntityRegistryManager } from '../../utils/ha/entity-registry';
-import { Entity } from '../../utils/ha/entity-registry/types';
+import { EntityRegistryManager } from '../../utils/ha/registry/entity';
+import { Entity } from '../../utils/ha/registry/entity/types';
 import { Camera, CameraInitializationOptions } from '../camera';
 import { Capabilities } from '../capabilities';
 import { CameraManagerEngine } from '../engine';
@@ -67,9 +67,8 @@ export class FrigateCamera extends Camera {
     // Entity information is required if the Frigate camera name is missing, or
     // if the entity requires automatic resolution of motion/occupancy sensors.
     if (cameraEntity && (!hasCameraName || hasAutoTriggers)) {
-      try {
-        entity = await entityRegistryManager.getEntity(hass, cameraEntity);
-      } catch (e) {
+      entity = await entityRegistryManager.getEntity(hass, cameraEntity);
+      if (!entity) {
         throw new CameraInitializationError(localize('error.no_camera_entity'), config);
       }
     }

src/camera-manager/frigate/engine-frigate.ts

@@ -15,7 +15,7 @@ import {
   runWhenIdleIfSupported,
 } from '../../utils/basic';
 import { getEntityTitle } from '../../utils/ha';
-import { EntityRegistryManager } from '../../utils/ha/entity-registry';
+import { EntityRegistryManager } from '../../utils/ha/registry/entity';
 import { ViewMedia } from '../../view/media';
 import { ViewMediaClassifier } from '../../view/media-classifier';
 import { RecordingSegmentsCache, RequestCache } from '../cache';