paravielfalt/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Activity Actions

Synchronize HTML page cache with sessions (#6815)

Browse source
This commit is contained in:
Akihiko Odaki 2018-03-18 23:14:38 +09:00 committed by Eugen Rochko
parent 566ace2d64
commit 721234230c
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.babelrc
View file

@ -4,6 +4,8 @@
[ [
"env", "env",
{ {
"debug": true,
"exclude": ["transform-async-to-generator", "transform-regenerator"],
"loose": true, "loose": true,
"modules": false, "modules": false,
"targets": { "targets": {

30
app/javascript/mastodon/service_worker/entry.js
View file

@ -1,5 +1,9 @@
import './web_push_notifications'; import './web_push_notifications';
function openCache() {
return caches.open('mastodon-web');
}
function fetchRoot() { function fetchRoot() {
return fetch('/', { credentials: 'include' }); return fetch('/', { credentials: 'include' });
} }
@ -7,10 +11,7 @@ function fetchRoot() {
// Cause a new version of a registered Service Worker to replace an existing one // Cause a new version of a registered Service Worker to replace an existing one
// that is already installed, and replace the currently active worker on open pages. // that is already installed, and replace the currently active worker on open pages.
self.addEventListener('install', function(event) { self.addEventListener('install', function(event) {
const promises = Promise.all([caches.open('mastodon-web'), fetchRoot()]); event.waitUntil(Promise.all([openCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root)));
const asyncAdd = promises.then(([cache, root]) => cache.put('/', root));
event.waitUntil(asyncAdd);
}); });
self.addEventListener('activate', function(event) { self.addEventListener('activate', function(event) {
event.waitUntil(self.clients.claim()); event.waitUntil(self.clients.claim());
@ -19,12 +20,29 @@ self.addEventListener('fetch', function(event) {
const url = new URL(event.request.url); const url = new URL(event.request.url);
if (url.pathname.startsWith('/web/')) { if (url.pathname.startsWith('/web/')) {
event.respondWith(fetchRoot().then(response => { const asyncResponse = fetchRoot();
const asyncCache = openCache();
event.respondWith(asyncResponse.then(async response => {
if (response.ok) { if (response.ok) {
return response; const cache = await asyncCache;
await cache.put('/', response);
return response.clone();
} }
throw null; throw null;
}).catch(() => caches.match('/'))); }).catch(() => caches.match('/')));
} else if (url.pathname === '/auth/sign_out') {
const asyncResponse = fetch(event.request);
const asyncCache = openCache();
event.respondWith(asyncResponse.then(async response => {
if (response.ok || response.type === 'opaqueredirect') {
const cache = await asyncCache;
await cache.delete('/');
}
return response;
}));
} }
}); });