fix: multiple push notifications susbscriptions on multiple account servers (#1069)

composables/push-notifications/createPushSubscription.ts

@@ -4,6 +4,7 @@ import type {
   PushManagerSubscriptionInfo,
   RequiredUserLogin,
 } from '~/composables/push-notifications/types'
+import { PushSubscriptionError } from '~/composables/push-notifications/types'
 
 export const createPushSubscription = async (
   user: RequiredUserLogin,
@@ -41,8 +42,11 @@ export const createPushSubscription = async (
       )
     })
     .catch((error) => {
-      if (error.code === 20 && error.name === 'AbortError')
-        console.warn('Your browser supports Web Push Notifications, but does not seem to implement the VAPID protocol.')
+      let useError: PushSubscriptionError | Error = error
+      if (error.code === 11 && error.name === 'InvalidStateError')
+        useError = new PushSubscriptionError('too_many_registrations', 'Too many registrations')
+      else if (error.code === 20 && error.name === 'AbortError')
+        console.error('Your browser supports Web Push Notifications, but does not seem to implement the VAPID protocol.')
       else if (error.code === 5 && error.name === 'InvalidCharacterError')
         console.error('The VAPID public key seems to be invalid:', vapidKey)
 
@@ -54,6 +58,9 @@ export const createPushSubscription = async (
           console.error(e)
           return Promise.resolve(undefined)
         })
+        .finally(() => {
+          return Promise.reject(useError)
+        })
     })
 }
 

composables/push-notifications/types.ts

@@ -24,3 +24,12 @@ export interface CustomEmojisInfo {
   lastUpdate: number
   emojis: mastodon.v1.CustomEmoji[]
 }
+
+export type PushSubscriptionErrorCode = 'too_many_registrations'
+export class PushSubscriptionError extends Error {
+  code: PushSubscriptionErrorCode
+  constructor(code: PushSubscriptionErrorCode, message?: string) {
+    super(message)
+    this.code = code
+  }
+}