+
diff --git a/src/widgets/emby/component.jsx b/src/widgets/emby/component.jsx
index 090a9c3f..6f66d1dc 100644
--- a/src/widgets/emby/component.jsx
+++ b/src/widgets/emby/component.jsx
@@ -225,7 +225,9 @@ export default function Component({ service }) {
}),
);
const url = `/api/services/proxy?${params.toString()}`;
- await fetch(url).then(() => {
+ await fetch(url, {
+ method: "POST",
+ }).then(() => {
sessionMutate();
});
}
diff --git a/src/widgets/glances/widget.js b/src/widgets/glances/widget.js
index e018ae39..00d3ac5a 100644
--- a/src/widgets/glances/widget.js
+++ b/src/widgets/glances/widget.js
@@ -3,7 +3,7 @@ import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "{url}/api/{endpoint}",
proxyHandler: credentialedProxyHandler,
- allowedEndpoints: /\d\/quicklook|diskio|fs|gpu|system|mem|network|processlist|sensors/,
+ allowedEndpoints: /\d\/quicklook|diskio|cpu|fs|gpu|system|mem|network|processlist|sensors/,
};
export default widget;
diff --git a/src/widgets/omada/component.jsx b/src/widgets/omada/component.jsx
index c4da6067..e63f93d3 100644
--- a/src/widgets/omada/component.jsx
+++ b/src/widgets/omada/component.jsx
@@ -9,7 +9,7 @@ export default function Component({ service }) {
const { widget } = service;
- const { data: omadaData, error: omadaAPIError } = useWidgetAPI(widget, {
+ const { data: omadaData, error: omadaAPIError } = useWidgetAPI(widget, "info", {
refreshInterval: 5000,
});
diff --git a/src/widgets/omada/widget.js b/src/widgets/omada/widget.js
index 5e32edad..3f5a70a1 100644
--- a/src/widgets/omada/widget.js
+++ b/src/widgets/omada/widget.js
@@ -2,6 +2,12 @@ import omadaProxyHandler from "./proxy";
const widget = {
proxyHandler: omadaProxyHandler,
+
+ mappings: {
+ info: {
+ endpoint: "api/info",
+ },
+ },
};
export default widget;
diff --git a/src/widgets/openwrt/proxy.js b/src/widgets/openwrt/proxy.js
index 04c7a503..977db8ca 100644
--- a/src/widgets/openwrt/proxy.js
+++ b/src/widgets/openwrt/proxy.js
@@ -77,7 +77,7 @@ async function fetchSystem(url) {
const systemResponse = JSON.parse(data.toString())[1];
const response = {
uptime: systemResponse.uptime,
- cpuLoad: systemResponse.load[1],
+ cpuLoad: (systemResponse.load[1] / 65536.0).toFixed(2),
};
return [200, contentType, response];
}
diff --git a/src/widgets/stash/component.jsx b/src/widgets/stash/component.jsx
index 66f949c1..3d64c490 100644
--- a/src/widgets/stash/component.jsx
+++ b/src/widgets/stash/component.jsx
@@ -1,18 +1,26 @@
import { useTranslation } from "next-i18next";
+import { useEffect, useState } from "react";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
-import useWidgetAPI from "utils/proxy/use-widget-api";
+import { formatProxyUrl } from "utils/proxy/api-helpers";
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
- const { data: stats, error: stashError } = useWidgetAPI(widget, "stats");
+ const [stats, setStats] = useState(null);
- if (stashError) {
- return
;
- }
+ useEffect(() => {
+ async function fetchStats() {
+ const url = formatProxyUrl(widget, "stats");
+ const res = await fetch(url, { method: "POST" });
+ setStats(await res.json());
+ }
+ if (!stats) {
+ fetchStats();
+ }
+ }, [widget, stats]);
if (!stats) {
return (
diff --git a/src/widgets/unifi/proxy.js b/src/widgets/unifi/proxy.js
index c8356c1b..98c98f37 100644
--- a/src/widgets/unifi/proxy.js
+++ b/src/widgets/unifi/proxy.js
@@ -14,13 +14,13 @@ const prefixCacheKey = `${proxyName}__prefix`;
const logger = createLogger(proxyName);
async function getWidget(req) {
- const { group, service, type } = req.query;
+ const { group, service } = req.query;
let widget = null;
- if (type === "unifi_console") {
+ if (group === "unifi_console" && service === "unifi_console") {
// info widget
const index = req.query?.query ? JSON.parse(req.query.query).index : undefined;
- widget = await getPrivateWidgetOptions(type, index);
+ widget = await getPrivateWidgetOptions("unifi_console", index);
if (!widget) {
logger.debug("Error retrieving settings for this Unifi widget");
return null;
diff --git a/src/widgets/unmanic/component.jsx b/src/widgets/unmanic/component.jsx
index 03447068..98688463 100644
--- a/src/widgets/unmanic/component.jsx
+++ b/src/widgets/unmanic/component.jsx
@@ -1,16 +1,30 @@
+import { useEffect, useState } from "react";
+
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
+import { formatProxyUrl } from "utils/proxy/api-helpers";
export default function Component({ service }) {
const { widget } = service;
const { data: workersData, error: workersError } = useWidgetAPI(widget, "workers");
- const { data: pendingData, error: pendingError } = useWidgetAPI(widget, "pending");
- if (workersError || pendingError) {
- const finalError = workersError ?? pendingError;
- return
;
+ const [pendingData, setPendingData] = useState(null);
+
+ useEffect(() => {
+ async function fetchPending() {
+ const url = formatProxyUrl(widget, "pending");
+ const res = await fetch(url, { method: "POST" });
+ setPendingData(await res.json());
+ }
+ if (!pendingData) {
+ fetchPending();
+ }
+ }, [widget, pendingData]);
+
+ if (workersError) {
+ return
;
}
if (!workersData || !pendingData) {
diff --git a/src/widgets/uptimerobot/component.jsx b/src/widgets/uptimerobot/component.jsx
index c0cb670f..27485401 100644
--- a/src/widgets/uptimerobot/component.jsx
+++ b/src/widgets/uptimerobot/component.jsx
@@ -1,18 +1,26 @@
import { useTranslation } from "next-i18next";
+import { useEffect, useState } from "react";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
-import useWidgetAPI from "utils/proxy/use-widget-api";
+import { formatProxyUrl } from "utils/proxy/api-helpers";
export default function Component({ service }) {
const { widget } = service;
const { t } = useTranslation();
- const { data: uptimerobotData, error: uptimerobotError } = useWidgetAPI(widget, "getmonitors");
+ const [uptimerobotData, setUptimerobotData] = useState(null);
- if (uptimerobotError) {
- return
;
- }
+ useEffect(() => {
+ async function fetchData() {
+ const url = formatProxyUrl(widget, "getmonitors");
+ const res = await fetch(url, { method: "POST" });
+ setUptimerobotData(await res.json());
+ }
+ if (!uptimerobotData) {
+ fetchData();
+ }
+ }, [widget, uptimerobotData]);
if (!uptimerobotData) {
return (
diff --git a/src/widgets/wgeasy/component.jsx b/src/widgets/wgeasy/component.jsx
index 0289d48c..624002c4 100644
--- a/src/widgets/wgeasy/component.jsx
+++ b/src/widgets/wgeasy/component.jsx
@@ -28,7 +28,7 @@ export default function Component({ service }) {
const enabled = infoData.filter((item) => item.enabled).length;
const disabled = infoData.length - enabled;
- const connectionThreshold = widget.threshold ?? 2 * 60 * 1000;
+ const connectionThreshold = (widget.threshold ?? 2) * 60 * 1000;
const currentTime = new Date();
const connected = infoData.filter(
(item) => currentTime - new Date(item.latestHandshakeAt) < connectionThreshold,
diff --git a/src/widgets/wgeasy/proxy.js b/src/widgets/wgeasy/proxy.js
index ec733475..d4289dc6 100644
--- a/src/widgets/wgeasy/proxy.js
+++ b/src/widgets/wgeasy/proxy.js
@@ -21,14 +21,21 @@ async function login(widget, service) {
});
try {
- const connectSidCookie = responseHeaders["set-cookie"]
+ let connectSidCookie = responseHeaders["set-cookie"];
+ if (!connectSidCookie) {
+ const sid = cache.get(`${sessionSIDCacheKey}.${service}`);
+ if (sid) {
+ return sid;
+ }
+ }
+ connectSidCookie = connectSidCookie
.find((cookie) => cookie.startsWith("connect.sid="))
.split(";")[0]
.replace("connect.sid=", "");
cache.put(`${sessionSIDCacheKey}.${service}`, connectSidCookie);
return connectSidCookie;
} catch (e) {
- logger.error(`Error logging into wg-easy`);
+ logger.error(`Error logging into wg-easy, error: ${e}`);
cache.del(`${sessionSIDCacheKey}.${service}`);
return null;
}