修改SW的更新机制 (#213)

lavas-project · Nov 28, 2018 · 5860bad · 5860bad
1 parent 106f38b
commit 5860bad
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 =======
 
+## Lavas-core-vue [1.2.3] - 2018-11-28
+
+- [Enhancement]] 调整 ServiceWorker 的更新机制。[ISSUE #212](https://github.com/lavas-project/lavas/issues/212) [PR](https://github.com/lavas-project/lavas/issues/213)
+
 ## Lavas-core-vue [1.2.2] - 2018-10-18
 
 - [Fix] 修复使用 Koa 服务器时，precache-manifest.xxx.js (workbox 3 新增的预缓存文件) 无法加载的问题。[ISSUE #210](https://github.com/lavas-project/lavas/issues/210) [PR](https://github.com/lavas-project/lavas/pull/211)

diff --git a/packages/lavas-core-vue/core/templates/sw-register.js b/packages/lavas-core-vue/core/templates/sw-register.js
@@ -3,17 +3,26 @@
  * @author panyuqi@baidu.com (panyuqi)
  */
 
+function emitUpdate() {
+    var event = document.createEvent('Event');
+    event.initEvent('sw.update', true, true);
+    window.dispatchEvent(event);
+}
+
 if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('/service-worker.js').then(function(reg) {
-        reg.onupdatefound = function() {
+    navigator.serviceWorker.register('/service-worker.js').then(function (reg) {
+        if (reg.waiting) {
+            emitUpdate();
+            return;
+        }
+
+        reg.onupdatefound = function () {
             var installingWorker = reg.installing;
-            installingWorker.onstatechange = function() {
+            installingWorker.onstatechange = function () {
                 switch (installingWorker.state) {
                     case 'installed':
                         if (navigator.serviceWorker.controller) {
-                            var event = document.createEvent('Event');
-                            event.initEvent('sw.update', true, true);
-                            window.dispatchEvent(event);
+                            emitUpdate();
                         }
                         break;
                 }

diff --git a/packages/lavas-core-vue/package.json b/packages/lavas-core-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lavas-core-vue",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Lavas core implemented by Vue",
   "main": "dist/index.js",
   "files": [