Fix pomodoro timer

Author: Stigmatoz

src/background.ts

@@ -6,17 +6,24 @@ import { Settings } from './functions/settings';
 import { StorageParams } from './storage/storage-params';
 import { injecStorage } from './storage/inject-storage';
 import { todayLocalDate } from './utils/date';
+import { checkPomodoro } from './functions/pomodoro';
 
 logger.log('Start background script');
+let pomodoroTimer: number;
 
 self.onerror = err => {
   console.error('Unhandled error:', err);
 };
 
-Browser.storage.onChanged.addListener((changes, namespace) => {
+Browser.storage.onChanged.addListener(async (changes, namespace) => {
   for (var key in changes) {
     if (Object.values(StorageParams).includes(key as StorageParams))
-      Settings.getInstance().reloadSetting(key as StorageParams);
+      await Settings.getInstance().reloadSetting(key as StorageParams);
+
+    if (key == StorageParams.IS_POMODORO_ENABLED) {
+      const value = changes[StorageParams.IS_POMODORO_ENABLED].newValue;
+      pomodoro(value);
+    }
   }
 });
 
@@ -54,5 +61,15 @@ Browser.windows.onFocusChanged.addListener(() => {
   logger.log('onFocusChanged');
 });
 
+async function pomodoro(value?: boolean) {
+  if (value == undefined) {
+    const settingsStorage = injecStorage();
+    value = await settingsStorage.getValue(StorageParams.IS_POMODORO_ENABLED);
+  }
+  if (value == true) pomodoroTimer = setInterval(checkPomodoro, 1000);
+  else clearInterval(pomodoroTimer);
+}
+
+pomodoro();
 scheduleJobs();
 initTracker();

src/functions/pomodoro.ts

@@ -4,6 +4,7 @@ import { StorageParams } from '../storage/storage-params';
 import { useBadge, BadgeIcon, BadgeColor } from './useBadge';
 import { Settings } from './settings';
 import Browser from 'webextension-polyfill';
+import { logger } from '../utils/logger';
 
 export async function checkPomodoro() {
   function isTargetPeriod() {
@@ -48,28 +49,41 @@ export async function checkPomodoro() {
 
   const pomodoroEndTime = addSeconds(startTime, workTime * frequency + restTime * frequency);
 
+  const activeTab = await Browser.tabs.query({ active: true });
+
   if (now > pomodoroEndTime) {
     await storage.saveValue(StorageParams.IS_POMODORO_ENABLED, false);
     await storage.saveValue(StorageParams.POMODORO_START_TIME, null);
+    await useBadge({
+      tabId: activeTab[0].id,
+      text: null,
+      color: BadgeColor.none,
+      icon: BadgeIcon.default,
+    });
     return;
   }
 
   const isWork = isTargetPeriod();
 
-  const activeTab = await Browser.tabs.query({ active: true });
-
-  if (isWork)
+  if (isWork) {
+    logger.log('[Pomodoro] Work Time');
     await useBadge({
       tabId: activeTab[0].id,
       text: null,
       color: BadgeColor.none,
       icon: BadgeIcon.pomodoroWorkingTime,
     });
-  else
+  } else {
+    logger.log('[Pomodoro] Rest Time');
     await useBadge({
       tabId: activeTab[0].id,
       text: null,
       color: BadgeColor.none,
       icon: BadgeIcon.pomodoroRestTime,
     });
+  }
+
+  return {
+    isWork,
+  };
 }

src/tracker.ts

@@ -16,7 +16,6 @@ import { Settings } from './functions/settings';
 import { useNotificationList } from './functions/useNotificationList';
 import { NotificationType, useNotification } from './functions/useNotification';
 import { Messages } from './utils/messages';
-import { checkPomodoro } from './functions/pomodoro';
 
 const activeTabInstance = ActiveTab.getInstance();
 
@@ -40,8 +39,6 @@ async function trackTime() {
     if (isValidPage(activeTab)) {
       const activeDomain = extractHostname(activeTab!.url);
 
-      await checkPomodoro();
-
       if ((await isInBlackList(activeDomain)) && (await canChangeBadge())) {
         await useBadge({
           tabId: activeTab?.id,