add error handling to weather fetch functions, including cors

CHANGELOG.md

@@ -38,6 +38,7 @@ planned for 2025-07-01
 - [calendar] fix fullday event rrule until with timezone offset (#3781)
 - [feat] Add rule `no-undef` in config file validation to fix #3785 (#3786)
 - [fonts] Fix `roboto.css` to avoid error message `Unknown descriptor 'var(' in @font-face rule.` in firefox console (#3787)
+- [weather] add error handling to fetch functions including cors
 
 ### Updated
 

js/server_functions.js

@@ -41,25 +41,29 @@ 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) {
 		Log.error(error);
-		res.send(error);
+		res.status(500).json({ message: error.message });
 	}
 }
 

modules/default/utils.js

@@ -17,20 +17,26 @@ 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 (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;
+		if (type === "xml") {
+			return new DOMParser().parseFromString(data, "text/html");
+		} else {
+			if (!data || !data.length > 0) return "null"; //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;
 		}
-		return dataResponse;
+	} else {
+		throw new Error(`Response status: ${response.status}`);
 	}
+
 }
 
 /**