Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: iOS push subscription gets lost #1802

Closed
wants to merge 1 commit into from
Closed

fix: iOS push subscription gets lost #1802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sw/eventListener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function onPush (sw) {
notifications.filter(({ tag: nTag }) => nTag === tag).forEach(n => n.close())
}
log(`[sw:push] ${nid} - show notification with title "${payload.title}"`)
return await sw.registration.showNotification(payload.title, payload.options)
return event.waitUntil(sw.registration.showNotification(payload.title, payload.options))
}

// according to the spec, there should only be zero or one notification since we used a tag filter
Expand All @@ -77,7 +77,7 @@ export function onPush (sw) {
log(`[sw:push] ${nid} - no existing ${tag} notifications found`)
setAppBadge(sw, ++activeCount)
log(`[sw:push] ${nid} - show notification with title "${payload.title}"`)
return await sw.registration.showNotification(payload.title, payload.options)
return event.waitUntil(sw.registration.showNotification(payload.title, payload.options))
}

// handle unexpected case here
Expand All @@ -90,7 +90,7 @@ export function onPush (sw) {
// return null
}

return await mergeAndShowNotification(sw, payload, notifications, tag, nid, iOS)
return event.waitUntil(mergeAndShowNotification(event, sw, payload, notifications, tag, nid, iOS))
})())
}
}
Expand All @@ -100,7 +100,7 @@ export function onPush (sw) {
const immediatelyShowNotification = (tag) =>
!tag || ['TIP', 'FORWARDEDTIP', 'EARN', 'STREAK', 'TERRITORY_TRANSFER'].includes(tag.split('-')[0])

const mergeAndShowNotification = async (sw, payload, currentNotifications, tag, nid, iOS) => {
const mergeAndShowNotification = async (event, sw, payload, currentNotifications, tag, nid, iOS) => {
// sanity check
const otherTagNotifications = currentNotifications.filter(({ tag: nTag }) => nTag !== tag)
if (otherTagNotifications.length > 0) {
Expand Down Expand Up @@ -178,7 +178,7 @@ const mergeAndShowNotification = async (sw, payload, currentNotifications, tag,

const options = { icon: payload.options?.icon, tag, data: { url: '/notifications', ...mergedPayload } }
log(`[sw:push] ${nid} - show notification with title "${title}"`)
return await sw.registration.showNotification(title, options)
return event.waitUntil(sw.registration.showNotification(title, options))
}

export function onNotificationClick (sw) {
Expand Down
Loading