@jon49/sw 0.12.14 → 0.13.1

package/lib/routes.ts

@@ -1,6 +1,6 @@
-let { html, links } =
+let { html, links, db, globalDb } =
     // @ts-ignore
-    self.app as { links: { file: string, url: string }[], html: Function }
+    self.app as { links: { file: string, url: string }[], html: Function, db: any, globalDb: any }
 
 if (!links) {
     console.error("Expecting links defined with `self.app.links`, but found none.")
@@ -19,8 +19,7 @@ const searchParamsHandler = {
   }
 }
 
-function searchParams<TReturn>(req: Request) : TReturn & {_url: URL} {
-  let url = new URL(req.url)
+function searchParams<TReturn>(url: URL) : TReturn & {_url: URL} {
   return new Proxy(url, searchParamsHandler)
 }
 
@@ -99,6 +98,7 @@ export async function findRoute(url: URL, method: unknown) {
         }
         // @ts-ignore
         for (const r of self.app.routes) {
+            // @ts-ignore
             if (r.file
                 && (r.route instanceof RegExp && r.route.test(url.pathname)
                  || (r.route instanceof Function && r.route(url)))) {
@@ -144,7 +144,25 @@ interface ExectuteHandlerOptions {
 async function executeHandler({ url, req, event }: ExectuteHandlerOptions) : Promise<Response> {
     let method = req.method.toLowerCase()
     let isPost = method === "post"
-    if (!isPost && !url.pathname.endsWith("/")) return cacheResponse(url.pathname, event)
+    if (!isPost) {
+        if (!url.pathname.endsWith("/")) {
+            return cacheResponse(url.pathname, event)
+        }
+
+        if (url.searchParams.get("login") === "success") {
+            await globalDb.setLoggedIn(true)
+        }
+
+        let lastUrl: string | undefined
+        if (url.pathname === "/web/" && (lastUrl = (await db.get("last-url"))?.url)) {
+            url = new URL(lastUrl)
+        } else if (url.searchParams.has("pushUrl") || url.searchParams.has("hz")) {
+            let saveUrl = new URL(url.href)
+            saveUrl.searchParams.delete("pushUrl")
+            saveUrl.searchParams.delete("hz")
+            await db.set("last-url", { url: saveUrl.href }, { sync: false })
+        }
+    }
 
     let handlers =
         <RouteHandler<RouteGetArgs | RoutePostArgs> | null>
@@ -155,7 +173,7 @@ async function executeHandler({ url, req, event }: ExectuteHandlerOptions) : Pro
         try {
             let messages: string[] = []
             const data = await getData(req)
-            let query = searchParams<{ handler?: string }>(req)
+            let query = searchParams<{ handler?: string }>(url)
             let args = { req, data, query }
             let result = await (
                 handlers instanceof Function
@@ -175,7 +193,7 @@ async function executeHandler({ url, req, event }: ExectuteHandlerOptions) : Pro
             }
 
             if (isHtml(result)) {
-                if (req.url.includes("hz")) {
+                if (url.searchParams.has("hz")) {
                     result = html`<template>${result}</template>`
                 }
 
@@ -368,4 +386,3 @@ type RequireAtLeastOne<T, Keys extends keyof T = keyof T> =
 export type Route = RequireAtLeastOne<Route_, "file" | "get" | "post">
 export type RoutePage = Pick<Route_, "get" | "post">
 
-

package/package.json

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