Use index instead of name, lots of code cleanup

docs/widgets/index.md

@@ -20,12 +20,10 @@ Service widgets are used to display the status of a service, often a web service
     server: localhost
     container: plex
     widgets:
-      - Tautulli:
+      - type: tautulli
-          type: tautulli
         url: http://172.16.1.1:8181
         key: aabbccddeeffgghhiijjkkllmmnnoo
-      - UptimeKuma:
+      - type: uptimekuma
-          type: uptimekuma
         url: http://172.16.1.2:8080
         slug: aaaaaaabbbbb
 ```

src/components/services/item.jsx

@@ -155,7 +155,7 @@ export default function Item({ service, group, useEqualHeights }) {
         )}
 
         {service.widgets.map((widget) => (
-          <Widget widget={widget} service={service} />
+          <Widget widget={widget} service={service} key={widget.index} />
         ))}
       </div>
     </li>

src/components/services/widget.jsx

@@ -8,7 +8,7 @@ export default function Widget({ widget, service }) {
 
   const ServiceWidget = components[widget.type];
 
-  const fullService = service;
+  const fullService = Object.apply({}, service);
   fullService.widget = widget;
   if (ServiceWidget) {
     return (

src/pages/api/services/proxy.js

@@ -9,8 +9,8 @@ const logger = createLogger("servicesProxy");
 
 export default async function handler(req, res) {
   try {
-    const { service, group, name } = req.query;
+    const { service, group, index } = req.query;
-    const serviceWidget = await getServiceWidget(group, service, name);
+    const serviceWidget = await getServiceWidget(group, service, index);
     let type = serviceWidget?.type;
 
     // exceptions
@@ -41,7 +41,7 @@ export default async function handler(req, res) {
         const endpoint = mapping?.endpoint;
         const endpointProxy = mapping?.proxyHandler || serviceProxyHandler;
 
-        if (mapping.method && mapping.method !== req.method) {
+        if (mapping?.method && mapping.method !== req.method) {
           logger.debug("Unsupported method: %s", req.method);
           return res.status(403).json({ error: "Unsupported method" });
         }

src/utils/config/service-helpers.js

@@ -354,10 +354,12 @@ export function cleanServiceGroups(groups) {
       if (typeof cleanedService.weight !== "number") {
         cleanedService.weight = 0;
       }
-      cleanedService.widgets = cleanedService.widgets ? cleanedService.widgets : [];
+      if (!cleanedService.widgets) cleanedService.widgets = [];
-      if (cleanedService.widget != undefined) cleanedService.widgets.push(cleanedService.widget);
+      if (cleanedService.widget) {
-      if (cleanedService.widgets != []) {
+        cleanedService.widgets.push(cleanedService.widget);
-        cleanedService.widgets = cleanedService.widgets.map((widget) => {
+        delete cleanedService.widget;
+      }
+      cleanedService.widgets = cleanedService.widgets.map((widgetData, index) => {
         // whitelisted set of keys to pass to the frontend
         // alphabetical, grouped by widget(s)
         const {
@@ -497,7 +499,7 @@ export function cleanServiceGroups(groups) {
 
           // spoolman
           spoolIds,
-          } = Object.keys(widget)[0] != "type" ? widget[Object.keys(widget)[0]] : widget;
+        } = widgetData;
 
         let fieldsList = fields;
         if (typeof fields === "string") {
@@ -509,13 +511,13 @@ export function cleanServiceGroups(groups) {
           }
         }
 
-          widget = {
+        const widget = {
           type,
           fields: fieldsList || null,
           hide_errors: hideErrors || false,
           service_name: service.name,
           service_group: serviceGroup.name,
-            widget_name: Object.keys(widget)[0] != "type" ? Object.keys(widget)[0] : "",
+          index,
         };
 
         if (type === "azuredevops") {
@@ -663,8 +665,6 @@ export function cleanServiceGroups(groups) {
         }
         return widget;
       });
-      }
-      cleanedService.widget = null;
       return cleanedService;
     }),
   }));
@@ -697,15 +697,11 @@ export async function getServiceItem(group, service) {
   return false;
 }
 
-export default async function getServiceWidget(group, service, name = null) {
+export default async function getServiceWidget(group, service, index) {
   const serviceItem = await getServiceItem(group, service);
-  if (serviceItem && (name == null || name === "undefined")) {
+  if (serviceItem) {
-    const { widget } = serviceItem;
+    const { widget, widgets } = serviceItem;
-    return widget;
+    return index > -1 && widgets ? widgets[index] : widget;
-  }
-  if (serviceItem && name != null && name !== "undefined") {
-    const { widgets } = serviceItem;
-    return widgets.filter((widget) => Object.keys(widget)[0] == name)[0][name];
   }
   return false;
 }

src/utils/proxy/api-helpers.js

@@ -12,7 +12,7 @@ export function getURLSearchParams(widget, endpoint) {
   const params = new URLSearchParams({
     group: widget.service_group,
     service: widget.service_name,
-    ...(widget.widget_name != "" && { name: widget.widget_name }),
+    index: widget.index,
   });
   if (endpoint) {
     params.append("endpoint", endpoint);

src/utils/proxy/handlers/credentialed.js

@@ -9,10 +9,10 @@ import widgets from "widgets/widgets";
 const logger = createLogger("credentialedProxyHandler");
 
 export default async function credentialedProxyHandler(req, res, map) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });

src/utils/proxy/handlers/generic.js

@@ -8,10 +8,10 @@ import widgets from "widgets/widgets";
 const logger = createLogger("genericProxyHandler");
 
 export default async function genericProxyHandler(req, res, map) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });

src/utils/proxy/handlers/jsonrpc.js

@@ -65,10 +65,10 @@ export async function sendJsonRpcRequest(url, method, params, widget) {
 }
 
 export default async function jsonrpcProxyHandler(req, res) {
-  const { group, service, endpoint: method, name } = req.query;
+  const { group, service, endpoint: method, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
     const api = widgets?.[widget.type]?.api;
 
     const [, mapping] = Object.entries(widgets?.[widget.type]?.mappings).find(([, value]) => value.endpoint === method);

src/utils/proxy/handlers/synology.js

@@ -131,13 +131,13 @@ function toError(url, synologyError) {
 }
 
 export default async function synologyProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const serviceWidget = await getServiceWidget(group, service, name ? name : null);
+  const serviceWidget = await getServiceWidget(group, service, index);
   const widget = widgets?.[serviceWidget.type];
   const mapping = widget?.mappings?.[endpoint];
   if (!widget.api || !mapping) {

src/widgets/audiobookshelf/proxy.js

@@ -23,14 +23,14 @@ async function retrieveFromAPI(url, key) {
 }
 
 export default async function audiobookshelfProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/beszel/proxy.js

@@ -34,10 +34,10 @@ async function login(loginUrl, username, password, service) {
 }
 
 export default async function beszelProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });

src/widgets/calendar/proxy.js

@@ -5,10 +5,10 @@ import createLogger from "utils/logger";
 const logger = createLogger("calendarProxyHandler");
 
 export default async function calendarProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
     const integration = widget.integrations?.find((i) => i.name === endpoint);
 
     if (integration) {

src/widgets/crowdsec/proxy.js

@@ -35,14 +35,14 @@ async function login(widget, service) {
 }
 
 export default async function crowdsecProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.error("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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget || !widgets[widget.type].api) {
     logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid widget configuration" });

src/widgets/deluge/proxy.js

@@ -40,14 +40,14 @@ function login(url, password) {
 }
 
 export default async function delugeProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/flood/proxy.js

@@ -28,14 +28,14 @@ async function login(widget) {
 }
 
 export default async function floodProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/freshrss/proxy.js

@@ -74,14 +74,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function freshrssProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   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" });

src/widgets/fritzbox/proxy.js

@@ -46,8 +46,8 @@ async function requestEndpoint(apiBaseUrl, service, action) {
 }
 
 export default async function fritzboxProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
-  const serviceWidget = await getServiceWidget(group, service, name ? name : null);
+  const serviceWidget = await getServiceWidget(group, service, index);
 
   if (!serviceWidget) {
     res.status(500).json({ error: { message: "Service widget not found" } });

src/widgets/gamedig/proxy.js

@@ -7,8 +7,8 @@ const proxyName = "gamedigProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function gamedigProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
-  const serviceWidget = await getServiceWidget(group, service, name ? name : null);
+  const serviceWidget = await getServiceWidget(group, service, index);
   const url = new URL(serviceWidget.url);
 
   try {

src/widgets/homeassistant/proxy.js

@@ -62,14 +62,14 @@ async function getQuery(query, { url, key }) {
 }
 
 export default async function homeassistantProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   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" });

src/widgets/homebox/proxy.js

@@ -68,14 +68,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function homeboxProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   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" });

src/widgets/homebridge/proxy.js

@@ -71,14 +71,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function homebridgeProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/jackett/proxy.js

@@ -25,14 +25,14 @@ async function fetchJackettCookie(widget, loginURL) {
 }
 
 export default async function jackettProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (!group || !service) {
     logger.error("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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget || !widgets[widget.type].api) {
     logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid widget configuration" });

src/widgets/jdownloader/proxy.js

@@ -12,12 +12,12 @@ const proxyName = "jdownloaderProxyHandler";
 const logger = createLogger(proxyName);
 
 async function getWidget(req) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return null;

src/widgets/kavita/proxy.js

@@ -70,14 +70,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function KavitaProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   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" });

src/widgets/minecraft/proxy.js

@@ -7,8 +7,8 @@ const proxyName = "minecraftProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function minecraftProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
-  const serviceWidget = await getServiceWidget(group, service, name ? name : null);
+  const serviceWidget = await getServiceWidget(group, service, index);
   const url = new URL(serviceWidget.url);
   try {
     const pingResponse = await pingWithPromise(url.hostname, url.port || 25565);

src/widgets/npm/proxy.js

@@ -36,10 +36,10 @@ async function login(loginUrl, username, password, service) {
 }
 
 export default async function npmProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
 
     if (!widgets?.[widget.type]?.api) {
       return res.status(403).json({ error: "Service does not support API calls" });

src/widgets/omada/proxy.js

@@ -33,10 +33,10 @@ async function login(loginUrl, username, password, controllerVersionMajor) {
 }
 
 export default async function omadaProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
 
     if (widget) {
       const { url } = widget;

src/widgets/openmediavault/proxy.js

@@ -12,14 +12,14 @@ const BG_POLL_PERIOD = 500;
 const logger = createLogger(PROXY_NAME);
 
 async function getWidget(req) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/openwrt/proxy.js

@@ -17,14 +17,14 @@ const PARAMS = {
 };
 
 async function getWidget(req) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/photoprism/proxy.js

@@ -6,14 +6,14 @@ import createLogger from "utils/logger";
 const logger = createLogger("photoprismProxyHandler");
 
 export default async function photoprismProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/pihole/proxy.js

@@ -33,7 +33,7 @@ async function login(widget, service) {
 }
 
 export default async function piholeProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
   let endpoint = "stats/summary";
 
   if (!group || !service) {
@@ -41,7 +41,7 @@ export default async function piholeProxyHandler(req, res) {
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   if (!widget) {
     logger.error("Invalid or missing widget for service '%s' in group '%s'", service, group);
     return res.status(400).json({ error: "Invalid widget configuration" });

src/widgets/plex/proxy.js

@@ -16,14 +16,14 @@ const tvCacheKey = `${proxyName}__tv`;
 const logger = createLogger(proxyName);
 
 async function getWidget(req) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/pyload/proxy.js

@@ -67,11 +67,11 @@ async function login(loginUrl, service, username, password = "") {
 }
 
 export default async function pyloadProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = req.query;
 
   try {
     if (group && service) {
-      const widget = await getServiceWidget(group, service, name ? name : null);
+      const widget = await getServiceWidget(group, service, index);
 
       if (widget) {
         const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget }));

src/widgets/qbittorrent/proxy.js

@@ -21,14 +21,14 @@ async function login(widget) {
 }
 
 export default async function qbittorrentProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/qnap/proxy.js

@@ -77,14 +77,14 @@ async function apiCall(widget, endpoint, service) {
 }
 
 export default async function qnapProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   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" });

src/widgets/rutorrent/proxy.js

@@ -45,10 +45,10 @@ const getTorrentInfo = (data) => ({
 });
 
 export default async function rutorrentProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
 
   if (group && service) {
-    const widget = await getServiceWidget(group, service, name ? name : null);
+    const widget = await getServiceWidget(group, service, index);
 
     if (widget) {
       const api = widgets?.[widget.type]?.api;

src/widgets/suwayomi/proxy.js

@@ -114,14 +114,14 @@ function extractCounts(responseJSON, fields) {
 }
 
 export default async function suwayomiProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/tdarr/proxy.js

@@ -8,14 +8,14 @@ const proxyName = "tdarrProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function tdarrProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/transmission/proxy.js

@@ -11,14 +11,14 @@ const headerCacheKey = `${proxyName}__headers`;
 const logger = createLogger(proxyName);
 
 export default async function transmissionProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/unifi/proxy.js

@@ -14,13 +14,13 @@ const prefixCacheKey = `${proxyName}__prefix`;
 const logger = createLogger(proxyName);
 
 async function getWidget(req) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
 
   let widget = null;
   if (group === "unifi_console" && service === "unifi_console") {
     // info widget
-    const index = req.query?.query ? JSON.parse(req.query.query).index : undefined;
+    const infowidgetIndex = req.query?.query ? JSON.parse(req.query.query).index : undefined;
-    widget = await getPrivateWidgetOptions("unifi_console", index);
+    widget = await getPrivateWidgetOptions("unifi_console", infowidgetIndex);
     if (!widget) {
       logger.debug("Error retrieving settings for this Unifi widget");
       return null;
@@ -32,7 +32,7 @@ async function getWidget(req) {
       return null;
     }
 
-    widget = await getServiceWidget(group, service, name ? name : null);
+    widget = await getServiceWidget(group, service, index);
 
     if (!widget) {
       logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/urbackup/proxy.js

@@ -3,8 +3,8 @@ import { UrbackupServer } from "urbackup-server-api";
 import getServiceWidget from "utils/config/service-helpers";
 
 export default async function urbackupProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
-  const serviceWidget = await getServiceWidget(group, service, name ? name : null);
+  const serviceWidget = await getServiceWidget(group, service, index);
 
   const server = new UrbackupServer({
     url: serviceWidget.url,

src/widgets/watchtower/proxy.js

@@ -8,14 +8,14 @@ const proxyName = "watchtowerProxyHandler";
 const logger = createLogger(proxyName);
 
 export default async function watchtowerProxyHandler(req, res) {
-  const { group, service, endpoint, name } = req.query;
+  const { group, service, endpoint, index } = 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, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
 
   if (!widget) {
     logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group);

src/widgets/xteve/proxy.js

@@ -7,13 +7,13 @@ import getServiceWidget from "utils/config/service-helpers";
 const logger = createLogger("xteveProxyHandler");
 
 export default async function xteveProxyHandler(req, res) {
-  const { group, service, name } = req.query;
+  const { group, service, index } = req.query;
 
   if (!group || !service) {
     return res.status(400).json({ error: "Invalid proxy service type" });
   }
 
-  const widget = await getServiceWidget(group, service, name ? name : null);
+  const widget = await getServiceWidget(group, service, index);
   const api = widgets?.[widget.type]?.api;
   if (!api) {
     return res.status(403).json({ error: "Service does not support API calls" });