Merge branch 'develop' into fetch

Author: KristjanESPERANTO

.gitignore

@@ -58,8 +58,12 @@ Temporary Items
 modules
 !modules/default
 
-# Ignore changes to the custom css files but keep others.
-css/custom.css
+# Ignore changes to the custom css files but keep the sample and main.
+/css/*
+!/css/custom.css.sample
+!/css/font-awesome.css
+!/css/main.css
+!/css/roboto.css
 
 # Ignore users config file but keep the sample.
 config

CHANGELOG.md

@@ -15,10 +15,11 @@ 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)
 
 ### Removed
 
-- [weather] Removed deprecated ukmetoffice datapoint provider (#3842, #3952)
+- [weather] Removed deprecated `ukmetoffice` datapoint provider (#3842, #3952)
 
 ### Changed
 
@@ -32,6 +33,7 @@ planned for 2026-01-01
 - [calendar] hide repeatingCountTitle if the event count is zero (#3949)
 - [core] refactor: replace `XMLHttpRequest` with `fetch` in `translator.js` (#3950)
 - [tests] migrate e2e tests to Playwright (#3950)
+- [core] configure cspell to check default modules only and fix typos (#3955)
 
 ### Fixed
 

cspell.config.json

@@ -3,19 +3,25 @@
 	"language": "en",
 	"words": [
 		"aarch",
+		"Adak",
 		"Alvinger",
 		"Ampio",
 		"andrezibaia",
 		"angeldeejay",
+		"apikey",
 		"apiontek",
 		"armv",
 		"ashishtank",
 		"autoplay",
+		"Autorestart",
 		"beada",
+		"Behaviour",
 		"Binney",
 		"bluemanos",
 		"bnitkin",
 		"bokmål",
+		"bouncyflip",
+		"boxspinner",
 		"Brasileiro",
 		"Brento",
 		"browserwindow",
@@ -25,14 +31,22 @@
 		"bugsounet",
 		"buxxi",
 		"byday",
+		"calcage",
+		"calendarfetcher",
 		"calendarfetcherutils",
 		"calendarutils",
+		"calevents",
 		"chamakura",
+		"Citypage",
 		"cjbrunner",
+		"clearsky",
 		"clientonly",
 		"clockfaces",
+		"cloudcover",
 		"cmdline",
 		"codac",
+		"Codrops",
+		"cornerexpand",
 		"Crazylegstoo",
 		"crazyscot",
 		"Creepin",
@@ -43,14 +57,23 @@
 		"Cymraeg",
 		"dariom",
 		"darksky",
+		"dataheaders",
+		"Datamart",
 		"dateheader",
 		"dateheaders",
+		"datekey",
 		"dathbe",
 		"davide",
 		"DAYAFTERTOMORROW",
 		"DAYBEFOREYESTERDAY",
 		"defaultmodules",
+		"Deificit",
+		"Descr",
+		"dewpoint",
 		"dgoth",
+		"difflink",
+		"dismissttl",
+		"Displayer",
 		"dkallen",
 		"drivelist",
 		"DTEND",
@@ -63,18 +86,26 @@
 		"Edgardos",
 		"Ekristoffe",
 		"elec",
+		"elif",
 		"eltociear",
+		"endfor",
+		"endmacro",
 		"envcanada",
 		"envsub",
 		"envsubst",
 		"eouia",
+		"Evapotranspration",
 		"exdate",
+		"exdates",
 		"expectedheaders",
+		"exploader",
 		"ezeholz",
+		"Fadesteps",
 		"Faizan",
 		"feedme",
 		"feelslike",
 		"Fenner",
+		"Feuchte",
 		"fewieden",
 		"fixuppm",
 		"flopp",
@@ -83,7 +114,9 @@
 		"forecastweather",
 		"fortawesome",
 		"frameguard",
+		"freezinglevel",
 		"Frysk",
+		"fullarticle",
 		"fulldate",
 		"fullday",
 		"fullscreen",
@@ -92,9 +125,19 @@
 		"GHSA",
 		"ghsas",
 		"grenagit",
+		"Halfclear",
+		"heavyrain",
+		"heavyrainandthunder",
+		"heavyrainshowers",
+		"heavyrainshowersandthunder",
+		"heavysleet",
+		"heavysleetshowersandthunder",
+		"heavysnow",
+		"heavysnowandthunder",
 		"Heiko",
 		"Hirschberger",
 		"hourlyweather",
+		"humidex",
 		"Hwind",
 		"ical",
 		"illimarkangur",
@@ -123,15 +166,18 @@
 		"Knapoc",
 		"Koepke",
 		"kolbyjack",
+		"Komplex",
 		"krekos",
 		"Kristjan",
 		"krukle",
 		"labwc",
 		"Landis",
 		"larryare",
+		"Lastberechnung",
 		"letsencrypt",
 		"libgpiod",
 		"Lightspeed",
+		"loadingcircle",
 		"locationforecast",
 		"lockstring",
 		"lstrip",
@@ -159,9 +205,12 @@
 		"Ñandú",
 		"nathannaveen",
 		"naveensrinivasan",
+		"nbsp",
 		"ndom",
 		"Nerfzooka",
 		"NEWSFEED",
+		"newsfeedfetcher",
+		"newsfetcher",
 		"newsitems",
 		"nfogal",
 		"njwilliams",
@@ -170,42 +219,61 @@
 		"nunjuck",
 		"odroid",
 		"oemel",
+		"oldconfig",
 		"onecall",
 		"onevent",
 		"openmeteo",
+		"openmeto",
 		"openweathermap",
 		"oraclesean",
 		"oscarb",
+		"pcat",
 		"philnagel",
+		"pirateweather",
+		"plained",
 		"plebcity",
+		"pmax",
+		"pmean",
+		"pmedian",
+		"pmin",
 		"Português",
 		"PRECIP",
 		"Problema",
 		"psieg",
+		"pubdate",
 		"radokristof",
 		"rajniszp",
 		"rebuilded",
 		"Reis",
 		"rejas",
+		"relativehumidity",
 		"Resig",
 		"roboto",
 		"rohitdharavath",
 		"Rosso",
+		"Rothfusz",
 		"rrule",
 		"savvadam",
 		"sdetweil",
+		"searchstr",
 		"sendheaders",
 		"serveronly",
 		"sexualized",
+		"Sitecode",
 		"skpanagiotis",
 		"SMHI",
 		"Snille",
+		"snowandthunder",
+		"snowshowersandthunder",
 		"socketclient",
 		"socketio",
 		"spectron",
 		"Starinvest",
+		"stationid",
+		"STEADMAN",
 		"sthuber",
 		"Stieber",
+		"strinner",
 		"stylelintrc",
 		"subclassing",
 		"sunaction",
@@ -216,42 +284,74 @@
 		"tada",
 		"taglist",
 		"Teeuw",
+		"Teil",
 		"TESTMODE",
 		"thomasrockhu",
+		"thumbslider",
+		"timeformat",
+		"titlereplacestr",
+		"titlesearchstr",
+		"todaytemp",
 		"tomzt",
+		"trunc",
+		"ttlms",
 		"ukmetoffice",
 		"ukmetofficedatahub",
 		"unitless",
+		"unixtime",
 		"unparseable",
 		"updatenotification",
+		"uxdt",
 		"Vaice",
 		"veeck",
+		"verjaardag",
 		"VEVENT",
 		"vgtu",
+		"Vitest",
 		"Voelt",
+		"Vorberechnung",
 		"vppencilsharpener",
 		"Wallys",
 		"Weatherbit",
+		"weathercode",
 		"WEATHERDATA",
 		"Weatherflow",
 		"weatherforecast",
 		"weathergov",
 		"weathericon",
 		"weathericons",
 		"weatherobject",
+		"weatherprovider",
 		"weatherutils",
+		"webcal",
+		"winddirection",
+		"windgusts",
 		"windspeed",
 		"Woolridge",
 		"worktree",
+		"Wsymb",
 		"xlarge",
+		"xmark",
 		"xrandr",
 		"xsmall",
 		"xsorifc",
 		"xwindows",
 		"xxxe",
 		"Ybbet",
+		"yearmatch",
 		"yearmatchgroup"
 	],
-	"ignorePaths": ["node_modules/**", "modules/**", "translations/**", "tests/mocks/**", "tests/e2e/modules/clock_es_spec.js", "css/roboto.css"],
+	"ignorePaths": [
+		"css/roboto.css",
+		"node_modules/**",
+		"modules/!(default)/**",
+		"modules/default/**/translations/!(en).json",
+		"modules/default/calendar/windowsZones.json",
+		"modules/default/clock/faces/*.svg",
+		"modules/default/weather/providers/yr.js",
+		"tests/mocks/**",
+		"tests/e2e/modules/clock_es_spec.js",
+		"translations/**"
+	],
 	"dictionaries": ["node"]
 }

