From 0666268d9158e218ecffe40700b0084d23ce16ca Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 18 Feb 2023 22:19:01 -0800 Subject: [PATCH] unmanic use generic proxy --- src/widgets/unmanic/proxy.js | 55 ----------------------------------- src/widgets/unmanic/widget.js | 6 ++-- 2 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 src/widgets/unmanic/proxy.js diff --git a/src/widgets/unmanic/proxy.js b/src/widgets/unmanic/proxy.js deleted file mode 100644 index 7a833765..00000000 --- a/src/widgets/unmanic/proxy.js +++ /dev/null @@ -1,55 +0,0 @@ -import getServiceWidget from "utils/config/service-helpers"; -import { formatApiCall } from "utils/proxy/api-helpers"; -import validateWidgetData from "utils/proxy/validate-widget-data"; -import { httpProxy } from "utils/proxy/http"; -import createLogger from "utils/logger"; -import widgets from "widgets/widgets"; - -const logger = createLogger("unmanicProxyHandler"); - -export default async function unmanicProxyHandler(req, res, map) { - const { group, service, endpoint } = req.query; - - if (group && service) { - const widget = await getServiceWidget(group, service); - - if (!widgets?.[widget.type]?.api) { - return res.status(403).json({ error: "Service does not support API calls" }); - } - - if (widget) { - const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget })); - - const [status, contentType, data] = await httpProxy(url, { - method: req.method, - body: (endpoint === "pending/tasks") ? "{}" : "", - }); - - let resultData = data; - - if (!validateWidgetData(widget, endpoint, resultData)) { - return res.status(status).json({error: {message: "Invalid data", url, data: resultData}}); - } - - if (status === 200 && map) { - resultData = map(data); - } - - if (contentType) res.setHeader("Content-Type", contentType); - - if (status === 204 || status === 304) { - return res.status(status).end(); - } - - if (status >= 400) { - logger.debug("HTTP Error %d calling %s//%s%s...", status, url.protocol, url.hostname, url.pathname); - return res.status(status).json({error: {message: "HTTP Error", url, data}}); - } - - return res.status(status).send(resultData); - } - } - - 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/widgets/unmanic/widget.js b/src/widgets/unmanic/widget.js index 69bc6380..5de0626d 100644 --- a/src/widgets/unmanic/widget.js +++ b/src/widgets/unmanic/widget.js @@ -1,10 +1,9 @@ -import unmanicProxyHandler from "./proxy"; - +import genericProxyHandler from "utils/proxy/handlers/generic"; import { asJson } from "utils/proxy/api-helpers"; const widget = { api: "{url}/unmanic/api/v2/{endpoint}", - proxyHandler: unmanicProxyHandler, + proxyHandler: genericProxyHandler, mappings: { workers: { @@ -16,6 +15,7 @@ const widget = { }, pending: { method: "POST", + body: "{}", endpoint: "pending/tasks", validate: [ "recordsTotal"