@timesheet/plugin-google-calendar 1.1.0 → 1.2.1

package/dist/lib/googleCalendarClient.d.ts

@@ -21,6 +21,7 @@ export declare class GoogleCalendarClient {
         expiration?: string;
     }>;
     stopWatch(channelId: string, resourceId: string): Promise<void>;
+    private static readonly REQUEST_TIMEOUT_MS;
     private request;
     private buildUrl;
 }

package/dist/lib/googleCalendarClient.js

@@ -64,14 +64,28 @@ class GoogleCalendarClient {
     }
     async stopWatch(channelId, resourceId) {
         const token = await this.getAccessToken();
-        const response = await fetch('https://www.googleapis.com/calendar/v3/channels/stop', {
-            method: 'POST',
-            headers: {
-                Authorization: `Bearer ${token}`,
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({ id: channelId, resourceId })
-        });
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), GoogleCalendarClient.REQUEST_TIMEOUT_MS);
+        let response;
+        try {
+            response = await fetch('https://www.googleapis.com/calendar/v3/channels/stop', {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ id: channelId, resourceId }),
+                signal: controller.signal
+            });
+        }
+        catch (error) {
+            clearTimeout(timeoutId);
+            if (error instanceof DOMException && error.name === 'AbortError') {
+                throw new Error(`Google Calendar API channels/stop timed out after ${GoogleCalendarClient.REQUEST_TIMEOUT_MS}ms`);
+            }
+            throw error;
+        }
+        clearTimeout(timeoutId);
         // 404 means channel already expired — not an error
         if (!response.ok && response.status !== 404) {
             const errorText = await response.text();
@@ -80,15 +94,29 @@ class GoogleCalendarClient {
     }
     async request(method, path, query, body, retried = false) {
         const token = await this.getAccessToken();
-        const response = await fetch(this.buildUrl(path, query), {
-            method,
-            headers: {
-                Authorization: `Bearer ${token}`,
-                Accept: 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: body !== undefined ? JSON.stringify(body) : undefined
-        });
+        const controller = new AbortController();
+        const timeoutId = setTimeout(() => controller.abort(), GoogleCalendarClient.REQUEST_TIMEOUT_MS);
+        let response;
+        try {
+            response = await fetch(this.buildUrl(path, query), {
+                method,
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    Accept: 'application/json',
+                    'Content-Type': 'application/json'
+                },
+                body: body !== undefined ? JSON.stringify(body) : undefined,
+                signal: controller.signal
+            });
+        }
+        catch (error) {
+            clearTimeout(timeoutId);
+            if (error instanceof DOMException && error.name === 'AbortError') {
+                throw new Error(`Google Calendar API ${method} ${path} timed out after ${GoogleCalendarClient.REQUEST_TIMEOUT_MS}ms`);
+            }
+            throw error;
+        }
+        clearTimeout(timeoutId);
         if (response.status === 401 && !retried) {
             const refreshed = await this.refreshAccessToken();
             if (refreshed) {
@@ -118,3 +146,4 @@ class GoogleCalendarClient {
     }
 }
 exports.GoogleCalendarClient = GoogleCalendarClient;
+GoogleCalendarClient.REQUEST_TIMEOUT_MS = 30000;

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;
@@ -411,11 +426,7 @@ function getHeader(input, name) {
     return value === undefined || value === null ? undefined : String(value);
 }
 async function ensureWatchChannels(context) {
-    // The webhook URL is passed via the context metadata (set by the backend runtime)
-    const contextAny = context;
-    const metadata = contextAny['metadata'];
-    const webhooks = metadata?.['webhooks'];
-    const webhookUrl = webhooks?.['integration-webhook'];
+    const webhookUrl = context.metadata?.webhooks?.['integration-webhook'];
     if (!webhookUrl) {
         context.logger.info('No webhook URL available — skipping watch channel registration');
         return;

package/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "google-calendar-sync",
   "name": "Google Calendar Sync",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "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.1.0",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -13,6 +13,6 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@timesheet/integration-sdk": "^0.2.0"
+    "@timesheet/integration-sdk": "^0.3.0"
   }
 }