web/notify.moe
Code Issues Pull Requests Activity

Cleanup

Browse Source
This commit is contained in:
Eduard Urbach 2017-12-04 11:19:21 +01:00
parent 30994db2fa
commit 26ab168dd7
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/ServiceWorkerManager.ts
View File

@ -88,24 +88,9 @@ export class ServiceWorkerManager {
break
case "reload page":
console.log("service worker instructed to reload page...disobeying in test mode")
// location.reload(true)
break
case "reload styles":
console.log("service worker instructed to reload styles")
const links = document.getElementsByTagName("link")
for(const x in links) {
const link = links[x]
if(link.getAttribute("rel") === "stylesheet") {
link.href = link.href
}
}
break
// case "offline":
// this.arn.statusMessage.showError("You are viewing an offline version of the site now.")
// break
}
}
}

47
sw/service-worker.ts
View File

@ -136,9 +136,12 @@ class MyServiceWorker {
// Save the served E-Tag when onResponse is called
let servedETag = undefined
let onResponse = (response: Response) => {
servedETag = response.headers.get("ETag")
ETAGS.set(request.url, servedETag)
let onResponse = (response: Response | null) => {
if(response) {
servedETag = response.headers.get("ETag")
ETAGS.set(request.url, servedETag)
}
return response
}
@ -276,14 +279,19 @@ class MyServiceWorker {
// Serve network first.
// Fall back to cache.
async networkFirst(request: Request, network: Promise<Response>, onResponse: (r: Response) => Response): Promise<Response> {
let response: Response
let response: Response | null
try {
response = await network
console.log("Network HIT:", request.url)
} catch(error) {
response = await this.fromCache(request)
console.log("Network MISS:", request.url, error)
try {
response = await this.fromCache(request)
} catch(error) {
console.error(error)
}
}
return onResponse(response)
@ -292,14 +300,19 @@ class MyServiceWorker {
// Serve cache first.
// Fall back to network.
async cacheFirst(request: Request, network: Promise<Response>, onResponse: (r: Response) => Response): Promise<Response> {
let response: Response
let response: Response | null
try {
response = await this.fromCache(request)
console.log("Cache HIT:", request.url)
} catch(error) {
response = await network
console.log("Cache MISS:", request.url, error)
try {
response = await network
} catch(error) {
console.error(error)
}
}
return onResponse(response)
@ -439,18 +452,18 @@ class MyClient {
})
}
async reloadPage(url: string) {
let networkFetch = serviceWorker.reloads.get(url.replace("/_/", "/"))
// async reloadPage(url: string) {
// let networkFetch = serviceWorker.reloads.get(url.replace("/_/", "/"))
if(networkFetch) {
await networkFetch
}
// if(networkFetch) {
// await networkFetch
// }
return this.postMessage({
type: "reload page",
url
})
}
// return this.postMessage({
// type: "reload page",
// url
// })
// }
reloadStyles() {
return this.postMessage({