@pipedream/google_calendar 0.5.6 → 0.5.8

package/actions/add-attendees-to-event/add-attendees-to-event.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_calendar-add-attendees-to-event",
   name: "Add Attendees To Event",
   description: "Add attendees to an existing event. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Events.html#update)",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   props: {
     googleCalendar,

package/actions/create-event/create-event.mjs

@@ -7,7 +7,7 @@ export default {
   key: "google_calendar-create-event",
   name: "Create Event",
   description: "Create an event in a Google Calendar. [See the documentation](https://developers.google.com/calendar/api/v3/reference/events/insert)",
-  version: "0.2.4",
+  version: "0.2.5",
   type: "action",
   props: {
     googleCalendar,

package/actions/delete-event/delete-event.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_calendar-delete-event",
   name: "Delete an Event",
   description: "Delete an event from a Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Events.html#delete)",
-  version: "0.1.6",
+  version: "0.1.7",
   type: "action",
   props: {
     googleCalendar,

package/actions/get-calendar/get-calendar.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_calendar-get-calendar",
   name: "Retrieve Calendar Details",
   description: "Retrieve calendar details of a Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Calendars.html#get)",
-  version: "0.1.7",
+  version: "0.1.8",
   type: "action",
   props: {
     googleCalendar,

package/actions/get-event/get-event.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_calendar-get-event",
   name: "Retrieve Event Details",
   description: "Retrieve event details from Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Events.html#get)",
-  version: "0.1.7",
+  version: "0.1.8",
   type: "action",
   props: {
     googleCalendar,

package/actions/list-calendars/list-calendars.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_calendar-list-calendars",
   name: "List Calendars",
   description: "Retrieve a list of calendars from Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Calendarlist.html#list)",
-  version: "0.1.7",
+  version: "0.1.8",
   type: "action",
   props: {
     googleCalendar,

package/actions/list-events/list-events.mjs

@@ -6,7 +6,7 @@ export default {
   key: "google_calendar-list-events",
   name: "List Events",
   description: "Retrieve a list of event from the Google Calendar. [See the documentation](https://developers.google.com/calendar/api/v3/reference/events/list)",
-  version: "0.0.7",
+  version: "0.0.8",
   type: "action",
   props: {
     googleCalendar,

package/actions/query-free-busy-calendars/query-free-busy-calendars.mjs

@@ -4,7 +4,7 @@ export default {
   key: "google_calendar-query-free-busy-calendars",
   name: "Retrieve Free/Busy Calendar Details",
   description: "Retrieve free/busy calendar details from Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Freebusy.html#query)",
-  version: "0.1.7",
+  version: "0.1.8",
   type: "action",
   props: {
     googleCalendar,

package/actions/quick-add-event/quick-add-event.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_calendar-quick-add-event",
   name: "Add Quick Event",
   description: "Create a quick event to the Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Events.html#quickAdd)",
-  version: "0.1.6",
+  version: "0.1.7",
   type: "action",
   props: {
     googleCalendar,

package/actions/update-event/update-event.mjs

@@ -6,7 +6,7 @@ export default {
   key: "google_calendar-update-event",
   name: "Update Event",
   description: "Update an event from Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Events.html#update)",
-  version: "0.0.9",
+  version: "0.0.10",
   type: "action",
   props: {
     googleCalendar,

package/common/constants.mjs

@@ -85,7 +85,12 @@ const REPEAT_FREQUENCIES = {
   YEARLY: "year",
 };
 
+const WEBHOOK_SUBSCRIPTION_EXPIRATION_TIME_MILLISECONDS = 24 * 60 * 60 * 1000;
+const WEBHOOK_SUBSCRIPTION_RENEWAL_SECONDS =
+  (WEBHOOK_SUBSCRIPTION_EXPIRATION_TIME_MILLISECONDS * 0.95) / 1000;
+
 export default {
   API,
   REPEAT_FREQUENCIES,
+  WEBHOOK_SUBSCRIPTION_RENEWAL_SECONDS,
 };

package/package.json

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

package/sources/event-cancelled/event-cancelled.mjs

@@ -6,7 +6,7 @@ export default {
   key: "google_calendar-event-cancelled",
   name: "New Cancelled Event",
   description: "Emit new event when a Google Calendar event is cancelled or deleted",
-  version: "0.1.10",
+  version: "0.1.11",
   type: "source",
   dedupe: "unique",
   props: {

package/sources/event-ended/event-ended.mjs

@@ -6,7 +6,7 @@ export default {
   key: "google_calendar-event-ended",
   name: "New Ended Event",
   description: "Emit new event when a Google Calendar event ends",
-  version: "0.1.10",
+  version: "0.1.11",
   type: "source",
   dedupe: "unique",
   props: {

package/sources/new-calendar/new-calendar.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_calendar-new-calendar",
   name: "New Calendar Created",
   description: "Emit new event when a calendar is created.",
-  version: "0.1.10",
+  version: "0.1.11",
   type: "source",
   dedupe: "unique",
   props: {

package/sources/new-event-search/new-event-search.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_calendar-new-event-search",
   name: "New Event Matching a Search",
   description: "Emit new event when a Google Calendar event is created that matches a search",
-  version: "0.1.10",
+  version: "0.1.11",
   type: "source",
   dedupe: "unique",
   props: {

package/sources/new-or-updated-event-instant/new-or-updated-event-instant.mjs

@@ -1,14 +1,14 @@
 import { v4 as uuid } from "uuid";
 import sampleEmit from "./test-event.mjs";
 import googleCalendar from "../../google_calendar.app.mjs";
-import { DEFAULT_POLLING_SOURCE_TIMER_INTERVAL } from "@pipedream/platform";
+import constants from "../../common/constants.mjs";
 
 export default {
   key: "google_calendar-new-or-updated-event-instant",
   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.15",
   dedupe: "unique",
   props: {
     googleCalendar,
@@ -38,7 +38,7 @@ export default {
       description: "The Google Calendar API requires occasional renewal of push notification subscriptions. **This runs in the background, so you should not need to modify this schedule**.",
       type: "$.interface.timer",
       static: {
-        intervalSeconds: DEFAULT_POLLING_SOURCE_TIMER_INTERVAL,
+        intervalSeconds: constants.WEBHOOK_SUBSCRIPTION_RENEWAL_SECONDS,
       },
     },
   },
@@ -66,7 +66,11 @@ export default {
       await this.makeWatchRequest();
     },
     async deactivate() {
-      await this.stopWatchRequest();
+      try {
+        await this.stopWatchRequest();
+      } catch (e) {
+        console.log(`Error deactivating webhook. ${e}`);
+      }
     },
   },
   methods: {
@@ -199,16 +203,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 +230,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 +258,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);

package/sources/upcoming-event-alert/upcoming-event-alert.mjs

@@ -8,7 +8,7 @@ export default {
   description: `Emit new event based on a time interval before an upcoming event in the calendar. This source uses Pipedream's Task Scheduler.
     [See the documentation](https://pipedream.com/docs/examples/waiting-to-execute-next-step-of-workflow/#step-1-create-a-task-scheduler-event-source) 
     for more information and instructions for connecting your Pipedream account.`,
-  version: "0.0.9",
+  version: "0.0.10",
   type: "source",
   props: {
     pipedream: taskScheduler.props.pipedream,