Refactor to avoid use of "all-static" classes.

src/card.ts

@@ -84,7 +84,7 @@ import {
   shouldUpdateBasedOnHass,
   sideLoadHomeAssistantElements
 } from './utils/ha';
-import { BrowseMediaUtil } from './utils/ha/browse-media.js';
+import { getEventID } from './utils/ha/browse-media.js';
 import { supportsFeature } from './utils/ha/update.js';
 import { isValidMediaShowInfo } from './utils/media-info.js';
 import { ResolvedMediaCache } from './utils/resolved-media.js';
@@ -915,7 +915,7 @@ export class FrigateCard extends LitElement {
       });
       return;
     }
-    const event_id = BrowseMediaUtil.getEventID(this._view.media);
+    const event_id = getEventID(this._view.media);
     if (!event_id) {
       this._setMessageAndUpdate({
         message: localize('error.download_no_event_id'),

src/components/gallery.ts

@@ -13,7 +13,11 @@ import { customElement, property } from 'lit/decorators.js';
 import galleryStyle from '../scss/gallery.scss';
 import { CameraConfig, frigateCardConfigDefaults, GalleryConfig } from '../types.js';
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
-import { BrowseMediaUtil } from '../utils/ha/browse-media.js';
+import {
+  fetchChildMediaAndDispatchViewChange,
+  fetchLatestMediaAndDispatchViewChange,
+  getFullDependentBrowseMediaQueryParametersOrDispatchError
+} from '../utils/ha/browse-media';
 import { View } from '../view.js';
 import { renderProgressIndicator } from './message.js';
 import './thumbnail.js';
@@ -51,7 +55,7 @@ export class FrigateCardGallery extends LitElement {
 
     if (!this.view.target) {
       const browseMediaQueryParameters =
-        BrowseMediaUtil.getFullDependentBrowseMediaQueryParametersOrDispatchError(
+        getFullDependentBrowseMediaQueryParametersOrDispatchError(
           this,
           this.hass,
           this.cameras,
@@ -63,7 +67,7 @@ export class FrigateCardGallery extends LitElement {
         return;
       }
 
-      BrowseMediaUtil.fetchLatestMediaAndDispatchViewChange(
+      fetchLatestMediaAndDispatchViewChange(
         this,
         this.hass,
         this.view,
@@ -216,7 +220,7 @@ export class FrigateCardGalleryCore extends LitElement {
                   <ha-card
                     @click=${(ev) => {
                       if (this.hass && this.view) {
-                        BrowseMediaUtil.fetchChildMediaAndDispatchViewChange(
+                        fetchChildMediaAndDispatchViewChange(
                           this,
                           this.hass,
                           this.view,

src/components/live.ts

@@ -38,7 +38,7 @@ import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
 import { contentsChanged } from '../utils/basic.js';
 import { getCameraIcon, getCameraTitle } from '../utils/camera.js';
 import { homeAssistantSignPath } from '../utils/ha';
-import { BrowseMediaUtil } from '../utils/ha/browse-media.js';
+import { getFullDependentBrowseMediaQueryParameters } from '../utils/ha/browse-media.js';
 import {
   dispatchExistingMediaShowInfoAsEvent,
   dispatchMediaShowEvent
@@ -125,7 +125,7 @@ export class FrigateCardLive extends LitElement {
     // Does not use getFullDependentBrowseMediaQueryParametersOrDispatchError to
     // ensure that non-Frigate cameras will work in live view (they will not
     // have a Frigate camera name).
-    const browseMediaParams = BrowseMediaUtil.getFullDependentBrowseMediaQueryParameters(
+    const browseMediaParams = getFullDependentBrowseMediaQueryParameters(
       this.hass,
       this.cameras,
       this.view.camera,

src/components/surround-thumbnails.ts

@@ -10,7 +10,10 @@ import {
   ThumbnailsControlConfig
 } from '../types.js';
 import { dispatchFrigateCardEvent } from '../utils/basic.js';
-import { BrowseMediaUtil } from '../utils/ha/browse-media.js';
+import {
+  getFirstTrueMediaChildIndex,
+  multipleBrowseMediaQueryMerged
+} from '../utils/ha/browse-media';
 import { View } from '../view.js';
 import { dispatchErrorMessageEvent } from './message.js';
 import './surround.js';
@@ -68,14 +71,11 @@ export class FrigateCardSurround extends LitElement {
     }
     let parent: FrigateBrowseMediaSource | null;
     try {
-      parent = await BrowseMediaUtil.multipleBrowseMediaQueryMerged(
+      parent = await multipleBrowseMediaQueryMerged(this.hass, browseMediaParams);
-        this.hass,
-        browseMediaParams,
-      );
     } catch (e) {
       return dispatchErrorMessageEvent(this, (e as Error).message);
     }
-    if (BrowseMediaUtil.getFirstTrueMediaChildIndex(parent) !== null) {
+    if (getFirstTrueMediaChildIndex(parent) !== null) {
       this.view
         ?.evolve({
           ...(this.targetView && { view: this.targetView }),

src/components/thumbnail-carousel.ts

@@ -7,7 +7,7 @@ import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss';
 import type { FrigateBrowseMediaSource, ThumbnailsControlConfig } from '../types.js';
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
 import { contentsChanged, dispatchFrigateCardEvent } from '../utils/basic.js';
-import { BrowseMediaUtil } from '../utils/ha/browse-media.js';
+import { isTrueMedia } from '../utils/ha/browse-media';
 import { View } from '../view.js';
 import { FrigateCardCarousel } from './carousel.js';
 import './thumbnail.js';
@@ -154,7 +154,7 @@ export class FrigateCardThumbnailCarousel extends FrigateCardCarousel {
     if (
       !parent.children ||
       !parent.children.length ||
-      !BrowseMediaUtil.isTrueMedia(parent.children[childIndex])
+      !isTrueMedia(parent.children[childIndex])
     ) {
       return;
     }

src/components/timeline.ts

@@ -37,7 +37,12 @@ import {
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
 import { dispatchFrigateCardEvent } from '../utils/basic.js';
 import { getCameraTitle } from '../utils/camera.js';
-import { BrowseMediaUtil } from '../utils/ha/browse-media.js';
+import {
+  createEventParentForChildren,
+  getBrowseMediaQueryParameters,
+  isTrueMedia,
+  multipleBrowseMediaQuery
+} from '../utils/ha/browse-media';
 import { View, ViewContext } from '../view';
 import { dispatchErrorMessageEvent, dispatchMessageEvent } from './message.js';
 import './surround-thumbnails.js';
@@ -137,7 +142,7 @@ class TimelineEventManager {
       const event = child.frigate?.event;
       if (
         event &&
-        BrowseMediaUtil.isTrueMedia(child) &&
+        isTrueMedia(child) &&
         ['video', 'image'].includes(child.media_content_type)
       ) {
         let item = this._dataset.get(event.id);
@@ -282,11 +287,7 @@ class TimelineEventManager {
           this._dateStart &&
           cameraConfig.camera_name !== CAMERA_BIRDSEYE
         ) {
-          const param = BrowseMediaUtil.getBrowseMediaQueryParameters(
+          const param = getBrowseMediaQueryParameters(hass, cameraID, cameraConfig, {
-            hass,
-            cameraID,
-            cameraConfig,
-            {
             // Events are always fetched for the maximum extent of the managed
             // range. This is because events may change at any point in time
             // (e.g. a long-running event that ends).
@@ -294,8 +295,7 @@ class TimelineEventManager {
             after: this._dateStart.getTime() / 1000,
             unlimited: true,
             mediaType: mediaType as 'clips' | 'snapshots',
-            },
+          });
-          );
           if (param) {
             params.push(param);
           }
@@ -309,7 +309,7 @@ class TimelineEventManager {
 
     let results: Map<BrowseMediaQueryParameters, FrigateBrowseMediaSource>;
     try {
-      results = await BrowseMediaUtil.multipleBrowseMediaQuery(hass, params);
+      results = await multipleBrowseMediaQuery(hass, params);
     } catch (e) {
       return dispatchErrorMessageEvent(element, (e as Error).message);
     }
@@ -572,10 +572,7 @@ export class FrigateCardTimelineCore extends LitElement {
       return null;
     }
 
-    const target = BrowseMediaUtil.createEventParentForChildren(
+    const target = createEventParentForChildren('Timeline events', children);
-      'Timeline events',
-      children,
-    );
     return {
       target: target,
       childIndex: childIndex < 0 ? null : childIndex,

src/components/viewer.ts

@@ -28,9 +28,16 @@ import type {
 } from '../types.js';
 import { stopEventFromActivatingCardWideActions } from '../utils/action.js';
 import { contentsChanged } from '../utils/basic.js';
-import { BrowseMediaUtil } from '../utils/ha/browse-media.js';
+import {
+  fetchLatestMediaAndDispatchViewChange,
+  getEventStartTime,
+  getFullDependentBrowseMediaQueryParametersOrDispatchError,
+  isTrueMedia,
+  multipleBrowseMediaQueryMerged,
+  overrideMultiBrowseMediaQueryParameters
+} from '../utils/ha/browse-media.js';
 import { createMediaShowInfo } from '../utils/media-info.js';
-import { ResolvedMediaCache, ResolvedMediaUtil } from '../utils/resolved-media.js';
+import { ResolvedMediaCache, resolveMedia } from '../utils/resolved-media.js';
 import { View } from '../view.js';
 import { AutoMediaPlugin } from './embla-plugins/automedia.js';
 import { Lazyload, LazyloadType } from './embla-plugins/lazyload.js';
@@ -66,7 +73,7 @@ export class FrigateCardViewer extends LitElement {
     }
 
     const browseMediaQueryParameters =
-      BrowseMediaUtil.getFullDependentBrowseMediaQueryParametersOrDispatchError(
+      getFullDependentBrowseMediaQueryParametersOrDispatchError(
         this,
         this.hass,
         this.cameras,
@@ -83,14 +90,13 @@ export class FrigateCardViewer extends LitElement {
         return;
       }
 
-      BrowseMediaUtil.fetchLatestMediaAndDispatchViewChange(
+      fetchLatestMediaAndDispatchViewChange(
         this,
         this.hass,
         this.view,
-        BrowseMediaUtil.overrideMultiBrowseMediaQueryParameters(
+        overrideMultiBrowseMediaQueryParameters(browseMediaQueryParameters, {
-          browseMediaQueryParameters,
+          mediaType: mediaType,
-          { mediaType: mediaType },
+        }),
-        ),
       );
       return renderProgressIndicator();
     }
@@ -161,8 +167,8 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
         i < (target.children || []).length;
         ++i
       ) {
-        if (BrowseMediaUtil.isTrueMedia(target.children[i])) {
+        if (isTrueMedia(target.children[i])) {
-          await ResolvedMediaUtil.resolveMedia(
+          await resolveMedia(
             this.hass,
             target.children[i],
             this.resolvedMediaCache,
@@ -321,7 +327,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
     let prevIndex: number | null = null;
     for (let i = this.view.childIndex - 1; i >= 0; i--) {
       const media = this.view.target.children[i];
-      if (media && BrowseMediaUtil.isTrueMedia(media)) {
+      if (media && isTrueMedia(media)) {
         prevIndex = i;
         break;
       }
@@ -331,7 +337,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
     let nextIndex: number | null = null;
     for (let i = this.view.childIndex + 1; i < this.view.target.children.length; i++) {
       const media = this.view.target.children[i];
-      if (media && BrowseMediaUtil.isTrueMedia(media)) {
+      if (media && isTrueMedia(media)) {
         nextIndex = i;
         break;
       }
@@ -365,7 +371,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
       return null;
     }
 
-    const snapshotStartTime = BrowseMediaUtil.getEventStartTime(snapshot);
+    const snapshotStartTime = getEventStartTime(snapshot);
     if (!snapshotStartTime) {
       return null;
     }
@@ -383,10 +389,10 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
     let latest: number | null = null;
     for (let i = 0; i < this.view.target.children.length; i++) {
       const child = this.view.target.children[i];
-      if (!BrowseMediaUtil.isTrueMedia(child)) {
+      if (!isTrueMedia(child)) {
         continue;
       }
-      const startTime = BrowseMediaUtil.getEventStartTime(child);
+      const startTime = getEventStartTime(child);
 
       if (startTime && (earliest === null || startTime < earliest)) {
         earliest = startTime;
@@ -401,7 +407,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
 
     let clips: FrigateBrowseMediaSource | null;
 
-    const params = BrowseMediaUtil.overrideMultiBrowseMediaQueryParameters(
+    const params = overrideMultiBrowseMediaQueryParameters(
       this.browseMediaQueryParameters,
       {
         mediaType: 'clips',
@@ -411,7 +417,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
     );
 
     try {
-      clips = await BrowseMediaUtil.multipleBrowseMediaQueryMerged(this.hass, params);
+      clips = await multipleBrowseMediaQueryMerged(this.hass, params);
     } catch (e) {
       // This is best effort.
       return null;
@@ -423,10 +429,10 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
 
     for (let i = 0; i < clips.children.length; i++) {
       const child = clips.children[i];
-      if (!BrowseMediaUtil.isTrueMedia(child)) {
+      if (!isTrueMedia(child)) {
         continue;
       }
-      const clipStartTime = BrowseMediaUtil.getEventStartTime(child);
+      const clipStartTime = getEventStartTime(child);
       if (clipStartTime && clipStartTime === snapshotStartTime) {
         return this.view.evolve({
           view: 'clip',
@@ -487,12 +493,12 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
       !this.view ||
       !this.view.target ||
       !this.view.target.children ||
-      !BrowseMediaUtil.isTrueMedia(this.view.target.children[childIndex])
+      !isTrueMedia(this.view.target.children[childIndex])
     ) {
       return;
     }
 
-    ResolvedMediaUtil.resolveMedia(
+    resolveMedia(
       this.hass,
       this.view.target.children[childIndex],
       this.resolvedMediaCache,
@@ -664,7 +670,7 @@ export class FrigateCardViewerCarousel extends FrigateCardMediaCarousel {
       !this.hass ||
       !this.view ||
       !this.viewerConfig ||
-      !BrowseMediaUtil.isTrueMedia(mediaToRender) ||
+      !isTrueMedia(mediaToRender) ||
       !['video', 'image'].includes(mediaToRender.media_content_type)
     ) {
       return;

src/utils/ha/browse-media.ts

@@ -16,33 +16,32 @@ import {
 import { View } from '../../view.js';
 import { getCameraTitle } from '../camera.js';
 
-export class BrowseMediaUtil {
 /**
  * Return the Frigate event_id given a FrigateBrowseMediaSource object.
  * @param media The event to get the id from.
  * @returns The `event_id` or `null` if not successfully parsed.
  */
-  static getEventID(media: FrigateBrowseMediaSource): string | null {
+export const getEventID = (media: FrigateBrowseMediaSource): string | null => {
   return media.frigate?.event.id ?? null;
-  }
+};
 
 /**
  * Return the event start time given a FrigateBrowseMediaSource object.
  * @param browseMedia The media object to get the start time from.
  * @returns The start time in unix/epoch time, or null if it cannot be determined.
  */
-  static getEventStartTime(media: FrigateBrowseMediaSource): number | null {
+export const getEventStartTime = (media: FrigateBrowseMediaSource): number | null => {
   return media.frigate?.event.start_time ?? null;
-  }
+};
 
 /**
  * Determine if a FrigateBrowseMediaSource object is truly a media item (vs a folder).
  * @param media The media object.
  * @returns `true` if it's truly a media item, `false` otherwise.
  */
-  static isTrueMedia(media?: FrigateBrowseMediaSource): boolean {
+export const isTrueMedia = (media?: FrigateBrowseMediaSource): boolean => {
   return !!media && !media.can_expand;
-  }
+};
 
 /**
  * From a FrigateBrowseMediaSource item extract the first true media item from the
@@ -50,15 +49,15 @@ export class BrowseMediaUtil {
  * @param media The media object with children.
  * @returns The first true media item found.
  */
-  static getFirstTrueMediaChildIndex(
+export const getFirstTrueMediaChildIndex = (
   media: FrigateBrowseMediaSource | null,
-  ): number | null {
+): number | null => {
   if (!media || !media.children) {
     return null;
   }
-    const index = media.children.findIndex((child) => this.isTrueMedia(child));
+  const index = media.children.findIndex((child) => isTrueMedia(child));
   return index >= 0 ? index : null;
-  }
+};
 
 /**
  * Browse Frigate media with a media content id. May throw.
@@ -66,16 +65,16 @@ export class BrowseMediaUtil {
  * @param media_content_id The media content id to browse.
  * @returns A FrigateBrowseMediaSource object or null on malformed.
  */
-  static async browseMedia(
+export const browseMedia = async (
   hass: HomeAssistant,
   media_content_id: string,
-  ): Promise<FrigateBrowseMediaSource> {
+): Promise<FrigateBrowseMediaSource> => {
   const request = {
     type: 'media_source/browse_media',
     media_content_id: media_content_id,
   };
   return await homeAssistantWSRequest(hass, frigateBrowseMediaSourceSchema, request);
-  }
+};
 
 /**
  * Browse Frigate media with a media query. May throw.
@@ -83,11 +82,11 @@ export class BrowseMediaUtil {
  * @param params The search parameters to use to search for media.
  * @returns A FrigateBrowseMediaSource object or null on malformed.
  */
-  static async browseMediaQuery(
+export const browseMediaQuery = async (
   hass: HomeAssistant,
   params: BrowseMediaQueryParameters,
-  ): Promise<FrigateBrowseMediaSource> {
+): Promise<FrigateBrowseMediaSource> => {
-    return this.browseMedia(
+  return browseMedia(
     hass,
     // Defined in:
     // https://github.com/blakeblackshear/frigate-hass-integration/blob/master/custom_components/frigate/media_source.py
@@ -106,7 +105,7 @@ export class BrowseMediaUtil {
       params.zone,
     ].join('/'),
   );
-  }
+};
 
 /**
  * Browse multiple Frigate media queries. May throw.
@@ -114,19 +113,19 @@ export class BrowseMediaUtil {
  * @param params An array of search parameters to use to search for media.
  * @returns A map of FrigateBrowseMediaSource object or null on malformed.
  */
-  static async multipleBrowseMediaQuery(
+export const multipleBrowseMediaQuery = async (
   hass: HomeAssistant,
   params: BrowseMediaQueryParameters | BrowseMediaQueryParameters[],
-  ): Promise<Map<BrowseMediaQueryParameters, FrigateBrowseMediaSource>> {
+): Promise<Map<BrowseMediaQueryParameters, FrigateBrowseMediaSource>> => {
   params = Array.isArray(params) ? params : [params];
   const output: Map<BrowseMediaQueryParameters, FrigateBrowseMediaSource> = new Map();
   await Promise.all(
     params.map(async (param: BrowseMediaQueryParameters): Promise<void> => {
-        output.set(param, await this.browseMediaQuery(hass, param));
+      output.set(param, await browseMediaQuery(hass, param));
     }),
   );
   return output;
-  }
+};
 
 /**
  * Browse multiple Frigate media queries, then merged them. May throw.
@@ -134,14 +133,12 @@ export class BrowseMediaUtil {
  * @param params An array of search parameters to use to search for media.
  * @returns A single FrigateBrowseMediaSource object or null on malformed.
  */
-  static async multipleBrowseMediaQueryMerged(
+export const multipleBrowseMediaQueryMerged = async (
   hass: HomeAssistant,
   params: BrowseMediaQueryParameters | BrowseMediaQueryParameters[],
-  ): Promise<FrigateBrowseMediaSource> {
+): Promise<FrigateBrowseMediaSource> => {
-    return this.mergeFrigateBrowseMediaSources(
+  return mergeFrigateBrowseMediaSources(await multipleBrowseMediaQuery(hass, params));
-      await this.multipleBrowseMediaQuery(hass, params),
+};
-    );
-  }
 
 /**
  * Merge multiple FrigateBrowseMediaSource into a single. Note that this may
@@ -150,14 +147,14 @@ export class BrowseMediaUtil {
  * @param input A map of query -> result.
  * @returns A single FrigateBrowseMediaSource object.
  */
-  static mergeFrigateBrowseMediaSources(
+export const mergeFrigateBrowseMediaSources = async (
   input: Map<BrowseMediaQueryParameters, FrigateBrowseMediaSource>,
-  ): FrigateBrowseMediaSource {
+): Promise<FrigateBrowseMediaSource> => {
   const children: FrigateBrowseMediaSource[] = [];
 
   for (const [query, result] of input.entries()) {
     for (const child of result.children || []) {
-        if (this.isTrueMedia(child)) {
+      if (isTrueMedia(child)) {
         children.push(child);
       } else {
         // If there are multiple inputs, separate the folder names with the
@@ -191,19 +188,19 @@ export class BrowseMediaUtil {
     return 0;
   };
 
-    return this.createEventParentForChildren('Merged events', children.sort(eventSort));
+  return createEventParentForChildren('Merged events', children.sort(eventSort));
-  }
+};
 
 /**
  * Get the parameters to search for media.
  * @returns A BrowseMediaQueryParameters object.
  */
-  static getBrowseMediaQueryParameters(
+export const getBrowseMediaQueryParameters = (
   hass: HomeAssistant,
   cameraID: string,
   cameraConfig?: CameraConfig,
   overrides?: Partial<BrowseMediaQueryParameters>,
-  ): BrowseMediaQueryParameters | null {
+): BrowseMediaQueryParameters | null => {
   if (!cameraConfig || !cameraConfig.camera_name) {
     return null;
   }
@@ -216,7 +213,7 @@ export class BrowseMediaUtil {
     cameraID: cameraID,
     ...overrides,
   };
-  }
+};
 
 /**
  * Apply overrides to multiple query parameters.
@@ -224,16 +221,16 @@ export class BrowseMediaUtil {
  * @param overrides The overrides to apply.
  * @returns The override query parameters.
  */
-  static overrideMultiBrowseMediaQueryParameters(
+export const overrideMultiBrowseMediaQueryParameters = (
   parameters: BrowseMediaQueryParameters[],
   overrides: Partial<BrowseMediaQueryParameters>,
-  ): BrowseMediaQueryParameters[] {
+): BrowseMediaQueryParameters[] => {
   const output: BrowseMediaQueryParameters[] = [];
   parameters.forEach((param) => {
     output.push({ ...param, ...overrides });
   });
   return output;
-  }
+};
 
 /**
  * Get BrowseMediaQueryParameters for a camera (including its dependencies).
@@ -243,12 +240,12 @@ export class BrowseMediaUtil {
  * @param mediaType Optional media type to include in the parameters.
  * @returns An array of query parameters.
  */
-  static getFullDependentBrowseMediaQueryParameters(
+export const getFullDependentBrowseMediaQueryParameters = (
   hass: HomeAssistant,
   cameras: Map<string, CameraConfig>,
   camera: string,
   mediaType?: 'clips' | 'snapshots',
-  ): BrowseMediaQueryParameters[] | null {
+): BrowseMediaQueryParameters[] | null => {
   const cameraIDs: Set<string> = new Set();
   const getDependentCameras = (camera: string): void => {
     const cameraConfig = cameras.get(camera);
@@ -265,7 +262,7 @@ export class BrowseMediaUtil {
 
   const params: BrowseMediaQueryParameters[] = [];
   for (const cameraID of cameraIDs) {
-      const param = BrowseMediaUtil.getBrowseMediaQueryParameters(
+    const param = getBrowseMediaQueryParameters(
       hass,
       cameraID,
       cameras.get(cameraID),
@@ -279,7 +276,7 @@ export class BrowseMediaUtil {
     params.push(param);
   }
   return params.length ? params : null;
-  }
+};
 
 /**
  * Get BrowseMediaQueryParameters for a camera (including its dependencies) or dispatch an error.
@@ -290,14 +287,14 @@ export class BrowseMediaUtil {
  * @param mediaType Optional media type to include in the parameters.
  * @returns An array of query parameters.
  */
-  static getFullDependentBrowseMediaQueryParametersOrDispatchError(
+export const getFullDependentBrowseMediaQueryParametersOrDispatchError = (
   element: HTMLElement,
   hass: HomeAssistant,
   cameras: Map<string, CameraConfig>,
   camera: string,
   mediaType?: 'clips' | 'snapshots',
-  ): BrowseMediaQueryParameters[] | null {
+): BrowseMediaQueryParameters[] | null => {
-    const params = this.getFullDependentBrowseMediaQueryParameters(
+  const params = getFullDependentBrowseMediaQueryParameters(
     hass,
     cameras,
     camera,
@@ -312,7 +309,7 @@ export class BrowseMediaUtil {
     return null;
   }
   return params;
-  }
+};
 
 /**
  * Fetch the latest media and dispatch a change view event to reflect the
@@ -324,24 +321,19 @@ export class BrowseMediaUtil {
  * @param browseMediaQueryParameters The media parameters to query with.
  * @returns
  */
-  static async fetchLatestMediaAndDispatchViewChange(
+export const fetchLatestMediaAndDispatchViewChange = async (
   element: HTMLElement,
   hass: HomeAssistant,
   view: Readonly<View>,
-    browseMediaQueryParameters:
+  browseMediaQueryParameters: BrowseMediaQueryParameters | BrowseMediaQueryParameters[],
-      | BrowseMediaQueryParameters
+): Promise<void> => {
-      | BrowseMediaQueryParameters[],
-  ): Promise<void> {
   let parent: FrigateBrowseMediaSource | null;
   try {
-      parent = await BrowseMediaUtil.multipleBrowseMediaQueryMerged(
+    parent = await multipleBrowseMediaQueryMerged(hass, browseMediaQueryParameters);
-        hass,
-        browseMediaQueryParameters,
-      );
   } catch (e) {
     return dispatchErrorMessageEvent(element, (e as Error).message);
   }
-    const childIndex = BrowseMediaUtil.getFirstTrueMediaChildIndex(parent);
+  const childIndex = getFirstTrueMediaChildIndex(parent);
   if (!parent || !parent.children || childIndex == null) {
     return dispatchMessageEvent(
       element,
@@ -358,7 +350,7 @@ export class BrowseMediaUtil {
       childIndex: childIndex,
     })
     .dispatchChangeEvent(element);
-  }
+};
 
 /**
  * Fetch the media of a child FrigateBrowseMediaSource object and dispatch a change
@@ -369,15 +361,15 @@ export class BrowseMediaUtil {
  * @param child The FrigateBrowseMediaSource child to query for.
  * @returns
  */
-  static async fetchChildMediaAndDispatchViewChange(
+export const fetchChildMediaAndDispatchViewChange = async (
   element: HTMLElement,
   hass: HomeAssistant,
   view: Readonly<View>,
   child: Readonly<FrigateBrowseMediaSource>,
-  ): Promise<void> {
+): Promise<void> => {
   let parent: FrigateBrowseMediaSource;
   try {
-      parent = await BrowseMediaUtil.browseMedia(hass, child.media_content_id);
+    parent = await browseMedia(hass, child.media_content_id);
   } catch (e) {
     return dispatchErrorMessageEvent(element, (e as Error).message);
   }
@@ -387,7 +379,7 @@ export class BrowseMediaUtil {
       target: parent,
     })
     .dispatchChangeEvent(element);
-  }
+};
 
 /**
  * Given an array of media children, create a parent for them.
@@ -395,10 +387,10 @@ export class BrowseMediaUtil {
  * @param children The children media items.
  * @returns A single parent containing the children.
  */
-  static createEventParentForChildren(
+export const createEventParentForChildren = (
   title: string,
   children: FrigateBrowseMediaSource[],
-  ): FrigateBrowseMediaSource {
+): FrigateBrowseMediaSource => {
   return {
     title: title,
     media_class: MEDIA_CLASS_PLAYLIST,
@@ -410,5 +402,4 @@ export class BrowseMediaUtil {
     thumbnail: null,
     children: children,
   };
-  }
+};
-}

src/utils/resolved-media.ts

@@ -34,12 +34,11 @@ export class ResolvedMediaCache {
   }
 }
 
-export class ResolvedMediaUtil {
+export const resolveMedia = async (
-  static async resolveMedia(
   hass: HomeAssistant,
   mediaSource?: FrigateBrowseMediaSource,
   cache?: ResolvedMediaCache,
-  ): Promise<ResolvedMedia | null> {
+): Promise<ResolvedMedia | null> => {
   if (!mediaSource) {
     return null;
   }
@@ -51,14 +50,9 @@ export class ResolvedMediaUtil {
     type: 'media_source/resolve_media',
     media_content_id: mediaSource.media_content_id,
   };
-    const resolvedMedia = await homeAssistantWSRequest(
+  const resolvedMedia = await homeAssistantWSRequest(hass, resolvedMediaSchema, request);
-      hass,
-      resolvedMediaSchema,
-      request,
-    );
   if (cache && resolvedMedia) {
     cache.set(mediaSource.media_content_id, resolvedMedia);
   }
   return resolvedMedia;
-  }
+};
-}