Refactor main types.ts .

src/components/live/live-go2rtc.ts

@@ -8,14 +8,10 @@ import {
 } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { CameraEndpoints } from '../../camera-manager/types.js';
+import { CameraConfig, MicrophoneConfig } from '../../config/types.js';
 import { localize } from '../../localize/localize';
 import liveMSEStyle from '../../scss/live-go2rtc.scss';
-import {
-  CameraConfig,
-  ExtendedHomeAssistant,
-  FrigateCardMediaPlayer,
-  MicrophoneConfig,
-} from '../../types.js';
+import { ExtendedHomeAssistant, FrigateCardMediaPlayer } from '../../types.js';
 import { getEndpointAddressOrDispatchError } from '../../utils/endpoint';
 import { setControlsOnVideo } from '../../utils/media.js';
 import { screenshotMedia } from '../../utils/screenshot.js';

src/components/live/live-ha.ts

@@ -2,12 +2,13 @@ import { HomeAssistant } from 'custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { createRef, Ref, ref } from 'lit/directives/ref.js';
-import liveHAStyle from '../../scss/live-ha.scss';
-import { CameraConfig, FrigateCardMediaPlayer } from '../../types.js';
-import { getStateObjOrDispatchError } from './live.js';
+import { CameraConfig } from '../../config/types';
 import '../../patches/ha-camera-stream';
 import '../../patches/ha-hls-player.js';
 import '../../patches/ha-web-rtc-player.ts';
+import liveHAStyle from '../../scss/live-ha.scss';
+import { FrigateCardMediaPlayer } from '../../types.js';
+import { getStateObjOrDispatchError } from './live.js';
 
 @customElement('frigate-card-live-ha')
 export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPlayer {
@@ -55,7 +56,7 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla
   }
 
   public async getScreenshotURL(): Promise<string | null> {
-    return await this._playerRef.value?.getScreenshotURL() ?? null;
+    return (await this._playerRef.value?.getScreenshotURL()) ?? null;
   }
 
   protected render(): TemplateResult | void {

src/components/live/live-image.ts

@@ -2,8 +2,9 @@ import { HomeAssistant } from 'custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { createRef, ref, Ref } from 'lit/directives/ref.js';
+import { CameraConfig } from '../../config/types';
 import basicBlockStyle from '../../scss/basic-block.scss';
-import { CameraConfig, FrigateCardMediaPlayer } from '../../types.js';
+import { FrigateCardMediaPlayer } from '../../types.js';
 import '../image.js';
 import { getStateObjOrDispatchError } from './live.js';
 

src/components/live/live-jsmpeg.ts

@@ -4,22 +4,18 @@ import { customElement, property } from 'lit/decorators.js';
 import { until } from 'lit/directives/until.js';
 import { CameraEndpoints } from '../../camera-manager/types.js';
 import { renderProgressIndicator } from '../../components/message.js';
+import { CameraConfig, CardWideConfig } from '../../config/types.js';
 import { localize } from '../../localize/localize.js';
 import liveJSMPEGStyle from '../../scss/live-jsmpeg.scss';
-import {
-  CameraConfig,
-  CardWideConfig,
-  ExtendedHomeAssistant,
-  FrigateCardMediaPlayer,
-} from '../../types.js';
+import { ExtendedHomeAssistant, FrigateCardMediaPlayer } from '../../types.js';
 import { getEndpointAddressOrDispatchError } from '../../utils/endpoint.js';
 import {
   dispatchMediaLoadedEvent,
   dispatchMediaPauseEvent,
   dispatchMediaPlayEvent,
 } from '../../utils/media-info.js';
-import { dispatchErrorMessageEvent } from '../message.js';
 import { Timer } from '../../utils/timer.js';
+import { dispatchErrorMessageEvent } from '../message.js';
 
 // Number of seconds a signed URL is valid for.
 const JSMPEG_URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60;

src/components/live/live-webrtc-card.ts

@@ -3,14 +3,10 @@ import { HomeAssistant } from 'custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { CameraEndpoints } from '../../camera-manager/types.js';
+import { CameraConfig, CardWideConfig } from '../../config/types.js';
 import { localize } from '../../localize/localize.js';
 import liveWebRTCCardStyle from '../../scss/live-webrtc-card.scss';
-import {
-  CameraConfig,
-  CardWideConfig,
-  FrigateCardError,
-  FrigateCardMediaPlayer,
-} from '../../types.js';
+import { FrigateCardError, FrigateCardMediaPlayer } from '../../types.js';
 import { mayHaveAudio } from '../../utils/audio.js';
 import {
   dispatchMediaLoadedEvent,

src/components/live/live.ts

@@ -17,28 +17,30 @@ import { createRef, Ref, ref } from 'lit/directives/ref.js';
 import { CameraManager } from '../../camera-manager/manager.js';
 import { CameraConfigs, CameraEndpoints } from '../../camera-manager/types.js';
 import {
-  ConditionsManagerEpoch,
-  getOverriddenConfig,
-} from '../../utils/card-controller/conditions-manager.js';
+  CameraConfig,
+  CardWideConfig,
+  frigateCardConfigDefaults,
+  LiveConfig,
+  LiveOverrides,
+  LiveProvider,
+  TransitionEffect,
+} from '../../config/types.js';
 import { localize } from '../../localize/localize.js';
 import basicBlockStyle from '../../scss/basic-block.scss';
 import liveCarouselStyle from '../../scss/live-carousel.scss';
 import liveProviderStyle from '../../scss/live-provider.scss';
 import {
-  CameraConfig,
-  CardWideConfig,
   ExtendedHomeAssistant,
-  frigateCardConfigDefaults,
   FrigateCardMediaPlayer,
-  LiveConfig,
-  LiveOverrides,
-  LiveProvider,
   MediaLoadedInfo,
   Message,
-  TransitionEffect,
 } from '../../types.js';
 import { stopEventFromActivatingCardWideActions } from '../../utils/action.js';
 import { contentsChanged } from '../../utils/basic.js';
+import {
+  ConditionsManagerEpoch,
+  getOverriddenConfig,
+} from '../../utils/card-controller/conditions-manager.js';
 import { CarouselSelected } from '../../utils/embla/carousel-controller.js';
 import { AutoLazyLoad } from '../../utils/embla/plugins/auto-lazy-load/auto-lazy-load.js';
 import { AutoMediaActions } from '../../utils/embla/plugins/auto-media-actions/auto-media-actions.js';