align CLEAR_NOTIFICATIONS promises to event.waitUntil

stackernews · Jan 6, 2025 · e1e3a24 · e1e3a24
1 parent 432b436
commit e1e3a24
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/sw/eventListener.js b/sw/eventListener.js
@@ -242,17 +242,13 @@ export function onMessage (sw) {
       return event.waitUntil(storage.removeItem('subscription'))
     }
     if (event.data.action === CLEAR_NOTIFICATIONS) {
-      return event.waitUntil((async () => {
-        let notifications = []
-        try {
-          notifications = await sw.registration.getNotifications()
-        } catch (err) {
-          console.error('failed to get notifications')
-        }
+      const promises = []
+      promises.push(sw.registration.getNotifications().then((notifications) => {
         notifications.forEach(notification => notification.close())
-        activeCount = 0
-        return await clearAppBadge(sw)
-      })())
+      }))
+      activeCount = 0
+      promises.push(clearAppBadge(sw))
+      event.waitUntil(Promise.all(promises))
     }
   }
 }