Merge branch 'benphelps:main' into github-widget

public/locales/ar/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/bg/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/ca/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/cs/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/da/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/de/common.json

@@ -615,5 +615,10 @@
         "wanStatus": "WAN Status",
         "up": "Up",
         "down": "Down"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/el/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/en/common.json

@@ -102,6 +102,11 @@
         "subscriptions": "Subscriptions",
         "unread": "Unread"
     },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
+    },
     "changedetectionio": {
         "totalObserved": "Total Observed",
         "diffsDetected": "Diffs Detected"

public/locales/eo/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/es/common.json

@@ -607,13 +607,18 @@
         "poolUsage": "Comprobación del uso del grupo de memoria"
     },
     "pfsense": {
-        "load": "Load Avg",
+        "load": "Promedio de carga",
-        "memory": "Mem Usage",
+        "memory": "Memoria utilizada",
-        "wanStatus": "WAN Status",
+        "wanStatus": "Estado de la WAN",
-        "up": "Up",
+        "up": "Arriba",
-        "down": "Down",
+        "down": "Abajo",
-        "temp": "Temp",
+        "temp": "Temperatura",
-        "disk": "Disk Usage",
+        "disk": "Uso del disco",
-        "wanIP": "WAN IP"
+        "wanIP": "IP de la WAN"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/fi/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/fr/common.json

@@ -607,13 +607,18 @@
         "poolUsage": "Pool"
     },
     "pfsense": {
-        "load": "Load Avg",
+        "load": "Charge moy.",
-        "memory": "Mem Usage",
+        "memory": "Util. Mém.",
-        "wanStatus": "WAN Status",
+        "wanStatus": "Statut WAN",
         "up": "Up",
         "down": "Down",
         "temp": "Temp",
-        "disk": "Disk Usage",
+        "disk": "Util. Disque",
-        "wanIP": "WAN IP"
+        "wanIP": "IP WAN"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/he/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/hi/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/hr/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/hu/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/it/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/ja/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/ko/common.json

@@ -615,5 +615,10 @@
         "wanStatus": "WAN Status",
         "up": "Up",
         "down": "Down"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/lv/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/ms/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/nb-NO/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/nl/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/pl/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/pt-BR/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/pt/common.json

@@ -624,5 +624,10 @@
         "down": "Down",
         "temp": "Temp",
         "disk": "Disk Usage"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/ro/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/ru/common.json

@@ -615,5 +615,10 @@
         "up": "Up",
         "down": "Down",
         "temp": "Temp"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/sk/common.json

@@ -615,5 +615,10 @@
         "down": "Down",
         "temp": "Temp",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/sl/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/sr/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/sv/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/te/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/th/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/tr/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/uk/common.json

@@ -607,13 +607,18 @@
         "poolUsage": "Використання пулу"
     },
     "pfsense": {
-        "load": "Load Avg",
+        "load": "Середнє завантаження",
-        "memory": "Mem Usage",
+        "memory": "Використання пам'яті",
-        "wanStatus": "WAN Status",
+        "wanStatus": "Статус WAN",
-        "up": "Up",
+        "up": "Вгору",
-        "down": "Down",
+        "down": "Вниз",
-        "temp": "Temp",
+        "temp": "Температура",
-        "disk": "Disk Usage",
+        "disk": "Використання диска",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/vi/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/yue/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/zh-CN/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

public/locales/zh-Hant/common.json

@@ -615,5 +615,10 @@
         "temp": "Temp",
         "disk": "Disk Usage",
         "wanIP": "WAN IP"
+    },
+    "caddy": {
+        "upstreams": "Upstreams",
+        "requests": "Current requests",
+        "requests_failed": "Failed requests"
     }
 }

src/utils/proxy/handlers/generic.js

