Merge branch 'main' into dev

src/camera-manager/camera.ts

@@ -222,6 +222,7 @@ export class Camera {
   protected _stateChangeHandler = (difference: HassStateDifference): void => {
     this._eventCallback?.({
       cameraID: this.getID(),
+      id: difference.entityID,
       type: isTriggeredState(difference.newState.state) ? 'new' : 'end',
     });
   };

src/camera-manager/frigate/camera.ts

@@ -477,7 +477,7 @@ export class FrigateCamera extends Camera {
 
     this._eventCallback?.({
       cameraID,
-
+      id: ev.after.id,
       fidelity: 'high',
       type: ev.type,
       // In cases where there are both clip and snapshot media, ensure to only

src/camera-manager/frigate/types.ts

@@ -98,6 +98,7 @@ export type PTZInfo = z.infer<typeof ptzInfoSchema>;
 
 const frigateEventChangeBeforeAfterSchema = z.object({
   camera: z.string(),
+  id: z.string(),
   snapshot: z
     .object({
       frame_time: z.number(),

src/camera-manager/types.ts

@@ -151,6 +151,10 @@ export interface EngineOptions {
 export interface CameraEvent {
   cameraID: string;
 
+  // Source ID (e.g. entity ID or Frigate event ID), used to determine what has
+  // triggered/untriggered.
+  id: string;
+
   type:
     | 'new' // A new event has started.
     | 'update' // An update for an event is available (except GenAI).