Skip to content

Google Calendar improvements to New or Updated Event source #14925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 13, 2024
Merged

Google Calendar improvements to New or Updated Event source #14925

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a692a06
Google Calendar - New Created or Updated Event (Instant) - update to …
fsv-michael Dec 11, 2024
8af0d01
Google Calendar - New Created or Updated Event (Instant) - reduce API…
fsv-michael Dec 11, 2024
d2a9579
Address style issues and additional bug identified by coderabbitai
fsv-michael Dec 11, 2024
497cb75
versions, lint fix
michelle0927 Dec 11, 2024
a9f4a28
pnpm-lock.yaml
michelle0927 Dec 11, 2024
f109b55
update
michelle0927 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions ...nts/google_calendar/sources/new-or-updated-event-instant/new-or-updated-event-instant.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,16 +199,19 @@ export default {
}
return new Date(min);
},
getChannelIds() {
const channelIds = [];
getCalendarIdForChannelId(incomingChannelId) {
for (const calendarId of this.calendarIds) {
const channelId = this.db.get(`${calendarId}.channelId`);
channelIds.push(channelId);
if (this.db.get(`${calendarId}.channelId`) === incomingChannelId) {
return calendarId;
}
}
return channelIds;
return null;
},
},
async run(event) {
let calendarId = null; // calendar ID matching incoming channel ID

// refresh watch
if (event.interval_seconds) {
// get time
Expand All @@ -224,9 +227,9 @@ export default {
}
} else {
// Verify channel ID
const channelIds = this.getChannelIds();
const incomingChannelId = event?.headers?.["x-goog-channel-id"];
if (!channelIds.includes(incomingChannelId)) {
calendarId = this.getCalendarIdForChannelId(incomingChannelId);
if (!calendarId) {
console.log(
`Unexpected channel ID ${incomingChannelId}. This likely means there are multiple, older subscriptions active.`,
);
Expand All @@ -252,7 +255,8 @@ export default {
}

// Fetch and emit events
for (const calendarId of this.calendarIds) {
const checkCalendarIds = calendarId ? [ calendarId ] : this.calendarIds;
for (const calendarId of checkCalendarIds) {
const syncToken = this.getNextSyncToken(calendarId);
let nextSyncToken = null;
let nextPageToken = null;
Expand All @@ -266,6 +270,7 @@ export default {
syncToken,
pageToken: nextPageToken,
maxResults: 2500,
validateStatus: (status) => (status >= 200 && (status < 300 || status == 410)),
});
if (syncStatus === 410) {
console.log("Sync token invalid, resyncing");
Expand Down