Fix hassio logs for core < 2024.11

home-assistant · Nov 7, 2024 · 6f4dd31 · 6f4dd31
1 parent a08c7a3
commit 6f4dd31
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/src/data/hassio/supervisor.ts b/src/data/hassio/supervisor.ts
@@ -185,6 +185,15 @@ export const fetchHassioInfo = async (
 export const fetchHassioBoots = async (hass: HomeAssistant) =>
   hass.callApi<HassioResponse<HassioBoots>>("GET", `hassio/host/logs/boots`);
 
+export const fetchHassioLogsLegacy = async (
+  hass: HomeAssistant,
+  provider: string
+) =>
+  hass.callApi<string>(
+    "GET",
+    `hassio/${provider.includes("_") ? `addons/${provider}` : provider}/logs`
+  );
+
 export const fetchHassioLogs = async (
   hass: HomeAssistant,
   provider: string,

diff --git a/src/panels/config/logs/error-log-card.ts b/src/panels/config/logs/error-log-card.ts
@@ -49,6 +49,7 @@ import {
   fetchHassioBoots,
   fetchHassioLogs,
   fetchHassioLogsFollow,
+  fetchHassioLogsLegacy,
   getHassioLogDownloadLinesUrl,
   getHassioLogDownloadUrl,
 } from "../../../data/hassio/supervisor";
@@ -545,8 +546,7 @@ class ErrorLogCard extends LitElement {
         this._streamSupported = false;
         let logs = "";
         if (isComponentLoaded(this.hass, "hassio") && this.provider) {
-          const repsonse = await fetchHassioLogs(this.hass, this.provider);
-          logs = await repsonse.text();
+          logs = await fetchHassioLogsLegacy(this.hass, this.provider);
         } else {
           logs = await fetchErrorLog(this.hass);
         }

diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
@@ -158,8 +158,13 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
         },
         callApi: async (method, path, parameters, headers) =>
           hassCallApi(auth, method, path, parameters, headers),
-        callApiRaw: async (method, path, parameters, headers, signal) =>
-          hassCallApiRaw(auth, method, path, parameters, headers, signal),
+        callApiRaw: async (
+          method,
+          path,
+          parameters,
+          headers,
+          signal // introduced in 2024.11
+        ) => hassCallApiRaw(auth, method, path, parameters, headers, signal),
         fetchWithAuth: (
           path: string,
           init: Parameters<typeof fetchWithAuth>[2]

diff --git a/src/types.ts b/src/types.ts
@@ -259,7 +259,7 @@ export interface HomeAssistant {
     parameters?: Record<string, any>,
     headers?: Record<string, string>
   ): Promise<T>;
-  callApiRaw(
+  callApiRaw( // introduced in 2024.11
     method: "GET" | "POST" | "PUT" | "DELETE",
     path: string,
     parameters?: Record<string, any>,