);
}
diff --git a/src/components/version.jsx b/src/components/version.jsx
index bc142e925..9b1d8cdec 100644
--- a/src/components/version.jsx
+++ b/src/components/version.jsx
@@ -8,9 +8,9 @@ import cachedFetch from "utils/proxy/cached-fetch";
export default function Version() {
const { t, i18n } = useTranslation();
- const buildTime = process.env.NEXT_PUBLIC_BUILDTIME ?? new Date().toISOString();
- const revision = process.env.NEXT_PUBLIC_REVISION ?? "dev";
- const version = process.env.NEXT_PUBLIC_VERSION ?? "dev";
+ const buildTime = process.env.NEXT_PUBLIC_BUILDTIME?.length ? process.env.NEXT_PUBLIC_BUILDTIME : new Date().toISOString();
+ const revision = process.env.NEXT_PUBLIC_REVISION?.length ? process.env.NEXT_PUBLIC_REVISION : "dev";
+ const version = process.env.NEXT_PUBLIC_VERSION?.length ? process.env.NEXT_PUBLIC_VERSION : "dev";
const cachedFetcher = (resource) => cachedFetch(resource, 5).then((res) => res.json());
@@ -36,17 +36,14 @@ export default function Version() {
{version} ({revision.substring(0, 7)}, {formatDate(buildTime)})
) : (
- releaseData &&
- compareVersions(latestRelease.tag_name, version) > 0 && (
-
)}
{version === "main" || version === "dev" || version === "nightly"
diff --git a/src/components/widgets/datetime/datetime.jsx b/src/components/widgets/datetime/datetime.jsx
index dceaf06a3..88b25e2d9 100644
--- a/src/components/widgets/datetime/datetime.jsx
+++ b/src/components/widgets/datetime/datetime.jsx
@@ -15,22 +15,21 @@ const textSizes = {
export default function DateTime({ options }) {
const { text_size: textSize, format } = options;
const { i18n } = useTranslation();
- const [date, setDate] = useState(new Date());
-
+ const [date, setDate] = useState("");
+
useEffect(() => {
+ const dateFormat = new Intl.DateTimeFormat(i18n.language, { ...format });
const interval = setInterval(() => {
- setDate(new Date());
+ setDate(dateFormat.format(new Date()));
}, 1000);
return () => clearInterval(interval);
- }, [setDate]);
-
- const dateFormat = new Intl.DateTimeFormat(i18n.language, { ...format });
+ }, [date, setDate, i18n.language, format]);
return (
diff --git a/src/components/widgets/resources/memory.jsx b/src/components/widgets/resources/memory.jsx
index 452634565..2888f9070 100644
--- a/src/components/widgets/resources/memory.jsx
+++ b/src/components/widgets/resources/memory.jsx
@@ -52,7 +52,7 @@ export default function Memory({ expanded }) {
- {t("common.bytes", { value: data.memory.freeMemMb * 1024 * 1024, maximumFractionDigits: 0, binary: true })}
+ {t("common.bytes", { value: data.memory.freeMemMb * 1024 * 1024, maximumFractionDigits: 1, binary: true })}
{t("resources.free")}
@@ -61,7 +61,7 @@ export default function Memory({ expanded }) {
{t("common.bytes", {
value: data.memory.totalMemMb * 1024 * 1024,
- maximumFractionDigits: 0,
+ maximumFractionDigits: 1,
binary: true,
})}
diff --git a/src/pages/api/docker/status/[...service].js b/src/pages/api/docker/status/[...service].js
index 8330ac3d3..2861a1e58 100644
--- a/src/pages/api/docker/status/[...service].js
+++ b/src/pages/api/docker/status/[...service].js
@@ -40,6 +40,7 @@ export default async function handler(req, res) {
return res.status(200).json({
status: info.State.Status,
+ health: info.State.Health?.Status
});
} catch {
return res.status(500).send({
diff --git a/src/pages/api/ping.js b/src/pages/api/ping.js
index 79c7da0c9..66eab281c 100644
--- a/src/pages/api/ping.js
+++ b/src/pages/api/ping.js
@@ -15,11 +15,18 @@ export default async function handler(req, res) {
});
}
- const startTime = performance.now();
- const [status] = await httpProxy(pingURL, {
+ let startTime = performance.now();
+ let [status] = await httpProxy(pingURL, {
method: "HEAD"
});
- const endTime = performance.now();
+ let endTime = performance.now();
+
+ if (status >= 400) {
+ // try one more time as a GET in case HEAD is rejected for whatever reason
+ startTime = performance.now();
+ [status] = await httpProxy(pingURL);
+ endTime = performance.now();
+ }
return res.status(200).json({
status,
diff --git a/src/utils/config/config.js b/src/utils/config/config.js
index 0003c589d..57a63f7b4 100644
--- a/src/utils/config/config.js
+++ b/src/utils/config/config.js
@@ -32,5 +32,5 @@ export function getSettings() {
const settingsYaml = join(process.cwd(), "config", "settings.yaml");
const fileContents = readFileSync(settingsYaml, "utf8");
- return yaml.load(fileContents);
+ return yaml.load(fileContents) ?? {};
}
\ No newline at end of file
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 15740d22b..e0a9f23f1 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -118,6 +118,7 @@ export function cleanServiceGroups(groups) {
container,
currency, // coinmarketcap widget
symbols,
+ defaultinterval
} = cleanedService.widget;
cleanedService.widget = {
@@ -129,6 +130,7 @@ export function cleanServiceGroups(groups) {
if (currency) cleanedService.widget.currency = currency;
if (symbols) cleanedService.widget.symbols = symbols;
+ if (defaultinterval) cleanedService.widget.defaultinterval = defaultinterval;
if (type === "docker") {
if (server) cleanedService.widget.server = server;
diff --git a/src/utils/proxy/handlers/jsonrpc.js b/src/utils/proxy/handlers/jsonrpc.js
new file mode 100644
index 000000000..274276122
--- /dev/null
+++ b/src/utils/proxy/handlers/jsonrpc.js
@@ -0,0 +1,82 @@
+import { JSONRPCClient, JSONRPCErrorException } from "json-rpc-2.0";
+
+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";
+
+const logger = createLogger("jsonrpcProxyHandler");
+
+export async function sendJsonRpcRequest(url, method, params, username, password) {
+ const headers = {
+ "content-type": "application/json",
+ "accept": "application/json"
+ }
+
+ if (username && password) {
+ headers.authorization = `Basic ${Buffer.from(`${username}:${password}`).toString("base64")}`;
+ }
+
+ const client = new JSONRPCClient(async (rpcRequest) => {
+ const body = JSON.stringify(rpcRequest);
+ const httpRequestParams = {
+ method: "POST",
+ headers,
+ body
+ };
+
+ // eslint-disable-next-line no-unused-vars
+ const [status, contentType, data] = await httpProxy(url, httpRequestParams);
+ if (status === 200) {
+ const json = JSON.parse(data.toString());
+
+ // in order to get access to the underlying error object in the JSON response
+ // you must set `result` equal to undefined
+ if (json.error && (json.result === null)) {
+ json.result = undefined;
+ }
+ return client.receive(json);
+ }
+
+ return Promise.reject(data?.error ? data : new Error(data.toString()));
+ });
+
+ try {
+ const response = await client.request(method, params);
+ return [200, "application/json", JSON.stringify(response)];
+ }
+ catch (e) {
+ if (e instanceof JSONRPCErrorException) {
+ logger.debug("Error calling JSONPRC endpoint: %s. %s", url, e.message);
+ return [200, "application/json", JSON.stringify({result: null, error: {code: e.code, message: e.message}})];
+ }
+
+ logger.warn("Error calling JSONPRC endpoint: %s. %s", url, e);
+ return [500, "application/json", JSON.stringify({result: null, error: {code: 2, message: e.toString()}})];
+ }
+}
+
+export default async function jsonrpcProxyHandler(req, res) {
+ const { group, service, endpoint: method } = req.query;
+
+ if (group && service) {
+ const widget = await getServiceWidget(group, service);
+ const api = widgets?.[widget.type]?.api;
+
+ if (!api) {
+ return res.status(403).json({ error: "Service does not support API calls" });
+ }
+
+ if (widget) {
+ const url = formatApiCall(api, { ...widget });
+
+ // eslint-disable-next-line no-unused-vars
+ const [status, contentType, data] = await sendJsonRpcRequest(url, method, null, widget.username, widget.password);
+ return res.status(status).end(data);
+ }
+ }
+
+ logger.debug("Invalid or missing proxy service type '%s' in group '%s'", service, group);
+ return res.status(400).json({ error: "Invalid proxy service type" });
+}
diff --git a/src/utils/proxy/http.js b/src/utils/proxy/http.js
index 16b58bf70..e07f06ff8 100644
--- a/src/utils/proxy/http.js
+++ b/src/utils/proxy/http.js
@@ -18,10 +18,15 @@ function addCookieHandler(url, params) {
};
}
-export function httpsRequest(url, params) {
+function handleRequest(requestor, url, params) {
return new Promise((resolve, reject) => {
addCookieHandler(url, params);
- const request = https.request(url, params, (response) => {
+ if (params?.body) {
+ params.headers = params.headers ?? {};
+ params.headers['content-length'] = Buffer.byteLength(params.body);
+ }
+
+ const request = requestor.request(url, params, (response) => {
const data = [];
response.on("data", (chunk) => {
@@ -38,7 +43,7 @@ export function httpsRequest(url, params) {
reject([500, error]);
});
- if (params.body) {
+ if (params?.body) {
request.write(params.body);
}
@@ -46,32 +51,12 @@ export function httpsRequest(url, params) {
});
}
+export function httpsRequest(url, params) {
+ return handleRequest(https, url, params);
+}
+
export function httpRequest(url, params) {
- return new Promise((resolve, reject) => {
- addCookieHandler(url, params);
- const request = http.request(url, params, (response) => {
- const data = [];
-
- response.on("data", (chunk) => {
- data.push(chunk);
- });
-
- response.on("end", () => {
- addCookieToJar(url, response.headers);
- resolve([response.statusCode, response.headers["content-type"], Buffer.concat(data), response.headers]);
- });
- });
-
- request.on("error", (error) => {
- reject([500, error]);
- });
-
- if (params.body) {
- request.write(params.body);
- }
-
- request.end();
- });
+ return handleRequest(http, url, params);
}
export async function httpProxy(url, params = {}) {
diff --git a/src/widgets/changedetectionio/component.jsx b/src/widgets/changedetectionio/component.jsx
index 0a4ce8d2c..6f98df6b5 100644
--- a/src/widgets/changedetectionio/component.jsx
+++ b/src/widgets/changedetectionio/component.jsx
@@ -14,6 +14,11 @@ export default function Component({ service }) {
if (error) {
return
;
}
+
+ if (!data) {
+ return
;
+ }
+
const totalObserved = Object.keys(data).length;
let diffsDetected = 0;
diff --git a/src/widgets/coinmarketcap/component.jsx b/src/widgets/coinmarketcap/component.jsx
index 90b91a5ea..180ffe220 100644
--- a/src/widgets/coinmarketcap/component.jsx
+++ b/src/widgets/coinmarketcap/component.jsx
@@ -17,11 +17,12 @@ export default function Component({ service }) {
{ label: t("coinmarketcap.30days"), value: "30d" },
];
- const [dateRange, setDateRange] = useState(dateRangeOptions[0].value);
-
const { widget } = service;
const { symbols } = widget;
const currencyCode = widget.currency ?? "USD";
+ const interval = widget.defaultinterval ?? dateRangeOptions[0].value;
+
+ const [dateRange, setDateRange] = useState(interval);
const { data: statsData, error: statsError } = useWidgetAPI(widget, "v1/cryptocurrency/quotes/latest", {
symbol: `${symbols.join(",")}`,
diff --git a/src/widgets/components.js b/src/widgets/components.js
index b781172bf..b0752b62f 100644
--- a/src/widgets/components.js
+++ b/src/widgets/components.js
@@ -7,8 +7,11 @@ const components = {
bazarr: dynamic(() => import("./bazarr/component")),
changedetectionio: dynamic(() => import("./changedetectionio/component")),
coinmarketcap: dynamic(() => import("./coinmarketcap/component")),
+ deluge: dynamic(() => import("./deluge/component")),
+ diskstation: dynamic(() => import("./diskstation/component")),
docker: dynamic(() => import("./docker/component")),
emby: dynamic(() => import("./emby/component")),
+ flood: dynamic(() => import("./flood/component")),
gluetun: dynamic(() => import("./gluetun/component")),
gotify: dynamic(() => import("./gotify/component")),
hdhomerun: dynamic(() => import("./hdhomerun/component")),
@@ -23,6 +26,7 @@ const components = {
nzbget: dynamic(() => import("./nzbget/component")),
ombi: dynamic(() => import("./ombi/component")),
overseerr: dynamic(() => import("./overseerr/component")),
+ paperlessngx: dynamic(() => import("./paperlessngx/component")),
pihole: dynamic(() => import("./pihole/component")),
plex: dynamic(() => import("./plex/component")),
portainer: dynamic(() => import("./portainer/component")),
@@ -34,6 +38,7 @@ const components = {
readarr: dynamic(() => import("./readarr/component")),
rutorrent: dynamic(() => import("./rutorrent/component")),
sabnzbd: dynamic(() => import("./sabnzbd/component")),
+ scrutiny: dynamic(() => import("./scrutiny/component")),
sonarr: dynamic(() => import("./sonarr/component")),
speedtest: dynamic(() => import("./speedtest/component")),
strelaysrv: dynamic(() => import("./strelaysrv/component")),
diff --git a/src/widgets/deluge/component.jsx b/src/widgets/deluge/component.jsx
new file mode 100644
index 000000000..6615cac0c
--- /dev/null
+++ b/src/widgets/deluge/component.jsx
@@ -0,0 +1,52 @@
+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: torrentData, error: torrentError } = useWidgetAPI(widget);
+
+ if (torrentError) {
+ return
;
+ }
+
+ if (!torrentData) {
+ return (
+
+
+
+
+
+
+ );
+ }
+
+ const { torrents } = torrentData;
+ const keys = torrents ? Object.keys(torrents) : [];
+
+ let rateDl = 0;
+ let rateUl = 0;
+ let completed = 0;
+ for (let i = 0; i < keys.length; i += 1) {
+ const torrent = torrents[keys[i]];
+ rateDl += torrent.download_payload_rate;
+ rateUl += torrent.upload_payload_rate;
+ completed += torrent.total_remaining === 0 ? 1 : 0;
+ }
+
+ const leech = keys.length - completed || 0;
+
+ return (
+
+
+
+
+
+
+ );
+}
diff --git a/src/widgets/deluge/proxy.js b/src/widgets/deluge/proxy.js
new file mode 100644
index 000000000..371f7759b
--- /dev/null
+++ b/src/widgets/deluge/proxy.js
@@ -0,0 +1,63 @@
+import { formatApiCall } from "utils/proxy/api-helpers";
+import { sendJsonRpcRequest } from "utils/proxy/handlers/jsonrpc";
+import getServiceWidget from "utils/config/service-helpers";
+import createLogger from "utils/logger";
+import widgets from "widgets/widgets";
+
+const logger = createLogger("delugeProxyHandler");
+
+const dataMethod = "web.update_ui";
+const dataParams = [
+ ["queue", "name", "total_wanted", "state", "progress", "download_payload_rate", "upload_payload_rate", "total_remaining"],
+ {}
+];
+const loginMethod = "auth.login";
+
+async function sendRpc(url, method, params) {
+ const [status, contentType, data] = await sendJsonRpcRequest(url, method, params);
+ const json = JSON.parse(data.toString());
+ if (json?.error) {
+ if (json.error.code === 1) {
+ return [403, contentType, data];
+ }
+ return [500, contentType, data];
+ }
+
+ return [status, contentType, data];
+}
+
+function login(url, password) {
+ return sendRpc(url, loginMethod, [password]);
+}
+
+export default async function delugeProxyHandler(req, res) {
+ const { group, service } = req.query;
+
+ if (!group || !service) {
+ logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
+ return res.status(400).json({ error: "Invalid proxy service type" });
+ }
+
+ const widget = await getServiceWidget(group, service);
+
+ if (!widget) {
+ logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
+ return res.status(400).json({ error: "Invalid proxy service type" });
+ }
+
+ const api = widgets?.[widget.type]?.api
+ const url = new URL(formatApiCall(api, { ...widget }));
+
+ let [status, contentType, data] = await sendRpc(url, dataMethod, dataParams);
+ if (status === 403) {
+ [status, contentType, data] = await login(url, widget.password);
+ if (status !== 200) {
+ return res.status(status).end(data);
+ }
+
+ // eslint-disable-next-line no-unused-vars
+ [status, contentType, data] = await sendRpc(url, dataMethod, dataParams);
+ }
+
+ return res.status(status).end(data);
+}
diff --git a/src/widgets/deluge/widget.js b/src/widgets/deluge/widget.js
new file mode 100644
index 000000000..b5518b666
--- /dev/null
+++ b/src/widgets/deluge/widget.js
@@ -0,0 +1,8 @@
+import delugeProxyHandler from "./proxy";
+
+const widget = {
+ api: "{url}/json",
+ proxyHandler: delugeProxyHandler,
+};
+
+export default widget;
diff --git a/src/widgets/diskstation/component.jsx b/src/widgets/diskstation/component.jsx
new file mode 100644
index 000000000..3a87eebc3
--- /dev/null
+++ b/src/widgets/diskstation/component.jsx
@@ -0,0 +1,41 @@
+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: listData, error: listError } = useWidgetAPI(widget, "list");
+
+ if (listError) {
+ return
;
+ }
+
+ const tasks = listData?.data?.tasks;
+ if (!tasks) {
+ return (
+
+
+
+
+
+
+ );
+ }
+
+ const rateDl = tasks.reduce((acc, task) => acc + (task?.additional?.transfer?.speed_download ?? 0), 0);
+ const rateUl = tasks.reduce((acc, task) => acc + (task?.additional?.transfer?.speed_upload ?? 0), 0);
+ const completed = tasks.filter((task) => task?.additional?.transfer?.size_downloaded === task?.size)?.length || 0;
+ const leech = tasks.length - completed || 0;
+
+ return (
+
+
+
+
+
+
+ );
+}
diff --git a/src/widgets/diskstation/proxy.js b/src/widgets/diskstation/proxy.js
new file mode 100644
index 000000000..af7678152
--- /dev/null
+++ b/src/widgets/diskstation/proxy.js
@@ -0,0 +1,70 @@
+import { formatApiCall } from "utils/proxy/api-helpers";
+import { httpProxy } from "utils/proxy/http";
+import createLogger from "utils/logger";
+import widgets from "widgets/widgets";
+import getServiceWidget from "utils/config/service-helpers";
+
+const logger = createLogger("diskstationProxyHandler");
+const authApi = "{url}/webapi/auth.cgi?api=SYNO.API.Auth&version=2&method=login&account={username}&passwd={password}&session=DownloadStation&format=cookie"
+
+async function login(widget) {
+ const loginUrl = formatApiCall(authApi, widget);
+ const [status, contentType, data] = await httpProxy(loginUrl);
+ if (status !== 200) {
+ return [status, contentType, data];
+ }
+
+ const json = JSON.parse(data.toString());
+ if (json?.success !== true) {
+ // from https://global.download.synology.com/download/Document/Software/DeveloperGuide/Package/DownloadStation/All/enu/Synology_Download_Station_Web_API.pdf
+ /*
+ Code Description
+ 400 No such account or incorrect password
+ 401 Account disabled
+ 402 Permission denied
+ 403 2-step verification code required
+ 404 Failed to authenticate 2-step verification code
+ */
+ let message = "Authentication failed.";
+ if (json?.error?.code >= 403) message += " 2FA enabled.";
+ logger.warn("Unable to login. Code: %d", json?.error?.code);
+ return [401, "application/json", JSON.stringify({ code: json?.error?.code, message })];
+ }
+
+ return [status, contentType, data];
+}
+
+export default async function diskstationProxyHandler(req, res) {
+ const { group, service, endpoint } = req.query;
+
+ if (!group || !service) {
+ return res.status(400).json({ error: "Invalid proxy service type" });
+ }
+
+ const widget = await getServiceWidget(group, service);
+ const api = widgets?.[widget.type]?.api;
+ if (!api) {
+ return res.status(403).json({ error: "Service does not support API calls" });
+ }
+
+ const url = formatApiCall(api, { endpoint, ...widget });
+ let [status, contentType, data] = await httpProxy(url);
+ if (status !== 200) {
+ logger.debug("Error %d calling endpoint %s", status, url);
+ return res.status(status, data);
+ }
+
+ const json = JSON.parse(data.toString());
+ if (json?.success !== true) {
+ logger.debug("Logging in to DiskStation");
+ [status, contentType, data] = await login(widget);
+ if (status !== 200) {
+ return res.status(status).end(data)
+ }
+
+ [status, contentType, data] = await httpProxy(url);
+ }
+
+ if (contentType) res.setHeader("Content-Type", contentType);
+ return res.status(status).send(data);
+}
diff --git a/src/widgets/diskstation/widget.js b/src/widgets/diskstation/widget.js
new file mode 100644
index 000000000..71187425d
--- /dev/null
+++ b/src/widgets/diskstation/widget.js
@@ -0,0 +1,14 @@
+import diskstationProxyHandler from "./proxy";
+
+const widget = {
+ api: "{url}/webapi/DownloadStation/task.cgi?api=SYNO.DownloadStation.Task&version=1&method={endpoint}",
+ proxyHandler: diskstationProxyHandler,
+
+ mappings: {
+ "list": {
+ endpoint: "list&additional=transfer",
+ },
+ },
+};
+
+export default widget;
diff --git a/src/widgets/docker/component.jsx b/src/widgets/docker/component.jsx
index bdc49be38..9d3affd3d 100644
--- a/src/widgets/docker/component.jsx
+++ b/src/widgets/docker/component.jsx
@@ -46,7 +46,9 @@ export default function Component({ service }) {
return (
-
+ {statsData.stats.memory_stats.usage &&
+
+ }
{network && (
<>
diff --git a/src/widgets/flood/component.jsx b/src/widgets/flood/component.jsx
new file mode 100644
index 000000000..4676d798b
--- /dev/null
+++ b/src/widgets/flood/component.jsx
@@ -0,0 +1,53 @@
+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: torrentData, error: torrentError } = useWidgetAPI(widget, "torrents");
+
+ if (torrentError) {
+ return ;
+ }
+
+ if (!torrentData) {
+ return (
+
+
+
+
+
+
+ );
+ }
+
+ let rateDl = 0;
+ let rateUl = 0;
+ let completed = 0;
+ let leech = 0;
+
+ Object.values(torrentData.torrents).forEach(torrent => {
+ rateDl += torrent.downRate;
+ rateUl += torrent.upRate;
+ if(torrent.status.includes('complete')){
+ completed += 1;
+ }
+ if(torrent.status.includes('downloading')){
+ leech += 1;
+ }
+ })
+
+ return (
+
+
+
+
+
+
+ );
+}
diff --git a/src/widgets/flood/proxy.js b/src/widgets/flood/proxy.js
new file mode 100644
index 000000000..6c7921cc4
--- /dev/null
+++ b/src/widgets/flood/proxy.js
@@ -0,0 +1,66 @@
+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";
+
+const logger = createLogger("floodProxyHandler");
+
+async function login(widget) {
+ logger.debug("flood is rejecting the request, logging in.");
+ const loginUrl = new URL(`${widget.url}/api/auth/authenticate`).toString();
+
+ const loginParams = {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: null
+ };
+
+ if (widget.username && widget.password) {
+ loginParams.body = JSON.stringify({
+ "username": widget.username,
+ "password": widget.password
+ });
+ }
+
+ // eslint-disable-next-line no-unused-vars
+ const [status, contentType, data] = await httpProxy(loginUrl, loginParams);
+ return [status, data];
+}
+
+export default async function floodProxyHandler(req, res) {
+ const { group, service, endpoint } = req.query;
+
+ if (!group || !service) {
+ logger.debug("Invalid or missing service '%s' or group '%s'", service, group);
+ return res.status(400).json({ error: "Invalid proxy service type" });
+ }
+
+ const widget = await getServiceWidget(group, service);
+
+ if (!widget) {
+ logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
+ return res.status(400).json({ error: "Invalid proxy service type" });
+ }
+
+ const url = new URL(formatApiCall("{url}/api/{endpoint}", { endpoint, ...widget }));
+ const params = { method: "GET", headers: {} };
+
+ let [status, contentType, data] = await httpProxy(url, params);
+ if (status === 401) {
+ [status, data] = await login(widget);
+
+ if (status !== 200) {
+ logger.error("HTTP %d logging in to flood. Data: %s", status, data);
+ return res.status(status).end(data);
+ }
+
+ [status, contentType, data] = await httpProxy(url, params);
+ }
+
+ if (status !== 200) {
+ logger.error("HTTP %d getting data from flood. Data: %s", status, data);
+ }
+
+ if (contentType) res.setHeader("Content-Type", contentType);
+ return res.status(status).send(data);
+}
diff --git a/src/widgets/flood/widget.js b/src/widgets/flood/widget.js
new file mode 100644
index 000000000..027ff344b
--- /dev/null
+++ b/src/widgets/flood/widget.js
@@ -0,0 +1,7 @@
+import floodProxyHandler from "./proxy";
+
+const widget = {
+ proxyHandler: floodProxyHandler,
+};
+
+export default widget;
diff --git a/src/widgets/npm/proxy.js b/src/widgets/npm/proxy.js
index ff15db62b..d6499e58c 100644
--- a/src/widgets/npm/proxy.js
+++ b/src/widgets/npm/proxy.js
@@ -20,12 +20,18 @@ async function login(loginUrl, username, password) {
});
const status = authResponse[0];
- const data = JSON.parse(Buffer.from(authResponse[2]).toString());
+ let data = authResponse[2];
- if (status === 200) {
- cache.put(tokenCacheKey, data.token);
+ try {
+ data = JSON.parse(Buffer.from(authResponse[2]).toString());
+
+ if (status === 200) {
+ const expiration = new Date(data.expires) - Date.now();
+ cache.put(tokenCacheKey, data.token, expiration - (5 * 60 * 1000)); // expiration -5 minutes
+ }
+ } catch (e) {
+ logger.error(`Error ${status} logging into npm`, authResponse[2]);
}
-
return [status, data.token ?? data];
}
@@ -51,8 +57,8 @@ export default async function npmProxyHandler(req, res) {
if (!token) {
[status, token] = await login(loginUrl, widget.username, widget.password);
if (status !== 200) {
- logger.debug(`HTTTP ${status} logging into npm api: ${data}`);
- return res.status(status).send(data);
+ logger.debug(`HTTTP ${status} logging into npm api: ${token}`);
+ return res.status(status).send(token);
}
}
diff --git a/src/widgets/nzbget/proxy.js b/src/widgets/nzbget/proxy.js
deleted file mode 100644
index 4feac7812..000000000
--- a/src/widgets/nzbget/proxy.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { JSONRPCClient } from "json-rpc-2.0";
-
-import getServiceWidget from "utils/config/service-helpers";
-
-export default async function nzbgetProxyHandler(req, res) {
- const { group, service, endpoint } = req.query;
-
- if (group && service) {
- const widget = await getServiceWidget(group, service);
-
- if (widget) {
- const constructedUrl = new URL(widget.url);
- constructedUrl.pathname = "jsonrpc";
-
- const authorization = Buffer.from(`${widget.username}:${widget.password}`).toString("base64");
-
- const client = new JSONRPCClient((jsonRPCRequest) =>
- fetch(constructedUrl.toString(), {
- method: "POST",
- headers: {
- "content-type": "application/json",
- authorization: `Basic ${authorization}`,
- },
- body: JSON.stringify(jsonRPCRequest),
- }).then(async (response) => {
- if (response.status === 200) {
- const jsonRPCResponse = await response.json();
- return client.receive(jsonRPCResponse);
- }
-
- return Promise.reject(new Error(response.statusText));
- })
- );
-
- return res.send(await client.request(endpoint));
- }
- }
-
- return res.status(400).json({ error: "Invalid proxy service type" });
-}
diff --git a/src/widgets/nzbget/widget.js b/src/widgets/nzbget/widget.js
index 975c8dea7..841fb66c0 100644
--- a/src/widgets/nzbget/widget.js
+++ b/src/widgets/nzbget/widget.js
@@ -1,7 +1,8 @@
-import nzbgetProxyHandler from "./proxy";
+import jsonrpcProxyHandler from "utils/proxy/handlers/jsonrpc";
const widget = {
- proxyHandler: nzbgetProxyHandler,
+ api: "{url}/jsonrpc",
+ proxyHandler: jsonrpcProxyHandler,
};
export default widget;
diff --git a/src/widgets/overseerr/component.jsx b/src/widgets/overseerr/component.jsx
index 6f5ae8ffe..230a166ce 100644
--- a/src/widgets/overseerr/component.jsx
+++ b/src/widgets/overseerr/component.jsx
@@ -15,6 +15,7 @@ export default function Component({ service }) {
return (
+
@@ -24,6 +25,7 @@ export default function Component({ service }) {
return (
+
diff --git a/src/widgets/overseerr/widget.js b/src/widgets/overseerr/widget.js
index 945af5edb..cc80cffa2 100644
--- a/src/widgets/overseerr/widget.js
+++ b/src/widgets/overseerr/widget.js
@@ -9,6 +9,7 @@ const widget = {
endpoint: "request/count",
validate: [
"pending",
+ "processing",
"approved",
"available",
],
diff --git a/src/widgets/paperlessngx/component.jsx b/src/widgets/paperlessngx/component.jsx
new file mode 100644
index 000000000..d0c2e12f3
--- /dev/null
+++ b/src/widgets/paperlessngx/component.jsx
@@ -0,0 +1,29 @@
+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 { widget } = service;
+
+ const { data: statisticsData, error: statisticsError } = useWidgetAPI(widget, "statistics");
+
+ if (statisticsError) {
+ return ;
+ }
+
+ if (!statisticsData) {
+ return (
+
+
+
+
+ );
+ }
+
+ return (
+
+ {statisticsData.documents_inbox !== undefined && }
+
+
+ );
+}
diff --git a/src/widgets/paperlessngx/widget.js b/src/widgets/paperlessngx/widget.js
new file mode 100644
index 000000000..8af8079db
--- /dev/null
+++ b/src/widgets/paperlessngx/widget.js
@@ -0,0 +1,17 @@
+import genericProxyHandler from "utils/proxy/handlers/generic";
+
+const widget = {
+ api: "{url}/api/{endpoint}",
+ proxyHandler: genericProxyHandler,
+
+ mappings: {
+ "statistics": {
+ endpoint: "statistics/?format=json",
+ validate: [
+ "documents_total"
+ ]
+ },
+ },
+};
+
+export default widget;
diff --git a/src/widgets/qbittorrent/proxy.js b/src/widgets/qbittorrent/proxy.js
index 14271b656..e1ea7f901 100644
--- a/src/widgets/qbittorrent/proxy.js
+++ b/src/widgets/qbittorrent/proxy.js
@@ -1,30 +1,23 @@
import { formatApiCall } from "utils/proxy/api-helpers";
-import { addCookieToJar, setCookieHeader } from "utils/proxy/cookie-jar";
import { httpProxy } from "utils/proxy/http";
import getServiceWidget from "utils/config/service-helpers";
import createLogger from "utils/logger";
const logger = createLogger("qbittorrentProxyHandler");
-async function login(widget, params) {
+async function login(widget) {
logger.debug("qBittorrent is rejecting the request, logging in.");
const loginUrl = new URL(`${widget.url}/api/v2/auth/login`).toString();
const loginBody = `username=${encodeURI(widget.username)}&password=${encodeURI(widget.password)}`;
-
- // using fetch intentionally, for login only, as the httpProxy method causes qBittorrent to
- // complain about header encoding
- return fetch(loginUrl, {
+ const loginParams = {
method: "POST",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
body: loginBody,
- })
- .then(async (response) => {
- addCookieToJar(loginUrl, response.headers);
- setCookieHeader(loginUrl, params);
- const data = await response.text();
- return [response.status, data];
- })
- .catch((err) => [500, err]);
+ }
+
+ // eslint-disable-next-line no-unused-vars
+ const [status, contentType, data] = await httpProxy(loginUrl, loginParams);
+ return [status, data];
}
export default async function qbittorrentProxyHandler(req, res) {
@@ -44,11 +37,10 @@ export default async function qbittorrentProxyHandler(req, res) {
const url = new URL(formatApiCall("{url}/api/v2/{endpoint}", { endpoint, ...widget }));
const params = { method: "GET", headers: {} };
- setCookieHeader(url, params);
let [status, contentType, data] = await httpProxy(url, params);
if (status === 403) {
- [status, data] = await login(widget, params);
+ [status, data] = await login(widget);
if (status !== 200) {
logger.error("HTTP %d logging in to qBittorrent. Data: %s", status, data);
@@ -59,9 +51,9 @@ export default async function qbittorrentProxyHandler(req, res) {
logger.error("Error logging in to qBittorrent: Data: %s", data);
return res.status(401).end(data);
}
- }
- [status, contentType, data] = await httpProxy(url, params);
+ [status, contentType, data] = await httpProxy(url, params);
+ }
if (status !== 200) {
logger.error("HTTP %d getting data from qBittorrent. Data: %s", status, data);
diff --git a/src/widgets/scrutiny/component.jsx b/src/widgets/scrutiny/component.jsx
new file mode 100644
index 000000000..0f769d9fd
--- /dev/null
+++ b/src/widgets/scrutiny/component.jsx
@@ -0,0 +1,62 @@
+import Container from "components/services/widget/container";
+import Block from "components/services/widget/block";
+import useWidgetAPI from "utils/proxy/use-widget-api";
+
+
+// @see https://github.com/AnalogJ/scrutiny/blob/d8d56f77f9e868127c4849dac74d65512db658e8/webapp/frontend/src/app/shared/device-status.pipe.ts
+const DeviceStatus = {
+ passed: 0,
+ failed_smart: 1,
+ failed_scrutiny: 2,
+ failed_both: 3,
+
+ isFailed(s){ return s > this.passed && s <= this.failed_both},
+ isUnknown(s){ return s < this.passed || s > this.failed_both}
+}
+
+// @see https://github.com/AnalogJ/scrutiny/blob/d8d56f77f9e868127c4849dac74d65512db658e8/webapp/frontend/src/app/core/config/app.config.ts
+const DeviceStatusThreshold = {
+ smart: 1,
+ scrutiny: 2,
+ both: 3
+}
+
+export default function Component({ service }) {
+ const { widget } = service;
+
+ const { data: scrutinySettings, error: scrutinySettingsError } = useWidgetAPI(widget, "settings");
+ const { data: scrutinyData, error: scrutinyError } = useWidgetAPI(widget, "summary");
+
+ if (scrutinyError || scrutinySettingsError) {
+ const finalError = scrutinyError ?? scrutinySettingsError;
+ return ;
+ }
+
+ if (!scrutinyData || !scrutinySettings) {
+ return (
+
+
+
+
+
+ );
+ }
+
+ const deviceIds = Object.values(scrutinyData.data.summary);
+ const statusThreshold = scrutinySettings.settings.metrics.status_threshold;
+
+ const failed = deviceIds.filter(deviceId => (DeviceStatus.isFailed(deviceId.device.device_status) && statusThreshold === DeviceStatusThreshold.both) || [statusThreshold, DeviceStatus.failed_both].includes(deviceId.device.device_status))?.length || 0;
+ const unknown = deviceIds.filter(deviceId => DeviceStatus.isUnknown(deviceId.device.device_status))?.length || 0;
+ const passed = deviceIds.length - (failed + unknown);
+
+ return (
+
+
+
+
+
+
+ );
+
+}
+
diff --git a/src/widgets/scrutiny/widget.js b/src/widgets/scrutiny/widget.js
new file mode 100644
index 000000000..0d2e6b5c8
--- /dev/null
+++ b/src/widgets/scrutiny/widget.js
@@ -0,0 +1,23 @@
+import genericProxyHandler from "utils/proxy/handlers/generic";
+
+const widget = {
+ api: "{url}/api/{endpoint}",
+ proxyHandler: genericProxyHandler,
+
+ mappings: {
+ summary: {
+ endpoint: "summary",
+ validate: [
+ "data",
+ ]
+ },
+ settings: {
+ endpoint: "settings",
+ validate: [
+ "settings",
+ ]
+ }
+ },
+};
+
+export default widget;
diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js
index 4d956eb6f..0d7d6d4a9 100644
--- a/src/widgets/widgets.js
+++ b/src/widgets/widgets.js
@@ -4,7 +4,10 @@ import autobrr from "./autobrr/widget";
import bazarr from "./bazarr/widget";
import changedetectionio from "./changedetectionio/widget";
import coinmarketcap from "./coinmarketcap/widget";
+import deluge from "./deluge/widget";
+import diskstation from "./diskstation/widget";
import emby from "./emby/widget";
+import flood from "./flood/widget";
import gluetun from "./gluetun/widget";
import gotify from "./gotify/widget";
import hdhomerun from "./hdhomerun/widget";
@@ -18,6 +21,7 @@ import npm from "./npm/widget";
import nzbget from "./nzbget/widget";
import ombi from "./ombi/widget";
import overseerr from "./overseerr/widget";
+import paperlessngx from "./paperlessngx/widget";
import pihole from "./pihole/widget";
import plex from "./plex/widget";
import portainer from "./portainer/widget";
@@ -29,6 +33,7 @@ import radarr from "./radarr/widget";
import readarr from "./readarr/widget";
import rutorrent from "./rutorrent/widget";
import sabnzbd from "./sabnzbd/widget";
+import scrutiny from "./scrutiny/widget";
import sonarr from "./sonarr/widget";
import speedtest from "./speedtest/widget";
import strelaysrv from "./strelaysrv/widget";
@@ -48,7 +53,10 @@ const widgets = {
bazarr,
changedetectionio,
coinmarketcap,
+ deluge,
+ diskstation,
emby,
+ flood,
gluetun,
gotify,
hdhomerun,
@@ -63,6 +71,7 @@ const widgets = {
nzbget,
ombi,
overseerr,
+ paperlessngx,
pihole,
plex,
portainer,
@@ -74,6 +83,7 @@ const widgets = {
readarr,
rutorrent,
sabnzbd,
+ scrutiny,
sonarr,
speedtest,
strelaysrv,