debounceのロジックを改善しました

appthrust · Apr 15, 2024 · 68d669f · 68d669f
1 parent 350aade
commit 68d669f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/packages/kubekit-client/package.json b/packages/kubekit-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kubekit/client",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "kahirokunn",

diff --git a/packages/kubekit-client/src/client/index.ts b/packages/kubekit-client/src/client/index.ts
@@ -392,20 +392,15 @@ class Debounce {
       return max;
     };
 
-    const getSortedAddedAt = () =>
-      Object.values(this.#cache.get(cacheKey) || {})
-        .sort()
-        .reverse();
+    const now = Number(new Date())
+    const getCurrentPushedAt = this.#cache.get(cacheKey)?.[resourceVersion] || now;
+    const currentElapsedTime = now - getCurrentPushedAt
+    const getOldestPushedAt = Object.values(this.#cache.get(cacheKey) || {})[0] || now;
+    const oldestElapsedTime = now - getOldestPushedAt
 
-    const sortedAddedAt = getSortedAddedAt();
-    const isMaxWaitTimeReached =
-      sortedAddedAt.length >= 2 &&
-      sortedAddedAt[0] - sortedAddedAt[sortedAddedAt.length - 1] >= this.#maxWaitMilliSeconds;
-
-    if (!isMaxWaitTimeReached) {
+    if (this.#maxWaitMilliSeconds > oldestElapsedTime && this.#waitMilliSeconds > currentElapsedTime) {
       await sleep(this.#waitMilliSeconds);
     }
-    // 1. resourceVersionは文字列で比較できる様にする
     if (BigInt(resourceVersion) === getLatestResourceVersion()) {
       this.#cache.delete(cacheKey);
       await func();