add error handling to weather fetch functions, including cors

Author: sdetweil

CHANGELOG.md

@@ -15,6 +15,7 @@ planned for 2026-01-01
 
 - [weather] feat: add configurable forecast date format option (#3918)
 - [core] Add new `server:watch` script to run MagicMirror² server-only with automatic restarts when files (defined in `config.watchTargets`) change (#3920)
+- [weather] add error handling to fetch functions including cors (#3791)
 
 ### Changed
 

js/server_functions.js

@@ -41,28 +41,32 @@ async function cors (req, res) {
 			url = `invalid url: ${req.url}`;
 			Log.error(url);
 			res.send(url);
-		} else {
-			url = match[1];
-
-			const headersToSend = getHeadersToSend(req.url);
-			const expectedReceivedHeaders = geExpectedReceivedHeaders(req.url);
+			return;
+		}
+		url = match[1];
 
-			Log.log(`cors url: ${url}`);
-			const response = await fetch(url, { headers: headersToSend });
+		const headersToSend = getHeadersToSend(req.url);
+		const expectedReceivedHeaders = geExpectedReceivedHeaders(req.url);
+		Log.log(`cors url: ${url}`);
 
+		const response = await fetch(url, { headers: headersToSend });
+		if (response.ok) {
 			for (const header of expectedReceivedHeaders) {
 				const headerValue = response.headers.get(header);
 				if (header) res.set(header, headerValue);
 			}
 			const data = await response.text();
 			res.send(data);
+		} else {
+			res.status(response.status).json({ message: response.statusText });
 		}
+
 	} catch (error) {
 		// Only log errors in non-test environments to keep test output clean
 		if (process.env.mmTestMode !== "true") {
-			Log.error(error);
+			Log.error(`Error in CORS request: ${error}`);
 		}
-		res.send(error);
+		res.status(500).json({ error: error.message });
 	}
 }
 

modules/default/utils.js

@@ -17,19 +17,28 @@ async function performWebRequest (url, type = "json", useCorsProxy = false, requ
 		requestUrl = url;
 		request.headers = getHeadersToSend(requestHeaders);
 	}
-	const response = await fetch(requestUrl, request);
-	const data = await response.text();
 
-	if (type === "xml") {
-		return new DOMParser().parseFromString(data, "text/html");
-	} else {
-		if (!data || !data.length > 0) return undefined;
+	try {
+		const response = await fetch(requestUrl, request);
+		if (response.ok) {
+			const data = await response.text();
+
+			if (type === "xml") {
+				return new DOMParser().parseFromString(data, "text/html");
+			} else {
+				if (!data || !data.length > 0) return undefined;
 
-		const dataResponse = JSON.parse(data);
-		if (!dataResponse.headers) {
-			dataResponse.headers = getHeadersFromResponse(expectedResponseHeaders, response);
+				const dataResponse = JSON.parse(data);
+				if (!dataResponse.headers) {
+					dataResponse.headers = getHeadersFromResponse(expectedResponseHeaders, response);
+				}
+				return dataResponse;
+			}
+		} else {
+			throw new Error(`Response status: ${response.status}`);
 		}
-		return dataResponse;
+	} catch (error) {
+		Log.error(`Error fetching data from ${url}: ${error}`);
 	}
 }