feat: Rename the card to advanced-camera-card (#1873)

Whilst the Frigate support in this card is the best among camera
engines, the name incorrectly suggests that Frigate is a requirement.
Instead, to broaden the appeal, change to more camera agnostic name.
This does not suggest any change in priority, role or support for
Frigate.

This change is likely to be bug prone, due to the size of the rename --
the code contains 1500+ references to "Frigate" most of which make sense
to rename, some which do not, all of which needed human assessment.

- Closes #1298


BREAKING CHANGE: References to `frigate-card` in all kinds of
configuration need to be updated to `advanced-camera-card`. An automated
config upgrade should take care of the majority of usecases (click `Edit
-> Upgrade -> Save`), though may not be perfect.
This commit is contained in:
Dermot Duffy
2025-02-06 19:32:32 -08:00
committed by GitHub
parent 43947b49dc
commit cc376a8be1
305 changed files with 4270 additions and 3686 deletions
+28 -28
View File
@@ -18,13 +18,13 @@ import {
import { MicrophoneState } from '../../card-controller/types.js';
import { ViewManagerEpoch } from '../../card-controller/view/types.js';
import { MediaActionsController } from '../../components-lib/media-actions-controller.js';
import { dispatchFrigateCardErrorEvent } from '../../components-lib/message/dispatch.js';
import { dispatchAdvancedCameraCardErrorEvent } from '../../components-lib/message/dispatch.js';
import { ZoomSettingsObserved } from '../../components-lib/zoom/types.js';
import { handleZoomSettingsObservedEvent } from '../../components-lib/zoom/zoom-view-context.js';
import {
CameraConfig,
CardWideConfig,
frigateCardConfigDefaults,
configDefaults,
LiveConfig,
liveConfigAbsoluteRootSchema,
Overrides,
@@ -45,11 +45,11 @@ import '../carousel';
import { EmblaCarouselPlugins } from '../carousel.js';
import '../next-prev-control.js';
import '../ptz.js';
import { FrigateCardPTZ } from '../ptz.js';
import { AdvancedCameraCardPTZ } from '../ptz.js';
import './provider.js';
import { FrigateCardLiveProvider } from './provider.js';
import { AdvancedCameraCardLiveProvider } from './provider.js';
const FRIGATE_CARD_LIVE_PROVIDER = 'frigate-card-live-provider';
const ADVANCED_CAMERA_CARD_LIVE_PROVIDER = 'advanced-camera-card-live-provider';
interface CameraNeighbor {
id: string;
@@ -61,8 +61,8 @@ interface CameraNeighbors {
next?: CameraNeighbor;
}
@customElement('frigate-card-live-carousel')
export class FrigateCardLiveCarousel extends LitElement {
@customElement('advanced-camera-card-live-carousel')
export class AdvancedCameraCardLiveCarousel extends LitElement {
@property({ attribute: false })
public hass?: ExtendedHomeAssistant;
@@ -95,7 +95,7 @@ export class FrigateCardLiveCarousel extends LitElement {
// Index between camera name and slide number.
protected _cameraToSlide: Record<string, number> = {};
protected _refPTZControl: Ref<FrigateCardPTZ> = createRef();
protected _refPTZControl: Ref<AdvancedCameraCardPTZ> = createRef();
protected _refCarousel: Ref<HTMLElement> = createRef();
protected _mediaActionsController = new MediaActionsController();
@@ -118,7 +118,7 @@ export class FrigateCardLiveCarousel extends LitElement {
protected _getTransitionEffect(): TransitionEffect {
return (
this.overriddenLiveConfig?.transition_effect ??
frigateCardConfigDefaults.live.transition_effect
configDefaults.live.transition_effect
);
}
@@ -143,7 +143,7 @@ export class FrigateCardLiveCarousel extends LitElement {
changedProps.has('overriddenLiveConfig')
) {
this._mediaActionsController.setOptions({
playerSelector: FRIGATE_CARD_LIVE_PROVIDER,
playerSelector: ADVANCED_CAMERA_CARD_LIVE_PROVIDER,
...(this.overriddenLiveConfig?.auto_play && {
autoPlayConditions: this.overriddenLiveConfig.auto_play,
}),
@@ -254,8 +254,8 @@ export class FrigateCardLiveCarousel extends LitElement {
}
const liveProvider = slide?.querySelector(
FRIGATE_CARD_LIVE_PROVIDER,
) as FrigateCardLiveProvider | null;
ADVANCED_CAMERA_CARD_LIVE_PROVIDER,
) as AdvancedCameraCardLiveProvider | null;
if (liveProvider) {
liveProvider.load = action === 'load';
}
@@ -280,7 +280,7 @@ export class FrigateCardLiveCarousel extends LitElement {
try {
// The condition controller object contains the currently live camera, which
// (in the carousel for example) is not necessarily the live camera *this*
// <frigate-card-live-provider> is rendering right now, so we provide a
// <advanced-camera-card-live-provider> is rendering right now, so we provide a
// stateOverride to evaluate the condition in that context.
liveConfig = getOverriddenConfig(
this.conditionsManagerEpoch.manager,
@@ -292,7 +292,7 @@ export class FrigateCardLiveCarousel extends LitElement {
},
).live;
} catch (ev) {
return dispatchFrigateCardErrorEvent(this, ev);
return dispatchAdvancedCameraCardErrorEvent(this, ev);
}
const cameraMetadata = this.cameraManager.getCameraMetadata(cameraID);
@@ -300,7 +300,7 @@ export class FrigateCardLiveCarousel extends LitElement {
return html`
<div class="embla__slide">
<frigate-card-live-provider
<advanced-camera-card-live-provider
?load=${!liveConfig.lazy_load}
.microphoneState=${view?.camera === cameraID
? this.microphoneState
@@ -315,14 +315,14 @@ export class FrigateCardLiveCarousel extends LitElement {
.hass=${this.hass}
.cardWideConfig=${this.cardWideConfig}
.zoomSettings=${view?.context?.zoom?.[cameraID]?.requested}
@frigate-card:zoom:change=${(ev: CustomEvent<ZoomSettingsObserved>) =>
@advanced-camera-card:zoom:change=${(ev: CustomEvent<ZoomSettingsObserved>) =>
handleZoomSettingsObservedEvent(
ev,
this.viewManagerEpoch?.manager,
cameraID,
)}
>
</frigate-card-live-provider>
</advanced-camera-card-live-provider>
</div>
`;
}
@@ -381,7 +381,7 @@ export class FrigateCardLiveCarousel extends LitElement {
? neighbors?.previous
: neighbors?.next;
return html`<frigate-card-next-previous-control
return html`<advanced-camera-card-next-previous-control
slot=${side}
.hass=${this.hass}
.side=${side}
@@ -394,7 +394,7 @@ export class FrigateCardLiveCarousel extends LitElement {
stopEventFromActivatingCardWideActions(ev);
}}
>
</frigate-card-next-previous-control>`;
</advanced-camera-card-next-previous-control>`;
}
protected render(): TemplateResult | void {
@@ -424,7 +424,7 @@ export class FrigateCardLiveCarousel extends LitElement {
// options/plugins actually change.
return html`
<frigate-card-carousel
<advanced-camera-card-carousel
${ref(this._refCarousel)}
.loop=${hasMultipleCameras}
.dragEnabled=${hasMultipleCameras && this.overriddenLiveConfig?.draggable}
@@ -434,11 +434,11 @@ export class FrigateCardLiveCarousel extends LitElement {
)}
.selected=${this._getSelectedCameraIndex()}
transitionEffect=${this._getTransitionEffect()}
@frigate-card:carousel:select=${this._setViewHandler.bind(this)}
@frigate-card:media:loaded=${() => {
@advanced-camera-card:carousel:select=${this._setViewHandler.bind(this)}
@advanced-camera-card:media:loaded=${() => {
this._mediaHasLoaded = true;
}}
@frigate-card:media:unloaded=${() => {
@advanced-camera-card:media:unloaded=${() => {
this._mediaHasLoaded = false;
}}
>
@@ -447,14 +447,14 @@ export class FrigateCardLiveCarousel extends LitElement {
${slides}
<!-- -->
${this._renderNextPrevious('right', neighbors)}
</frigate-card-carousel>
<frigate-card-ptz
</advanced-camera-card-carousel>
<advanced-camera-card-ptz
.config=${this.overriddenLiveConfig.controls.ptz}
.cameraManager=${this.cameraManager}
.cameraID=${getStreamCameraID(view, this.viewFilterCameraID)}
.forceVisibility=${forcePTZVisibility}
>
</frigate-card-ptz>
</advanced-camera-card-ptz>
`;
}
@@ -486,7 +486,7 @@ export class FrigateCardLiveCarousel extends LitElement {
// If the view has changed, or if the media actions controller has just been
// initialized, then call the necessary media action.
// See: https://github.com/dermotduffy/frigate-hass-card/issues/1626
// See: https://github.com/dermotduffy/advanced-camera-card/issues/1626
if (initialized || changedProperties.has('viewManagerEpoch')) {
this._setMediaTarget();
}
@@ -499,6 +499,6 @@ export class FrigateCardLiveCarousel extends LitElement {
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-carousel': FrigateCardLiveCarousel;
'advanced-camera-card-live-carousel': AdvancedCameraCardLiveCarousel;
}
}
+10 -9
View File
@@ -19,8 +19,8 @@ import { ExtendedHomeAssistant } from '../../types.js';
import { contentsChanged } from '../../utils/basic.js';
import './carousel.js';
@customElement('frigate-card-live-grid')
export class FrigateCardLiveGrid extends LitElement {
@customElement('advanced-camera-card-live-grid')
export class AdvancedCameraCardLiveGrid extends LitElement {
@property({ attribute: false })
public hass?: ExtendedHomeAssistant;
@@ -56,7 +56,7 @@ export class FrigateCardLiveGrid extends LitElement {
const triggeredCameraID = cameraID ?? view?.camera;
return html`
<frigate-card-live-carousel
<advanced-camera-card-live-carousel
grid-id=${ifDefined(cameraID)}
.hass=${this.hass}
.viewManagerEpoch=${this.viewManagerEpoch}
@@ -71,7 +71,7 @@ export class FrigateCardLiveGrid extends LitElement {
?triggered=${triggeredCameraID &&
!!this.triggeredCameraIDs?.has(triggeredCameraID)}
>
</frigate-card-live-carousel>
</advanced-camera-card-live-carousel>
`;
}
@@ -110,14 +110,15 @@ export class FrigateCardLiveGrid extends LitElement {
}
return html`
<frigate-card-media-grid
<advanced-camera-card-media-grid
.selected=${this.viewManagerEpoch?.manager.getView()?.camera}
.displayConfig=${this.overriddenLiveConfig?.display}
@frigate-card:media-grid:selected=${(ev: CustomEvent<MediaGridSelected>) =>
this._gridSelectCamera(ev.detail.selected)}
@advanced-camera-card:media-grid:selected=${(
ev: CustomEvent<MediaGridSelected>,
) => this._gridSelectCamera(ev.detail.selected)}
>
${[...cameraIDs].map((cameraID) => this._renderCarousel(cameraID))}
</frigate-card-media-grid>
</advanced-camera-card-media-grid>
`;
}
@@ -128,6 +129,6 @@ export class FrigateCardLiveGrid extends LitElement {
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-grid': FrigateCardLiveGrid;
'advanced-camera-card-live-grid': AdvancedCameraCardLiveGrid;
}
}
+5 -5
View File
@@ -11,8 +11,8 @@ import { ExtendedHomeAssistant } from '../../types.js';
import { contentsChanged } from '../../utils/basic.js';
import './grid.js';
@customElement('frigate-card-live')
export class FrigateCardLive extends LitElement {
@customElement('advanced-camera-card-live')
export class AdvancedCameraCardLive extends LitElement {
@property({ attribute: false })
public conditionsManagerEpoch?: ConditionsManagerEpoch;
@@ -57,7 +57,7 @@ export class FrigateCardLive extends LitElement {
// - Various events are captured to prevent them propagating upwards if the
// card is in the background.
return html`
<frigate-card-live-grid
<advanced-camera-card-live-grid
.hass=${this.hass}
.viewManagerEpoch=${this.viewManagerEpoch}
.nonOverriddenLiveConfig=${this.nonOverriddenLiveConfig}
@@ -70,7 +70,7 @@ export class FrigateCardLive extends LitElement {
.microphoneState=${this.microphoneState}
.triggeredCameraIDs=${this.triggeredCameraIDs}
>
</frigate-card-live-grid>
</advanced-camera-card-live-grid>
`;
}
@@ -81,6 +81,6 @@ export class FrigateCardLive extends LitElement {
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live': FrigateCardLive;
'advanced-camera-card-live': AdvancedCameraCardLive;
}
}
+41 -35
View File
@@ -17,7 +17,7 @@ import { PartialZoomSettings } from '../../components-lib/zoom/types.js';
import {
CameraConfig,
CardWideConfig,
frigateCardConfigDefaults,
configDefaults,
LiveConfig,
LiveProvider,
} from '../../config/types.js';
@@ -26,7 +26,7 @@ import { localize } from '../../localize/localize.js';
import liveProviderStyle from '../../scss/live-provider.scss';
import {
ExtendedHomeAssistant,
FrigateCardMediaPlayer,
AdvancedCameraCardMediaPlayer,
FullscreenElement,
} from '../../types.js';
import { aspectRatioToString } from '../../utils/basic.js';
@@ -39,10 +39,10 @@ import '../next-prev-control.js';
import '../ptz.js';
import '../surround.js';
@customElement('frigate-card-live-provider')
export class FrigateCardLiveProvider
@customElement('advanced-camera-card-live-provider')
export class AdvancedCameraCardLiveProvider
extends LitElement
implements FrigateCardMediaPlayer
implements AdvancedCameraCardMediaPlayer
{
@property({ attribute: false })
public hass?: ExtendedHomeAssistant;
@@ -84,7 +84,7 @@ export class FrigateCardLiveProvider
@state()
protected _showStreamTroubleshooting = false;
protected _refProvider: Ref<LitElement & FrigateCardMediaPlayer> = createRef();
protected _refProvider: Ref<LitElement & AdvancedCameraCardMediaPlayer> = createRef();
// A note on dynamic imports:
//
@@ -94,7 +94,7 @@ export class FrigateCardLiveProvider
// underlying code is not yet loaded.
//
// Test case: A card with a non-live view, but live pre-loaded, attempts to
// call mute() when the <frigate-card-live> element first renders in the
// call mute() when the <advanced-camera-card-live> element first renders in the
// background. These calls fail without waiting for loading here.
protected _importPromises: Promise<unknown>[] = [];
@@ -168,7 +168,7 @@ export class FrigateCardLiveProvider
} else if (this.cameraConfig?.frigate.camera_name) {
return 'jsmpeg';
}
return frigateCardConfigDefaults.cameras.live_provider;
return configDefaults.cameras.live_provider;
}
return this.cameraConfig?.live_provider || 'image';
}
@@ -254,7 +254,7 @@ export class FrigateCardLiveProvider
protected _useZoomIfRequired(template: TemplateResult): TemplateResult {
return this.liveConfig?.zoomable
? html` <frigate-card-zoomer
? html` <advanced-camera-card-zoomer
.defaultSettings=${guard([this.cameraConfig?.dimensions?.layout], () =>
this.cameraConfig?.dimensions?.layout
? {
@@ -264,11 +264,11 @@ export class FrigateCardLiveProvider
: undefined,
)}
.settings=${this.zoomSettings}
@frigate-card:zoom:zoomed=${() => this.setControls(false)}
@frigate-card:zoom:unzoomed=${() => this.setControls()}
@advanced-camera-card:zoom:zoomed=${() => this.setControls(false)}
@advanced-camera-card:zoom:unzoomed=${() => this.setControls()}
>
${template}
</frigate-card-zoomer>`
</advanced-camera-card-zoomer>`
: template;
}
@@ -331,12 +331,12 @@ export class FrigateCardLiveProvider
return html`${this._useZoomIfRequired(html`
${showImageDuringLoading || provider === 'image'
? html` <frigate-card-live-image
? html` <advanced-camera-card-live-image
${ref(this._refProvider)}
.hass=${this.hass}
.cameraConfig=${this.cameraConfig}
@frigate-card:live:error=${() => this._providerErrorHandler()}
@frigate-card:media:loaded=${(ev: Event) => {
@advanced-camera-card:live:error=${() => this._providerErrorHandler()}
@advanced-camera-card:media:loaded=${(ev: Event) => {
if (provider === 'image') {
// Only count the media has loaded if the required provider is
// the image (not just the temporary image shown during
@@ -347,21 +347,21 @@ export class FrigateCardLiveProvider
}
}}
>
</frigate-card-live-image>`
</advanced-camera-card-live-image>`
: html``}
${provider === 'ha'
? html` <frigate-card-live-ha
? html` <advanced-camera-card-live-ha
${ref(this._refProvider)}
class=${classMap(providerClasses)}
.hass=${this.hass}
.cameraConfig=${this.cameraConfig}
?controls=${this.liveConfig.controls.builtin}
@frigate-card:live:error=${() => this._providerErrorHandler()}
@frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
@advanced-camera-card:live:error=${() => this._providerErrorHandler()}
@advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
>
</frigate-card-live-ha>`
</advanced-camera-card-live-ha>`
: provider === 'go2rtc'
? html`<frigate-card-live-go2rtc
? html`<advanced-camera-card-live-go2rtc
${ref(this._refProvider)}
class=${classMap(providerClasses)}
.hass=${this.hass}
@@ -370,12 +370,14 @@ export class FrigateCardLiveProvider
.microphoneState=${this.microphoneState}
.microphoneConfig=${this.liveConfig.microphone}
?controls=${this.liveConfig.controls.builtin}
@frigate-card:live:error=${() => this._providerErrorHandler()}
@frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
@advanced-camera-card:live:error=${() => this._providerErrorHandler()}
@advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind(
this,
)}
>
</frigate-card-live-go2rtc>`
</advanced-camera-card-live-go2rtc>`
: provider === 'webrtc-card'
? html`<frigate-card-live-webrtc-card
? html`<advanced-camera-card-live-webrtc-card
${ref(this._refProvider)}
class=${classMap(providerClasses)}
.hass=${this.hass}
@@ -383,32 +385,36 @@ export class FrigateCardLiveProvider
.cameraEndpoints=${this.cameraEndpoints}
.cardWideConfig=${this.cardWideConfig}
?controls=${this.liveConfig.controls.builtin}
@frigate-card:live:error=${() => this._providerErrorHandler()}
@frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
@advanced-camera-card:live:error=${() => this._providerErrorHandler()}
@advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind(
this,
)}
>
</frigate-card-live-webrtc-card>`
</advanced-camera-card-live-webrtc-card>`
: provider === 'jsmpeg'
? html` <frigate-card-live-jsmpeg
? html` <advanced-camera-card-live-jsmpeg
${ref(this._refProvider)}
class=${classMap(providerClasses)}
.hass=${this.hass}
.cameraConfig=${this.cameraConfig}
.cameraEndpoints=${this.cameraEndpoints}
.cardWideConfig=${this.cardWideConfig}
@frigate-card:live:error=${() => this._providerErrorHandler()}
@frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
@advanced-camera-card:live:error=${() => this._providerErrorHandler()}
@advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind(
this,
)}
>
</frigate-card-live-jsmpeg>`
</advanced-camera-card-live-jsmpeg>`
: html``}
`)}
${showLoadingIcon
? html`<frigate-card-icon
? html`<advanced-camera-card-icon
title=${localize('error.awaiting_live')}
.icon=${{ icon: 'mdi:progress-helper' }}
@click=${() => {
this._showStreamTroubleshooting = !this._showStreamTroubleshooting;
}}
></frigate-card-icon>`
></advanced-camera-card-icon>`
: ''}
${this._showStreamTroubleshooting
? renderMessage(
@@ -430,6 +436,6 @@ export class FrigateCardLiveProvider
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-provider': FrigateCardLiveProvider;
'advanced-camera-card-live-provider': AdvancedCameraCardLiveProvider;
}
}
@@ -1,7 +1,7 @@
# go2rtc Player
This is a modified version of the go2rtc example video player code, modified for
use in the Frigate card. In order to make future maintenance easier,
use in the Advanced Camera Card. In order to make future maintenance easier,
modifications have been kept to a minimum.
## Original Example Code
@@ -15,7 +15,7 @@ import { localize } from '../../../../localize/localize.js';
import liveGo2RTCStyle from '../../../../scss/live-go2rtc.scss';
import {
ExtendedHomeAssistant,
FrigateCardMediaPlayer,
AdvancedCameraCardMediaPlayer,
FullscreenElement,
Message,
} from '../../../../types.js';
@@ -25,7 +25,7 @@ import { screenshotMedia } from '../../../../utils/screenshot.js';
import { renderMessage } from '../../../message.js';
import { VideoRTC } from './video-rtc.js';
customElements.define('frigate-card-live-go2rtc-player', VideoRTC);
customElements.define('advanced-camera-card-live-go2rtc-player', VideoRTC);
// Note (2023-02-18): Depending on the behavior of the player / browser is
// possible this URL will need to be re-signed in order to avoid HA spamming
@@ -34,8 +34,11 @@ customElements.define('frigate-card-live-go2rtc-player', VideoRTC);
// provider).
const GO2RTC_URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60;
@customElement('frigate-card-live-go2rtc')
export class FrigateCardGo2RTC extends LitElement implements FrigateCardMediaPlayer {
@customElement('advanced-camera-card-live-go2rtc')
export class AdvancedCameraCardGo2RTC
extends LitElement
implements AdvancedCameraCardMediaPlayer
{
// Not an reactive property to avoid resetting the video.
public hass?: ExtendedHomeAssistant;
@@ -116,7 +119,7 @@ export class FrigateCardGo2RTC extends LitElement implements FrigateCardMediaPla
super.connectedCallback();
// Reset the player when reconnected to the DOM.
// https://github.com/dermotduffy/frigate-hass-card/issues/996
// https://github.com/dermotduffy/advanced-camera-card/issues/996
this.requestUpdate();
}
@@ -205,6 +208,6 @@ export class FrigateCardGo2RTC extends LitElement implements FrigateCardMediaPla
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-go2rtc': FrigateCardGo2RTC;
'advanced-camera-card-live-go2rtc': AdvancedCameraCardGo2RTC;
}
}
+1 -1
View File
@@ -29,7 +29,7 @@ export class VideoRTC extends HTMLElement {
onmessage: Record<string, (msg: { type: string; value: string }) => void>;
// Custom methods/members.
containingPlayer: FrigateCardMediaPlayer | null;
containingPlayer: AdvancedCameraCardMediaPlayer | null;
microphoneStream: MediaStream | null;
reconnect();
@@ -162,8 +162,8 @@ export class VideoRTC extends HTMLElement {
this.microphoneStream = null;
/**
* A reference to a containing FrigateCardMediaPlayer object.
* @type {FrigateCardMediaPlayer}}
* A reference to a containing AdvancedCameraCardMediaPlayer object.
* @type {AdvancedCameraCardMediaPlayer}}
*/
this.containingPlayer = null;
@@ -222,7 +222,7 @@ export class VideoRTC extends HTMLElement {
* https://developer.chrome.com/blog/autoplay/
*/
play() {
// Frigate card controls playing at a higher level.
// Advanced Camera Card controls playing at a higher level.
}
/**
@@ -303,7 +303,7 @@ export class VideoRTC extends HTMLElement {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
this.video.addEventListener('error', (_ev) => {
// For Frigate Card, we avoid log spam here from errors, and also don't
// For Advanced Camera Card, we avoid log spam here from errors, and also don't
// attempt to close the websocket unless the connection is open (otherwise
// on reconnect() an exception will be thrown here that we're attempting
// to close a connection that's not open)
@@ -405,7 +405,7 @@ export class VideoRTC extends HTMLElement {
if (this.pc) {
// Do not close the (microphone) track attached to the peer connection as
// that is controlled by MicrophoneManager.
// See: https://github.com/dermotduffy/frigate-hass-card/issues/1810
// See: https://github.com/dermotduffy/advanced-camera-card/issues/1810
this.pc.close();
this.pc = null;
+10 -7
View File
@@ -7,10 +7,13 @@ import '../../../patches/ha-camera-stream';
import '../../../patches/ha-hls-player.js';
import '../../../patches/ha-web-rtc-player.js';
import liveHAStyle from '../../../scss/live-ha.scss';
import { FrigateCardMediaPlayer, FullscreenElement } from '../../../types.js';
import { AdvancedCameraCardMediaPlayer, FullscreenElement } from '../../../types.js';
@customElement('frigate-card-live-ha')
export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPlayer {
@customElement('advanced-camera-card-live-ha')
export class AdvancedCameraCardLiveHA
extends LitElement
implements AdvancedCameraCardMediaPlayer
{
@property({ attribute: false })
public hass?: HomeAssistant;
@@ -20,7 +23,7 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla
@property({ attribute: true, type: Boolean })
public controls = false;
protected _playerRef: Ref<Element & FrigateCardMediaPlayer> = createRef();
protected _playerRef: Ref<Element & AdvancedCameraCardMediaPlayer> = createRef();
public async play(): Promise<void> {
return this._playerRef.value?.play();
@@ -67,7 +70,7 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla
return;
}
return html` <frigate-card-ha-camera-stream
return html` <advanced-camera-card-ha-camera-stream
${ref(this._playerRef)}
.hass=${this.hass}
.stateObj=${this.cameraConfig?.camera_entity
@@ -76,7 +79,7 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla
.controls=${this.controls}
.muted=${true}
>
</frigate-card-ha-camera-stream>`;
</advanced-camera-card-ha-camera-stream>`;
}
static get styles(): CSSResultGroup {
@@ -86,6 +89,6 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-ha': FrigateCardLiveHA;
'advanced-camera-card-live-ha': AdvancedCameraCardLiveHA;
}
}
+10 -7
View File
@@ -4,18 +4,21 @@ 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 { FrigateCardMediaPlayer, FullscreenElement } from '../../../types.js';
import { AdvancedCameraCardMediaPlayer, FullscreenElement } from '../../../types.js';
import '../../image-base.js';
@customElement('frigate-card-live-image')
export class FrigateCardLiveImage extends LitElement implements FrigateCardMediaPlayer {
@customElement('advanced-camera-card-live-image')
export class AdvancedCameraCardLiveImage
extends LitElement
implements AdvancedCameraCardMediaPlayer
{
@property({ attribute: false })
public hass?: HomeAssistant;
@property({ attribute: false })
public cameraConfig?: CameraConfig;
protected _refImage: Ref<Element & FrigateCardMediaPlayer> = createRef();
protected _refImage: Ref<Element & AdvancedCameraCardMediaPlayer> = createRef();
public async play(): Promise<void> {
await this._refImage.value?.play();
@@ -63,13 +66,13 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia
}
return html`
<frigate-card-image-base
<advanced-camera-card-image-base
${ref(this._refImage)}
.hass=${this.hass}
.imageConfig=${this.cameraConfig.image}
.cameraConfig=${this.cameraConfig}
>
</frigate-card-image-base>
</advanced-camera-card-image-base>
`;
}
@@ -80,6 +83,6 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-image': FrigateCardLiveImage;
'advanced-camera-card-live-image': AdvancedCameraCardLiveImage;
}
}
+7 -4
View File
@@ -15,8 +15,8 @@ import { CameraConfig, CardWideConfig } from '../../../config/types.js';
import { localize } from '../../../localize/localize.js';
import liveJSMPEGStyle from '../../../scss/live-jsmpeg.scss';
import {
AdvancedCameraCardMediaPlayer,
ExtendedHomeAssistant,
FrigateCardMediaPlayer,
FullscreenElement,
Message,
} from '../../../types.js';
@@ -38,8 +38,11 @@ const JSMPEG_URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60;
// Number of seconds before the expiry to trigger a refresh.
const JSMPEG_URL_SIGN_REFRESH_THRESHOLD_SECONDS = 1 * 60 * 60;
@customElement('frigate-card-live-jsmpeg')
export class FrigateCardLiveJSMPEG extends LitElement implements FrigateCardMediaPlayer {
@customElement('advanced-camera-card-live-jsmpeg')
export class AdvancedCameraCardLiveJSMPEG
extends LitElement
implements AdvancedCameraCardMediaPlayer
{
@property({ attribute: false })
public cameraConfig?: CameraConfig;
@@ -303,6 +306,6 @@ export class FrigateCardLiveJSMPEG extends LitElement implements FrigateCardMedi
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-jsmpeg': FrigateCardLiveJSMPEG;
'advanced-camera-card-live-jsmpeg': AdvancedCameraCardLiveJSMPEG;
}
}
+12 -12
View File
@@ -16,8 +16,8 @@ import { CameraConfig, CardWideConfig } from '../../../config/types.js';
import { localize } from '../../../localize/localize.js';
import liveWebRTCCardStyle from '../../../scss/live-webrtc-card.scss';
import {
FrigateCardError,
FrigateCardMediaPlayer,
AdvancedCameraCardError,
AdvancedCameraCardMediaPlayer,
FullscreenElement,
Message,
} from '../../../types.js';
@@ -43,10 +43,10 @@ import { VideoRTC } from './go2rtc/video-rtc.js';
// Create a wrapper for AlexxIT's WebRTC card
// - https://github.com/AlexxIT/WebRTC
@customElement('frigate-card-live-webrtc-card')
export class FrigateCardLiveWebRTCCard
@customElement('advanced-camera-card-live-webrtc-card')
export class AdvancedCameraCardLiveWebRTCCard
extends LitElement
implements FrigateCardMediaPlayer
implements AdvancedCameraCardMediaPlayer
{
@property({ attribute: false })
public cameraConfig?: CameraConfig;
@@ -125,7 +125,7 @@ export class FrigateCardLiveWebRTCCard
super.connectedCallback();
// Reset the player when reconnected to the DOM.
// https://github.com/dermotduffy/frigate-hass-card/issues/996
// https://github.com/dermotduffy/advanced-camera-card/issues/996
this.requestUpdate();
}
@@ -177,11 +177,11 @@ export class FrigateCardLiveWebRTCCard
// hidden. This is incompatible with the card zoom support, since the
// video will easily stop if the user zooms in too much. Disable this
// feature by default.
// See: https://github.com/dermotduffy/frigate-hass-card/issues/1614
// See: https://github.com/dermotduffy/advanced-camera-card/issues/1614
intersection: 0,
// Frigate card always starts muted (unlike webrtc-card).
// See: https://github.com/dermotduffy/frigate-hass-card/issues/1654
// Advanced Camera Card always starts muted (unlike webrtc-card).
// See: https://github.com/dermotduffy/advanced-camera-card/issues/1654
muted: true,
...this.cameraConfig.webrtc_card,
@@ -209,12 +209,12 @@ export class FrigateCardLiveWebRTCCard
this._message = {
type: 'error',
message:
e instanceof FrigateCardError
e instanceof AdvancedCameraCardError
? e.message
: localize('error.webrtc_card_reported_error') +
': ' +
(e as Error).message,
context: (e as FrigateCardError).context,
context: (e as AdvancedCameraCardError).context,
};
dispatchLiveErrorEvent(this);
return;
@@ -275,6 +275,6 @@ export class FrigateCardLiveWebRTCCard
declare global {
interface HTMLElementTagNameMap {
'frigate-card-live-webrtc-card': FrigateCardLiveWebRTCCard;
'advanced-camera-card-live-webrtc-card': AdvancedCameraCardLiveWebRTCCard;
}
}