!rightAlignedWidgets.includes(widget.type))
.map((widget, i) => (
-
+
))}
-
+
{widgets
.filter((widget) => rightAlignedWidgets.includes(widget.type))
.map((widget, i) => (
-
+
))}
@@ -289,7 +294,7 @@ function Home({ initialSettings }) {
{services?.length > 0 && (
{services.map((group) => (
-
+
))}
)}
@@ -302,14 +307,16 @@ function Home({ initialSettings }) {
- {!initialSettings?.color && }
-
- {!initialSettings?.theme && }
-
+
+
+ {!initialSettings?.color && }
+
+ {!initialSettings?.theme && }
+
-
- {!initialSettings?.hideVersion &&
}
+
+ {!initialSettings?.hideVersion && }
+
{
try {
+ const isSwarm = !!servers[serverName].swarm;
const docker = new Docker(getDockerArguments(serverName).conn);
- const containers = await docker.listContainers({
- all: true,
- });
+ const listProperties = { all: true };
+ const containers = await ((isSwarm) ? docker.listServices(listProperties) : docker.listContainers(listProperties));
// bad docker connections can result in a object?
// in any case, this ensures the result is the expected array
@@ -76,17 +76,19 @@ export async function servicesFromDocker() {
const discovered = containers.map((container) => {
let constructedService = null;
+ const containerLabels = isSwarm ? shvl.get(container, 'Spec.Labels') : container.Labels;
+ const containerName = isSwarm ? shvl.get(container, 'Spec.Name') : container.Names[0];
- Object.keys(container.Labels).forEach((label) => {
+ Object.keys(containerLabels).forEach((label) => {
if (label.startsWith("homepage.")) {
if (!constructedService) {
constructedService = {
- container: container.Names[0].replace(/^\//, ""),
+ container: containerName.replace(/^\//, ""),
server: serverName,
type: 'service'
};
}
- shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(container.Labels[label]));
+ shvl.set(constructedService, label.replace("homepage.", ""), substituteEnvironmentVars(containerLabels[label]));
}
});
@@ -156,11 +158,20 @@ export async function servicesFromKubernetes() {
return null;
});
- const traefikIngressList = await crd.listClusterCustomObject("traefik.containo.us", "v1alpha1", "ingressroutes")
+ const traefikIngressList = await crd.listClusterCustomObject("traefik.io", "v1alpha1", "ingressroutes")
.then((response) => response.body)
- .catch((error) => {
- logger.error("Error getting traefik ingresses: %d %s %s", error.statusCode, error.body, error.response);
- return null;
+ .catch(async (error) => {
+ logger.error("Error getting traefik ingresses from traefik.io: %d %s %s", error.statusCode, error.body, error.response);
+
+ // Fallback to the old traefik CRD group
+ const fallbackIngressList = await crd.listClusterCustomObject("traefik.containo.us", "v1alpha1", "ingressroutes")
+ .then((response) => response.body)
+ .catch((fallbackError) => {
+ logger.error("Error getting traefik ingresses from traefik.containo.us: %d %s %s", fallbackError.statusCode, fallbackError.body, fallbackError.response);
+ return null;
+ });
+
+ return fallbackIngressList;
});
if (traefikIngressList && traefikIngressList.items.length > 0) {
@@ -168,7 +179,7 @@ export async function servicesFromKubernetes() {
.filter((ingress) => ingress.metadata.annotations && ingress.metadata.annotations[`${ANNOTATION_BASE}/href`])
ingressList.items.push(...traefikServices);
}
-
+
if (!ingressList) {
return [];
}
@@ -276,7 +287,8 @@ export function cleanServiceGroups(groups) {
wan, // opnsense widget, pfsense widget
enableBlocks, // emby/jellyfin
enableNowPlaying,
- volume, // diskstation widget
+ volume, // diskstation widget,
+ enableQueue, // sonarr/radarr
} = cleanedService.widget;
const fieldsList = typeof fields === 'string' ? JSON.parse(fields) : fields;
@@ -312,6 +324,9 @@ export function cleanServiceGroups(groups) {
if (enableBlocks !== undefined) cleanedService.widget.enableBlocks = JSON.parse(enableBlocks);
if (enableNowPlaying !== undefined) cleanedService.widget.enableNowPlaying = JSON.parse(enableNowPlaying);
}
+ if (["sonarr", "radarr"].includes(type)) {
+ if (enableQueue !== undefined) cleanedService.widget.enableQueue = JSON.parse(enableQueue);
+ }
if (["diskstation", "qnap"].includes(type)) {
if (volume) cleanedService.widget.volume = volume;
}
@@ -322,16 +337,13 @@ export function cleanServiceGroups(groups) {
}));
}
-export default async function getServiceWidget(group, service) {
+export async function getServiceItem(group, service) {
const configuredServices = await servicesFromConfig();
const serviceGroup = configuredServices.find((g) => g.name === group);
if (serviceGroup) {
const serviceEntry = serviceGroup.services.find((s) => s.name === service);
- if (serviceEntry) {
- const { widget } = serviceEntry;
- return widget;
- }
+ if (serviceEntry) return serviceEntry;
}
const discoveredServices = await servicesFromDocker();
@@ -339,20 +351,24 @@ export default async function getServiceWidget(group, service) {
const dockerServiceGroup = discoveredServices.find((g) => g.name === group);
if (dockerServiceGroup) {
const dockerServiceEntry = dockerServiceGroup.services.find((s) => s.name === service);
- if (dockerServiceEntry) {
- const { widget } = dockerServiceEntry;
- return widget;
- }
+ if (dockerServiceEntry) return dockerServiceEntry;
}
const kubernetesServices = await servicesFromKubernetes();
const kubernetesServiceGroup = kubernetesServices.find((g) => g.name === group);
if (kubernetesServiceGroup) {
const kubernetesServiceEntry = kubernetesServiceGroup.services.find((s) => s.name === service);
- if (kubernetesServiceEntry) {
- const { widget } = kubernetesServiceEntry;
- return widget;
- }
+ if (kubernetesServiceEntry) return kubernetesServiceEntry;
+ }
+
+ return false;
+}
+
+export default async function getServiceWidget(group, service) {
+ const serviceItem = await getServiceItem(group, service);
+ if (serviceItem) {
+ const { widget } = serviceItem;
+ return widget;
}
return false;
diff --git a/src/utils/proxy/handlers/credentialed.js b/src/utils/proxy/handlers/credentialed.js
index 5d4b7e3b..8fa975d0 100644
--- a/src/utils/proxy/handlers/credentialed.js
+++ b/src/utils/proxy/handlers/credentialed.js
@@ -55,6 +55,12 @@ export default async function credentialedProxyHandler(req, res, map) {
} else {
headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
}
+ } else if (widget.type === "paperlessngx") {
+ if (widget.key) {
+ headers.Authorization = `Token ${widget.key}`;
+ } else {
+ headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
+ }
} else {
headers["X-API-Key"] = `${widget.key}`;
}
diff --git a/src/utils/proxy/http.js b/src/utils/proxy/http.js
index e022fb46..72f65be3 100644
--- a/src/utils/proxy/http.js
+++ b/src/utils/proxy/http.js
@@ -1,5 +1,7 @@
/* eslint-disable prefer-promise-reject-errors */
/* eslint-disable no-param-reassign */
+import { createUnzip } from "node:zlib";
+
import { http, https } from "follow-redirects";
import { addCookieToJar, setCookieHeader } from "./cookie-jar";
@@ -28,12 +30,24 @@ function handleRequest(requestor, url, params) {
const request = requestor.request(url, params, (response) => {
const data = [];
+ const contentEncoding = response.headers['content-encoding']?.trim().toLowerCase();
- response.on("data", (chunk) => {
+ let responseContent = response;
+ if (contentEncoding === 'gzip' || contentEncoding === 'deflate') {
+ responseContent = createUnzip();
+ // zlib errors
+ responseContent.on("error", (e) => {
+ logger.error(e);
+ responseContent = response; // fallback
+ });
+ response.pipe(responseContent);
+ }
+
+ responseContent.on("data", (chunk) => {
data.push(chunk);
});
- response.on("end", () => {
+ responseContent.on("end", () => {
addCookieToJar(url, response.headers);
resolve([response.statusCode, response.headers["content-type"], Buffer.concat(data), response.headers]);
});
diff --git a/src/utils/proxy/use-widget-api.js b/src/utils/proxy/use-widget-api.js
index 52e986e1..e4744038 100644
--- a/src/utils/proxy/use-widget-api.js
+++ b/src/utils/proxy/use-widget-api.js
@@ -7,7 +7,11 @@ export default function useWidgetAPI(widget, ...options) {
if (options && options[1]?.refreshInterval) {
config.refreshInterval = options[1].refreshInterval;
}
- const { data, error, mutate } = useSWR(formatProxyUrl(widget, ...options), config);
+ let url = formatProxyUrl(widget, ...options)
+ if (options[0] === "") {
+ url = null
+ }
+ const { data, error, mutate } = useSWR(url, config);
// make the data error the top-level error
return { data, error: data?.error ?? error, mutate }
}
diff --git a/src/widgets/components.js b/src/widgets/components.js
index 3a918e62..5d2dc7e6 100644
--- a/src/widgets/components.js
+++ b/src/widgets/components.js
@@ -31,6 +31,7 @@ const components = {
healthchecks: dynamic(() => import("./healthchecks/component")),
immich: dynamic(() => import("./immich/component")),
jackett: dynamic(() => import("./jackett/component")),
+ jdownloader: dynamic(() => import("./jdownloader/component")),
jellyfin: dynamic(() => import("./emby/component")),
jellyseerr: dynamic(() => import("./jellyseerr/component")),
komga: dynamic(() => import("./komga/component")),
@@ -93,4 +94,4 @@ const components = {
xteve: dynamic(() => import("./xteve/component")),
};
-export default components;
+export default components;
\ No newline at end of file
diff --git a/src/widgets/homebridge/proxy.js b/src/widgets/homebridge/proxy.js
index b0a75a03..a9e1ac97 100644
--- a/src/widgets/homebridge/proxy.js
+++ b/src/widgets/homebridge/proxy.js
@@ -63,7 +63,7 @@ async function apiCall(widget, endpoint, service) {
}
if (status !== 200) {
- logger.error("Error getting data from Homebridge: %s status %d. Data: %s", url, status, data);
+ logger.error("Error getting data from Homebridge: %s status %d. Data: %s", url, status, JSON.stringify(data));
return { status, contentType, data: null, responseHeaders };
}
diff --git a/src/widgets/jdownloader/component.jsx b/src/widgets/jdownloader/component.jsx
new file mode 100644
index 00000000..8f271935
--- /dev/null
+++ b/src/widgets/jdownloader/component.jsx
@@ -0,0 +1,39 @@
+import { useTranslation } from "next-i18next";
+
+import Block from "components/services/widget/block";
+import Container from "components/services/widget/container";
+import useWidgetAPI from "utils/proxy/use-widget-api";
+
+export default function Component({ service }) {
+ const { t } = useTranslation();
+
+ const { widget } = service;
+
+ const { data: jdownloaderData, error: jdownloaderAPIError } = useWidgetAPI(widget, "unified", {
+ refreshInterval: 30000,
+ });
+
+ if (jdownloaderAPIError) {
+ return ;
+ }
+
+ if (!jdownloaderData) {
+ return (
+
+
+
+
+
+
+ );
+ }
+
+ return (
+
+
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/src/widgets/jdownloader/proxy.js b/src/widgets/jdownloader/proxy.js
new file mode 100644
index 00000000..be858d51
--- /dev/null
+++ b/src/widgets/jdownloader/proxy.js
@@ -0,0 +1,196 @@
+/* eslint-disable no-underscore-dangle */
+import crypto from 'crypto';
+import querystring from 'querystring';
+
+import { sha256, uniqueRid, validateRid, createEncryptionToken, decrypt, encrypt } from "./tools"
+
+import getServiceWidget from "utils/config/service-helpers";
+import { httpProxy } from "utils/proxy/http";
+import createLogger from "utils/logger";
+
+const proxyName = "jdownloaderProxyHandler";
+const logger = createLogger(proxyName);
+
+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;
+ }
+ const widget = await getServiceWidget(group, service);
+ if (!widget) {
+ logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
+ return null;
+ }
+
+ return widget;
+}
+
+async function login(loginSecret, deviceSecret, params) {
+ const rid = uniqueRid();
+ const path = `/my/connect?${querystring.stringify({ ...params, rid })}`;
+
+ const signature = crypto
+ .createHmac('sha256', loginSecret)
+ .update(path)
+ .digest('hex');
+ const url = `${new URL(`https://api.jdownloader.org${path}&signature=${signature}`)}`
+
+ const [status, contentType, data] = await httpProxy(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+
+ if (status !== 200) {
+ logger.error("HTTP %d communicating with jdownloader. Data: %s", status, data.toString());
+ return [status, data];
+ }
+
+ try {
+ const decryptedData = JSON.parse(decrypt(data.toString(), loginSecret))
+ const sessionToken = decryptedData.sessiontoken;
+ validateRid(decryptedData, rid);
+ const serverEncryptionToken = createEncryptionToken(loginSecret, sessionToken);
+ const deviceEncryptionToken = createEncryptionToken(deviceSecret, sessionToken);
+ return [status, decryptedData, contentType, serverEncryptionToken, deviceEncryptionToken, sessionToken];
+ } catch (e) {
+ logger.error("Error decoding jdownloader API data. Data: %s", data.toString());
+ return [status, null];
+ }
+}
+
+
+async function getDevice(serverEncryptionToken, deviceName, params) {
+ const rid = uniqueRid();
+ const path = `/my/listdevices?${querystring.stringify({ ...params, rid })}`;
+ const signature = crypto
+ .createHmac('sha256', serverEncryptionToken)
+ .update(path)
+ .digest('hex');
+ const url = `${new URL(`https://api.jdownloader.org${path}&signature=${signature}`)}`
+
+ const [status, , data] = await httpProxy(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+
+ if (status !== 200) {
+ logger.error("HTTP %d communicating with jdownloader. Data: %s", status, data.toString());
+ return [status, data];
+ }
+
+ try {
+ const decryptedData = JSON.parse(decrypt(data.toString(), serverEncryptionToken))
+ const filteredDevice = decryptedData.list.filter(device => device.name === deviceName);
+ return [status, filteredDevice[0].id];
+ } catch (e) {
+ logger.error("Error decoding jdownloader API data. Data: %s", data.toString());
+ return [status, null];
+ }
+
+}
+
+function createBody(rid, query, params) {
+ const baseBody = {
+ apiVer: 1,
+ rid,
+ url: query
+ };
+ return params ? { ...baseBody, params: [JSON.stringify(params)] } : baseBody;
+}
+
+async function queryPackages(deviceEncryptionToken, deviceId, sessionToken, params) {
+ const rid = uniqueRid();
+ const body = encrypt(JSON.stringify(createBody(rid, '/downloadsV2/queryPackages', params)), deviceEncryptionToken);
+ const url = `${new URL(`https://api.jdownloader.org/t_${encodeURI(sessionToken)}_${encodeURI(deviceId)}/downloadsV2/queryPackages`)}`
+ const [status, , data] = await httpProxy(url, {
+ method: 'POST',
+ body,
+ });
+
+ if (status !== 200) {
+ logger.error("HTTP %d communicating with jdownloader. Data: %s", status, data.toString());
+ return [status, data];
+ }
+
+ try {
+ const decryptedData = JSON.parse(decrypt(data.toString(), deviceEncryptionToken))
+ return decryptedData.data;
+ } catch (e) {
+ logger.error("Error decoding JDRss jdownloader data. Data: %s", data.toString());
+ return [status, null];
+ }
+
+}
+
+
+export default async function jdownloaderProxyHandler(req, res) {
+ const widget = await getWidget(req);
+
+ if (!widget) {
+ return res.status(400).json({ error: "Invalid proxy service type" });
+ }
+ logger.debug("Getting data from JDRss API");
+ const { username } = widget
+ const { password } = widget
+
+ const appKey = "homepage"
+ const loginSecret = sha256(`${username}${password}server`)
+ const deviceSecret = sha256(`${username}${password}device`)
+ const email = username;
+
+ const loginData = await login(loginSecret, deviceSecret, {
+ appKey,
+ email
+ })
+
+ const deviceData = await getDevice(loginData[3], widget.client, {
+ sessiontoken: loginData[5]
+ })
+
+ const packageStatus = await queryPackages(loginData[4], deviceData[1], loginData[5], {
+ "bytesLoaded": false,
+ "bytesTotal": true,
+ "comment": false,
+ "enabled": true,
+ "eta": false,
+ "priority": false,
+ "finished": true,
+ "running": true,
+ "speed": true,
+ "status": true,
+ "childCount": false,
+ "hosts": false,
+ "saveTo": false,
+ "maxResults": -1,
+ "startAt": 0,
+ }
+ )
+
+ let bytesRemaining = 0;
+ let totalBytes = 0;
+ let totalSpeed = 0;
+ packageStatus.forEach(file => {
+ totalBytes += file.bytesTotal;
+ if (file.finished !== true) {
+ bytesRemaining += file.bytesTotal;
+ if (file.speed) {
+ totalSpeed += file.speed;
+ }
+ }
+ });
+
+ const data = {
+ downloadCount: packageStatus.length,
+ bytesRemaining,
+ totalBytes,
+ totalSpeed
+ };
+
+ return res.send(data);
+
+}
\ No newline at end of file
diff --git a/src/widgets/jdownloader/tools.js b/src/widgets/jdownloader/tools.js
new file mode 100644
index 00000000..d678b072
--- /dev/null
+++ b/src/widgets/jdownloader/tools.js
@@ -0,0 +1,55 @@
+import crypto from 'crypto';
+
+export function sha256(data) {
+ return crypto
+ .createHash('sha256')
+ .update(data)
+ .digest();
+}
+
+export function uniqueRid() {
+ return Math.floor(Math.random() * 10e12);
+}
+
+export function validateRid(decryptedData, rid) {
+ if (decryptedData.rid !== rid) {
+ throw new Error('RequestID mismatch');
+ }
+ return decryptedData;
+
+}
+
+export function decrypt(data, ivKey) {
+ const iv = ivKey.slice(0, ivKey.length / 2);
+ const key = ivKey.slice(ivKey.length / 2, ivKey.length);
+ const cipher = crypto.createDecipheriv('aes-128-cbc', key, iv);
+ return Buffer.concat([
+ cipher.update(data, 'base64'),
+ cipher.final()
+ ]).toString();
+}
+
+export function createEncryptionToken(oldTokenBuff, updateToken) {
+ const updateTokenBuff = Buffer.from(updateToken, 'hex');
+ const mergedBuffer = Buffer.concat([oldTokenBuff, updateTokenBuff], oldTokenBuff.length + updateTokenBuff.length);
+ return sha256(mergedBuffer);
+}
+
+export function encrypt(data, ivKey) {
+ if (typeof data !== 'string') {
+ throw new Error('data no es un string');
+ }
+ if (!(ivKey instanceof Buffer)) {
+ throw new Error('ivKey no es un buffer');
+ }
+ if (ivKey.length !== 32) {
+ throw new Error('ivKey tiene que tener tamaño 32');
+ }
+ const stringIVKey = ivKey.toString('hex');
+ const stringIV = stringIVKey.substring(0, stringIVKey.length / 2);
+ const stringKey = stringIVKey.substring(stringIVKey.length / 2, stringIVKey.length);
+ const iv = Buffer.from(stringIV, 'hex');
+ const key = Buffer.from(stringKey, 'hex');
+ const cipher = crypto.createCipheriv('aes-128-cbc', key, iv);
+ return cipher.update(data, 'utf8', 'base64') + cipher.final('base64');
+}
\ No newline at end of file
diff --git a/src/widgets/jdownloader/widget.js b/src/widgets/jdownloader/widget.js
new file mode 100644
index 00000000..acd25d74
--- /dev/null
+++ b/src/widgets/jdownloader/widget.js
@@ -0,0 +1,15 @@
+import jdownloaderProxyHandler from "./proxy";
+
+const widget = {
+ api: "https://api.jdownloader.org/{endpoint}/&signature={signature}",
+ proxyHandler: jdownloaderProxyHandler,
+
+ mappings: {
+ unified: {
+ endpoint: "/",
+ signature: "",
+ },
+ },
+};
+
+export default widget;
\ No newline at end of file
diff --git a/src/widgets/kubernetes/component.jsx b/src/widgets/kubernetes/component.jsx
index c4d67553..e756e4be 100644
--- a/src/widgets/kubernetes/component.jsx
+++ b/src/widgets/kubernetes/component.jsx
@@ -16,7 +16,7 @@ export default function Component({ service }) {
`/api/kubernetes/stats/${widget.namespace}/${widget.app}?${podSelectorString}`);
if (statsError || statusError) {
- return ;
+ return ;
}
if (statusData && statusData.status !== "running") {
diff --git a/src/widgets/lidarr/component.jsx b/src/widgets/lidarr/component.jsx
index a6aa82c7..68360d82 100644
--- a/src/widgets/lidarr/component.jsx
+++ b/src/widgets/lidarr/component.jsx
@@ -9,21 +9,21 @@ export default function Component({ service }) {
const { widget } = service;
- const { data: albumsData, error: albumsError } = useWidgetAPI(widget, "album");
+ const { data: artistsData, error: artistsError } = useWidgetAPI(widget, "artist");
const { data: wantedData, error: wantedError } = useWidgetAPI(widget, "wanted/missing");
const { data: queueData, error: queueError } = useWidgetAPI(widget, "queue/status");
- if (albumsError || wantedError || queueError) {
- const finalError = albumsError ?? wantedError ?? queueError;
+ if (artistsError || wantedError || queueError) {
+ const finalError = artistsError ?? wantedError ?? queueError;
return ;
}
- if (!albumsData || !wantedData || !queueData) {
+ if (!artistsData || !wantedData || !queueData) {
return (
-
+
);
}
@@ -32,7 +32,7 @@ export default function Component({ service }) {
-
+
);
}
diff --git a/src/widgets/lidarr/widget.js b/src/widgets/lidarr/widget.js
index 6ff93254..2f036726 100644
--- a/src/widgets/lidarr/widget.js
+++ b/src/widgets/lidarr/widget.js
@@ -1,16 +1,12 @@
import genericProxyHandler from "utils/proxy/handlers/generic";
-import { jsonArrayFilter } from "utils/proxy/api-helpers";
const widget = {
api: "{url}/api/v1/{endpoint}?apikey={key}",
proxyHandler: genericProxyHandler,
mappings: {
- album: {
- endpoint: "album",
- map: (data) => ({
- have: jsonArrayFilter(data, (item) => item?.statistics?.percentOfTracks === 100).length,
- }),
+ artist: {
+ endpoint: "artist",
},
"wanted/missing": {
endpoint: "wanted/missing",
diff --git a/src/widgets/paperlessngx/widget.js b/src/widgets/paperlessngx/widget.js
index 8af8079d..de37f595 100644
--- a/src/widgets/paperlessngx/widget.js
+++ b/src/widgets/paperlessngx/widget.js
@@ -1,8 +1,8 @@
-import genericProxyHandler from "utils/proxy/handlers/generic";
+import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "{url}/api/{endpoint}",
- proxyHandler: genericProxyHandler,
+ proxyHandler: credentialedProxyHandler,
mappings: {
"statistics": {
diff --git a/src/widgets/portainer/component.jsx b/src/widgets/portainer/component.jsx
index aab9eba1..53a6fd26 100644
--- a/src/widgets/portainer/component.jsx
+++ b/src/widgets/portainer/component.jsx
@@ -1,12 +1,8 @@
-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: containersData, error: containersError } = useWidgetAPI(widget, "docker/containers/json", {
@@ -27,8 +23,9 @@ export default function Component({ service }) {
);
}
- if (containersData.error) {
- return ;
+ if (containersData.error || containersData.message) {
+ // containersData can be itself an error object e.g. if environment fails
+ return ;
}
const running = containersData.filter((c) => c.State === "running").length;
diff --git a/src/widgets/radarr/component.jsx b/src/widgets/radarr/component.jsx
index f8a932ea..6ce2f599 100644
--- a/src/widgets/radarr/component.jsx
+++ b/src/widgets/radarr/component.jsx
@@ -1,22 +1,41 @@
import { useTranslation } from "next-i18next";
+import { useCallback } from 'react';
+
+import QueueEntry from "../../components/widgets/queue/queueEntry";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
+function getProgress(sizeLeft, size) {
+ return sizeLeft === 0 ? 100 : (1 - sizeLeft / size) * 100
+}
+
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
const { data: moviesData, error: moviesError } = useWidgetAPI(widget, "movie");
const { data: queuedData, error: queuedError } = useWidgetAPI(widget, "queue/status");
+ const { data: queueDetailsData, error: queueDetailsError } = useWidgetAPI(widget, "queue/details");
- if (moviesError || queuedError) {
- const finalError = moviesError ?? queuedError;
+ const formatDownloadState = useCallback((downloadState) => {
+ switch (downloadState) {
+ case "importPending":
+ return "import pending";
+ case "failedPending":
+ return "failed pending";
+ default:
+ return downloadState;
+ }
+ }, []);
+
+ if (moviesError || queuedError || queueDetailsError) {
+ const finalError = moviesError ?? queuedError ?? queueDetailsError;
return ;
}
- if (!moviesData || !queuedData) {
+ if (!moviesData || !queuedData || !queueDetailsData) {
return (
@@ -27,12 +46,27 @@ export default function Component({ service }) {
);
}
+ const enableQueue = widget?.enableQueue && Array.isArray(queueDetailsData) && queueDetailsData.length > 0;
+
return (
-
-
-
-
-
-
+ <>
+
+
+
+
+
+
+ {enableQueue &&
+ queueDetailsData.map((queueEntry) => (
+ entry.id === queueEntry.movieId)?.title ?? t("radarr.unknown")}
+ activity={formatDownloadState(queueEntry.trackedDownloadState)}
+ key={`${queueEntry.movieId}-${queueEntry.sizeLeft}`}
+ />
+ ))
+ }
+
);
}
diff --git a/src/widgets/radarr/widget.js b/src/widgets/radarr/widget.js
index 78054219..3373975e 100644
--- a/src/widgets/radarr/widget.js
+++ b/src/widgets/radarr/widget.js
@@ -1,5 +1,5 @@
import genericProxyHandler from "utils/proxy/handlers/generic";
-import { jsonArrayFilter } from "utils/proxy/api-helpers";
+import { asJson, jsonArrayFilter } from "utils/proxy/api-helpers";
const widget = {
api: "{url}/api/v3/{endpoint}?apikey={key}",
@@ -12,6 +12,7 @@ const widget = {
wanted: jsonArrayFilter(data, (item) => item.monitored && !item.hasFile && item.isAvailable).length,
have: jsonArrayFilter(data, (item) => item.hasFile).length,
missing: jsonArrayFilter(data, (item) => item.monitored && !item.hasFile).length,
+ all: asJson(data),
}),
},
"queue/status": {
@@ -20,6 +21,37 @@ const widget = {
"totalCount"
]
},
+ "queue/details": {
+ endpoint: "queue/details",
+ map: (data) => asJson(data).map((entry) => ({
+ trackedDownloadState: entry.trackedDownloadState,
+ trackedDownloadStatus: entry.trackedDownloadStatus,
+ timeLeft: entry.timeleft,
+ size: entry.size,
+ sizeLeft: entry.sizeleft,
+ movieId: entry.movieId ?? entry.id,
+ status: entry.status
+ })).sort((a, b) => {
+ const downloadingA = a.trackedDownloadState === "downloading"
+ const downloadingB = b.trackedDownloadState === "downloading"
+ if (downloadingA && !downloadingB) {
+ return -1;
+ }
+ if (downloadingB && !downloadingA) {
+ return 1;
+ }
+
+ const percentA = a.sizeLeft / a.size;
+ const percentB = b.sizeLeft / b.size;
+ if (percentA < percentB) {
+ return -1;
+ }
+ if (percentA > percentB) {
+ return 1;
+ }
+ return 0;
+ })
+ },
},
};
diff --git a/src/widgets/sonarr/component.jsx b/src/widgets/sonarr/component.jsx
index adbb8c30..27b1ab03 100644
--- a/src/widgets/sonarr/component.jsx
+++ b/src/widgets/sonarr/component.jsx
@@ -1,9 +1,26 @@
import { useTranslation } from "next-i18next";
+import { useCallback } from 'react';
+
+import QueueEntry from "../../components/widgets/queue/queueEntry";
import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
+function getProgress(sizeLeft, size) {
+ return sizeLeft === 0 ? 100 : (1 - sizeLeft / size) * 100
+}
+
+function getTitle(queueEntry, seriesData) {
+ let title = ''
+ const seriesTitle = seriesData.find((entry) => entry.id === queueEntry.seriesId)?.title;
+ if (seriesTitle) title += `${seriesTitle}: `;
+ const { episodeTitle } = queueEntry;
+ if (episodeTitle) title += episodeTitle;
+ if (title === '') return null;
+ return title;
+}
+
export default function Component({ service }) {
const { t } = useTranslation();
const { widget } = service;
@@ -11,13 +28,25 @@ export default function Component({ service }) {
const { data: wantedData, error: wantedError } = useWidgetAPI(widget, "wanted/missing");
const { data: queuedData, error: queuedError } = useWidgetAPI(widget, "queue");
const { data: seriesData, error: seriesError } = useWidgetAPI(widget, "series");
+ const { data: queueDetailsData, error: queueDetailsError } = useWidgetAPI(widget, "queue/details");
- if (wantedError || queuedError || seriesError) {
- const finalError = wantedError ?? queuedError ?? seriesError;
+ const formatDownloadState = useCallback((downloadState) => {
+ switch (downloadState) {
+ case "importPending":
+ return "import pending";
+ case "failedPending":
+ return "failed pending";
+ default:
+ return downloadState;
+ }
+ }, []);
+
+ if (wantedError || queuedError || seriesError || queueDetailsError) {
+ const finalError = wantedError ?? queuedError ?? seriesError ?? queueDetailsError;
return ;
}
- if (!wantedData || !queuedData || !seriesData) {
+ if (!wantedData || !queuedData || !seriesData || !queueDetailsData) {
return (
@@ -27,11 +56,26 @@ export default function Component({ service }) {
);
}
+ const enableQueue = widget?.enableQueue && Array.isArray(queueDetailsData) && queueDetailsData.length > 0;
+
return (
-
-
-
-
-
+ <>
+
+
+
+
+
+ {enableQueue &&
+ queueDetailsData.map((queueEntry) => (
+
+ ))
+ }
+
);
}
diff --git a/src/widgets/sonarr/widget.js b/src/widgets/sonarr/widget.js
index c1413975..7f658eb1 100644
--- a/src/widgets/sonarr/widget.js
+++ b/src/widgets/sonarr/widget.js
@@ -8,9 +8,10 @@ const widget = {
mappings: {
series: {
endpoint: "series",
- map: (data) => ({
- total: asJson(data).length,
- })
+ map: (data) => asJson(data).map((entry) => ({
+ title: entry.title,
+ id: entry.id
+ }))
},
queue: {
endpoint: "queue",
@@ -24,6 +25,39 @@ const widget = {
"totalRecords"
]
},
+ "queue/details": {
+ endpoint: "queue/details",
+ map: (data) => asJson(data).map((entry) => ({
+ trackedDownloadState: entry.trackedDownloadState,
+ trackedDownloadStatus: entry.trackedDownloadStatus,
+ timeLeft: entry.timeleft,
+ size: entry.size,
+ sizeLeft: entry.sizeleft,
+ seriesId: entry.seriesId,
+ episodeTitle: entry.episode?.title ?? entry.title,
+ episodeId: entry.episodeId ?? entry.id,
+ status: entry.status,
+ })).sort((a, b) => {
+ const downloadingA = a.trackedDownloadState === "downloading"
+ const downloadingB = b.trackedDownloadState === "downloading"
+ if (downloadingA && !downloadingB) {
+ return -1;
+ }
+ if (downloadingB && !downloadingA) {
+ return 1;
+ }
+
+ const percentA = a.sizeLeft / a.size;
+ const percentB = b.sizeLeft / b.size;
+ if (percentA < percentB) {
+ return -1;
+ }
+ if (percentA > percentB) {
+ return 1;
+ }
+ return 0;
+ })
+ }
},
};
diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js
index dc675bb8..ab8beb56 100644
--- a/src/widgets/widgets.js
+++ b/src/widgets/widgets.js
@@ -27,6 +27,7 @@ import healthchecks from "./healthchecks/widget";
import immich from "./immich/widget";
import jackett from "./jackett/widget";
import jellyseerr from "./jellyseerr/widget";
+import jdownloader from "./jdownloader/widget";
import komga from "./komga/widget";
import kopia from "./kopia/widget";
import lidarr from "./lidarr/widget";
@@ -115,6 +116,7 @@ const widgets = {
healthchecks,
immich,
jackett,
+ jdownloader,
jellyfin: emby,
jellyseerr,
komga,