faster data fetching, badge improvements

_locales/de/messages.json

@@ -48,5 +48,14 @@
 	},
 	"closed": {
 		"message": "geschlossen"
+	},
+	"badgeOpen": {
+		"message": "open"
+	},
+	"badgeClosed": {
+		"message": " "
+	},
+	"badgeEvent": {
+		"message": " "
 	}
 }

_locales/en/messages.json

@@ -48,5 +48,14 @@
 	},
 	"closed": {
 		"message": "closed"
+	},
+	"badgeOpen": {
+		"message": "open"
+	},
+	"badgeClosed": {
+		"message": " "
+	},
+	"badgeEvent": {
+		"message": " "
 	}
 }

src/background.js

@@ -30,28 +30,33 @@ function fetchSpaceApi() {
 
 async function fetchNewData() {
 	try {
-		const calendarJson = await fetchCalendar();
+		const result = await Promise.allSettled([fetchCalendar(), fetchSpaceApi()]);
-		window.calendar = calendarJson;
+		const calendarJson = result[0].value;
-	} catch (error) {
+		const spaceApiJson = result[1].value;
-		console.error(error);
-	}
 
-	try {
+		if (spaceApiJson) {
-		const spaceApiJson = await fetchSpaceApi();
+			const now = new Date();
+			const eventActive = calendarJson?.some((event) => (
+				new Date(event.begin) <= now && now <= new Date(event.end)
+			)) ?? false;
 
-		await browser.browserAction.setBadgeBackgroundColor({color: Config.openColor});
+			const badgeText = browser.i18n.getMessage(spaceApiJson.state.open ? 'badgeOpen' : eventActive ? 'badgeEvent' : 'badgeClosed');
-		await browser.browserAction.setBadgeText({text: spaceApiJson.state.open ? 'open' : ''});
+			const badgeBgColor = spaceApiJson.state.open ? Config.openColor : eventActive ? Config.eventColor : Config.closedColor;
+			await browser.browserAction.setBadgeText({text: badgeText});
+			await browser.browserAction.setBadgeBackgroundColor({color: badgeBgColor});
 
-		if (window.spaceApi && window.spaceApi.state.open !== spaceApiJson.state.open) {
+			if (window.spaceApi && window.spaceApi.state.open !== spaceApiJson.state.open) {
-			const state = browser.i18n.getMessage(spaceApiJson.state.open ? 'open' : 'closed');
+				const state = browser.i18n.getMessage(spaceApiJson.state.open ? 'open' : 'closed');
-			await browser.notifications.create('status-change', {
+				await browser.notifications.create('status-change', {
-				type: 'basic',
+					type: 'basic',
-				title: browser.i18n.getMessage('stateNotificationTitle'),
+					title: browser.i18n.getMessage('stateNotificationTitle'),
-				message: browser.i18n.getMessage('stateNotificationMessage', state),
+					message: browser.i18n.getMessage('stateNotificationMessage', state),
-				iconUrl: browser.runtime.getURL('src/icons/favicon.svg')
+					iconUrl: browser.runtime.getURL('src/icons/favicon.svg')
-			});
+				});
+			}
 		}
 
+		window.calendar = calendarJson;
 		window.spaceApi = spaceApiJson;
 	} catch (error) {
 		console.error(error);

src/config.js

@@ -3,6 +3,8 @@ export default {
 	spaceApiUrl: 'https://www.usrspace.at/spaceapi.json',
 	calenderUrl: 'https://www.usrspace.at/calendar.php',
 	openColor: '#33cc33',
+	closedColor: '#cc3333',
+	eventColor: '#9933cc',
 	quickLinks: [
 		{
 			url: 'https://www.usrspace.at/',