Add @tailwindcss/oxide to onlyBuiltDependencies

This reverts commit 06cf76d724.

.github/workflows/docker-publish.yml

@@ -84,7 +84,7 @@ jobs:
             latest=auto
 
       - name: Next.js build cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .next/cache
           key: nextjs-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx') }}

.github/workflows/docs-publish.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           python-version: 3.x
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache
@@ -63,7 +63,7 @@ jobs:
         with:
           python-version: 3.x
       - run: echo "cache_id=${{github.sha}}" >> $GITHUB_ENV
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache

.github/workflows/repo-maintenance.yml

@@ -32,7 +32,7 @@ jobs:
     name: 'Lock Old Threads'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           issue-inactive-days: '30'
           pr-inactive-days: '30'

docs/configs/docker.md

@@ -189,6 +189,8 @@ labels: ...
   - homepage.widgets[1].slug=youreventslughere
 ```
 
+To pass custom HTTP headers with a widget request when using labels, use the same dot-notation: `homepage.widget.headers.X-Auth-Key=secret` (or `homepage.widgets[0].headers.X-Auth-Key=secret` when multiple widgets are present).
+
 You can add specify fields for e.g. the [CustomAPI](../widgets/services/customapi.md) widget by using array-style dot notation:
 
 ```yaml

docs/configs/kubernetes.md

@@ -94,6 +94,7 @@ metadata:
     gethomepage.dev/name: Emby
     gethomepage.dev/widget.type: "emby"
     gethomepage.dev/widget.url: "https://emby.example.com"
+    gethomepage.dev/widget.headers.X-Auth-Key: "your-secret-here"
     gethomepage.dev/pod-selector: ""
     gethomepage.dev/weight: 10 # optional
     gethomepage.dev/instance: "public" # optional

docs/configs/services.md

@@ -101,6 +101,25 @@ Each service can have multiple widgets attached to it, for example:
 
       Multiple widgets per service are not yet supported with Kubernetes ingress annotations.
 
+#### Custom HTTP headers
+
+Widgets that make HTTP calls support extra request headers via `headers`. This is useful when a reverse proxy expects a secret header.
+
+```yaml
+- UptimeRobot:
+    icon: uptimekuma.png
+    href: https://uptimerobot.com/
+    widget:
+      type: uptimerobot
+      url: https://api.uptimerobot.com
+      key: ${UPTIMEROBOT_API_KEY}
+      headers:
+        User-Agent: homepage
+        X-Auth-Key: your-secret-here
+```
+
+If you define services via Docker labels or Kubernetes annotations, use the same key with dot-notation (for example `homepage.widget.headers.X-Auth-Key=secret` or `gethomepage.dev/widget.headers.X-Auth-Key: "secret"`).
+
 #### Field Visibility
 
 Each widget can optionally provide a list of which fields should be visible via the `fields` widget property. If no fields are specified, then all fields will be displayed. The `fields` property must be a valid YAML array of strings. As an example, here is the entry for Sonarr showing only a couple of fields.

package.json

@@ -25,7 +25,7 @@
     "luxon": "^3.6.1",
     "memory-cache": "^0.2.0",
     "minecraftstatuspinger": "^1.2.2",
-    "next": "^15.5.7",
+    "next": "^15.5.9",
     "next-i18next": "^12.1.0",
     "ping": "^0.4.4",
     "pretty-bytes": "^7.1.0",
