Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

[PM-6426] Fixing race condition with setting/unsetting active alarms

Browse Source
This commit is contained in:
Cesar Gonzalez 2024-04-01 11:18:09 -05:00
parent 0444489053
commit d989dc3804
No known key found for this signature in database
GPG Key ID: 3381A5457F8CCECF
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/browser/src/platform/services/browser-task-scheduler.service.ts
View File

@ -78,7 +78,7 @@ export class BrowserTaskSchedulerService
this.registerAlarmHandler(taskName, callback); this.registerAlarmHandler(taskName, callback);
if (this.recoveredAlarms.has(taskName)) { if (this.recoveredAlarms.has(taskName)) {
await this.triggerRecoveredAlarm(taskName); await this.triggerRecoveredAlarm(taskName, intervalInMinutes);
} }
const initialDelayInMinutes = initialDelayInMs ? initialDelayInMs / 1000 / 60 : undefined; const initialDelayInMinutes = initialDelayInMs ? initialDelayInMs / 1000 / 60 : undefined;
@ -116,7 +116,7 @@ export class BrowserTaskSchedulerService
): Promise<void> { ): Promise<void> {
const existingAlarm = await BrowserApi.getAlarm(name); const existingAlarm = await BrowserApi.getAlarm(name);
if (existingAlarm) { if (existingAlarm) {
this.logService.debug(`Alarm ${name} already exists. Skipping creation.`); this.logService.warning(`Alarm ${name} already exists. Skipping creation.`);
return; return;
} }
@ -167,19 +167,22 @@ export class BrowserTaskSchedulerService
} }
private async deleteActiveAlarm(name: ScheduledTaskName): Promise<void> { private async deleteActiveAlarm(name: ScheduledTaskName): Promise<void> {
delete this.onAlarmHandlers[name];
const activeAlarms = await firstValueFrom(this.activeAlarms$); const activeAlarms = await firstValueFrom(this.activeAlarms$);
const filteredAlarms = activeAlarms.filter((alarm) => alarm.name !== name); const filteredAlarms = activeAlarms.filter((alarm) => alarm.name !== name);
await this.updateActiveAlarms(filteredAlarms); await this.updateActiveAlarms(filteredAlarms);
delete this.onAlarmHandlers[name];
} }
private async updateActiveAlarms(alarms: ActiveAlarm[]): Promise<void> { private async updateActiveAlarms(alarms: ActiveAlarm[]): Promise<void> {
await this.activeAlarmsState.update(() => alarms); await this.activeAlarmsState.update(() => alarms);
} }
private async triggerRecoveredAlarm(name: ScheduledTaskName): Promise<void> { private async triggerRecoveredAlarm(
name: ScheduledTaskName,
periodInMinutes?: number,
): Promise<void> {
this.recoveredAlarms.delete(name); this.recoveredAlarms.delete(name);
await this.triggerAlarm(name); await this.triggerAlarm(name, periodInMinutes);
} }
private setupOnAlarmListener(): void { private setupOnAlarmListener(): void {
@ -187,20 +190,18 @@ export class BrowserTaskSchedulerService
} }
private handleOnAlarm = async (alarm: chrome.alarms.Alarm): Promise<void> => { private handleOnAlarm = async (alarm: chrome.alarms.Alarm): Promise<void> => {
await this.triggerAlarm(alarm.name as ScheduledTaskName); const { name, periodInMinutes } = alarm;
await this.triggerAlarm(name as ScheduledTaskName, periodInMinutes);
}; };
private async triggerAlarm(name: ScheduledTaskName): Promise<void> { private async triggerAlarm(name: ScheduledTaskName, periodInMinutes?: number): Promise<void> {
const handler = this.onAlarmHandlers[name]; const handler = this.onAlarmHandlers[name];
if (!periodInMinutes) {
await this.deleteActiveAlarm(name);
}
if (handler) { if (handler) {
handler(); handler();
} }
const alarm = await BrowserApi.getAlarm(name);
if (alarm?.periodInMinutes) {
return;
}
await this.deleteActiveAlarm(name);
} }
} }