Enhance logging related to web push

stackernews · Aug 15, 2023 · f1a0553 · f1a0553
1 parent 679f766
commit f1a0553
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/api/resolvers/notifications.js b/api/resolvers/notifications.js
@@ -238,10 +238,12 @@ export default {
         dbPushSubscription = await models.pushSubscription.update({
           data: { userId: me.id, endpoint, p256dh, auth }, where: { endpoint: oldEndpoint }
         })
+        console.log(`[webPush] updated subscription of user ${me.id}: old=${oldEndpoint} new=${endpoint}`)
       } else {
         dbPushSubscription = await models.pushSubscription.create({
           data: { userId: me.id, endpoint, p256dh, auth }
         })
+        console.log(`[webPush] created subscription for user ${me.id}: endpoint=${endpoint}`)
       }
 
       await replyToSubscription(dbPushSubscription.id, { title: 'Stacker News notifications are now active' })
@@ -257,8 +259,10 @@ export default {
       if (!subscription) {
         throw new GraphQLError('endpoint not found', { extensions: { code: 'BAD_INPUT' } })
       }
-      await models.pushSubscription.delete({ where: { id: subscription.id } })
-      return subscription
+      const deletedSubscription = await models.pushSubscription.delete({ where: { id: subscription.id } })
+      console.log(`[webPush] deleted subscription ${deletedSubscription.id} from user ${deletedSubscription.userId} due to client request`)
+
+      return deletedSubscription
     }
   },
   Notification: {

diff --git a/api/webPush/index.js b/api/webPush/index.js
@@ -57,14 +57,15 @@ const sendNotification = (subscription, payload) => {
   }
   const { id, endpoint, p256dh, auth } = subscription
   return webPush.sendNotification({ endpoint, keys: { p256dh, auth } }, payload)
-    .catch((err) => {
+    .catch(async (err) => {
       if (err.statusCode === 400) {
         console.log('[webPush] invalid request: ', err)
       } else if ([401, 403].includes(err.statusCode)) {
         console.log('[webPush] auth error: ', err)
       } else if (err.statusCode === 404 || err.statusCode === 410) {
         console.log('[webPush] subscription has expired or is no longer valid: ', err)
-        return models.pushSubscription.delete({ where: { id } })
+        const deletedSubscripton = await models.pushSubscription.delete({ where: { id } })
+        console.log(`[webPush] deleted subscription ${id} from user ${deletedSubscripton.userId} due to push error`)
       } else if (err.statusCode === 413) {
         console.log('[webPush] payload too large: ', err)
       } else if (err.statusCode === 429) {