Service worker refactoring

Jasper van Merle committed 7 years ago

Commit ec8616e1 parent 8ed1f4a2 files · +29 −41Browse files

Unified · Split

2 files

assets/javascripts/app/serviceworker.coffee +5 −13
views/service-worker.js.erb +24 −28

assets/javascripts/app/serviceworker.coffee+5−13

@@ -6,7 +6,6 @@ class app.ServiceWorker · 5 unmodified lines
6	6
7	7	constructor: ->
8	8	@registration = null
9		− @installingRegistration = null
10	9	@notifyUpdate = true
11	10
12	11	navigator.serviceWorker.register(app.config.service_worker_path, {scope: '/'})
@@ -16,37 +15,30 @@ class app.ServiceWorker · 3 unmodified lines
16	15	update: ->
17	16	return unless @registration
18	17	@notifyUpdate = true
19		− return @doUpdate()
	18	+ return @registration.update().catch(->)
20	19
21	20	updateInBackground: ->
22	21	return unless @registration
23	22	@notifyUpdate = false
24		− return @doUpdate()
	23	+ return @registration.update().catch(->)
25	24
26	25	reload: ->
27	26	return @updateInBackground().then(() -> app.reboot())
28	27
29		− doUpdate: ->
30		− return @registration.update().catch(->)
31		−
32	28	updateRegistration: (registration) ->
33		− $.off @registration, 'updatefound', @onUpdateFound if @registration
34		− $.off @installingRegistration, 'statechange', @onStateChange if @installingRegistration
35		−
36	29	@registration = registration
37		− @installingRegistration = null
38		−
39	30	$.on @registration, 'updatefound', @onUpdateFound
40	31	return
41	32
42	33	onUpdateFound: () =>
	34	+ $.off @installingRegistration, 'statechange', @onStateChange() if @installingRegistration
43	35	@installingRegistration = @registration.installing
44	36	$.on @installingRegistration, 'statechange', @onStateChange
45	37	return
46	38
47	39	onStateChange: () =>
48		− if @installingRegistration.state == 'installed' and navigator.serviceWorker.controller
49		− @updateRegistration(@installingRegistration)
	40	+ if @installingRegistration and @installingRegistration.state == 'installed' and navigator.serviceWorker.controller
	41	+ @installingRegistration = null
50	42	@onUpdateReady()
51	43	return
52	44

views/service-worker.js.erb+24−28

@@ -1,4 +1,4 @@
1		−<%# Use the hash of the application.js file as cache name, or 'app' if not running in production %>
	1	+<%# Use the hash of the application.js file as cache name or 'app' if not running in production %>
2	2	<%# This ensures that the cache is always updated if the hash of the application.js file changes %>
3	3	const cacheName = '<%= javascript_path('application', asset_host: false).scan(/application-([^\.]+)\.js/).last&.first \|\| 'app' %>';
4	4
@@ -28,37 +28,33 @@ self.addEventListener('install', event => { · 23 unmodified lines
28	28
29	29	<%# Remove old caches %>
30	30	self.addEventListener('activate', event => {
31		− event.waitUntil(
32		− caches.keys().then(keys => Promise.all(
33		− keys.map(key => {
34		− if (key !== cacheName) {
35		− return caches.delete(key);
36		− }
37		− })
38		− ))
39		− );
	31	+ event.waitUntil((async () => {
	32	+ const keys = await caches.keys();
	33	+ const jobs = keys.map(key => key !== cacheName ? caches.delete(key) : Promise.resolve());
	34	+ return await Promise.all(jobs);
	35	+ })());
40	36	});
41	37
42	38	<%# Handle HTTP requests %>
43	39	self.addEventListener('fetch', event => {
44		− event.respondWith(
45		− caches.match(event.request).then(response => {
46		− if (response) {
47		− return response;
	40	+ event.respondWith((async () => {
	41	+ const cachedResponse = await caches.match(event.request);
	42	+ if (cachedResponse) return cachedResponse;
	43	+
	44	+ try {
	45	+ const response = await fetch(event.request);
	46	+ return response;
	47	+ } catch (err) {
	48	+ const url = new URL(event.request.url);
	49	+
	50	+ <%# Attempt to return the index page from the cache if the user is visiting a url like devdocs.io/javascript/global_objects/array/find %>
	51	+ <%# The index page will make sure the correct documentation or a proper offline page is shown %>
	52	+ if (url.origin === location.origin && !url.pathname.includes('.')) {
	53	+ const cachedIndex = await caches.match('/');
	54	+ if (cachedIndex) return cachedIndex;
48	55	}
49	56
50		− return fetch(event.request)
51		− .catch(err => {
52		− const url = new URL(event.request.url);
53		−
54		− <%# Return the index page from the cache if the user is visiting a url like devdocs.io/javascript/global_objects/array/find %>
55		− <%# The index page will make sure the correct documentation or a proper offline page is shown %>
56		− if (url.origin === location.origin && !url.pathname.includes('.')) {
57		− return caches.match('/').then(response => response \|\| err);
58		− }
59		−
60		− return err;
61		− });
62		− })
63		− );
	57	+ throw err;
	58	+ }
	59	+ })());
64	60	});