js/server_functions.js

@@ -30,6 +30,7 @@ function getStartup (req, res) {
  * Only the url-param of the input request url is required. It must be the last parameter.
  * @param {Request} req - the request
  * @param {Response} res - the result
+ * @returns {Promise<void>} A promise that resolves when the response is sent
  */
 async function cors (req, res) {
 	try {
@@ -40,29 +41,32 @@ async function cors (req, res) {
 		if (!match) {
 			url = `invalid url: ${req.url}`;
 			Log.error(url);
-			res.send(url);
+			return res.status(400).send(url);
 		} else {
 			url = match[1];
 
 			const headersToSend = getHeadersToSend(req.url);
 			const expectedReceivedHeaders = geExpectedReceivedHeaders(req.url);
-
 			Log.log(`cors url: ${url}`);
-			const response = await fetch(url, { headers: headersToSend });
 
-			for (const header of expectedReceivedHeaders) {
-				const headerValue = response.headers.get(header);
-				if (header) res.set(header, headerValue);
+			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 {
+				throw new Error(`Response status: ${response.status}`);
 			}
-			const data = await response.text();
-			res.send(data);
 		}
 	} 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/alert/notificationFx.js

@@ -59,7 +59,7 @@
 		// notice, warning, error, success
 		// will add class ns-type-warning, ns-type-error or ns-type-success
 		type: "notice",
-		// if the user doesn´t close the notification then we remove it
+		// if the user doesn't close the notification then we remove it
 		// after the following time
 		ttl: 6000,
 		al_no: "ns-box",