@jon49/sw 0.14.5 → 0.14.7

package/lib/new-app-notifier.ts

@@ -3,9 +3,9 @@ let refreshing = false
 // The event listener that is fired when the service worker updates
 // Here we reload the page
 navigator.serviceWorker.addEventListener('controllerchange', function () {
-    if (refreshing) return
-    refreshing = true
-    window.location.reload()
+  if (refreshing) return
+  refreshing = true
+  window.location.reload()
 })
 
 /// Checks if there is a new version of the app available
@@ -13,54 +13,67 @@ navigator.serviceWorker.addEventListener('controllerchange', function () {
 /// @returns void
 /// @example
 /// notifier((state, worker) => {
-///     if (state !== "waiting") {
-///         // Show notification
-///     }
-///     if (/* user confirms update */) {
-///         worker.postMessage("skipWaiting")
-///     }
+///   if (state !== "waiting") {
+///     // Show notification
+///   }
+///   if (/* user confirms update */) {
+///     worker.postMessage("skipWaiting")
+///   }
 /// })
 function notifier(fn: (state: "" | "waiting", worker: ServiceWorker) => void) {
-    let newWorker: ServiceWorker | undefined | null
+  let newWorker: ServiceWorker | undefined | null
 
-    if ('serviceWorker' in navigator) {
-        // Register the service worker
-        navigator.serviceWorker.register('/web/sw.js').then(reg => {
-            if ((newWorker = reg.waiting)?.state === 'installed') {
-                // @ts-ignore
-                fn("waiting", newWorker)
-                return
-            }
-            reg.addEventListener('updatefound', () => {
-                // An updated service worker has appeared in reg.installing!
-                newWorker = reg.installing
+  if ('serviceWorker' in navigator) {
+    // Register the service worker
+    navigator.serviceWorker.register('/web/sw.js').then(reg => {
+      if ((newWorker = reg.waiting)?.state === 'installed') {
+        // @ts-ignore
+        fn("waiting", newWorker)
+        return
+      }
+      reg.addEventListener('updatefound', () => {
+        // An updated service worker has appeared in reg.installing!
+        newWorker = reg.installing
 
-                newWorker?.addEventListener('statechange', () => {
+        newWorker?.addEventListener('statechange', () => {
 
-                    // There is a new service worker available, show the notification
-                    if (newWorker?.state === "installed" && navigator.serviceWorker.controller) {
-                        navigator.serviceWorker.controller.postMessage("installed")
-                        fn("", newWorker)
-                    }
+          // There is a new service worker available, show the notification
+          if (newWorker?.state === "installed" && navigator.serviceWorker.controller) {
+            navigator.serviceWorker.controller.postMessage("installed")
+            fn("", newWorker)
+          }
 
-                })
-            })
         })
-    }
+      })
+    })
+  }
 }
 
 notifier(notifyUserAboutNewVersion)
 
-function notifyUserAboutNewVersion(state = "", worker: ServiceWorker) {
-    let nav = document.getElementById("sw-message")
-    nav?.insertAdjacentHTML("afterbegin", `<div class=inline><a traits=skip-waiting href="#">Click here to update your app.</a></div>`)
-    // @ts-ignore
-    window.app = window.app || {}
+function skipWaiting(id: string) {
+  let el = document.getElementById(id)
+  el?.addEventListener("click", (e: MouseEvent) => {
+    e.preventDefault()
     // @ts-ignore
-    window.app.sw = worker
-    if (state === "waiting") return
-    // Publish custom event for "user-messages" to display a toast.
-    document.dispatchEvent(new CustomEvent("user-messages", {
-        detail: { html: `A new version of the app is available. <a traits=skip-waiting href="#">Click to update the app.</a>` }
-    }))
+    window.app.sw.postMessage({ action: 'skipWaiting' })
+  })
+}
+
+function notifyUserAboutNewVersion(state = "", worker: ServiceWorker) {
+  let nav = document.getElementById("sw-message")
+  nav?.insertAdjacentHTML("afterbegin", `<div class=inline><a id=skipWaiting href="#">Click here to update your app.</a></div>`)
+  // @ts-ignore
+  skipWaiting("skipWaiting")
+  // @ts-ignore
+  window.app = window.app || {}
+  // @ts-ignore
+  window.app.sw = worker
+  if (state === "waiting") return
+  // Publish custom event for "user-messages" to display a toast.
+  document.dispatchEvent(new CustomEvent("user-messages", {
+    detail: { html: `A new version of the app is available. <a id=skipWaiting1 href="#">Click to update the app.</a>` }
+  }))
+  // @ts-ignore
+  skipWaiting("skipWaiting1")
 }

package/lib/routes.middleware.ts

@@ -138,12 +138,25 @@ async function executeHandler({ url, req, ctx }: ExectuteHandlerOptions): Promis
             const data = await getData(req)
             let query = searchParams<{ handler?: string }>(url)
             let args = { req, data, query }
-            let result = await (
-                handlers instanceof Function
-                    ? handlers(args)
-                    : (call(handlers[query.handler ?? ""], args)
-                        || call(handlers[method], args)
-                        || Promise.reject("I'm sorry, I didn't understand where to route your request.")))
+            let result
+            try {
+                result = await (
+                    handlers instanceof Function
+                        ? handlers(args)
+                        : (call(handlers[query.handler ?? ""], args)
+                            || call(handlers[method], args)
+                            || Promise.reject("I'm sorry, I didn't understand where to route your request.")))
+            } catch (e: any) {
+                if (e.reasons) {
+                    ctx.messages =
+                        e.reasons.map((x: any) => x.reason.reasons).flat().map((x: any) => x.reason).flat()
+                    return {
+                        status: 204,
+                    }
+                } else {
+                    throw e
+                }
+            }
 
             if (!result) {
                 return isPost
@@ -309,4 +322,4 @@ type RequireAtLeastOne<T, Keys extends keyof T = keyof T> =
     }[Keys]
 
 export type Route = RequireAtLeastOne<Route_, "file" | "get" | "post">
-export type RoutePage = Pick<Route_, "get" | "post">
+export type RoutePage = Pick<Route_, "get" | "post">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jon49/sw",
-  "version": "0.14.5",
+  "version": "0.14.7",
   "description": "Packages for MVC service workers.",
   "type": "module",
   "files": [