fix: pwa 还是先 autoUpdate 吧

adams549659584 · May 30, 2023 · 538d8a4 · 538d8a4 · vercel · May 30, 2023
1 parent da33467
commit 538d8a4
Show file tree

Hide file tree

Showing 11 changed files with 722 additions and 691 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "go-proxy-bingai",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "private": true,
   "scripts": {
     "dev": "vite",

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { NMessageProvider, NConfigProvider, type GlobalThemeOverrides, NDialogProvider } from 'naive-ui';
 import { RouterView } from 'vue-router';
-import ReloadPWA from '@/components/ReloadPWA/ReloadPWA.vue';
 
 const themeOverrides: GlobalThemeOverrides = {
   common: {
@@ -17,7 +16,6 @@ const themeOverrides: GlobalThemeOverrides = {
   <NConfigProvider :theme-overrides="themeOverrides">
     <NDialogProvider>
       <NMessageProvider>
-        <ReloadPWA />
         <RouterView />
       </NMessageProvider>
     </NDialogProvider>

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -15,8 +15,8 @@ const __APP_INFO__ = {
 
 const initPwaOptions = (env: Record<string, string>) => {
   const pwaOptions: Partial<VitePWAOptions> = {
-    srcDir: 'src',
-    filename: 'sw.ts',
+    // srcDir: 'src',
+    // filename: 'sw.ts',
     includeAssets: ['img/logo.svg'],
     manifest: {
       name: 'BingAI',
@@ -45,14 +45,48 @@ const initPwaOptions = (env: Record<string, string>) => {
     //   enabled: true,
     //   type: 'module',
     // },
-    strategies: 'injectManifest',
-    workbox: {
-      cleanupOutdatedCaches: true,
-      clientsClaim: true,
-      skipWaiting: true,
-    },
+    // strategies: 'injectManifest',
+    // workbox: {
+    //   cleanupOutdatedCaches: true,
+    //   clientsClaim: true,
+    //   skipWaiting: true,
+    // },
     // 取消注册服务工作进程
     // selfDestroying: true,
+    registerType: 'autoUpdate',
+    workbox: {
+      globPatterns: ['**/*.{js,css,html,ico,png,svg}'],
+      runtimeCaching: [
+        {
+          urlPattern: /(.*?)\.(js|css|ts)/, // js /css /ts静态资源缓存
+          handler: 'StaleWhileRevalidate',
+          options: {
+            cacheName: 'BingAI-assets',
+            expiration: {
+              maxEntries: 100,
+              maxAgeSeconds: 60 * 60 * 24 * 7,
+            },
+            cacheableResponse: {
+              statuses: [0, 200],
+            },
+          },
+        },
+        {
+          urlPattern: /(.*?)\.(png|jpe?g|svg|gif|bmp|psd|tiff|tga|eps|ico)/, // 图片缓存
+          handler: 'CacheFirst',
+          options: {
+            cacheName: 'BingAI-images',
+            expiration: {
+              maxEntries: 100,
+              maxAgeSeconds: 60 * 60 * 24 * 7,
+            },
+            cacheableResponse: {
+              statuses: [0, 200],
+            },
+          },
+        },
+      ],
+    },
   };
   return pwaOptions;
 };

diff --git a/web/assets/index-36027b8d.js b/web/assets/index-36027b8d.js
diff --git a/web/assets/index-4cac3f94.js b/web/assets/index-4cac3f94.js
diff --git a/web/assets/index-58dc3d18.js → web/assets/index-5d6cbc08.js b/web/assets/index-58dc3d18.js → web/assets/index-5d6cbc08.js
diff --git a/web/assets/workbox-window.prod.es5-08b2315b.js b/web/assets/workbox-window.prod.es5-08b2315b.js
diff --git a/web/index.html b/web/index.html
@@ -40,9 +40,9 @@
   <script src="/web/js/bing/chat/global.js"></script>
   <script src="/web/js/bing/chat/amd.js"></script>
   <script src="/web/js/bing/chat/config.js"></script>
-  <script type="module" crossorigin src="/web/assets/index-4cac3f94.js"></script>
+  <script type="module" crossorigin src="/web/assets/index-36027b8d.js"></script>
   <link rel="stylesheet" href="/web/assets/index-4b631cfd.css">
-<link rel="manifest" href="/web/manifest.webmanifest"></head>
+<link rel="manifest" href="/web/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/web/registerSW.js"></script></head>
 
 <body>
   <div id="b_sydHeadBg"></div>

diff --git a/web/registerSW.js b/web/registerSW.js
diff --git a/web/sw.js b/web/sw.js
diff --git a/web/workbox-9d4bbdea.js b/web/workbox-9d4bbdea.js