Merge pull request #17 from MliKiowa/main

fix: googlefont cache

source/js/sw.js

@@ -7,6 +7,10 @@ const PreCache = [
   '/js/script.js'
 ];
 
+const CacheDomain = [
+  "fonts.googleapis.com"
+];
+
 // 安装时预加载必要内容
 self.addEventListener('install', (event) => {
   console.log(`Service Worker ${VERSION} installing.`);
@@ -17,27 +21,34 @@ self.addEventListener('install', (event) => {
   );
 });
 
-self.addEventListener('fetch', (event) => {
-  // 检查请求是否为 POST 或带有查询参数的 GET 这样可用避免错误缓存
-  if (event.request.method === 'POST' || (event.request.method === 'GET' && event.request.url.indexOf('?') !== -1)) {
-    event.respondWith(fetch(event.request));
+async function cacheRequest(request) {
+  const responseToCache = await fetch(request);
+  const responseToCacheClone = responseToCache.clone();
+  const cache = await caches.open(VERSION);
+  cache.put(request, responseToCacheClone);
+  return responseToCache;
+}
+
+async function respondRequest(request) {
+  const response = await caches.match(request);
+  if (response) {
+    return response;
+  }
+  return cacheRequest(request);
+}
+
+self.addEventListener('fetch', function (event) {
+  var url = new URL(event.request.url);
+  // 检查请求的域名是否在 CacheDomain 中
+  if (CacheDomain.includes(url.hostname)) {
+    event.respondWith(respondRequest(event.request));
   } else {
-    event.respondWith(
-      caches.match(event.request)
-        .then((response) => {
-          if (response) {
-            return response;
-          }
-          return fetch(event.request).then((responseToCache) => {
-            var responseToCacheClone = responseToCache.clone();
-            caches.open(VERSION).then((cache) => {
-              cache.put(event.request, responseToCacheClone);
-            });
-            return responseToCache;
-          });
-        }
-        )
-    );
+    // 检查请求是否为 POST 或带有查询参数的 GET 这样可避免错误缓存
+    if (event.request.method === 'POST' || (event.request.method === 'GET' && event.request.url.indexOf('?') !== -1)) {
+      event.respondWith(fetch(event.request));
+    } else {
+      event.respondWith(respondRequest(event.request));
+    }
   }
 });
 
@@ -65,4 +76,4 @@ if ('serviceWorker' in navigator) {
     .catch((error) => {
       console.log('Service Worker 注册失败: ', error);
     });
-}
+}