Refactor main types.ts .

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

@@ -1,22 +1,8 @@
 import { HomeAssistant } from 'custom-card-helpers';
-import { CameraConfig, ExtendedHomeAssistant } from '../../types';
-import { ViewMedia } from '../../view/media';
-import {
-  CameraManagerMediaCapabilities,
-  DataQuery,
-  EventQuery,
-  PartialEventQuery,
-  CameraConfigs,
-  CameraManagerCameraCapabilities,
-  QueryType,
-  CameraEndpoint,
-} from '../types';
-import { EntityRegistryManager } from '../../utils/ha/entity-registry';
-import { CameraManagerEngine } from '../engine';
-import { GenericCameraManagerEngine } from '../generic/engine-generic';
-import { CameraInitializationError } from '../error';
+import { CameraConfig } from '../../config/types';
 import { localize } from '../../localize/localize';
-import { Entity } from '../../utils/ha/entity-registry/types';
+import { ExtendedHomeAssistant } from '../../types';
+import { canonicalizeHAURL } from '../../utils/ha';
 import { BrowseMediaManager } from '../../utils/ha/browse-media/browse-media-manager';
 import {
   BROWSE_MEDIA_CACHE_SECONDS,
@@ -24,12 +10,27 @@ import {
   MEDIA_CLASS_VIDEO,
   RichBrowseMedia,
 } from '../../utils/ha/browse-media/types';
-import { BrowseMediaMetadata } from './types';
-import { rangesOverlap } from '../range';
+import { EntityRegistryManager } from '../../utils/ha/entity-registry';
+import { Entity } from '../../utils/ha/entity-registry/types';
 import { ResolvedMediaCache, resolveMedia } from '../../utils/ha/resolved-media';
-import { canonicalizeHAURL } from '../../utils/ha';
+import { ViewMedia } from '../../view/media';
 import { RequestCache } from '../cache';
+import { CameraManagerEngine } from '../engine';
+import { CameraInitializationError } from '../error';
+import { GenericCameraManagerEngine } from '../generic/engine-generic';
+import { rangesOverlap } from '../range';
+import {
+  CameraConfigs,
+  CameraEndpoint,
+  CameraManagerCameraCapabilities,
+  CameraManagerMediaCapabilities,
+  DataQuery,
+  EventQuery,
+  PartialEventQuery,
+  QueryType,
+} from '../types';
 import { BrowseMediaViewMediaFactory } from './media';
+import { BrowseMediaMetadata } from './types';
 
 /**
  * A utility method to determine if a browse media object matches against a

src/camera-manager/engine-factory.ts

@@ -1,6 +1,6 @@
 import { HomeAssistant } from 'custom-card-helpers';
+import { CameraConfig } from '../config/types';
 import { localize } from '../localize/localize';
-import { CameraConfig } from '../types';
 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';

src/camera-manager/engine.ts

@@ -1,11 +1,23 @@
 import { HomeAssistant } from 'custom-card-helpers';
-import { CameraConfig, ExtendedHomeAssistant } from '../types';
+import { CameraConfig } from '../config/types';
+import { ExtendedHomeAssistant } from '../types';
 import { EntityRegistryManager } from '../utils/ha/entity-registry';
 import { ViewMedia } from '../view/media';
 import {
+  CameraConfigs,
+  CameraEndpoint,
+  CameraEndpoints,
+  CameraEndpointsContext,
+  CameraManagerCameraCapabilities,
+  CameraManagerCameraMetadata,
+  CameraManagerMediaCapabilities,
   DataQuery,
+  Engine,
+  EngineOptions,
   EventQuery,
   EventQueryResultsMap,
+  MediaMetadataQuery,
+  MediaMetadataQueryResultsMap,
   PartialEventQuery,
   PartialRecordingQuery,
   PartialRecordingSegmentsQuery,
@@ -14,17 +26,6 @@ import {
   RecordingQueryResultsMap,
   RecordingSegmentsQuery,
   RecordingSegmentsQueryResultsMap,
-  CameraManagerCameraCapabilities,
-  CameraManagerMediaCapabilities,
-  CameraManagerCameraMetadata,
-  CameraEndpointsContext,
-  CameraConfigs,
-  Engine,
-  CameraEndpoints,
-  MediaMetadataQuery,
-  MediaMetadataQueryResultsMap,
-  EngineOptions,
-  CameraEndpoint,
 } from './types';
 
 export const CAMERA_MANAGER_ENGINE_EVENT_LIMIT_DEFAULT = 10000;

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

@@ -9,8 +9,9 @@ import orderBy from 'lodash-es/orderBy';
 import throttle from 'lodash-es/throttle';
 import uniq from 'lodash-es/uniq';
 import uniqWith from 'lodash-es/uniqWith';
+import { CameraConfig } from '../../config/types';
 import { localize } from '../../localize/localize';
-import { CameraConfig, ExtendedHomeAssistant } from '../../types';
+import { ExtendedHomeAssistant } from '../../types';
 import {
   allPromises,
   formatDate,

src/camera-manager/frigate/media.ts

@@ -1,12 +1,12 @@
 import fromUnixTime from 'date-fns/fromUnixTime';
 import isEqual from 'lodash-es/isEqual';
-import { CameraConfig } from '../../types';
+import { CameraConfig } from '../../config/types';
 import {
-  ViewMedia,
   EventViewMedia,
   RecordingViewMedia,
-  ViewMediaType,
   VideoContentType,
+  ViewMedia,
+  ViewMediaType,
 } from '../../view/media';
 import { FrigateEvent, FrigateRecording } from './types';
 import {

src/camera-manager/frigate/util.ts

@@ -1,5 +1,6 @@
 import utcToZonedTime from 'date-fns-tz/utcToZonedTime';
-import { CameraConfig, ClipsOrSnapshots } from '../../types';
+import { CameraConfig } from '../../config/types';
+import { ClipsOrSnapshots } from '../../types';
 import { formatDateAndTime, prettifyTitle } from '../../utils/basic';
 import { FrigateEvent, FrigateRecording } from './types';
 

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

@@ -1,35 +1,36 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 import { HomeAssistant } from 'custom-card-helpers';
-import { CameraConfig, ExtendedHomeAssistant } from '../../types';
+import { CameraConfig } from '../../config/types';
+import { ExtendedHomeAssistant } from '../../types';
+import { getEntityIcon, getEntityTitle } from '../../utils/ha';
+import { EntityRegistryManager } from '../../utils/ha/entity-registry';
 import { ViewMedia } from '../../view/media';
+import { CameraManagerEngine } from '../engine';
 import {
+  CameraConfigs,
+  CameraEndpoint,
+  CameraEndpoints,
+  CameraEndpointsContext,
+  CameraManagerCameraCapabilities,
   CameraManagerCameraMetadata,
   CameraManagerMediaCapabilities,
   DataQuery,
+  Engine,
+  EngineOptions,
   EventQuery,
   EventQueryResultsMap,
+  MediaMetadataQuery,
+  MediaMetadataQueryResultsMap,
   PartialEventQuery,
   PartialRecordingQuery,
   PartialRecordingSegmentsQuery,
+  QueryReturnType,
+  RecordingQuery,
   RecordingQueryResultsMap,
   RecordingSegmentsQuery,
   RecordingSegmentsQueryResultsMap,
-  CameraEndpointsContext,
-  CameraConfigs,
-  RecordingQuery,
-  QueryReturnType,
-  CameraManagerCameraCapabilities,
-  Engine,
-  CameraEndpoints,
-  MediaMetadataQuery,
-  MediaMetadataQueryResultsMap,
-  EngineOptions,
-  CameraEndpoint,
 } from '../types';
-import { getEntityIcon, getEntityTitle } from '../../utils/ha';
-import { EntityRegistryManager } from '../../utils/ha/entity-registry';
-import { CameraManagerEngine } from '../engine';
 
 export class GenericCameraManagerEngine implements CameraManagerEngine {
   public getEngineType(): Engine {

src/camera-manager/manager.ts

@@ -3,9 +3,9 @@ import add from 'date-fns/add';
 import cloneDeep from 'lodash-es/cloneDeep';
 import merge from 'lodash-es/merge.js';
 import sum from 'lodash-es/sum';
+import { CameraConfig, CamerasConfig } from '../config/types.js';
 import { MEDIA_CHUNK_SIZE_DEFAULT } from '../const.js';
 import { localize } from '../localize/localize.js';
-import { CameraConfig, CamerasConfig } from '../types.js';
 import { allPromises, arrayify, setify } from '../utils/basic.js';
 import { getCameraID } from '../utils/camera.js';
 import { CardCameraAPI } from '../utils/card-controller/types.js';
@@ -17,14 +17,23 @@ import { CameraManagerEngine } from './engine.js';
 import { CameraInitializationError } from './error.js';
 import { CameraManagerReadOnlyConfigStore, CameraManagerStore } from './store.js';
 import {
-  CameraEndpoint, CameraEndpoints, CameraEndpointsContext, CameraManagerCameraCapabilities,
+  CameraEndpoint,
+  CameraEndpoints,
+  CameraEndpointsContext,
+  CameraManagerCameraCapabilities,
   CameraManagerCameraMetadata,
   CameraManagerCapabilities,
-  CameraManagerMediaCapabilities, DataQuery, Engine, EngineOptions, EventQuery,
+  CameraManagerMediaCapabilities,
+  DataQuery,
+  Engine,
+  EngineOptions,
+  EventQuery,
   EventQueryResults,
   EventQueryResultsMap,
-  MediaMetadata, MediaMetadataQuery,
-  MediaMetadataQueryResults, MediaQuery,
+  MediaMetadata,
+  MediaMetadataQuery,
+  MediaMetadataQueryResults,
+  MediaQuery,
   PartialDataQuery,
   PartialEventQuery,
   PartialQueryConcreteType,
@@ -40,7 +49,7 @@ import {
   RecordingSegmentsQuery,
   RecordingSegmentsQueryResults,
   RecordingSegmentsQueryResultsMap,
-  ResultsMap
+  ResultsMap,
 } from './types.js';
 import { sortMedia } from './util.js';
 

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

@@ -1,6 +1,30 @@
 import { HomeAssistant } from 'custom-card-helpers';
-import { CameraConfig } from '../../types';
+import add from 'date-fns/add';
+import endOfDay from 'date-fns/endOfDay';
+import parse from 'date-fns/parse';
+import startOfDay from 'date-fns/startOfDay';
+import orderBy from 'lodash-es/orderBy';
+import { CameraConfig } from '../../config/types';
+import { allPromises, formatDate, isValidDate } from '../../utils/basic';
+import {
+  BrowseMediaStep,
+  BrowseMediaTarget,
+} from '../../utils/ha/browse-media/browse-media-manager';
+import {
+  BROWSE_MEDIA_CACHE_SECONDS,
+  BrowseMedia,
+  MEDIA_CLASS_IMAGE,
+  MEDIA_CLASS_VIDEO,
+  RichBrowseMedia,
+} from '../../utils/ha/browse-media/types';
 import { ViewMedia } from '../../view/media';
+import {
+  BrowseMediaCameraManagerEngine,
+  getViewMediaFromBrowseMediaArray,
+  isMediaWithinDates,
+} from '../browse-media/engine-browse-media';
+import { BrowseMediaMetadata } from '../browse-media/types';
+import { CAMERA_MANAGER_ENGINE_EVENT_LIMIT_DEFAULT } from '../engine';
 import {
   CameraConfigs,
   CameraEndpoint,
@@ -19,32 +43,8 @@ import {
   QueryResultsType,
   QueryReturnType,
 } from '../types';
-import { CAMERA_MANAGER_ENGINE_EVENT_LIMIT_DEFAULT } from '../engine';
-import {
-  BrowseMediaStep,
-  BrowseMediaTarget,
-} from '../../utils/ha/browse-media/browse-media-manager';
-import { allPromises, formatDate, isValidDate } from '../../utils/basic';
-import endOfDay from 'date-fns/endOfDay';
-import {
-  BROWSE_MEDIA_CACHE_SECONDS,
-  BrowseMedia,
-  MEDIA_CLASS_IMAGE,
-  MEDIA_CLASS_VIDEO,
-  RichBrowseMedia,
-} from '../../utils/ha/browse-media/types';
-import parse from 'date-fns/parse';
-import { MotionEyeEventQueryResults } from './types';
-import orderBy from 'lodash-es/orderBy';
-import startOfDay from 'date-fns/startOfDay';
-import add from 'date-fns/add';
-import {
-  BrowseMediaCameraManagerEngine,
-  getViewMediaFromBrowseMediaArray,
-  isMediaWithinDates,
-} from '../browse-media/engine-browse-media';
-import { BrowseMediaMetadata } from '../browse-media/types';
 import motioneyeLogo from './assets/motioneye-logo.svg';
+import { MotionEyeEventQueryResults } from './types';
 
 class MotionEyeQueryResultsClassifier {
   public static isMotionEyeEventQueryResults(

src/camera-manager/store.ts

@@ -1,4 +1,4 @@
-import { CameraConfig } from '../types';
+import { CameraConfig } from '../config/types';
 import { ViewMedia } from '../view/media';
 import { CameraManagerEngine } from './engine';
 import { CameraConfigs, Engine } from './types';

src/camera-manager/types.ts

@@ -1,4 +1,4 @@
-import { CameraConfig, FrigateCardView } from '../types';
+import { CameraConfig, FrigateCardView } from '../config/types';
 import { ViewMedia } from '../view/media';
 
 // ====

src/camera-manager/util.ts

@@ -1,13 +1,13 @@
-import startOfHour from 'date-fns/startOfHour';
-import endOfHour from 'date-fns/endOfHour';
-import startOfDay from 'date-fns/startOfDay';
 import endOfDay from 'date-fns/endOfDay';
+import endOfHour from 'date-fns/endOfHour';
 import endOfMinute from 'date-fns/endOfMinute';
-import { DateRange } from './range';
+import startOfDay from 'date-fns/startOfDay';
+import startOfHour from 'date-fns/startOfHour';
 import orderBy from 'lodash-es/orderBy';
 import uniqBy from 'lodash-es/uniqBy';
+import { CameraConfig } from '../config/types';
 import { ViewMedia } from '../view/media';
-import { CameraConfig } from '../types';
+import { DateRange } from './range';
 
 export const convertRangeToCacheFriendlyTimes = (
   range: DateRange,