From 121cc90de9feecd397d0cb444164c3ba5f27f9eb Mon Sep 17 00:00:00 2001 From: Jeff Date: Sat, 12 Oct 2024 17:40:06 -0400 Subject: [PATCH] Log even more garbage --- app/worker.ts | 84 +++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/app/worker.ts b/app/worker.ts index 63003c7..357d171 100644 --- a/app/worker.ts +++ b/app/worker.ts @@ -100,51 +100,63 @@ export default function start(self: ServiceWorkerGlobalScope) { })() ) }) -} -async function submitSubscription( - registration: ServiceWorkerRegistration, - subscription: PushSubscription | null -) { - const db = database() + async function submitSubscription( + registration: ServiceWorkerRegistration, + subscription: PushSubscription | null + ) { + const db = database() - if (subscription === null) return + await sendMessage({ + message: `Is subscription null? ${subscription === null}`, + }) - const existingSubscriptionId = await db.subscriptions.get(1) + if (subscription === null) return - const applicationServerKey = urlB64ToUint8Array(pushPublicKey) - const newSubscription = await registration.pushManager.subscribe({ - userVisibleOnly: true, - applicationServerKey: applicationServerKey, - }) + const existingSubscriptionId = await db.subscriptions.get(1) - await (existingSubscriptionId === undefined - ? postSubscription(newSubscription, db) - : putSubscription(newSubscription, existingSubscriptionId.subscriptionId)) + await sendMessage({ + message: `Existing subscription ID ${existingSubscriptionId}`, + }) - return newSubscription -} + const applicationServerKey = urlB64ToUint8Array(pushPublicKey) + const newSubscription = await registration.pushManager.subscribe({ + userVisibleOnly: true, + applicationServerKey: applicationServerKey, + }) -async function postSubscription( - subscription: PushSubscription, - db: ReturnType -) { - const response = await fetch(`${process.env.BASE_URL}/api/subscription/`, { - method: "POST", - body: JSON.stringify(subscription), - }) + await (existingSubscriptionId === undefined + ? postSubscription(newSubscription, db) + : putSubscription(newSubscription, existingSubscriptionId.subscriptionId)) - db.subscriptions.put({ - id: 1, - subscriptionId: (await response.json()).subscriptionId, - }) -} + return newSubscription + } -function putSubscription(subscription: PushSubscription, id: number) { - return fetch(`${process.env.BASE_URL}/api/subscription/${id}`, { - method: "PUT", - body: JSON.stringify(subscription), - }) + async function postSubscription( + subscription: PushSubscription, + db: ReturnType + ) { + const response = await fetch(`${process.env.BASE_URL}/api/subscription/`, { + method: "POST", + body: JSON.stringify(subscription), + }) + + await sendMessage({ + message: `Response status ${response.status}`, + }) + + db.subscriptions.put({ + id: 1, + subscriptionId: (await response.json()).subscriptionId, + }) + } + + function putSubscription(subscription: PushSubscription, id: number) { + return fetch(`${process.env.BASE_URL}/api/subscription/${id}`, { + method: "PUT", + body: JSON.stringify(subscription), + }) + } } function database() {