Google Calendar improvements to New or Updated Event source

components/google_calendar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_calendar",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "Pipedream Google_calendar Components",
   "main": "google_calendar.app.mjs",
   "keywords": [

components/google_calendar/sources/new-or-updated-event-instant/new-or-updated-event-instant.mjs

@@ -8,7 +8,7 @@ export default {
   type: "source",
   name: "New Created or Updated Event (Instant)",
   description: "Emit new event when a Google Calendar events is created or updated (does not emit cancelled events)",
-  version: "0.1.13",
+  version: "0.1.14",
   dedupe: "unique",
   props: {
     googleCalendar,
@@ -199,16 +199,18 @@ 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
@@ -224,9 +226,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.`,
         );
@@ -252,41 +254,49 @@ 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;
       while (!nextSyncToken) {
-        const {
-          data: syncData = {},
-          status: syncStatus,
-        } = await this.googleCalendar.listEvents({
-          returnOnlyData: false,
-          calendarId,
-          syncToken,
-          pageToken: nextPageToken,
-          maxResults: 2500,
-        });
-        if (syncStatus === 410) {
-          console.log("Sync token invalid, resyncing");
-          nextSyncToken = await this.googleCalendar.fullSync(this.calendarId);
-          break;
-        }
-        nextPageToken = syncData.nextPageToken;
-        nextSyncToken = syncData.nextSyncToken;
-
-        const { items: events = [] } = syncData;
-        events
-          .filter(this.isEventRelevant, this)
-          .forEach((event) => {
-            const { status } = event;
-            if (status === "cancelled") {
-              console.log("Event cancelled. Exiting.");
-              return;
-            }
-            const meta = this.generateMeta(event);
-            this.$emit(event, meta);
+        try {
+          const { data: syncData = {} } = await this.googleCalendar.listEvents({
+            returnOnlyData: false,
+            calendarId,
+            syncToken,
+            pageToken: nextPageToken,
+            maxResults: 2500,
           });
+
+          nextPageToken = syncData.nextPageToken;
+          nextSyncToken = syncData.nextSyncToken;
+
+          const { items: events = [] } = syncData;
+          events
+            .filter(this.isEventRelevant, this)
+            .forEach((event) => {
+              const { status } = event;
+              if (status === "cancelled") {
+                console.log("Event cancelled. Exiting.");
+                return;
+              }
+              const meta = this.generateMeta(event);
+              this.$emit(event, meta);
+            });
+        } catch (error) {
+          if (error === "Sync token is no longer valid, a full sync is required.") {
+            console.log("Sync token invalid, resyncing");
+            nextSyncToken = await this.googleCalendar.fullSync(calendarId);
+            break;
+          } else {
+            throw error;
+          }
+        }
       }
 
       this.setNextSyncToken(calendarId, nextSyncToken);