@timesheet/plugin-google-calendar 1.2.0 → 1.2.2

package/dist/lib/taskSync.js

@@ -194,6 +194,21 @@ async function syncCalendar(context, projectMapping) {
     if (!syncToken && metadataSyncToken) {
         syncToken = metadataSyncToken;
     }
+    try {
+        return await fetchAndSyncEvents(context, client, projectMapping, calendarId, syncStateKey, syncToken);
+    }
+    catch (err) {
+        // Google returns 400 or 410 when a sync token is invalid/expired — clear it and do a full resync
+        const errMsg = String(err);
+        if (syncToken && (errMsg.includes('(410)') || errMsg.includes('Invalid sync token'))) {
+            context.logger.warn('Sync token expired, performing full resync', { calendarId });
+            await context.state.delete(syncStateKey);
+            return await fetchAndSyncEvents(context, client, projectMapping, calendarId, syncStateKey, undefined);
+        }
+        throw err;
+    }
+}
+async function fetchAndSyncEvents(context, client, projectMapping, calendarId, syncStateKey, syncToken) {
     let pageToken;
     let nextSyncToken;
     let syncedCount = 0;
@@ -303,10 +318,10 @@ function toTaskDateRange(event) {
     let endRaw = event.end?.dateTime;
     // Handle all-day events (date field instead of dateTime)
     if (!startRaw && event.start?.date) {
-        startRaw = `${event.start.date}T00:00:00Z`;
+        startRaw = `${event.start.date}T00:00:00+00:00`;
     }
     if (!endRaw && event.end?.date) {
-        endRaw = `${event.end.date}T00:00:00Z`;
+        endRaw = `${event.end.date}T00:00:00+00:00`;
     }
     if (!startRaw || !endRaw) {
         return null;
@@ -317,8 +332,8 @@ function toTaskDateRange(event) {
         return null;
     }
     return {
-        startDateTime: start.toISOString(),
-        endDateTime: end.toISOString()
+        startDateTime: toTimesheetDateTime(start),
+        endDateTime: toTimesheetDateTime(end)
     };
 }
 function buildGoogleEventPayload(task) {
@@ -478,6 +493,10 @@ async function ensureWatchChannels(context) {
         }
     }
 }
+/** Format a Date to the offset format the Timesheet backend expects: yyyy-MM-dd'T'HH:mm:ss+00:00 */
+function toTimesheetDateTime(date) {
+    return date.toISOString().replace(/\.\d{3}Z$/, '+00:00');
+}
 function readMetadataString(metadata, key) {
     const value = metadata[key];
     if (typeof value === 'string' && value.trim().length > 0) {

package/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "google-calendar-sync",
   "name": "Google Calendar Sync",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Synchronize Timesheet tasks with Google Calendar",
   "longDescription": "Bidirectional synchronization between Timesheet tasks and Google Calendar events.",
   "icon": "google-calendar",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timesheet/plugin-google-calendar",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [