fix(polling): drive cursor stall on full page, calendar latestUpdated past filtered events

Author: waleedlatif1

apps/sim/lib/webhooks/polling/google-calendar.ts

@@ -282,19 +282,19 @@ async function processEvents(
   let latestUpdated: string | null = null
 
   for (const event of events) {
+    // Client-side event type filter — skip before idempotency so filtered events aren't cached
+    const computedEventType = determineEventType(event)
+    if (eventTypeFilter && computedEventType !== eventTypeFilter) {
+      continue
+    }
+
     // Track the latest `updated` timestamp for clock-skew-free state tracking
     if (event.updated) {
       if (!latestUpdated || event.updated > latestUpdated) {
         latestUpdated = event.updated
       }
     }
 
-    // Client-side event type filter — skip before idempotency so filtered events aren't cached
-    const computedEventType = determineEventType(event)
-    if (eventTypeFilter && computedEventType !== eventTypeFilter) {
-      continue
-    }
-
     try {
       // Idempotency key includes `updated` so re-edits of the same event re-trigger
       const idempotencyKey = `${webhookData.id}:${event.id}:${event.updated || event.created || ''}`

apps/sim/lib/webhooks/polling/google-drive.ts

@@ -260,7 +260,7 @@ async function fetchChanges(
     const overLimit = allChanges.length >= maxFiles
 
     if (!hasMore || overLimit || pages >= MAX_PAGES) {
-      if (hasMore && !overLimit) {
+      if (hasMore) {
         lastNextPageToken = data.nextPageToken as string
       }
       break