Update service worker

go.mod

@@ -7,13 +7,13 @@ require (
  github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2
  github.com/google/uuid v1.6.0
  github.com/stretchr/testify v1.6.1
- golang.org/x/net v0.25.0
+ golang.org/x/net v0.26.0
 )
 
 require (
  github.com/davecgh/go-spew v1.1.0 // indirect
  github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- golang.org/x/crypto v0.23.0 // indirect
+ golang.org/x/crypto v0.24.0 // indirect
  gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )

go.sum

@@ -17,17 +17,17 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

pkg/app/gen/app-worker.js

@@ -1,44 +1,50 @@
+// -----------------------------------------------------------------------------
+// PWA
+// -----------------------------------------------------------------------------
 const cacheName = "app-" + "{{.Version}}";
 const resourcesToCache = {{.ResourcesToCache}};
 
 self.addEventListener("install", (event) => {
  console.log("installing app worker {{.Version}}");
-
- event.waitUntil(
- caches
- .open(cacheName)
- .then((cache) => {
- return cache.addAll(resourcesToCache);
- })
- .then(() => {
- self.skipWaiting();
- })
- );
+ event.waitUntil(installWorker());
 });
 
+async function installWorker() {
+ const cache = await caches.open(cacheName);
+ await cache.addAll(resourcesToCache);
+ await self.skipWaiting(); // Use this new service worker
+}
+
 self.addEventListener("activate", (event) => {
- event.waitUntil(
- caches.keys().then((keyList) => {
- return Promise.all(
- keyList.map((key) => {
- if (key !== cacheName) {
- return caches.delete(key);
- }
- })
- );
- })
- );
+ event.waitUntil(deletePreviousCaches());
  console.log("app worker {{.Version}} is activated");
 });
 
+async function deletePreviousCaches() {
+ keys = await caches.keys();
+ keys.forEach(async (key) => {
+ if (key != cacheName) {
+ console.log("deleting", key, "cache");
+ await caches.delete(key);
+ }
+ });
+}
+
 self.addEventListener("fetch", (event) => {
- event.respondWith(
- caches.match(event.request).then((response) => {
- return response || fetch(event.request);
- })
- );
+ event.respondWith(fetchWithCache(event.request));
 });
 
+async function fetchWithCache(request) {
+ cachedResponse = await caches.match(request);
+ if (cachedResponse) {
+ return cachedResponse;
+ }
+ return fetch(request);
+}
+
+// -----------------------------------------------------------------------------
+// Push Notifications
+// -----------------------------------------------------------------------------
 self.addEventListener("push", (event) => {
  if (!event.data || !event.data.text()) {
  return;

pkg/app/gen/app.js

@@ -31,17 +31,18 @@ goappInitWebAssembly();
 // -----------------------------------------------------------------------------
 async function goappInitServiceWorker() {
  if ("serviceWorker" in navigator) {
- try {
- const registration = await navigator.serviceWorker.register(
- "{{.WorkerJS}}"
- );
-
- goappServiceWorkerRegistration = registration;
- goappSetupNotifyUpdate(registration);
- goappSetupPushNotification();
- } catch (err) {
- console.error("goapp service worker registration failed", err);
- }
+ window.addEventListener("load", async () => {
+ try {
+ const registration = await navigator.serviceWorker.register(
+ "{{.WorkerJS}}"
+ );
+ goappServiceWorkerRegistration = registration;
+ goappSetupNotifyUpdate(registration);
+ goappSetupPushNotification();
+ } catch (err) {
+ console.error("goapp service worker registration failed: ", err);
+ }
+ });
  }
 }