From eae9c15a7cd76d886337b8034d9802ac9d9d7c2d Mon Sep 17 00:00:00 2001 From: Kit La Touche Date: Wed, 11 Feb 2026 14:56:58 -0500 Subject: Clean up service worker logic There's an asymmetry between client/sw message passing, and push event messages. I found that out experimentally. I was also mistakenly assigning to the wrong attribute of the unread-status object. Tentatively good now, but I need real new-message-events from the server to be sure. --- ui/service-worker.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'ui/service-worker.js') diff --git a/ui/service-worker.js b/ui/service-worker.js index 56bfca9..67391f7 100644 --- a/ui/service-worker.js +++ b/ui/service-worker.js @@ -34,9 +34,11 @@ self.addEventListener('push', (event) => { body: event.data.text(), }), ); + + const data = event.data?.json(); // Now we can do slower things that might fail: - conversationReadStatus[event.conversationId] ||= { lastRead: null, lastMessage: null }; - conversationReadStatus[event.conversationId].lastMessage = new Date(); + conversationReadStatus[data.conversationId] ||= { lastRead: null, lastMessage: null }; + conversationReadStatus[data.conversationId].lastMessage = new Date(); event.waitUntil( (async () => { if (navigator.setAppBadge) { @@ -48,10 +50,15 @@ self.addEventListener('push', (event) => { // The client has to tell us when it has read a conversation: self.addEventListener('message', (event) => { - switch (event.data?.type) { + const data = event.data; + switch (data.type) { case 'CONVERSATION_READ': - conversationReadStatus[event.data.conversationId] ||= { lastRead: null, lastMessage: null }; - conversationReadStatus[event.data.conversationId].lastMessage = event.data.at || new Date(); + conversationReadStatus[data.conversationId] ||= { lastRead: null, lastMessage: null }; + if (data.at) { + conversationReadStatus[data.conversationId].lastRead = new Date(data.at.ts); + } else { + conversationReadStatus[data.conversationId].lastRead = new Date(); + } event.waitUntil( (async () => { if (navigator.setAppBadge) { -- cgit v1.2.3