maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deploy] Fix short-circuiting condition for caching of the shell in service worker 🔧 🐢 (#6960)

Browse source
This commit is contained in:
Brett Beutell 2020-05-08 16:15:48 +02:00 • committed by GitHub
parent f9c49a13fa
commit 9431ab64b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
app/views/service_worker/index.js.erb
View file

@ -37,40 +37,45 @@
function createPageStream(request) {
const stream = new ReadableStream({
start(controller) {
if (!caches.match('/shell_top') || !caches.match('/shell_bottom')) { //return if shell isn't cached.
return
}
Promise.all([caches.match('/shell_top'), caches.match('/shell_bottom')])
.then((cachedShellMatches) => {
const cachedShellTop = cachedShellMatches[0];
const cachedShellBottom = cachedShellMatches[1];
if (!cachedShellTop || !cachedShellBottom) { // return if shell isn't cached.
return
}
// the body url is the request url plus 'include'
const url = new URL(request.url);
url.searchParams.set('i', 'i'); // Adds ?i=i or &i=i, which is our indicator for "internal" partial page
const startFetch = Promise.resolve(cachedShellTop);
const endFetch = Promise.resolve(cachedShellBottom);
const middleFetch = fetch(url).then(response => {
if (!response.ok && response.status === 404) {
return caches.match('/404.html');
}
if (!response.ok && response.status != 404) {
return caches.match('/500.html');
}
return response;
}).catch(err => caches.match('/offline.html'));
// the body url is the request url plus 'include'
const url = new URL(request.url);
url.searchParams.set('i', 'i'); // Adds ?i=i or &i=i, which is our indicator for "internal" partial page
const startFetch = caches.match('/shell_top');
const endFetch = caches.match('/shell_bottom');
const middleFetch = fetch(url).then(response => {
if (!response.ok && response.status === 404) {
return caches.match('/404.html');
}
if (!response.ok && response.status != 404) {
return caches.match('/500.html');
}
return response;
}).catch(err => caches.match('/offline.html'));
function pushStream(stream) {
const reader = stream.getReader();
return reader.read().then(function process(result) {
if (result.done) return;
controller.enqueue(result.value);
return reader.read().then(process);
});
}
startFetch
.then(response => pushStream(response.body))
.then(() => middleFetch)
.then(response => pushStream(response.body))
.then(() => endFetch)
.then(response => pushStream(response.body))
.then(() => controller.close());
})
function pushStream(stream) {
const reader = stream.getReader();
return reader.read().then(function process(result) {
if (result.done) return;
controller.enqueue(result.value);
return reader.read().then(process);
});
}
startFetch
.then(response => pushStream(response.body))
.then(() => middleFetch)
.then(response => pushStream(response.body))
.then(() => endFetch)
.then(response => pushStream(response.body))
.then(() => controller.close());
}
});