Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PWA + offline #325

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
cache api and html so actually works offline
  • Loading branch information
geekgonecrazy committed Jan 30, 2022
commit 47a65fc2c113526bdcbd7677574998c53abf82cf
12 changes: 9 additions & 3 deletions internal/view/content.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,17 @@
</script>
<script type="module">
if ('serviceWorker' in navigator) {
window.addEventListener('load', function() {
navigator.serviceWorker.register('pwabuilder-sw.js');
});
window.addEventListener('load', function() {
navigator.serviceWorker.register('pwabuilder-sw.js');
});
}
</script>
<script type="module">
import 'https://cdn.jsdelivr.net/npm/@pwabuilder/pwaupdate';

const el = document.createElement('pwa-update');
document.body.appendChild(el);
</script>
</body>

</html>
12 changes: 9 additions & 3 deletions internal/view/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,17 @@
</script>
<script type="module">
if ('serviceWorker' in navigator) {
window.addEventListener('load', function() {
navigator.serviceWorker.register('pwabuilder-sw.js');
});
window.addEventListener('load', function() {
navigator.serviceWorker.register('pwabuilder-sw.js');
});
}
</script>
<script type="module">
import 'https://cdn.jsdelivr.net/npm/@pwabuilder/pwaupdate';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have this living with our other static assets? It seems weird to me that we serve everything bundled withing the binary but this is fetched from an outside service.


const el = document.createElement('pwa-update');
document.body.appendChild(el);
</script>
</body>

</html>
12 changes: 9 additions & 3 deletions internal/view/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,17 @@
</script>
<script type="module">
if ('serviceWorker' in navigator) {
window.addEventListener('load', function() {
navigator.serviceWorker.register('pwabuilder-sw.js');
});
window.addEventListener('load', function() {
navigator.serviceWorker.register('pwabuilder-sw.js');
});
}
</script>
<script type="module">
import 'https://cdn.jsdelivr.net/npm/@pwabuilder/pwaupdate';

const el = document.createElement('pwa-update');
document.body.appendChild(el);
</script>
</body>

</html>
118 changes: 101 additions & 17 deletions internal/view/pwabuilder-sw.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,102 @@
// This is the "Offline copy of assets" service worker

const CACHE = "pwabuilder-offline";

importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');

self.addEventListener("message", (event) => {
if (event.data && event.data.type === "SKIP_WAITING") {
self.skipWaiting();
}
});

workbox.routing.registerRoute(
new RegExp('/*'),
new workbox.strategies.StaleWhileRevalidate({
cacheName: CACHE
})
//This is the service worker with the Advanced caching

importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as before, can we bundle this within shiori?


const API_CACHE = "api";
const BOOKMARK_CACHE = "bookmarks";
const HTML_CACHE = "html";
const JS_CACHE = "javascript";
const STYLE_CACHE = "stylesheets";
const IMAGE_CACHE = "images";
const FONT_CACHE = "fonts";

self.addEventListener("message", (event) => {
if (event.data && event.data.type === "SKIP_WAITING") {
self.skipWaiting();
}
});

workbox.routing.registerRoute(
({url, request, event}) => url.pathname === '/api/bookmarks',
new workbox.strategies.NetworkFirst({
cacheName: API_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 50,
}),
],
})
);

workbox.routing.registerRoute(
({url, event}) => event.request.destination === 'document' && url.pathname.startsWith('/bookmark'),
new workbox.strategies.NetworkFirst({
cacheName: BOOKMARK_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 500,
}),
],
})
);

workbox.routing.registerRoute(
({url, event}) => event.request.destination === 'document' && !url.pathname.startsWith('/bookmark'),
new workbox.strategies.NetworkFirst({
cacheName: HTML_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 10,
}),
],
})
);


workbox.routing.registerRoute(
({event}) => event.request.destination === 'script',
new workbox.strategies.StaleWhileRevalidate({
cacheName: JS_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 15,
}),
],
})
);

workbox.routing.registerRoute(
({event}) => event.request.destination === 'style',
new workbox.strategies.StaleWhileRevalidate({
cacheName: STYLE_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 15,
}),
],
})
);

workbox.routing.registerRoute(
({event}) => event.request.destination === 'image',
new workbox.strategies.StaleWhileRevalidate({
cacheName: IMAGE_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 15,
}),
],
})
);

workbox.routing.registerRoute(
({event}) => event.request.destination === 'font',
new workbox.strategies.StaleWhileRevalidate({
cacheName: FONT_CACHE,
plugins: [
new workbox.expiration.ExpirationPlugin({
maxEntries: 15,
}),
],
})
);
Loading