Fix calendar freeze (#9286)

Signed-off-by: Denis Bykhov <[email protected]>

Author: BykhovDenis

services/calendar/pod-calendar/src/auth.ts

@@ -122,7 +122,7 @@ export class AuthController {
     const secret = await this.accountClient.getIntegrationSecret(data)
     if (secret == null) return
     const token = JSON.parse(secret.secret)
-    const watchController = WatchController.get(this.accountClient)
+    const watchController = WatchController.get(this.ctx, this.accountClient)
     await watchController.unsubscribe(token)
     await removeIntegrationSecret(this.ctx, this.accountClient, data)
   }

services/calendar/pod-calendar/src/main.ts

@@ -61,9 +61,10 @@ export const main = async (): Promise<void> => {
   const accountClient = getAccountClient(getServiceToken())
 
   const pushHandler = new PushHandler(ctx, accountClient)
+  const watchController = WatchController.get(ctx, accountClient)
+
   const calendarController = CalendarController.getCalendarController(ctx, accountClient)
   await calendarController.startAll()
-  const watchController = WatchController.get(accountClient)
   watchController.startCheck()
   const endpoints: Endpoint[] = [
     {

services/calendar/pod-calendar/src/sync.ts

@@ -170,7 +170,7 @@ export class IncomingSyncManager {
 
   private async sync (calendarId: string): Promise<void> {
     await this.syncEvents(calendarId)
-    const watchController = WatchController.get(this.accountClient)
+    const watchController = WatchController.get(this.ctx, this.accountClient)
     await this.rateLimiter.take(1)
     await watchController.addWatch(this.user, this.email, calendarId, this.googleClient)
   }
@@ -564,7 +564,7 @@ export class IncomingSyncManager {
   async syncCalendars (): Promise<void> {
     const history = await getCalendarsSyncHistory(this.user, this.email)
     await this.calendarSync(history)
-    const watchController = WatchController.get(this.accountClient)
+    const watchController = WatchController.get(this.ctx, this.accountClient)
     await this.rateLimiter.take(1)
     await watchController.addWatch(this.user, this.email, null, this.googleClient)
   }

services/calendar/pod-calendar/src/watch.ts

@@ -1,5 +1,5 @@
 import { AccountClient } from '@hcengineering/account-client'
-import { generateId, isActiveMode, PersonId, WorkspaceUuid } from '@hcengineering/core'
+import { generateId, isActiveMode, MeasureContext, PersonId, WorkspaceUuid } from '@hcengineering/core'
 import { Credentials, OAuth2Client } from 'google-auth-library'
 import { calendar_v3 } from 'googleapis'
 import config from './config'
@@ -151,15 +151,18 @@ export class WatchController {
   private timer: NodeJS.Timeout | undefined = undefined
   protected static _instance: WatchController
 
-  private constructor (private readonly accountClient: AccountClient) {
-    console.log('watch started')
+  private constructor (
+    private readonly ctx: MeasureContext,
+    private readonly accountClient: AccountClient
+  ) {
+    this.ctx.info('watch started')
   }
 
-  static get (accountClient: AccountClient): WatchController {
+  static get (ctx: MeasureContext, accountClient: AccountClient): WatchController {
     if (WatchController._instance !== undefined) {
       return WatchController._instance
     }
-    return new WatchController(accountClient)
+    return new WatchController(ctx, accountClient)
   }
 
   private async getUserWatches (userId: PersonId, workspace: WorkspaceUuid): Promise<Record<string, Watch>> {
@@ -213,7 +216,7 @@ export class WatchController {
         toRefresh.push(watch)
       }
     }
-    console.log('watch, found for update', toRefresh.length)
+    this.ctx.info('watch, found for update', { count: toRefresh.length })
     if (toRefresh.length === 0) return
     const groups = new Map<string, WatchBase[]>()
     const workspaces = new Set<WorkspaceUuid>()
@@ -255,7 +258,7 @@ export class WatchController {
         await watchClient.subscribe(group)
       } catch {}
     }
-    console.log('watch check done')
+    this.ctx.info('watch check done')
   }
 
   async addWatch (
@@ -280,7 +283,12 @@ export class WatchController {
         await watchCalendars(user, email, googleClient)
       }
     } catch (err: any) {
-      console.error('Watch add error', user.workspace, user.userId, calendarId, err)
+      this.ctx.error('Watch add error', {
+        workspace: user.workspace,
+        user: user.userId,
+        calendar: calendarId,
+        err: err.message
+      })
     }
   }
 }

services/calendar/pod-calendar/src/workspaceClient.ts

@@ -114,7 +114,6 @@ export class WorkspaceClient {
         await client.startSync()
       })
     }
-    await limiter.waitProcessing()
   }
 
   private async createCalendarClient (user: Token): Promise<CalendarClient | undefined> {
@@ -158,7 +157,7 @@ export class WorkspaceClient {
 
   async pushEvent (user: Token, event: Event, type: 'create' | 'update' | 'delete'): Promise<void> {
     const client =
-      (await this.getCalendarClientByCalendar(event.calendar as Ref<ExternalCalendar>)) ??
+      this.getCalendarClientByCalendar(event.calendar as Ref<ExternalCalendar>) ??
       (await this.createCalendarClient(user))
     if (client === undefined) {
       console.warn('Client not found', event.calendar, this.workspace)
@@ -185,7 +184,7 @@ export class WorkspaceClient {
     const query = lastSync !== undefined ? { modifiedOn: { $gt: lastSync } } : {}
     const newEvents = await this.client.findAll(calendar.class.Event, query)
     for (const newEvent of newEvents) {
-      const client = await this.getCalendarClientByCalendar(newEvent.calendar as Ref<ExternalCalendar>)
+      const client = this.getCalendarClientByCalendar(newEvent.calendar as Ref<ExternalCalendar>)
       if (client === undefined) {
         this.ctx.warn('Client not found', { calendar: newEvent.calendar, workspace: this.workspace })
         continue
@@ -196,10 +195,10 @@ export class WorkspaceClient {
     this.ctx.info('all outcoming messages synced', { workspace: this.workspace })
   }
 
-  private async getCalendarClientByCalendar (id: Ref<ExternalCalendar>): Promise<CalendarClient | undefined> {
+  private getCalendarClientByCalendar (id: Ref<ExternalCalendar>): CalendarClient | undefined {
     const calendar = this.calendarsById.get(id)
     if (calendar === undefined) {
-      console.warn("couldn't find calendar by id", id)
+      this.ctx.warn("couldn't find calendar by id", { id })
       return
     }
     return this.clients.get(calendar.externalUser as GoogleEmail)