twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-25 04:55:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

[messaging] add fallback if lastHistoryId has been invalidated (#3782)

Browse Source
This commit is contained in:
Weiko 2024-02-02 15:28:38 +01:00 committed by GitHub
parent 8816b7fb31
commit ae5f82df59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts
View File

@ -28,31 +28,6 @@ export class GmailPartialSyncService {
private readonly messageChannelService: MessageChannelService,
) {}
private async getHistoryFromGmail(
workspaceId: string,
connectedAccountId: string,
lastSyncHistoryId: string,
maxResults: number,
) {
const connectedAccount = await this.connectedAccountService.getByIdOrFail(
connectedAccountId,
workspaceId,
);
const gmailClient = await this.gmailClientProvider.getGmailClient(
connectedAccount.refreshToken,
);
const history = await gmailClient.users.history.list({
userId: 'me',
startHistoryId: lastSyncHistoryId,
historyTypes: ['messageAdded', 'messageDeleted'],
maxResults,
});
return history.data;
}
public async fetchConnectedAccountThreads(
workspaceId: string,
connectedAccountId: string,
@ -71,15 +46,7 @@ export class GmailPartialSyncService {
const lastSyncHistoryId = connectedAccount.lastSyncHistoryId;
if (!lastSyncHistoryId) {
// Fall back to full sync
await this.messageQueueService.add<GmailFullSyncJobData>(
GmailFullSyncJob.name,
{ workspaceId, connectedAccountId },
{
id: `${workspaceId}-${connectedAccount.id}`,
retryLimit: 2,
},
);
await this.fallbackToFullSync(workspaceId, connectedAccountId);
return;
}
@ -91,30 +58,25 @@ export class GmailPartialSyncService {
throw new Error('No refresh token found');
}
const history = await this.getHistoryFromGmail(
workspaceId,
connectedAccountId,
const { history, error } = await this.getHistoryFromGmail(
refreshToken,
lastSyncHistoryId,
maxResults,
);
const historyId = history.historyId;
if (error && error.code === 404) {
await this.fallbackToFullSync(workspaceId, connectedAccountId);
if (!historyId) {
throw new Error('No history id found');
}
if (historyId === lastSyncHistoryId) {
return;
}
if (!history.history) {
await this.connectedAccountService.saveLastSyncHistoryId(
historyId,
connectedAccountId,
workspaceId,
);
const newHistoryId = history?.historyId;
if (!newHistoryId) {
throw new Error('No history id found');
}
if (newHistoryId === lastSyncHistoryId) {
return;
}
@ -156,7 +118,7 @@ export class GmailPartialSyncService {
if (errors.length) throw new Error('Error fetching messages');
await this.connectedAccountService.saveLastSyncHistoryId(
historyId,
newHistoryId,
connectedAccount.id,
workspaceId,
);
@ -207,4 +169,49 @@ export class GmailPartialSyncService {
messagesDeleted: uniqueMessagesDeleted,
};
}
private async getHistoryFromGmail(
refreshToken: string,
lastSyncHistoryId: string,
maxResults: number,
): Promise<{
history?: gmail_v1.Schema$ListHistoryResponse;
error?: any;
}> {
const gmailClient =
await this.gmailClientProvider.getGmailClient(refreshToken);
try {
const history = await gmailClient.users.history.list({
userId: 'me',
startHistoryId: lastSyncHistoryId,
historyTypes: ['messageAdded', 'messageDeleted'],
maxResults,
});
return { history: history.data };
} catch (error) {
const errorData = error?.response?.data?.error;
if (errorData) {
return { error: errorData };
}
throw error;
}
}
private async fallbackToFullSync(
workspaceId: string,
connectedAccountId: string,
) {
await this.messageQueueService.add<GmailFullSyncJobData>(
GmailFullSyncJob.name,
{ workspaceId, connectedAccountId },
{
id: `${workspaceId}-${connectedAccountId}`,
retryLimit: 2,
},
);
}
}