@@ -65,6 +65,7 @@
   },
   "pnpm": {
     "onlyBuiltDependencies": [
+      "@tailwindcss/oxide",
       "osx-temperature-sensor",
       "sharp"
     ]

pnpm-lock.yaml

@@ -51,11 +51,11 @@ importers:
         specifier: ^1.2.2
         version: 1.2.2
       next:
-        specifier: ^15.5.7
+        specifier: ^15.5.9
-        version: 15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 15.5.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       next-i18next:
         specifier: ^12.1.0
-        version: 12.1.0(next@15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 12.1.0(next@15.5.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       ping:
         specifier: ^0.4.4
         version: 0.4.4
@@ -466,8 +466,8 @@ packages:
   '@napi-rs/wasm-runtime@0.2.8':
     resolution: {integrity: sha512-OBlgKdX7gin7OIq4fadsjpg+cp2ZphvAIKucHsNfTdJiqdOmOEwQd/bHi0VwNrcw5xpBJyUw6cK/QilCqy1BSg==}
 
-  '@next/env@15.5.7':
+  '@next/env@15.5.9':
-    resolution: {integrity: sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==}
+    resolution: {integrity: sha512-4GlTZ+EJM7WaW2HEZcyU317tIQDjkQIyENDLxYJfSWlfqguN+dHkZgyQTV/7ykvobU7yEH5gKvreNrH4B6QgIg==}
 
   '@next/eslint-plugin-next@15.2.4':
     resolution: {integrity: sha512-O8ScvKtnxkp8kL9TpJTTKnMqlkZnS+QxwoQnJwPGBxjBbzd6OVVPEJ5/pMNrktSyXQD/chEfzfFzYLM6JANOOQ==}
@@ -1120,8 +1120,8 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  caniuse-lite@1.0.30001759:
+  caniuse-lite@1.0.30001760:
-    resolution: {integrity: sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==}
+    resolution: {integrity: sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==}
 
   chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
@@ -2212,8 +2212,8 @@ packages:
       next: '>= 10.0.0'
       react: '>= 16.8.0'
 
-  next@15.5.7:
+  next@15.5.9:
-    resolution: {integrity: sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==}
+    resolution: {integrity: sha512-agNLK89seZEtC5zUHwtut0+tNrc0Xw4FT/Dg+B/VLEo9pAcS9rtTKpek3V6kVcVwsB2YlqMaHdfZL4eLEVYuCg==}
     engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
     hasBin: true
     peerDependencies:
@@ -3374,7 +3374,7 @@ snapshots:
       '@tybys/wasm-util': 0.9.0
     optional: true
 
-  '@next/env@15.5.7': {}
+  '@next/env@15.5.9': {}
 
   '@next/eslint-plugin-next@15.2.4':
     dependencies:
@@ -4024,7 +4024,7 @@ snapshots:
 
   callsites@3.1.0: {}
 
-  caniuse-lite@1.0.30001759: {}
+  caniuse-lite@1.0.30001760: {}
 
   chalk@4.1.2:
     dependencies:
@@ -5259,7 +5259,7 @@ snapshots:
 
   net@1.0.2: {}
 
-  next-i18next@12.1.0(next@15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  next-i18next@12.1.0(next@15.5.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@babel/runtime': 7.26.9
       '@types/hoist-non-react-statics': 3.3.6
@@ -5267,18 +5267,18 @@ snapshots:
       hoist-non-react-statics: 3.3.2
       i18next: 21.10.0
       i18next-fs-backend: 1.2.0
-      next: 15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      next: 15.5.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     transitivePeerDependencies:
       - react-dom
       - react-native
 
-  next@15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  next@15.5.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@next/env': 15.5.7
+      '@next/env': 15.5.9
       '@swc/helpers': 0.5.15
-      caniuse-lite: 1.0.30001759
+      caniuse-lite: 1.0.30001760
       postcss: 8.4.31
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)

public/locales/en/common.json

@@ -532,7 +532,8 @@
         "child_bridges_status": "{{ok}}/{{total}}",
         "up": "Up",
         "pending": "Pending",
-        "down": "Down"
+        "down": "Down",
+        "ok": "Ok"
     },
     "healthchecks": {
         "new": "New",

src/components/widgets/widget/resource.jsx

@@ -24,12 +24,12 @@ export default function Resource({
           wide ? " min-w-[120px]" : "min-w-[85px]"
         }`}
       >
-        <div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
+        <div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between gap-2">
           <div className="pl-0.5">{value}</div>
           <div className="pr-1">{label}</div>
         </div>
         {expanded && (
-          <div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between">
+          <div className="text-theme-800 dark:text-theme-200 text-xs flex flex-row justify-between gap-2">
             <div className="pl-0.5">{expandedValue}</div>
             <div className="pr-1">{expandedLabel}</div>
           </div>

src/pages/api/widgets/resources.js

@@ -59,7 +59,7 @@ export default async function handler(req, res) {
   }
 
   if (type === "network") {
-    let networkData = await si.networkStats();
+    let networkData = await si.networkStats("*");
     let interfaceDefault;
     logger.debug("networkData:", JSON.stringify(networkData));
     if (interfaceName && interfaceName !== "default") {

src/pages/index.jsx

@@ -554,48 +554,38 @@ export default function Wrapper({ initialSettings, fallback }) {
       html.classList.add(desiredThemeClass);
     }
 
-    if (backgroundImage) {
+    // Remove any previously applied inline styles
-      const safeBackgroundImage = backgroundImage.replace(/'/g, "\\'");
+    body.style.backgroundImage = "";
-      body.style.backgroundImage = `linear-gradient(rgb(var(--bg-color) / ${opacity}), rgb(var(--bg-color) / ${opacity})), url('${safeBackgroundImage}')`;
+    body.style.backgroundColor = "";
-      body.style.backgroundSize = "cover";
+    body.style.backgroundAttachment = "";
-      body.style.backgroundPosition = "center";
-      body.style.backgroundAttachment = "fixed";
-      body.style.backgroundRepeat = "no-repeat";
-      body.style.backgroundColor = "";
-    } else {
-      body.style.backgroundImage = "none";
-      body.style.backgroundColor = "rgb(var(--bg-color))";
-      body.style.backgroundSize = "";
-      body.style.backgroundPosition = "";
-      body.style.backgroundAttachment = "";
-      body.style.backgroundRepeat = "";
-    }
-
-    return () => {
-      body.style.backgroundImage = "";
-      body.style.backgroundColor = "";
-      body.style.backgroundSize = "";
-      body.style.backgroundPosition = "";
-      body.style.backgroundAttachment = "";
-      body.style.backgroundRepeat = "";
-    };
   }, [backgroundImage, opacity, theme, color, initialSettings.color]);
 
   return (
-    <div id="page_wrapper" className="relative min-h-screen">
+    <>
-      <div
+      {backgroundImage && (
-        id="inner_wrapper"
+        <div
-        tabIndex="-1"
+          id="background"
-        className={classNames(
+          aria-hidden="true"
-          "w-full min-h-screen overflow-auto",
+          style={{
-          backgroundBlur &&
+            backgroundImage: `linear-gradient(rgb(var(--bg-color) / ${opacity}), rgb(var(--bg-color) / ${opacity})), url('${backgroundImage}')`,
-            `backdrop-blur${initialSettings.background.blur?.length ? `-${initialSettings.background.blur}` : ""}`,
+          }}
-          backgroundSaturate && `backdrop-saturate-${initialSettings.background.saturate}`,
+        />
-          backgroundBrightness && `backdrop-brightness-${initialSettings.background.brightness}`,
+      )}
-        )}
+      <div id="page_wrapper" className="relative h-full">
-      >
+        <div
-        <Index initialSettings={initialSettings} fallback={fallback} />
+          id="inner_wrapper"
+          tabIndex="-1"
+          className={classNames(
+            "w-full h-full overflow-auto",
+            backgroundBlur &&
+              `backdrop-blur${initialSettings.background.blur?.length ? `-${initialSettings.background.blur}` : ""}`,
+            backgroundSaturate && `backdrop-saturate-${initialSettings.background.saturate}`,
+            backgroundBrightness && `backdrop-brightness-${initialSettings.background.brightness}`,
+          )}
+        >
+          <Index initialSettings={initialSettings} fallback={fallback} />
+        </div>
       </div>
-    </div>
+    </>
   );
 }

src/styles/globals.css

@@ -30,6 +30,18 @@ body,
   height: 100%;
   margin: 0;
   padding: 0;
+  background-color: rgb(var(--bg-color));
+}
+
+#background {
+  position: fixed;
+  inset: 0;
+  z-index: 0;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-attachment: scroll;
+  pointer-events: none;
 }
 
 html,

src/utils/proxy/handlers/credentialed.js

@@ -27,6 +27,9 @@ export default async function credentialedProxyHandler(req, res, map) {
 
       const headers = {
         "Content-Type": "application/json",
+        ...(widgets[widget.type].headers ?? {}),
+        ...(widget.headers ?? {}),
+        ...(req.extraHeaders ?? {}),
       };
 
       if (widget.type === "stocks") {

src/utils/proxy/handlers/generic.js

@@ -25,7 +25,11 @@ export default async function genericProxyHandler(req, res, map) {
       }
       const url = new URL(urlString);
 
-      const headers = req.extraHeaders ?? widget.headers ?? widgets[widget.type].headers ?? {};
+      const headers = {
+        ...(widgets[widget.type].headers ?? {}),
+        ...(widget.headers ?? {}),
+        ...(req.extraHeaders ?? {}),
+      };
 
       if (widget.username && widget.password) {
         headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;

src/widgets/fritzbox/proxy.js

@@ -85,6 +85,9 @@ export default async function fritzboxProxyHandler(req, res) {
     requestExternalIPv6Prefix ? requestEndpoint(apiBaseUrl, "WANIPConnection", "X_AVM_DE_GetIPv6Prefix") : null,
   ])
     .then(([statusInfo, linkProperties, addonInfos, externalIPAddress, externalIPv6Address, externalIPv6Prefix]) => {
+      const ipv6Prefix = externalIPv6Prefix?.NewIPv6Prefix;
+      const ipv6Len = externalIPv6Prefix?.NewPrefixLength;
+
       res.status(200).json({
         connectionStatus: statusInfo?.NewConnectionStatus || "Unconfigured",
         uptime: statusInfo?.NewUptime || 0,
@@ -96,7 +99,7 @@ export default async function fritzboxProxyHandler(req, res) {
         sent: addonInfos?.NewX_AVM_DE_TotalBytesSent64 || 0,
         externalIPAddress: externalIPAddress?.NewExternalIPAddress || null,
         externalIPv6Address: externalIPv6Address?.NewExternalIPv6Address || null,
-        externalIPv6Prefix: externalIPv6Prefix?.NewIPv6Prefix || null,
+        externalIPv6Prefix: ipv6Prefix && ipv6Len != null ? `${ipv6Prefix}/${ipv6Len}` : (ipv6Prefix ?? null),
       });
     })
     .catch((error) => {

src/widgets/plex/proxy.js

@@ -65,7 +65,7 @@ async function fetchFromPlexAPI(endpoint, widget) {
 export default async function plexProxyHandler(req, res) {
   const widget = await getWidget(req);
 
-  const { service } = req.query;
+  const { service, index } = req.query;
 
   if (!widget) {
     return res.status(400).json({ error: "Invalid proxy service type" });
@@ -85,19 +85,19 @@ export default async function plexProxyHandler(req, res) {
     streams = apiData.MediaContainer._attributes.size;
   }
 
-  let libraries = cache.get(`${librariesCacheKey}.${service}`);
+  let libraries = cache.get(`${librariesCacheKey}.${service}.${index}`);
   if (libraries === null) {
     logger.debug("Getting libraries from Plex API");
     [status, apiData] = await fetchFromPlexAPI("/library/sections", widget);
     if (apiData && apiData.MediaContainer) {
       libraries = [].concat(apiData.MediaContainer.Directory);
-      cache.put(`${librariesCacheKey}.${service}`, libraries, 1000 * 60 * 60 * 6);
+      cache.put(`${librariesCacheKey}.${service}.${index}`, libraries, 1000 * 60 * 60 * 6);
     }
   }
 
-  let albums = cache.get(`${albumsCacheKey}.${service}`);
+  let albums = cache.get(`${albumsCacheKey}.${service}.${index}`);
-  let movies = cache.get(`${moviesCacheKey}.${service}`);
+  let movies = cache.get(`${moviesCacheKey}.${service}.${index}`);
-  let tv = cache.get(`${tvCacheKey}.${service}`);
+  let tv = cache.get(`${tvCacheKey}.${service}.${index}`);
   if (albums === null || movies === null || tv === null) {
     albums = 0;
     movies = 0;
@@ -123,9 +123,9 @@ export default async function plexProxyHandler(req, res) {
         }
       }),
     );
-    cache.put(`${albumsCacheKey}.${service}`, albums, 1000 * 60 * 10);
+    cache.put(`${albumsCacheKey}.${service}.${index}`, albums, 1000 * 60 * 10);
-    cache.put(`${tvCacheKey}.${service}`, tv, 1000 * 60 * 10);
+    cache.put(`${tvCacheKey}.${service}.${index}`, tv, 1000 * 60 * 10);
-    cache.put(`${moviesCacheKey}.${service}`, movies, 1000 * 60 * 10);
+    cache.put(`${moviesCacheKey}.${service}.${index}`, movies, 1000 * 60 * 10);
   }
 
   const data = {

src/widgets/pyload/proxy.js

@@ -11,6 +11,15 @@ const logger = createLogger(proxyName);
 const sessionCacheKey = `${proxyName}__sessionId`;
 const isNgCacheKey = `${proxyName}__isNg`;
 
+function parsePyloadResponse(url, data) {
+  try {
+    return JSON.parse(Buffer.from(data).toString());
+  } catch (e) {
+    logger.error(`Error communicating with pyload API at ${url}, returned: ${JSON.stringify(data)}`);
+    return data;
+  }
+}
+
 async function fetchFromPyloadAPI(url, sessionId, params, service) {
   const options = {
     body: params
@@ -33,13 +42,33 @@ async function fetchFromPyloadAPI(url, sessionId, params, service) {
 
   // eslint-disable-next-line no-unused-vars
   const [status, contentType, data, responseHeaders] = await httpProxy(url, options);
-  let returnData;
+  const returnData = parsePyloadResponse(url, data);
-  try {
+  return [status, returnData, responseHeaders];
-    returnData = JSON.parse(Buffer.from(data).toString());
+}
-  } catch (e) {
+
-    logger.error(`Error communicating with pyload API at ${url}, returned: ${JSON.stringify(data)}`);
+async function fetchFromPyloadAPIBasic(url, params, username, password) {
-    returnData = data;
+  const parsedUrl = new URL(url);
+  const isGetRequest = !params || Object.keys(params).length === 0;
+
+  const options = {
+    method: isGetRequest ? "GET" : "POST",
+    headers: {
+      Authorization: `Basic ${Buffer.from(`${username}:${password}`).toString("base64")}`,
+    },
+  };
+
+  if (isGetRequest) {
+    if (params) {
+      Object.keys(params).forEach((key) => parsedUrl.searchParams.append(key, params[key]));
+    }
+  } else {
+    options.headers["Content-Type"] = "application/json";
+    options.body = JSON.stringify(params);
   }
+
+  // eslint-disable-next-line no-unused-vars
+  const [status, contentType, data, responseHeaders] = await httpProxy(parsedUrl, options);
+  const returnData = parsePyloadResponse(parsedUrl, data);
   return [status, returnData, responseHeaders];
 }
 
@@ -66,24 +95,43 @@ async function login(loginUrl, service, username, password = "") {
   return sessionId;
 }
 
-export default async function pyloadProxyHandler(req, res) {
+export default async function pyloadProxyHandler(req, res, map = {}) {
   const { group, service, endpoint, index } = req.query;
+  const { ngEndpoint } = map;
 
   try {
     if (group && service) {
       const widget = await getServiceWidget(group, service, index);
 
       if (widget) {
-        const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget }));
+        const apiTemplate = widgets[widget.type].api;
+        const url = new URL(formatApiCall(apiTemplate, { endpoint, ...widget }));
+        const ngUrl = ngEndpoint ? new URL(formatApiCall(apiTemplate, { endpoint: ngEndpoint, ...widget })) : url;
         const loginUrl = `${widget.url}/api/login`;
+        const hasCredentials = widget.username && widget.password;
+
+        if (hasCredentials) {
+          const [status, data] = await fetchFromPyloadAPIBasic(ngUrl, null, widget.username, widget.password);
+
+          if (status === 200 && !data?.error) {
+            cache.put(`${isNgCacheKey}.${service}`, true);
+            return res.json(data);
+          }
+
+          if (status === 401) {
+            return res
+              .status(status)
+              .send({ error: { message: "Invalid credentials communicating with Pyload API", data } });
+          }
+        }
 
         let sessionId =
           cache.get(`${sessionCacheKey}.${service}`) ??
           (await login(loginUrl, service, widget.username, widget.password));
         let [status, data] = await fetchFromPyloadAPI(url, sessionId, null, service);
 
-        if (status === 403 || status === 401) {
+        if (status === 403 || status === 401 || (status === 400 && data?.error?.includes("CSRF token"))) {
-          logger.info("Failed to retrieve data from Pyload API, trying to login again...");
+          logger.info("Failed to retrieve data from Pyload API with session auth, trying to login again...");
           cache.del(`${sessionCacheKey}.${service}`);
           sessionId = await login(loginUrl, service, widget.username, widget.password);
           [status, data] = await fetchFromPyloadAPI(url, sessionId, null, service);

src/widgets/pyload/widget.js

@@ -7,6 +7,7 @@ const widget = {
   mappings: {
     status: {
       endpoint: "statusServer",
+      map: { ngEndpoint: "status_server" },
     },
   },
 };

src/widgets/uptimerobot/component.jsx

@@ -49,10 +49,12 @@ export default function Component({ service }) {
 
   // single monitor
   const monitor = uptimerobotData.monitors[0];
+  const logs = Array.isArray(monitor.logs) ? monitor.logs : [];
+  const lastUpLog = logs.find((log) => log.type === 2);
+  const lastDownLog = logs.find((log) => log.type === 1);
+
   let status;
   let uptime = 0;
-  let logIndex = 0;
-  const hasLogs = Array.isArray(monitor.logs) && monitor.logs.length > 0;
 
   switch (monitor.status) {
     case 0:
@@ -63,8 +65,7 @@ export default function Component({ service }) {
       break;
     case 2:
       status = t("uptimerobot.up");
-      uptime = t("common.duration", { value: hasLogs ? monitor.logs[0].duration : 0 });
+      uptime = t("common.duration", { value: lastUpLog?.duration ?? 0 });
-      logIndex = 1;
       break;
     case 8:
       status = t("uptimerobot.seemsdown");
@@ -77,14 +78,14 @@ export default function Component({ service }) {
       break;
   }
 
-  const lastDown = hasLogs ? new Date(monitor.logs[logIndex].datetime * 1000).toLocaleString() : "";
+  const lastDown = lastDownLog ? new Date(lastDownLog.datetime * 1000).toLocaleString() : "";
-  const downDuration = t("common.duration", { value: hasLogs ? monitor.logs[logIndex].duration : 0 });
+  const downDuration = t("common.duration", { value: lastDownLog?.duration ?? 0 });
-  const hideDown = !hasLogs || (logIndex === 1 && monitor.logs[logIndex].type !== 1);
+  const hideDown = !lastDownLog;
 
   return (
     <Container service={service}>
       <Block label="uptimerobot.status" value={status} />
-      {hasLogs && <Block label="uptimerobot.uptime" value={uptime} />}
+      <Block label="uptimerobot.uptime" value={uptime} />
       {!hideDown && <Block label="uptimerobot.lastDown" value={lastDown} />}
       {!hideDown && <Block label="uptimerobot.downDuration" value={downDuration} />}
     </Container>