Ensures Registering Alarm Event Listener at Root Scope

Needed to make sure the service worker wakes up.

Author: Step7750

src/background.ts

@@ -1,7 +1,7 @@
 import {Handle} from './lib/bridge/server';
 import {InternalResponseBundle} from './lib/bridge/types';
 import MessageSender = chrome.runtime.MessageSender;
-import {registerTradeAlarmIfPossible} from './lib/alarms/setup';
+import {alarmListener, registerTradeAlarmIfPossible} from './lib/alarms/setup';
 
 function unifiedHandler(request: any, sender: MessageSender, sendResponse: (response?: any) => void) {
     Handle(request, sender)
@@ -41,6 +41,11 @@ chrome.runtime.onMessageExternal.addListener((request, sender, sendResponse) =>
     return true;
 });
 
+if (chrome.alarms) {
+    // Install at the root level to make sure events wake up the service worker
+    chrome.alarms.onAlarm.addListener(alarmListener);
+}
+
 async function checkAlarmState() {
     await registerTradeAlarmIfPossible();
 }

src/lib/alarms/setup.ts

@@ -1,27 +1,26 @@
 import {PING_CSFLOAT_TRADE_STATUS_ALARM_NAME, pingTradeStatus} from './csfloat_trade_pings';
 import {HasPermissions} from '../bridge/handlers/has_permissions';
 
-async function alarmListener(alarm: chrome.alarms.Alarm) {
+export async function alarmListener(alarm: chrome.alarms.Alarm) {
     if (alarm.name === PING_CSFLOAT_TRADE_STATUS_ALARM_NAME) {
         await pingTradeStatus();
     }
 }
 
 async function registerAlarmListenerIfPossible() {
-    const hasPermissions = await HasPermissions.handleRequest({permissions: ['alarms'], origins: []}, {});
-    if (!hasPermissions.granted) {
-        return;
+    if (chrome.alarms) {
+        chrome.alarms.onAlarm.addListener(alarmListener);
     }
-    // Prevent duplicate listeners
-    chrome.alarms.onAlarm.removeListener(alarmListener);
-    chrome.alarms.onAlarm.addListener(alarmListener);
 }
 
 export async function registerTradeAlarmIfPossible() {
     const hasPermissions = await HasPermissions.handleRequest({permissions: ['alarms'], origins: []}, {});
     if (!hasPermissions.granted) {
         return;
     }
+
+    await registerAlarmListenerIfPossible();
+
     const alarm = await chrome.alarms.get(PING_CSFLOAT_TRADE_STATUS_ALARM_NAME);
 
     if (!alarm) {
@@ -30,6 +29,4 @@ export async function registerTradeAlarmIfPossible() {
             delayInMinutes: 1,
         });
     }
-
-    await registerAlarmListenerIfPossible();
 }