-
{full_title}
+
+ {stream_title}
+
{video_decision === "direct play" && audio_decision === "direct play" && (
@@ -74,8 +92,10 @@ function SingleSessionEntry({ session }) {
);
}
-function SessionEntry({ session }) {
- const { full_title, view_offset, progress_percent, state, video_decision, audio_decision } = session;
+function SessionEntry({ session, enableUser, showEpisodeNumber }) {
+ const { view_offset, progress_percent, state, video_decision, audio_decision } = session;
+
+ const stream_title = generateStreamTitle(session, enableUser, showEpisodeNumber);
return (
@@ -94,7 +114,9 @@ function SessionEntry({ session }) {
)}
-
{full_title}
+
+ {stream_title}
+
{video_decision === "direct play" && audio_decision === "direct play" && (
@@ -122,6 +144,10 @@ export default function Component({ service }) {
refreshInterval: 5000,
});
+ const enableUser = !!service.widget?.enableUser; // default is false
+ const expandOneStreamToTwoRows = service.widget?.expandOneStreamToTwoRows !== false; // default is true
+ const showEpisodeNumber = !!service.widget?.showEpisodeNumber; // default is false
+
if (activityError || (activityData && Object.keys(activityData.response.data).length === 0)) {
return
;
}
@@ -132,9 +158,11 @@ export default function Component({ service }) {
-
-
- -
-
+ {expandOneStreamToTwoRows && (
+
+ -
+
+ )}
);
}
@@ -155,18 +183,20 @@ export default function Component({ service }) {
{t("tautulli.no_active")}
-
- -
-
+ {expandOneStreamToTwoRows && (
+
+ -
+
+ )}
);
}
- if (playing.length === 1) {
+ if (expandOneStreamToTwoRows && playing.length === 1) {
const session = playing[0];
return (
-
+
);
}
@@ -174,7 +204,12 @@ export default function Component({ service }) {
return (
{playing.map((session) => (
-
+
))}
);
diff --git a/src/widgets/tdarr/proxy.js b/src/widgets/tdarr/proxy.js
index a1ebc149..898082f4 100644
--- a/src/widgets/tdarr/proxy.js
+++ b/src/widgets/tdarr/proxy.js
@@ -8,7 +8,7 @@ const proxyName = "tdarrProxyHandler";
const logger = createLogger(proxyName);
export default async function tdarrProxyHandler(req, res) {
- const { group, service, endpoint } = req.query;
+ const { group, service } = req.query;
if (!group || !service) {
logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
@@ -22,7 +22,7 @@ export default async function tdarrProxyHandler(req, res) {
return res.status(400).json({ error: "Invalid proxy service type" });
}
- const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget }));
+ const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint: undefined, ...widget }));
const [status, contentType, data] = await httpProxy(url, {
method: "POST",
diff --git a/src/widgets/transmission/proxy.js b/src/widgets/transmission/proxy.js
index f12d2a0c..823def05 100644
--- a/src/widgets/transmission/proxy.js
+++ b/src/widgets/transmission/proxy.js
@@ -11,7 +11,7 @@ const headerCacheKey = `${proxyName}__headers`;
const logger = createLogger(proxyName);
export default async function transmissionProxyHandler(req, res) {
- const { group, service, endpoint } = req.query;
+ const { group, service } = req.query;
if (!group || !service) {
logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
@@ -35,7 +35,7 @@ export default async function transmissionProxyHandler(req, res) {
const api = `${widget.url}${widget.rpcUrl || widgets[widget.type].rpcUrl}rpc`;
- const url = new URL(formatApiCall(api, { endpoint, ...widget }));
+ const url = new URL(formatApiCall(api, { endpoint: undefined, ...widget }));
const csrfHeaderName = "x-transmission-session-id";
const method = "POST";
diff --git a/src/widgets/truenas/component.jsx b/src/widgets/truenas/component.jsx
index 872d8c64..10d45bf6 100644
--- a/src/widgets/truenas/component.jsx
+++ b/src/widgets/truenas/component.jsx
@@ -40,7 +40,15 @@ export default function Component({ service }) {
{enablePools &&
poolsData.map((pool) => (
-
+
))}
);
diff --git a/src/widgets/truenas/pool.jsx b/src/widgets/truenas/pool.jsx
index 8e9d0465..b92ecb68 100644
--- a/src/widgets/truenas/pool.jsx
+++ b/src/widgets/truenas/pool.jsx
@@ -1,8 +1,18 @@
import classNames from "classnames";
import prettyBytes from "pretty-bytes";
-export default function Pool({ name, free, allocated, healthy }) {
- const total = free + allocated;
+export default function Pool({ name, free, allocated, healthy, data, nasType }) {
+ let total = 0;
+ if (nasType === "scale") {
+ total = free + allocated;
+ } else {
+ allocated = 0; // eslint-disable-line no-param-reassign
+ for (let i = 0; i < data.length; i += 1) {
+ total += data[i].stats.size;
+ allocated += data[i].stats.allocated; // eslint-disable-line no-param-reassign
+ }
+ }
+
const usedPercent = Math.round((allocated / total) * 100);
const statusColor = healthy ? "bg-green-500" : "bg-yellow-500";
diff --git a/src/widgets/truenas/widget.js b/src/widgets/truenas/widget.js
index 7435b6e1..5f8a38df 100644
--- a/src/widgets/truenas/widget.js
+++ b/src/widgets/truenas/widget.js
@@ -25,6 +25,7 @@ const widget = {
healthy: entry.healthy,
allocated: entry.allocated,
free: entry.free,
+ data: entry.topology.data,
})),
},
},
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/urbackup/widget.js b/src/widgets/urbackup/widget.js
index 5eac66d0..96c52296 100644
--- a/src/widgets/urbackup/widget.js
+++ b/src/widgets/urbackup/widget.js
@@ -2,6 +2,7 @@ import urbackupProxyHandler from "./proxy";
const widget = {
proxyHandler: urbackupProxyHandler,
+ allowedEndpoints: /status/,
};
export default widget;
diff --git a/src/widgets/wgeasy/component.jsx b/src/widgets/wgeasy/component.jsx
index e2434f51..624002c4 100644
--- a/src/widgets/wgeasy/component.jsx
+++ b/src/widgets/wgeasy/component.jsx
@@ -1,33 +1,45 @@
-import { useTranslation } from "next-i18next";
-
-import Block from "components/services/widget/block";
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: wgeasyData, error: wgeasyAPIError } = useWidgetAPI(widget, "unified", {
- refreshInterval: 5000,
- });
+ const { data: infoData, error: infoError } = useWidgetAPI(widget);
- if (wgeasyAPIError) {
- return
;
+ if (!widget.fields) {
+ widget.fields = ["connected", "enabled", "total"];
}
- if (!wgeasyData) {
+ if (infoError) {
+ return
;
+ }
+
+ if (!infoData) {
return (
-
+
+
+
+
);
}
+ const enabled = infoData.filter((item) => item.enabled).length;
+ const disabled = infoData.length - enabled;
+ const connectionThreshold = (widget.threshold ?? 2) * 60 * 1000;
+ const currentTime = new Date();
+ const connected = infoData.filter(
+ (item) => currentTime - new Date(item.latestHandshakeAt) < connectionThreshold,
+ ).length;
+
return (
-
+
+
+
+
);
}
diff --git a/src/widgets/wgeasy/proxy.js b/src/widgets/wgeasy/proxy.js
index 76f61151..d4289dc6 100644
--- a/src/widgets/wgeasy/proxy.js
+++ b/src/widgets/wgeasy/proxy.js
@@ -1,117 +1,77 @@
-/* eslint-disable no-underscore-dangle */
+import cache from "memory-cache";
+
+import getServiceWidget from "utils/config/service-helpers";
import { formatApiCall } from "utils/proxy/api-helpers";
import { httpProxy } from "utils/proxy/http";
-import getServiceWidget from "utils/config/service-helpers";
-import createLogger from "utils/logger";
import widgets from "widgets/widgets";
-
+import createLogger from "utils/logger";
const proxyName = "wgeasyProxyHandler";
-
const logger = createLogger(proxyName);
-let globalSid = null;
+const sessionSIDCacheKey = `${proxyName}__sessionSID`;
-async function getWidget(req) {
- const { group, service } = req.query;
- if (!group || !service) {
- logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
- return null;
+async function login(widget, service) {
+ const url = formatApiCall(widgets[widget.type].api, { ...widget, endpoint: "session" });
+ const [, , , responseHeaders] = await httpProxy(url, {
+ method: "POST",
+ body: JSON.stringify({ password: widget.password }),
+ headers: {
+ "Content-Type": "application/json",
+ },
+ });
+
+ try {
+ 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, error: ${e}`);
+ cache.del(`${sessionSIDCacheKey}.${service}`);
+ return null;
+ }
+}
+
+export default async function wgeasyProxyHandler(req, res) {
+ const { group, service } = req.query;
+
+ if (group && service) {
const widget = await getServiceWidget(group, service);
- if (!widget) {
- logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
- return null;
+
+ if (!widgets?.[widget.type]?.api) {
+ return res.status(403).json({ error: "Service does not support API calls" });
}
- return widget;
-}
-
-
-async function loginToWGEasy(endpoint, widget) {
- const api = widgets?.[widget.type]?.api;
- if (!api) {
- return [403, null];
- }
- // Create new session on WgEasy
- const url = new URL(formatApiCall(api, { endpoint, ...widget }));
-
- const [status, data, , responseHeaders] = await httpProxy(url, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
+ if (widget) {
+ let sid = cache.get(`${sessionSIDCacheKey}.${service}`);
+ if (!sid) {
+ sid = await login(widget, service);
+ if (!sid) {
+ return res.status(500).json({ error: "Failed to authenticate with Wg-Easy" });
+ }
+ }
+ const [, , data] = await httpProxy(
+ formatApiCall(widgets[widget.type].api, { ...widget, endpoint: "wireguard/client" }),
+ {
+ headers: {
+ "Content-Type": "application/json",
+ Cookie: `connect.sid=${sid}`,
+ },
},
- body: JSON.stringify({
- password: widget.password,
- })
- });
+ );
- if (status !== 204) {
- logger.error("HTTP %d communicating with NextPVR. Data: %s", status, data.toString());
- return [status, data, responseHeaders];
+ return res.json(JSON.parse(data));
}
- try {
- [ globalSid ] = responseHeaders["set-cookie"]
- } catch (e) {
- logger.error("Error decoding NextPVR API data. Data: %s", data.toString());
- return [status, null];
- }
- logger.info('gettingSID')
- return [status, true];
+ }
+
+ return res.status(400).json({ error: "Invalid proxy service type" });
}
-
-
-async function fetchDataFromWGeasy(endpoint, widget, sid) {
- const api = widgets?.[widget.type]?.api;
- if (!api) {
- return [403, null];
- }
- const url = `${new URL(formatApiCall(api, { endpoint, ...widget }))}`
- const [status, contentType, data] = await httpProxy(url, {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'Cookie': sid
- },
- });
-
- if (status !== 200) {
- logger.error("HTTP %d communicating with WGeasy. Data: %s", status, data.toString());
- return [status, data];
- }
-
- try {
- return [status, JSON.parse(data), contentType];
- } catch (e) {
- logger.error("Error decoding WGeasy API data. Data: %s", data.toString());
- return [status, null];
- }
-}
-
-export default async function WGeasyProxyHandler(req, res) {
- const widget = await getWidget(req);
-
- if (!globalSid) {
- await loginToWGEasy('session', widget);
- }
- if (!widget) {
- return res.status(400).json({ error: "Invalid proxy service type" });
- }
-
- logger.debug("Getting data from WGeasy API");
- // Calculate the number of clients
- const [status, apiData] = await fetchDataFromWGeasy('wireguard/client', widget, globalSid);
-
- if (status !== 200) {
- return res.status(status).json({ error: { message: "HTTP error communicating with WGeasy API", data: Buffer.from(apiData).toString() } });
- }
- let clientCount = 0;
- clientCount = apiData.length;
-
- const data = {
- clientCount
- };
-
- return res.status(status).send(data);
-
-}
-
diff --git a/src/widgets/wgeasy/widget.js b/src/widgets/wgeasy/widget.js
index fcb5bef6..7f7d69d7 100644
--- a/src/widgets/wgeasy/widget.js
+++ b/src/widgets/wgeasy/widget.js
@@ -1,14 +1,8 @@
-import nextpvrProxyHandler from "./proxy";
+import wgeasyProxyHandler from "./proxy";
const widget = {
api: "{url}/api/{endpoint}",
- proxyHandler: nextpvrProxyHandler,
-
- mappings: {
- unified: {
- endpoint: "/",
- },
- },
+ proxyHandler: wgeasyProxyHandler,
};
export default widget;
diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js
index 285a0a49..dc3c2352 100644
--- a/src/widgets/widgets.js
+++ b/src/widgets/widgets.js
@@ -12,11 +12,13 @@ import changedetectionio from "./changedetectionio/widget";
import channelsdvrserver from "./channelsdvrserver/widget";
import cloudflared from "./cloudflared/widget";
import coinmarketcap from "./coinmarketcap/widget";
+import crowdsec from "./crowdsec/widget";
import customapi from "./customapi/widget";
import deluge from "./deluge/widget";
import diskstation from "./diskstation/widget";
import downloadstation from "./downloadstation/widget";
import emby from "./emby/widget";
+import esphome from "./esphome/widget";
import evcc from "./evcc/widget";
import fileflows from "./fileflows/widget";
import flood from "./flood/widget";
@@ -32,6 +34,7 @@ import gotify from "./gotify/widget";
import grafana from "./grafana/widget";
import hdhomerun from "./hdhomerun/widget";
import homeassistant from "./homeassistant/widget";
+import homebox from "./homebox/widget";
import homebridge from "./homebridge/widget";
import healthchecks from "./healthchecks/widget";
import immich from "./immich/widget";
@@ -52,6 +55,7 @@ import mjpeg from "./mjpeg/widget";
import moonraker from "./moonraker/widget";
import mylar from "./mylar/widget";
import navidrome from "./navidrome/widget";
+import netalertx from "./netalertx/widget";
import netdata from "./netdata/widget";
import nextcloud from "./nextcloud/widget";
import nextdns from "./nextdns/widget";
@@ -71,7 +75,6 @@ import peanut from "./peanut/widget";
import pfsense from "./pfsense/widget";
import photoprism from "./photoprism/widget";
import proxmoxbackupserver from "./proxmoxbackupserver/widget";
-import pialert from "./pialert/widget";
import pihole from "./pihole/widget";
import plantit from "./plantit/widget";
import plex from "./plex/widget";
@@ -91,8 +94,11 @@ import sabnzbd from "./sabnzbd/widget";
import scrutiny from "./scrutiny/widget";
import sonarr from "./sonarr/widget";
import speedtest from "./speedtest/widget";
+import stash from "./stash/widget";
import strelaysrv from "./strelaysrv/widget";
+import swagdashboard from "./swagdashboard/widget";
import tailscale from "./tailscale/widget";
+import tandoor from "./tandoor/widget";
import tautulli from "./tautulli/widget";
import tdarr from "./tdarr/widget";
import titlecardmaker from "./titlecardmaker/widget";
@@ -105,6 +111,7 @@ import unmanic from "./unmanic/widget";
import uptimekuma from "./uptimekuma/widget";
import uptimerobot from "./uptimerobot/widget";
import watchtower from "./watchtower/widget";
+import wgeasy from "./wgeasy/widget";
import whatsupdocker from "./whatsupdocker/widget";
import wgeasy from "./wgeasy/widget";
import xteve from "./xteve/widget";
@@ -128,11 +135,13 @@ const widgets = {
channelsdvrserver,
cloudflared,
coinmarketcap,
+ crowdsec,
customapi,
deluge,
diskstation,
downloadstation,
emby,
+ esphome,
evcc,
fileflows,
flood,
@@ -148,6 +157,7 @@ const widgets = {
grafana,
hdhomerun,
homeassistant,
+ homebox,
homebridge,
healthchecks,
ical: calendar,
@@ -171,6 +181,7 @@ const widgets = {
moonraker,
mylar,
navidrome,
+ netalertx,
netdata,
nextcloud,
nextdns,
@@ -190,7 +201,7 @@ const widgets = {
pfsense,
photoprism,
proxmoxbackupserver,
- pialert,
+ pialert: netalertx,
pihole,
plantit,
plex,
@@ -210,8 +221,11 @@ const widgets = {
scrutiny,
sonarr,
speedtest,
+ stash,
strelaysrv,
+ swagdashboard,
tailscale,
+ tandoor,
tautulli,
tdarr,
titlecardmaker,
@@ -226,6 +240,7 @@ const widgets = {
uptimerobot,
urbackup,
watchtower,
+ wgeasy,
whatsupdocker,
wgeasy,
xteve,
diff --git a/src/widgets/xteve/component.jsx b/src/widgets/xteve/component.jsx
index 75629909..84a617c2 100644
--- a/src/widgets/xteve/component.jsx
+++ b/src/widgets/xteve/component.jsx
@@ -9,7 +9,7 @@ export default function Component({ service }) {
const { widget } = service;
- const { data: xteveData, error: xteveError } = useWidgetAPI(widget, "api");
+ const { data: xteveData, error: xteveError } = useWidgetAPI(widget);
if (xteveError) {
return
;
diff --git a/src/widgets/xteve/proxy.js b/src/widgets/xteve/proxy.js
index a8b1c80f..421f2b49 100644
--- a/src/widgets/xteve/proxy.js
+++ b/src/widgets/xteve/proxy.js
@@ -7,7 +7,7 @@ import getServiceWidget from "utils/config/service-helpers";
const logger = createLogger("xteveProxyHandler");
export default async function xteveProxyHandler(req, res) {
- const { group, service, endpoint } = req.query;
+ const { group, service } = req.query;
if (!group || !service) {
return res.status(400).json({ error: "Invalid proxy service type" });
@@ -19,7 +19,7 @@ export default async function xteveProxyHandler(req, res) {
return res.status(403).json({ error: "Service does not support API calls" });
}
- const url = formatApiCall(api, { endpoint, ...widget });
+ const url = formatApiCall(api, { endpoint: "api/", ...widget });
const method = "POST";
const payload = { cmd: "status" };
diff --git a/src/widgets/xteve/widget.js b/src/widgets/xteve/widget.js
index e7998e2e..72c62b25 100644
--- a/src/widgets/xteve/widget.js
+++ b/src/widgets/xteve/widget.js
@@ -3,12 +3,6 @@ import xteveProxyHandler from "./proxy";
const widget = {
api: "{url}/{endpoint}",
proxyHandler: xteveProxyHandler,
-
- mappings: {
- api: {
- endpoint: "api/",
- },
- },
};
export default widget;
+
+