@@ -57,7 +57,7 @@ export default async function genericProxyHandler(req, res, map) {
       }
 
       if (status >= 400) {
-        logger.debug("HTTP Error %d calling %s//%s%s...", status, url.protocol, url.hostname, url.pathname);
+        logger.debug("HTTP Error %d calling %s//%s%s%s...", status, url.protocol, url.hostname, url.port, url.pathname);
         return res.status(status).json({error: {message: "HTTP Error", url: sanitizeErrorURL(url), resultData}});
       }
 

src/utils/proxy/http.js

@@ -81,7 +81,7 @@ export async function httpProxy(url, params = {}) {
     return [status, contentType, data, responseHeaders];
   }
   catch (err) {
-    logger.error("Error calling %s//%s%s...", constructedUrl.protocol, constructedUrl.hostname, constructedUrl.pathname);
+    logger.error("Error calling %s//%s%s%s...", constructedUrl.protocol, constructedUrl.hostname, constructedUrl.port, constructedUrl.pathname);
     logger.error(err);
     return [500, "application/json", { error: {message: err?.message ?? "Unknown error", url, rawError: err} }, null];
   }

src/widgets/caddy/component.jsx

@@ -0,0 +1,39 @@
+import { useTranslation } from "next-i18next";
+
+import Container from "components/services/widget/container";
+import Block from "components/services/widget/block";
+import useWidgetAPI from "utils/proxy/use-widget-api";
+
+export default function Component({ service }) {
+  const { t } = useTranslation();
+
+  const { widget } = service;
+  const { data: resultData, error: resultError } = useWidgetAPI(widget, "result");
+
+
+  if (resultError) {
+    return <Container service={service} error={resultError} />;
+  }
+
+  if (!resultData) {
+    return (
+      <Container service={service}>,
+        <Block label="caddy.upstreams" />
+        <Block label="caddy.requests" />
+        <Block label="caddy.requests_failed" />
+      </Container>
+    );
+  }
+
+  const upstreams = resultData.length;
+  const requests = resultData.reduce((acc, val) => acc + val.num_requests, 0);
+  const requestsFailed = resultData.reduce((acc, val) => acc + val.fails, 0);
+
+  return (
+    <Container service={service}>
+      <Block label="caddy.upstreams" value={t("common.number", { value: upstreams })} />
+      <Block label="caddy.requests" value={t("common.number", { value: requests })} />
+      <Block label="caddy.requests_failed" value={t("common.number", { value: requestsFailed })} />
+    </Container>
+  );
+}

src/widgets/caddy/widget.js

@@ -0,0 +1,8 @@
+import genericProxyHandler from "utils/proxy/handlers/generic";
+
+const widget = {
+  api: "{url}/reverse_proxy/upstreams",
+  proxyHandler: genericProxyHandler,
+};
+
+export default widget;

src/widgets/components.js

@@ -6,6 +6,7 @@ const components = {
   authentik: dynamic(() => import("./authentik/component")),
   autobrr: dynamic(() => import("./autobrr/component")),
   bazarr: dynamic(() => import("./bazarr/component")),
+  caddy: dynamic(() => import("./caddy/component")),
   changedetectionio: dynamic(() => import("./changedetectionio/component")),
   channelsdvrserver: dynamic(() => import("./channelsdvrserver/component")),
   cloudflared: dynamic(() => import("./cloudflared/component")),

src/widgets/widgets.js

@@ -3,6 +3,7 @@ import audiobookshelf from "./audiobookshelf/widget";
 import authentik from "./authentik/widget";
 import autobrr from "./autobrr/widget";
 import bazarr from "./bazarr/widget";
+import caddy from "./caddy/widget";
 import changedetectionio from "./changedetectionio/widget";
 import channelsdvrserver from "./channelsdvrserver/widget";
 import cloudflared from "./cloudflared/widget";
@@ -88,6 +89,7 @@ const widgets = {
   authentik,
   autobrr,
   bazarr,
+  caddy,
   changedetectionio,
   channelsdvrserver,
   cloudflared,