jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-08-01 13:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust it

Browse Source
This commit is contained in:
Joakim Sørensen 2021-06-30 08:48:40 +00:00
parent 9ced09035f
commit 774393a515
1 changed files with 35 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
hassio/src/ingress-view/hassio-ingress-view.ts
View File

@ -38,21 +38,18 @@ class HassioIngressView extends LitElement {
@property({ attribute: false }) public route!: Route; @property({ attribute: false }) public route!: Route;
@property({ type: Boolean }) public narrow = false;
@property({ type: Boolean }) public ingressPanel = false; @property({ type: Boolean }) public ingressPanel = false;
@state() private _addon?: HassioAddonDetails; @state() private _addon?: HassioAddonDetails;
@property({ type: Boolean }) @state() private _resolveIngressStatus?: number;
public narrow = false;
private _resolveIngressTime?: number;
private _sessionKeepAlive?: number; private _sessionKeepAlive?: number;
private _resolveIngressURL: {
status?: number;
time?: number;
interval?: number;
} = {};
public disconnectedCallback() { public disconnectedCallback() {
super.disconnectedCallback(); super.disconnectedCallback();
@ -60,54 +57,38 @@ class HassioIngressView extends LitElement {
clearInterval(this._sessionKeepAlive); clearInterval(this._sessionKeepAlive);
this._sessionKeepAlive = undefined; this._sessionKeepAlive = undefined;
} }
if (this._resolveIngressURL.interval) {
clearInterval(this._resolveIngressURL.interval); this._resolveIngressStatus = undefined;
} this._resolveIngressTime = undefined;
this._resolveIngressURL = {};
} }
public connectedCallback() { public connectedCallback() {
super.connectedCallback(); super.connectedCallback();
this._resolveURL();
this._resolveIngressURL.interval = window.setInterval(async () => {
await this._resolveURL();
}, 1000);
} }
private async _resolveURL(): Promise<void> { private async _resolveURL(addonSlug: string): Promise<void> {
await this._fetchData(addonSlug);
if (!this._addon) { if (!this._addon) {
window.setTimeout(async () => {
this._resolveURL(addonSlug);
}, 1000);
return; return;
} }
if (this._addon.state !== "started") { if (!this._resolveIngressTime) {
clearInterval(this._resolveIngressURL.interval); this._resolveIngressTime = new Date().getTime();
await showAlertDialog(this, {
text:
this.hass.localize("ingress.not_running") ||
"The add-on is not running, please start it.",
title: this._addon.name,
confirmText:
this.hass.localize("ingress.go_to_dashboard") ||
"Go to add-on dashboard",
});
await nextRender();
navigate(`/hassio/addon/${this._addon.slug}/info`, { replace: true });
return;
} }
if ( if (
this._resolveIngressURL.status && this._resolveIngressStatus &&
this._resolveIngressURL.status !== STATUS_BAD_GATEWAY this._resolveIngressStatus !== STATUS_BAD_GATEWAY
) { ) {
if (this._resolveIngressURL.interval) { return;
clearInterval(this._resolveIngressURL.interval);
}
} }
if ( if (
this._resolveIngressURL.time && this._resolveIngressTime &&
new Date().getTime() > this._resolveIngressURL.time + TIMEOUT new Date().getTime() > this._resolveIngressTime + TIMEOUT
) { ) {
await showAlertDialog(this, { await showAlertDialog(this, {
text: text:
@ -124,22 +105,24 @@ class HassioIngressView extends LitElement {
try { try {
const response = await fetch(this._addon.ingress_url!); const response = await fetch(this._addon.ingress_url!);
this._resolveIngressURL.status = response.status; this._resolveIngressStatus = response.status;
await this._fetchData(this._addon.slug);
} catch (err) { } catch (err) {
// eslint-disable-next-line // eslint-disable-next-line
console.error(err); console.error(err);
} }
window.setTimeout(async () => {
await this._resolveURL(this._addon!.slug);
}, 1000);
} }
protected render(): TemplateResult { protected render(): TemplateResult {
if (!this._addon || this._resolveIngressURL.status === STATUS_BAD_GATEWAY) { if (!this._addon || this._resolveIngressStatus === STATUS_BAD_GATEWAY) {
return html` return html`
<hass-loading-screen <hass-loading-screen
.narrow=${this.narrow} .narrow=${this.narrow}
.header=${this._addon?.name} .header=${this._addon?.name}
> >
${this._resolveIngressURL.status === STATUS_BAD_GATEWAY ${this._resolveIngressStatus === STATUS_BAD_GATEWAY
? html`<p> ? html`<p>
${this.hass.localize("ingress.waiting") || ${this.hass.localize("ingress.waiting") ||
"Waiting for add-on to start"} "Waiting for add-on to start"}
@ -225,7 +208,7 @@ class HassioIngressView extends LitElement {
const oldAddon = oldRoute ? oldRoute.path.substr(1) : undefined; const oldAddon = oldRoute ? oldRoute.path.substr(1) : undefined;
if (addon && addon !== oldAddon) { if (addon && addon !== oldAddon) {
this._fetchData(addon); this._resolveURL(addon);
} }
} }
@ -288,16 +271,15 @@ class HassioIngressView extends LitElement {
return; return;
} }
if (this._sessionKeepAlive) { if (!this._sessionKeepAlive) {
clearInterval(this._sessionKeepAlive); this._sessionKeepAlive = window.setInterval(async () => {
try {
await validateHassioSession(this.hass, session);
} catch (err) {
session = await createHassioSession(this.hass);
}
}, 60000);
} }
this._sessionKeepAlive = window.setInterval(async () => {
try {
await validateHassioSession(this.hass, session);
} catch (err) {
session = await createHassioSession(this.hass);
}
}, 60000);
this._addon = addon; this._addon = addon;
} }