perf(calendar): pre-filter ICS data before parsing

Author: KristjanESPERANTO

cspell.config.json

@@ -257,6 +257,7 @@
 		"pubdate",
 		"radokristof",
 		"rajniszp",
+		"RDATE",
 		"rebuilded",
 		"Reis",
 		"rejas",

defaultmodules/calendar/calendarfetcher.js

@@ -59,7 +59,13 @@ class CalendarFetcher {
 			}
 
 			const responseData = await response.text();
-			const parsed = await ical.async.parseICS(responseData);
+
+			const filteredData = await CalendarFetcherUtils.preFilterICS(responseData, {
+				includePastEvents: this.includePastEvents,
+				maximumNumberOfDays: this.maximumNumberOfDays
+			});
+
+			const parsed = await ical.async.parseICS(filteredData);
 
 			Log.debug(`Parsed iCal data from ${this.url} with ${Object.keys(parsed).length} entries.`);
 

defaultmodules/calendar/calendarfetcherutils.js

@@ -41,6 +41,36 @@ const CalendarFetcherUtils = {
 		return moment.tz.guess();
 	},
 
+	/**
+	 * Calculate the time window of events to keep, as [start, end].
+	 * Without includePastEvents the window starts now; otherwise it also
+	 * reaches maximumNumberOfDays into the past.
+	 * @param {object} config Needs includePastEvents (boolean) and maximumNumberOfDays (number).
+	 * @returns {[Date, Date]} The start and end of the window.
+	 */
+	calculateFilterWindow (config) {
+		const today = moment().startOf("day");
+		const start = config.includePastEvents
+			? today.clone().subtract(config.maximumNumberOfDays, "days").toDate()
+			: new Date();
+		const end = today.clone().add(config.maximumNumberOfDays, "days").toDate();
+		return [start, end];
+	},
+
+	/**
+	 * Drop ICS data outside the configured time window before it is parsed,
+	 * so that node-ical only has to process events we might actually show.
+	 * @param {string} rawICS The raw ICS text.
+	 * @param {object} config Needs includePastEvents (boolean) and maximumNumberOfDays (number).
+	 * @returns {Promise<string>} The filtered ICS text.
+	 */
+	async preFilterICS (rawICS, config) {
+		// ics-filter is ESM-only, so we import it dynamically from this CommonJS file.
+		const { icsFilter } = await import("ics-filter");
+		const [start, end] = CalendarFetcherUtils.calculateFilterWindow(config);
+		return icsFilter(rawICS, start, end);
+	},
+
 	/**
 	 * Filter the events from ical according to the given config
 	 * @param {object} data the calendar data from ical

package-lock.json

@@ -93,6 +93,7 @@
 		"helmet": "^8.2.0",
 		"html-to-text": "^10.0.0",
 		"iconv-lite": "^0.7.2",
+		"ics-filter": "^1.0.2",
 		"ipaddr.js": "^2.4.0",
 		"moment": "^2.30.1",
 		"moment-timezone": "^0.6.2",

package.json

@@ -298,6 +298,29 @@ END:VCALENDAR`);
 		});
 	});
 
+	describe("calculateFilterWindow", () => {
+		it("ends maximumNumberOfDays after today's midnight", () => {
+			const [, end] = CalendarFetcherUtils.calculateFilterWindow({ includePastEvents: false, maximumNumberOfDays: 30 });
+
+			expect(end).toEqual(moment().startOf("day").add(30, "days").toDate());
+		});
+
+		it("starts now when includePastEvents is false", () => {
+			const before = Date.now();
+			const [start] = CalendarFetcherUtils.calculateFilterWindow({ includePastEvents: false, maximumNumberOfDays: 30 });
+			const after = Date.now();
+
+			expect(start.getTime()).toBeGreaterThanOrEqual(before);
+			expect(start.getTime()).toBeLessThanOrEqual(after);
+		});
+
+		it("starts maximumNumberOfDays before today's midnight when includePastEvents is true", () => {
+			const [start] = CalendarFetcherUtils.calculateFilterWindow({ includePastEvents: true, maximumNumberOfDays: 30 });
+
+			expect(start).toEqual(moment().startOf("day").subtract(30, "days").toDate());
+		});
+	});
+
 	describe("expandRecurringEvent", () => {
 		it("should extend end to end-of-day when event has no DTEND", () => {
 			// node-ical sets end === start when DTEND is absent; our code extends to endOf("day")