feat(): v1.2.2

JoeshuTT · Dec 7, 2023 · ed8170d · ed8170d
1 parent 5a8461e
commit ed8170d
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 41 deletions.
diff --git a/dist/types/types.d.ts b/dist/types/types.d.ts
@@ -1,7 +1,6 @@
 export interface VersionPollingOptions {
     appETagKey?: string;
     pollingInterval?: number;
-    immediate: boolean;
     htmlFileUrl: string;
     silent?: boolean;
     silentPollingInterval?: boolean;

diff --git a/dist/version-polling.common.js b/dist/version-polling.common.js
@@ -1,5 +1,5 @@
 /*!
-  * version-polling v1.2.0
+  * version-polling v1.2.2
   * (c) 2023 JoeshuTT
   * @license MIT
   */
@@ -50,7 +50,7 @@ function createWorker(func) {
   return worker;
 }
 function createWorkerFunc() {
-  let timerId;
+  let timerId = null;
   let options;
   self.onmessage = event => {
     let code = event.data["code"];
@@ -59,7 +59,6 @@ function createWorkerFunc() {
       htmlFileUrl,
       lastEtag,
       appETagKey,
-      immediate,
       pollingInterval,
       silentPollingInterval
     } = options;
@@ -81,16 +80,22 @@ function createWorkerFunc() {
         }
       });
     };
-    if (code === "pause") {
-      clearInterval(timerId);
-      timerId = null;
-    } else if (code === "start") {
-      immediate && runReq();
+    const startPollingTask = () => {
       if (!silentPollingInterval) {
         timerId = setInterval(runReq, pollingInterval);
       }
+    };
+    const pausePollingTask = () => {
+      if (timerId) {
+        clearInterval(timerId);
+        timerId = null;
+      }
+    };
+    if (code === "pause") {
+      pausePollingTask();
     } else {
-      runReq();
+      runReq(); // 立即执行一次
+      startPollingTask();
     }
   };
   return self;
@@ -104,7 +109,6 @@ let myWorker;
 const defaultOptions = {
   appETagKey: APP_ETAG_KEY,
   pollingInterval: 5 * 60 * 1000,
-  immediate: true,
   htmlFileUrl: `${location.origin}${location.pathname}`,
   silent: false,
   silentPollingInterval: false,
@@ -157,7 +161,6 @@ class VersionPolling {
     const {
       appETagKey,
       pollingInterval,
-      immediate,
       htmlFileUrl,
       silent,
       silentPollingInterval,
@@ -172,7 +175,6 @@ class VersionPolling {
       data: {
         appETagKey,
         pollingInterval,
-        immediate,
         htmlFileUrl,
         silentPollingInterval,
         lastEtag: this.appEtag

diff --git a/dist/version-polling.esm.js b/dist/version-polling.esm.js
@@ -1,5 +1,5 @@
 /*!
-  * version-polling v1.2.0
+  * version-polling v1.2.2
   * (c) 2023 JoeshuTT
   * @license MIT
   */
@@ -48,7 +48,7 @@ function createWorker(func) {
   return worker;
 }
 function createWorkerFunc() {
-  let timerId;
+  let timerId = null;
   let options;
   self.onmessage = event => {
     let code = event.data["code"];
@@ -57,7 +57,6 @@ function createWorkerFunc() {
       htmlFileUrl,
       lastEtag,
       appETagKey,
-      immediate,
       pollingInterval,
       silentPollingInterval
     } = options;
@@ -79,16 +78,22 @@ function createWorkerFunc() {
         }
       });
     };
-    if (code === "pause") {
-      clearInterval(timerId);
-      timerId = null;
-    } else if (code === "start") {
-      immediate && runReq();
+    const startPollingTask = () => {
       if (!silentPollingInterval) {
         timerId = setInterval(runReq, pollingInterval);
       }
+    };
+    const pausePollingTask = () => {
+      if (timerId) {
+        clearInterval(timerId);
+        timerId = null;
+      }
+    };
+    if (code === "pause") {
+      pausePollingTask();
     } else {
-      runReq();
+      runReq(); // 立即执行一次
+      startPollingTask();
     }
   };
   return self;
@@ -102,7 +107,6 @@ let myWorker;
 const defaultOptions = {
   appETagKey: APP_ETAG_KEY,
   pollingInterval: 5 * 60 * 1000,
-  immediate: true,
   htmlFileUrl: `${location.origin}${location.pathname}`,
   silent: false,
   silentPollingInterval: false,
@@ -155,7 +159,6 @@ class VersionPolling {
     const {
       appETagKey,
       pollingInterval,
-      immediate,
       htmlFileUrl,
       silent,
       silentPollingInterval,
@@ -170,7 +173,6 @@ class VersionPolling {
       data: {
         appETagKey,
         pollingInterval,
-        immediate,
         htmlFileUrl,
         silentPollingInterval,
         lastEtag: this.appEtag

diff --git a/dist/version-polling.js b/dist/version-polling.js
@@ -1,5 +1,5 @@
 /*!
-  * version-polling v1.2.0
+  * version-polling v1.2.2
   * (c) 2023 JoeshuTT
   * @license MIT
   */
@@ -54,7 +54,7 @@
     return worker;
   }
   function createWorkerFunc() {
-    let timerId;
+    let timerId = null;
     let options;
     self.onmessage = event => {
       let code = event.data["code"];
@@ -63,7 +63,6 @@
         htmlFileUrl,
         lastEtag,
         appETagKey,
-        immediate,
         pollingInterval,
         silentPollingInterval
       } = options;
@@ -85,16 +84,22 @@
           }
         });
       };
-      if (code === "pause") {
-        clearInterval(timerId);
-        timerId = null;
-      } else if (code === "start") {
-        immediate && runReq();
+      const startPollingTask = () => {
         if (!silentPollingInterval) {
           timerId = setInterval(runReq, pollingInterval);
         }
+      };
+      const pausePollingTask = () => {
+        if (timerId) {
+          clearInterval(timerId);
+          timerId = null;
+        }
+      };
+      if (code === "pause") {
+        pausePollingTask();
       } else {
-        runReq();
+        runReq(); // 立即执行一次
+        startPollingTask();
       }
     };
     return self;
@@ -108,7 +113,6 @@
   const defaultOptions = {
     appETagKey: APP_ETAG_KEY,
     pollingInterval: 5 * 60 * 1000,
-    immediate: true,
     htmlFileUrl: `${location.origin}${location.pathname}`,
     silent: false,
     silentPollingInterval: false,
@@ -161,7 +165,6 @@
       const {
         appETagKey,
         pollingInterval,
-        immediate,
         htmlFileUrl,
         silent,
         silentPollingInterval,
@@ -176,7 +179,6 @@
         data: {
           appETagKey,
           pollingInterval,
-          immediate,
           htmlFileUrl,
           silentPollingInterval,
           lastEtag: this.appEtag

diff --git a/dist/version-polling.min.js b/dist/version-polling.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "version-polling",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "一个用于实时检测 web 应用更新的 JavaScript 库",
   "engines": {
     "node": ">=14"