Merge pull request RocketChat#335 from Shailesh351/sb_sw_optimize

Improve SW Logic
shubhsherl · Jul 10, 2020 · bf851f7 · bf851f7
2 parents 89d601b + 761f985
commit bf851f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/theme/server/server.js b/app/theme/server/server.js
@@ -158,7 +158,7 @@ Meteor.startup(() => {
 	settings.get('css', (key, value = '') => {
 		currentHash = crypto.createHash('sha1').update(value).digest('hex');
 		currentSize = value.length;
-		injectIntoHead('css-theme', `<link rel="stylesheet" type="text/css" href="${ getURL(`/theme.css?${ currentHash }`) }">`);
+		injectIntoHead('css-theme', `<link rel="stylesheet" type="text/css" href="${ getURL(`/theme.css?hash=${ currentHash }`) }">`);
 	});
 });
 

diff --git a/public/sw.js b/public/sw.js
@@ -94,12 +94,15 @@ self.addEventListener('fetch', (event) => {
 
 	event.respondWith(
 		caches.match(event.request.clone()).then((cached) => {
-			const fetchEvent = fetchFromNetwork(event);
 			// We don't return cached HTML (except if fetch failed)
 			if (cached) {
 				const resourceType = cached.headers.get('content-type');
 				// We only return non css/js/html cached response e.g images
 				if (!hasHash(event.request.url) && !/text\/html/.test(resourceType)) {
+					// Refresh resources which are not(sound or assets)
+					if (!/sounds/.test(event.request.url) && !/assets/.test(event.request.url) && !/font/.test(event.request.url)) {
+						fetchFromNetwork(event);
+					}
 					return cached;
 				}
 
@@ -108,7 +111,7 @@ self.addEventListener('fetch', (event) => {
 					return cached;
 				}
 			}
-			return fetchEvent;
+			return fetchFromNetwork(event);
 		}),
 	);
 });