Fix incorrect engine detection.

src/camera-manager/engine-factory.ts

@@ -10,6 +10,7 @@ import { MemoryRequestCache, RecordingSegmentsCache, RequestCache } from './cach
 import { CameraManagerEngine } from './engine';
 import { CameraInitializationError } from './error';
 import { Engine } from './types';
+import { getCameraEntityFromConfig } from './util';
 
 export class CameraManagerEngineFactory {
   protected _entityRegistryManager: EntityRegistryManager;
@@ -63,16 +64,22 @@ export class CameraManagerEngineFactory {
       engine = Engine.Frigate;
     } else if (cameraConfig.engine === 'motioneye') {
       engine = Engine.MotionEye;
+    } else if (cameraConfig.engine === 'generic') {
+      engine = Engine.Generic;
     } else if (cameraConfig.engine === 'auto') {
-      const cameraEntity = cameraConfig.camera_entity;
+      const cameraEntity = getCameraEntityFromConfig(cameraConfig);
 
       if (cameraEntity) {
         let entity: Entity | null;
         try {
           entity = await this._entityRegistryManager.getEntity(hass, cameraEntity);
         } catch (e) {
-          // Throw a slightly friendlier exception (as a typo in the entity is
-          // likely to be a common failure mode).
+          // 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]) {
+            return Engine.Generic;
+          }
+          // Otherwise, it's probably a typo so throw an exception.
           throw new CameraInitializationError(
             localize('error.no_camera_entity'),
             cameraConfig,

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

@@ -81,6 +81,7 @@ import uniq from 'lodash-es/uniq';
 import format from 'date-fns/format';
 import { GenericCameraManagerEngine } from '../generic/engine-generic';
 import frigateLogo from './assets/frigate-logo-dark.svg';
+import { getCameraEntityFromConfig } from '../util';
 
 const EVENT_REQUEST_CACHE_MAX_AGE_SECONDS = 60;
 const RECORDING_SUMMARY_REQUEST_CACHE_MAX_AGE_SECONDS = 60;
@@ -153,12 +154,13 @@ export class FrigateCameraManagerEngine
       cameraConfig.triggers.motion || cameraConfig.triggers.occupancy;
 
     let entity: Entity | null = null;
+    const cameraEntity = getCameraEntityFromConfig(cameraConfig);
 
     // Entity information is required if the Frigate camera name is missing, or
     // if the entity requires automatic resolution of motion/occupancy sensors.
-    if (cameraConfig.camera_entity && (!hasCameraName || hasAutoTriggers)) {
+    if (cameraEntity && (!hasCameraName || hasAutoTriggers)) {
       try {
-        entity = await entityRegistryManager.getEntity(hass, cameraConfig.camera_entity);
+        entity = await entityRegistryManager.getEntity(hass, cameraEntity);
       } catch (e) {
         throw new CameraInitializationError(
           localize('error.no_camera_entity'),

src/camera-manager/util.ts

@@ -7,6 +7,7 @@ import { DateRange } from './range';
 import orderBy from 'lodash-es/orderBy';
 import uniqBy from 'lodash-es/uniqBy';
 import { ViewMedia } from '../view/media';
+import { CameraConfig } from '../types';
 
 export const convertRangeToCacheFriendlyTimes = (
   range: DateRange,
@@ -53,3 +54,7 @@ export const sortMedia = (mediaArray: ViewMedia[]): ViewMedia[] => {
     'asc',
   );
 };
+
+export const getCameraEntityFromConfig = (cameraConfig: CameraConfig): string | null => {
+  return cameraConfig.camera_entity ?? cameraConfig.webrtc_card?.entity ?? null;
+};