@timesheet/plugin-google-calendar 1.2.1 → 1.3.1

package/dist/handlers/handleSyncBatch.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleSyncBatch = void 0;
 const integration_sdk_1 = require("@timesheet/integration-sdk");
 const taskSync_1 = require("../lib/taskSync");
+const SYSTEM = 'google-calendar';
+const PROJECT_ENTITY = 'project';
 exports.handleSyncBatch = (0, integration_sdk_1.defineHandler)(async (input, context) => {
     context.logger.info('Processing sync batch', {
         sinceVersion: input.sinceVersion,
@@ -10,6 +12,19 @@ exports.handleSyncBatch = (0, integration_sdk_1.defineHandler)(async (input, con
         changeCount: input.changes.length,
         hasMore: input.hasMore
     });
+    // Pre-load all mappings once for the entire batch
+    const [projectMappings, taskMappings] = await Promise.all([
+        context.mappings.list({ system: SYSTEM, entity: PROJECT_ENTITY }),
+        context.mappings.list({ system: SYSTEM, entity: 'task' })
+    ]);
+    const projectMappingByLocalId = new Map();
+    for (const mapping of projectMappings) {
+        projectMappingByLocalId.set(mapping.localId, mapping);
+    }
+    const taskMappingByLocalId = new Map();
+    for (const mapping of taskMappings) {
+        taskMappingByLocalId.set(mapping.localId, mapping);
+    }
     let syncedCount = 0;
     const errors = [];
     for (const change of input.changes) {
@@ -22,7 +37,7 @@ exports.handleSyncBatch = (0, integration_sdk_1.defineHandler)(async (input, con
                 event,
                 taskId: change.entityId,
                 item: change.item
-            }, context);
+            }, context, { projectMappingByLocalId, taskMappingByLocalId });
             if (result.status === 'synced' || result.status === 'deleted') {
                 syncedCount++;
             }
@@ -37,7 +52,7 @@ exports.handleSyncBatch = (0, integration_sdk_1.defineHandler)(async (input, con
         }
     }
     return {
-        system: 'google-calendar',
+        system: SYSTEM,
         status: errors.length > 0 ? 'partial' : 'completed',
         syncedCount,
         details: {

package/dist/lib/googleCalendarClient.d.ts

@@ -7,6 +7,7 @@ interface GoogleCalendarClientOptions {
 export declare class GoogleCalendarClient {
     private readonly getAccessToken;
     private readonly refreshAccessToken;
+    private cachedToken;
     constructor(options: GoogleCalendarClientOptions);
     testConnection(): Promise<boolean>;
     listCalendars(): Promise<ExternalEntity[]>;

package/dist/lib/googleCalendarClient.js

@@ -3,8 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleCalendarClient = void 0;
 class GoogleCalendarClient {
     constructor(options) {
-        this.getAccessToken = options.getAccessToken;
-        this.refreshAccessToken = options.refreshAccessToken;
+        this.cachedToken = null;
+        this.getAccessToken = async () => {
+            if (this.cachedToken)
+                return this.cachedToken;
+            this.cachedToken = await options.getAccessToken();
+            return this.cachedToken;
+        };
+        this.refreshAccessToken = async () => {
+            this.cachedToken = null;
+            this.cachedToken = await options.refreshAccessToken();
+            return this.cachedToken;
+        };
     }
     async testConnection() {
         const calendars = await this.listCalendars();

package/dist/lib/taskSync.d.ts

@@ -1,4 +1,4 @@
-import { IntegrationContext } from '@timesheet/integration-sdk';
+import { IntegrationContext, MappingRecord } from '@timesheet/integration-sdk';
 import { GoogleCalendarConfig, GoogleCalendarSyncInput } from './types';
 export interface GoogleCalendarSyncResult {
     system: string;
@@ -6,7 +6,11 @@ export interface GoogleCalendarSyncResult {
     syncedCount: number;
     details?: Record<string, unknown>;
 }
-export declare function syncTaskToGoogleCalendar(input: GoogleCalendarSyncInput, context: IntegrationContext<GoogleCalendarConfig>): Promise<GoogleCalendarSyncResult>;
+export interface SyncBatchCaches {
+    projectMappingByLocalId?: Map<string, MappingRecord>;
+    taskMappingByLocalId?: Map<string, MappingRecord>;
+}
+export declare function syncTaskToGoogleCalendar(input: GoogleCalendarSyncInput, context: IntegrationContext<GoogleCalendarConfig>, caches?: SyncBatchCaches): Promise<GoogleCalendarSyncResult>;
 export declare function runGoogleCalendarFullSync(context: IntegrationContext<GoogleCalendarConfig>): Promise<GoogleCalendarSyncResult>;
 export declare function handleGoogleWebhook(input: GoogleCalendarSyncInput, context: IntegrationContext<GoogleCalendarConfig>): Promise<GoogleCalendarSyncResult>;
 export declare function ensureWatchChannels(context: IntegrationContext<GoogleCalendarConfig>): Promise<void>;

package/dist/lib/taskSync.js

@@ -8,7 +8,9 @@ const googleCalendarClient_1 = require("./googleCalendarClient");
 const SYSTEM = 'google-calendar';
 const PROJECT_ENTITY = 'project';
 const TASK_ENTITY = 'task';
-async function syncTaskToGoogleCalendar(input, context) {
+// Shared client instance for batch execution — avoids re-fetching the access token per change.
+let sharedClient = null;
+async function syncTaskToGoogleCalendar(input, context, caches) {
     const syncDirection = context.config?.syncDirection ?? 'bidirectional';
     if (syncDirection === 'google-to-timesheet' || syncDirection === 'external-to-timesheet') {
         return { system: SYSTEM, status: 'skipped', syncedCount: 0, details: { reason: 'sync-direction-mismatch' } };
@@ -21,15 +23,22 @@ async function syncTaskToGoogleCalendar(input, context) {
     if (!task) {
         return { system: SYSTEM, status: 'skipped', syncedCount: 0, details: { reason: 'task-not-found' } };
     }
-    const projectId = task.project?.id;
+    const projectId = task.project?.id ?? input.item?.projectId;
     if (!projectId) {
         return { system: SYSTEM, status: 'skipped', syncedCount: 0, details: { reason: 'missing-project' } };
     }
-    const projectMapping = await context.mappings.get({
-        system: SYSTEM,
-        entity: PROJECT_ENTITY,
-        localId: projectId
-    });
+    // Use pre-loaded project mapping from cache if available
+    let projectMapping;
+    if (caches?.projectMappingByLocalId) {
+        projectMapping = caches.projectMappingByLocalId.get(projectId) ?? null;
+    }
+    else {
+        projectMapping = await context.mappings.get({
+            system: SYSTEM,
+            entity: PROJECT_ENTITY,
+            localId: projectId
+        });
+    }
     const externalCalendarId = projectMapping?.externalId;
     if (!externalCalendarId) {
         return {
@@ -39,12 +48,19 @@ async function syncTaskToGoogleCalendar(input, context) {
             details: { reason: 'missing-project-mapping', projectId }
         };
     }
-    const client = createClient(context);
-    const taskMapping = await context.mappings.get({
-        system: SYSTEM,
-        entity: TASK_ENTITY,
-        localId: task.id
-    });
+    const client = getOrCreateClient(context);
+    // Use pre-loaded task mapping from cache if available
+    let taskMapping;
+    if (caches?.taskMappingByLocalId) {
+        taskMapping = caches.taskMappingByLocalId.get(task.id) ?? null;
+    }
+    else {
+        taskMapping = await context.mappings.get({
+            system: SYSTEM,
+            entity: TASK_ENTITY,
+            localId: task.id
+        });
+    }
     if (task.deleted) {
         if (taskMapping?.externalId) {
             const mappedCalendarId = getMappedCalendarId(taskMapping) ?? externalCalendarId;
@@ -88,9 +104,7 @@ async function syncTaskToGoogleCalendar(input, context) {
             details: { reason: 'missing-external-id' }
         };
     }
-    await context.mappings.upsert({
-        system: SYSTEM,
-        entity: TASK_ENTITY,
+    const upsertedMapping = {
         localId: task.id,
         externalId: externalEvent.id,
         externalLabel: externalEvent.summary ?? task.description ?? task.id,
@@ -100,7 +114,16 @@ async function syncTaskToGoogleCalendar(input, context) {
             updated: externalEvent.updated ?? ''
         },
         syncStatus: 'SYNCED'
+    };
+    await context.mappings.upsert({
+        system: SYSTEM,
+        entity: TASK_ENTITY,
+        ...upsertedMapping
     });
+    // Update in-memory cache so subsequent changes in the same batch see this mapping
+    if (caches?.taskMappingByLocalId) {
+        caches.taskMappingByLocalId.set(task.id, upsertedMapping);
+    }
     return {
         system: SYSTEM,
         status: 'synced',
@@ -318,10 +341,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;
@@ -332,8 +355,8 @@ function toTaskDateRange(event) {
         return null;
     }
     return {
-        startDateTime: start.toISOString(),
-        endDateTime: end.toISOString()
+        startDateTime: toTimesheetDateTime(start),
+        endDateTime: toTimesheetDateTime(end)
     };
 }
 function buildGoogleEventPayload(task) {
@@ -392,14 +415,21 @@ function createClient(context) {
         refreshAccessToken: () => context.credentials.refreshToken('google')
     });
 }
+function getOrCreateClient(context) {
+    if (!sharedClient) {
+        sharedClient = createClient(context);
+    }
+    return sharedClient;
+}
 async function loadTask(taskId, input, context) {
+    // Prefer inline item data from sync change — avoids an API round-trip
+    if (input?.item && typeof input.item === 'object' && input.item.id) {
+        return input.item;
+    }
     try {
         return await context.data.getTask(taskId);
     }
     catch {
-        if (input?.item && typeof input.item === 'object') {
-            return input.item;
-        }
         return null;
     }
 }
@@ -493,6 +523,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.1",
+  "version": "1.3.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.2.1",
+  "version": "1.3.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [