Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug where card did not subscribe to forecasts after HA reboot #268

Merged
merged 1 commit into from
Nov 1, 2023
Merged

Fix bug where card did not subscribe to forecasts after HA reboot #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 31 additions & 18 deletions src/clock-weather-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import { safeRender } from './helpers'
import { DateTime } from 'luxon'

console.info(
`%c CLOCK-WEATHER-CARD \n%c Version: ${version}`,
'color: orange; font-weight: bold; background: black',
'color: white; font-weight: bold; background: dimgray'
`%c CLOCK-WEATHER-CARD \n%c Version: ${version}`,
'color: orange; font-weight: bold; background: black',
'color: white; font-weight: bold; background: dimgray'
);

// This puts your card into the UI card picker dialog
Expand All @@ -62,7 +62,7 @@ export class ClockWeatherCard extends LitElement {

@state() private config!: MergedClockWeatherCardConfig
@state() private currentDate!: DateTime
@state() private forecastSubscriber?: Promise<() => void>
@state() private forecastSubscriber?: () => Promise<void>
@state() private forecasts?: WeatherForecast[]

constructor () {
Expand Down Expand Up @@ -135,7 +135,7 @@ export class ClockWeatherCard extends LitElement {

protected updated (changedProps: PropertyValues): void {
super.updated(changedProps)
if (changedProps.has('config')) {
if (changedProps.has('config') || !this.forecastSubscriber) {
this.subscribeForecastEvents()
}
}
Expand All @@ -148,39 +148,39 @@ export class ClockWeatherCard extends LitElement {
<ha-card
@action=${this.handleAction}
.actionHandler=${actionHandler({
hasHold: hasAction(this.config.hold_action),
hasDoubleClick: hasAction(this.config.double_tap_action)
})}
hasHold: hasAction(this.config.hold_action),
hasDoubleClick: hasAction(this.config.double_tap_action)
})}
tabindex="0"
.label=${`Clock Weather Card: ${this.config.entity || 'No Entity Defined'}`}
>
${this.config.title
? html`
? html`
<div class="card-header">
${this.config.title}
</div>`
: ''}
: ''}
<div class="card-content">
${showToday
? html`
? html`
<clock-weather-card-today>
${safeRender(() => this.renderToday())}
</clock-weather-card-today>`
: ''}
: ''}
${showForecast
? html`
? html`
<clock-weather-card-forecast>
${safeRender(() => this.renderForecast())}
</clock-weather-card-forecast>`
: ''}
: ''}
</div>
</ha-card>
`
}

public connectedCallback (): void {
super.connectedCallback()
if (this.hasUpdated && this.config && this.hass) {
if (this.hasUpdated) {
this.subscribeForecastEvents()
}
}
Expand All @@ -190,6 +190,13 @@ export class ClockWeatherCard extends LitElement {
this.unsubscribeForecastEvents()
}

protected willUpdate (changedProps: PropertyValues): void {
super.willUpdate(changedProps)
if (!this.forecastSubscriber) {
this.subscribeForecastEvents()
}
}

private renderToday (): TemplateResult {
const weather = this.getWeather()
const state = weather.state
Expand Down Expand Up @@ -571,10 +578,15 @@ export class ClockWeatherCard extends LitElement {
}

private subscribeForecastEvents (): void {
this.unsubscribeForecastEvents()
if (this.isLegacyWeather()) {
return
}

if (!this.isConnected || !this.config || !this.hass) {
return
}

const hourly = this.config.hourly_forecast
if (hourly && !this.supportsFeature(WeatherEntityFeature.FORECAST_HOURLY)) {
throw new Error(`Weather entity "${this.config.entity}" does not support hourly forecasts.`)
Expand All @@ -587,17 +599,18 @@ export class ClockWeatherCard extends LitElement {
const callback = (event: WeatherForecastEvent): void => {
this.forecasts = event.forecast
}
this.forecastSubscriber = this.hass.connection.subscribeMessage<WeatherForecastEvent>(callback, {
this.hass.connection.subscribeMessage<WeatherForecastEvent>(callback, {
type: 'weather/subscribe_forecast',
forecast_type: hourly ? 'hourly' : 'daily',
entity_id: this.config.entity
})
.then(forecastSubscriber => { this.forecastSubscriber = forecastSubscriber })
.catch(e => { console.error('clock-weather-card - Error when subscribing to weather forecast: ', JSON.stringify(e)) })
}

private unsubscribeForecastEvents (): void {
if (this.forecastSubscriber) {
this.forecastSubscriber
.then((unsub) => { unsub() })
this.forecastSubscriber()
.catch(e => { console.error('clock-weather-card - Error when unsubscribing weather forecast: ' + e) })
}
}
Expand Down