kennethnym/aris
1
0
Fork 0
mirror of https://github.com/kennethnym/aris.git synced 2026-03-20 17:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: deduplicate concurrent fetchEvents calls

Browse Source 
Co-authored-by: Ona <no-reply@ona.com>
This commit is contained in:
Kenneth
2026-02-28 15:53:36 +00:00
parent 851e6af951
commit e220ccc392
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/aris-source-caldav/src/caldav-source.ts
View File

@@ -75,6 +75,7 @@ export class CalDavSource implements FeedSource<CalDavFeedItem> {
private readonly injectedClient: CalDavDAVClient | null private readonly injectedClient: CalDavDAVClient | null
private clientPromise: Promise<CalDavDAVClient> | null = null private clientPromise: Promise<CalDavDAVClient> | null = null
private cachedEvents: { time: Date; events: CalDavEventData[] } | null = null private cachedEvents: { time: Date; events: CalDavEventData[] } | null = null
private pendingFetch: { time: Date; promise: Promise<CalDavEventData[]> } | null = null
constructor(options: CalDavSourceOptions) { constructor(options: CalDavSourceOptions) {
this.options = options this.options = options
@@ -127,11 +128,27 @@ export class CalDavSource implements FeedSource<CalDavFeedItem> {
return events.map((event) => createFeedItem(event, now)) return events.map((event) => createFeedItem(event, now))
} }
private async fetchEvents(context: Context): Promise<CalDavEventData[]> { private fetchEvents(context: Context): Promise<CalDavEventData[]> {
if (this.cachedEvents && this.cachedEvents.time === context.time) { if (this.cachedEvents && this.cachedEvents.time === context.time) {
return this.cachedEvents.events return Promise.resolve(this.cachedEvents.events)
} }
// Deduplicate concurrent fetches for the same context.time reference
if (this.pendingFetch && this.pendingFetch.time === context.time) {
return this.pendingFetch.promise
}
const promise = this.doFetchEvents(context).finally(() => {
if (this.pendingFetch?.promise === promise) {
this.pendingFetch = null
}
})
this.pendingFetch = { time: context.time, promise }
return promise
}
private async doFetchEvents(context: Context): Promise<CalDavEventData[]> {
const client = await this.connectClient() const client = await this.connectClient()
const calendars = await client.fetchCalendars() const calendars = await client.fetchCalendars()