kubernetes-fluent-client 2.6.5 → 3.0.0

package/dist/fluent/watch.d.ts

@@ -23,18 +23,24 @@ export declare enum WatchEvent {
     /** Resource list operation run */
     LIST = "list",
     /** List operation error */
-    LIST_ERROR = "list_error"
+    LIST_ERROR = "list_error",
+    /** Cache Misses */
+    CACHE_MISS = "cache_miss",
+    /** Increment resync failure count */
+    INC_RESYNC_FAILURE_COUNT = "inc_resync_failure_count",
+    /** Initialize a relist window */
+    INIT_CACHE_MISS = "init_cache_miss"
 }
 /** Configuration for the watch function. */
 export type WatchCfg = {
     /** The maximum number of times to retry the watch, the retry count is reset on success. Unlimited retries if not specified. */
-    retryMax?: number;
-    /** Seconds between each retry check. Defaults to 5. */
-    retryDelaySec?: number;
+    resyncFailureMax?: number;
+    /** Seconds between each resync check. Defaults to 5. */
+    resyncDelaySec?: number;
     /** Amount of seconds to wait before relisting the watch list. Defaults to 600 (10 minutes). */
     relistIntervalSec?: number;
-    /** Amount of seconds to wait before a forced-resyncing of the watch list. Defaults to 300 (5 minutes). */
-    resyncIntervalSec?: number;
+    /** Max amount of seconds to go without receiving an event before reconciliation starts. Defaults to 300 (5 minutes). */
+    lastSeenLimitSeconds?: number;
 };
 /** A wrapper around the Kubernetes watch API. */
 export declare class Watcher<T extends GenericClass> {

package/dist/fluent/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAG3D,oBAAY,UAAU;IACpB,sCAAsC;IACtC,OAAO,YAAY;IACnB,2BAA2B;IAC3B,aAAa,kBAAkB;IAC/B,kDAAkD;IAClD,UAAU,eAAe;IACzB,0BAA0B;IAC1B,SAAS,cAAc;IACvB,8BAA8B;IAC9B,OAAO,YAAY;IACnB,sBAAsB;IACtB,KAAK,UAAU;IACf,mCAAmC;IACnC,IAAI,SAAS;IACb,wCAAwC;IACxC,oBAAoB,yBAAyB;IAC7C,qCAAqC;IACrC,iBAAiB,sBAAsB;IACvC,kCAAkC;IAClC,IAAI,SAAS;IACb,2BAA2B;IAC3B,UAAU,eAAe;CAC1B;AAED,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG;IACrB,+HAA+H;IAC/H,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,0GAA0G;IAC1G,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IAwBzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAc9B;;;;;;;;;;;OAWG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,QAAa;IAgCzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAK9C,gGAAgG;IACzF,KAAK;IAOZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CAyTF"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAG3D,oBAAY,UAAU;IACpB,sCAAsC;IACtC,OAAO,YAAY;IACnB,2BAA2B;IAC3B,aAAa,kBAAkB;IAC/B,kDAAkD;IAClD,UAAU,eAAe;IACzB,0BAA0B;IAC1B,SAAS,cAAc;IACvB,8BAA8B;IAC9B,OAAO,YAAY;IACnB,sBAAsB;IACtB,KAAK,UAAU;IACf,mCAAmC;IACnC,IAAI,SAAS;IACb,wCAAwC;IACxC,oBAAoB,yBAAyB;IAC7C,qCAAqC;IACrC,iBAAiB,sBAAsB;IACvC,kCAAkC;IAClC,IAAI,SAAS;IACb,2BAA2B;IAC3B,UAAU,eAAe;IACzB,mBAAmB;IACnB,UAAU,eAAe;IACzB,qCAAqC;IACrC,wBAAwB,6BAA6B;IACrD,iCAAiC;IACjC,eAAe,oBAAoB;CACpC;AAED,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG;IACrB,+HAA+H;IAC/H,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IAyBzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAc9B;;;;;;;;;;;OAWG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,QAAa;IA0CzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAM9C,gGAAgG;IACzF,KAAK;IAOZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CAiUF"}

package/dist/fluent/watch.js

@@ -37,6 +37,12 @@ var WatchEvent;
     WatchEvent["LIST"] = "list";
     /** List operation error */
     WatchEvent["LIST_ERROR"] = "list_error";
+    /** Cache Misses */
+    WatchEvent["CACHE_MISS"] = "cache_miss";
+    /** Increment resync failure count */
+    WatchEvent["INC_RESYNC_FAILURE_COUNT"] = "inc_resync_failure_count";
+    /** Initialize a relist window */
+    WatchEvent["INIT_CACHE_MISS"] = "init_cache_miss";
 })(WatchEvent || (exports.WatchEvent = WatchEvent = {}));
 const NONE = 50;
 const OVERRIDE = 100;
@@ -47,13 +53,14 @@ class Watcher {
     #filters;
     #callback;
     #watchCfg;
+    #latestRelistWindow = "";
     // Track the last time data was received
     #lastSeenTime = NONE;
     #lastSeenLimit;
     // Create a wrapped AbortController to allow the watch to be aborted externally
     #abortController;
     // Track the number of retries
-    #retryCount = 0;
+    #resyncFailureCount = 0;
     // Create a stream to read the response body
     #stream;
     // Create an EventEmitter to emit events
@@ -82,19 +89,25 @@ class Watcher {
      */
     constructor(model, filters, callback, watchCfg = {}) {
         // Set the retry delay to 5 seconds if not specified
-        watchCfg.retryDelaySec ??= 5;
+        watchCfg.resyncDelaySec ??= 5;
         // Set the relist interval to 30 minutes if not specified
         watchCfg.relistIntervalSec ??= 1800;
         // Set the resync interval to 10 minutes if not specified
-        watchCfg.resyncIntervalSec ??= 600;
+        watchCfg.lastSeenLimitSeconds ??= 600;
         // Set the last seen limit to the resync interval
-        this.#lastSeenLimit = watchCfg.resyncIntervalSec * 1000;
+        this.#lastSeenLimit = watchCfg.lastSeenLimitSeconds * 1000;
+        // Set the latest relist interval to now
+        this.#latestRelistWindow = new Date().toISOString();
         // Add random jitter to the relist/resync intervals (up to 1 second)
         const jitter = Math.floor(Math.random() * 1000);
         // Check every relist interval for cache staleness
-        this.$relistTimer = setInterval(this.#list, watchCfg.relistIntervalSec * 1000 + jitter);
-        // Rebuild the watch every retry delay interval
-        this.#resyncTimer = setInterval(this.#checkResync, watchCfg.retryDelaySec * 1000 + jitter);
+        this.$relistTimer = setInterval(() => {
+            this.#latestRelistWindow = new Date().toISOString();
+            this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
+            this.#list;
+        }, watchCfg.relistIntervalSec * 1000 + jitter);
+        // Rebuild the watch every resync delay interval
+        this.#resyncTimer = setInterval(this.#checkResync, watchCfg.resyncDelaySec * 1000 + jitter);
         // Bind class properties
         this.#model = model;
         this.#filters = filters;
@@ -109,6 +122,7 @@ class Watcher {
      * @returns The AbortController for the watch.
      */
     async start() {
+        this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
         await this.#watch();
         return this.#abortController;
     }
@@ -210,6 +224,7 @@ class Watcher {
                 const alreadyExists = removedItems.delete(uid);
                 // If the item does not exist, it is new and should be added
                 if (!alreadyExists) {
+                    this.#events.emit(WatchEvent.CACHE_MISS, this.#latestRelistWindow);
                     // Send added event. Use void here because we don't care about the result (no consequences here if it fails)
                     void this.#process(item, types_1.WatchPhase.Added);
                     continue;
@@ -219,6 +234,7 @@ class Watcher {
                 const itemRV = parseInt(item.metadata.resourceVersion);
                 // Check if the resource version is newer than the cached version
                 if (itemRV > cachedRV) {
+                    this.#events.emit(WatchEvent.CACHE_MISS, this.#latestRelistWindow);
                     // Send a modified event if the resource version has changed
                     void this.#process(item, types_1.WatchPhase.Modified);
                 }
@@ -232,6 +248,7 @@ class Watcher {
             else {
                 // Otherwise, process the removed items
                 for (const item of removedItems.values()) {
+                    this.#events.emit(WatchEvent.CACHE_MISS, this.#latestRelistWindow);
                     void this.#process(item, types_1.WatchPhase.Deleted);
                 }
             }
@@ -292,7 +309,8 @@ class Watcher {
                 this.#events.emit(WatchEvent.CONNECT, url.pathname);
                 const { body } = response;
                 // Reset the retry count
-                this.#retryCount = 0;
+                this.#resyncFailureCount = 0;
+                this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
                 // Listen for events and call the callback function
                 this.#stream.on("data", async (line) => {
                     try {
@@ -348,23 +366,25 @@ class Watcher {
             // Reset the last seen time to now to allow the resync to be called again in case of failure
             this.#lastSeenTime = now;
             // If there are more attempts, retry the watch (undefined is unlimited retries)
-            if (this.#watchCfg.retryMax === undefined || this.#watchCfg.retryMax > this.#retryCount) {
+            if (this.#watchCfg.resyncFailureMax === undefined ||
+                this.#watchCfg.resyncFailureMax > this.#resyncFailureCount) {
                 // Increment the retry count
-                this.#retryCount++;
+                this.#resyncFailureCount++;
+                this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
                 if (this.#pendingReconnect) {
                     // wait for the connection to be re-established
                     this.#events.emit(WatchEvent.RECONNECT_PENDING);
                 }
                 else {
                     this.#pendingReconnect = true;
-                    this.#events.emit(WatchEvent.RECONNECT, this.#retryCount);
+                    this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
                     this.#streamCleanup();
                     void this.#watch();
                 }
             }
             else {
                 // Otherwise, call the finally function if it exists
-                this.#events.emit(WatchEvent.GIVE_UP, new Error(`Retry limit (${this.#watchCfg.retryMax}) exceeded, giving up`));
+                this.#events.emit(WatchEvent.GIVE_UP, new Error(`Retry limit (${this.#watchCfg.resyncFailureMax}) exceeded, giving up`));
                 this.close();
             }
         }

package/dist/fluent/watch.spec.js

@@ -116,13 +116,13 @@ const types_1 = require("./types");
     });
     (0, globals_1.it)("should return the cache id", () => {
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryDelaySec: 1,
+            resyncDelaySec: 1,
         });
         (0, globals_1.expect)(watcher.getCacheID()).toEqual("d69b75a611");
     });
     (0, globals_1.it)("should handle the CONNECT event", done => {
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryDelaySec: 1,
+            resyncDelaySec: 1,
         });
         setupAndStartWatcher(__1.WatchEvent.CONNECT, () => {
             done();
@@ -130,7 +130,7 @@ const types_1 = require("./types");
     });
     (0, globals_1.it)("should handle the DATA event", done => {
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryDelaySec: 1,
+            resyncDelaySec: 1,
         });
         setupAndStartWatcher(__1.WatchEvent.DATA, (pod, phase) => {
             (0, globals_1.expect)(pod.metadata?.name).toEqual(`pod-0`);
@@ -155,7 +155,7 @@ const types_1 = require("./types");
             .query({ watch: "true", resourceVersion: "45" })
             .replyWithError("Something bad happened");
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryDelaySec: 1,
+            resyncDelaySec: 1,
         });
         setupAndStartWatcher(__1.WatchEvent.NETWORK_ERROR, error => {
             (0, globals_1.expect)(error.message).toEqual("request to http://jest-test:8080/api/v1/pods?watch=true&resourceVersion=45 failed, reason: Something bad happened");
@@ -179,7 +179,7 @@ const types_1 = require("./types");
             .query({ watch: "true", resourceVersion: "65" })
             .replyWithError("Something bad happened");
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryDelaySec: 0.01,
+            resyncDelaySec: 0.01,
         });
         setupAndStartWatcher(__1.WatchEvent.RECONNECT, count => {
             (0, globals_1.expect)(count).toEqual(1);
@@ -188,8 +188,8 @@ const types_1 = require("./types");
     });
     (0, globals_1.it)("should perform a resync after the resync interval", done => {
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryDelaySec: 0.01,
-            resyncIntervalSec: 0.01,
+            resyncDelaySec: 0.01,
+            lastSeenLimitSeconds: 0.01,
         });
         setupAndStartWatcher(__1.WatchEvent.RECONNECT, count => {
             (0, globals_1.expect)(count).toEqual(1);
@@ -213,9 +213,9 @@ const types_1 = require("./types");
             .query({ watch: "true", resourceVersion: "75" })
             .replyWithError("Something bad happened");
         watcher = (0, _1.K8s)(__1.kind.Pod).Watch(evtMock, {
-            retryMax: 1,
-            retryDelaySec: 0.01,
-            resyncIntervalSec: 1,
+            resyncFailureMax: 1,
+            resyncDelaySec: 0.01,
+            lastSeenLimitSeconds: 1,
         });
         setupAndStartWatcher(__1.WatchEvent.GIVE_UP, error => {
             (0, globals_1.expect)(error.message).toContain("Retry limit (1) exceeded, giving up");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "2.6.5",
+  "version": "3.0.0",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",

package/src/fluent/watch.spec.ts

@@ -138,14 +138,14 @@ describe("Watcher", () => {
 
   it("should return the cache id", () => {
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryDelaySec: 1,
+      resyncDelaySec: 1,
     });
     expect(watcher.getCacheID()).toEqual("d69b75a611");
   });
 
   it("should handle the CONNECT event", done => {
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryDelaySec: 1,
+      resyncDelaySec: 1,
     });
     setupAndStartWatcher(WatchEvent.CONNECT, () => {
       done();
@@ -154,7 +154,7 @@ describe("Watcher", () => {
 
   it("should handle the DATA event", done => {
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryDelaySec: 1,
+      resyncDelaySec: 1,
     });
     setupAndStartWatcher(WatchEvent.DATA, (pod, phase) => {
       expect(pod.metadata?.name).toEqual(`pod-0`);
@@ -181,7 +181,7 @@ describe("Watcher", () => {
       .replyWithError("Something bad happened");
 
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryDelaySec: 1,
+      resyncDelaySec: 1,
     });
 
     setupAndStartWatcher(WatchEvent.NETWORK_ERROR, error => {
@@ -210,7 +210,7 @@ describe("Watcher", () => {
       .replyWithError("Something bad happened");
 
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryDelaySec: 0.01,
+      resyncDelaySec: 0.01,
     });
 
     setupAndStartWatcher(WatchEvent.RECONNECT, count => {
@@ -221,8 +221,8 @@ describe("Watcher", () => {
 
   it("should perform a resync after the resync interval", done => {
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryDelaySec: 0.01,
-      resyncIntervalSec: 0.01,
+      resyncDelaySec: 0.01,
+      lastSeenLimitSeconds: 0.01,
     });
 
     setupAndStartWatcher(WatchEvent.RECONNECT, count => {
@@ -249,9 +249,9 @@ describe("Watcher", () => {
       .replyWithError("Something bad happened");
 
     watcher = K8s(kind.Pod).Watch(evtMock, {
-      retryMax: 1,
-      retryDelaySec: 0.01,
-      resyncIntervalSec: 1,
+      resyncFailureMax: 1,
+      resyncDelaySec: 0.01,
+      lastSeenLimitSeconds: 1,
     });
 
     setupAndStartWatcher(WatchEvent.GIVE_UP, error => {

package/src/fluent/watch.ts

@@ -34,18 +34,24 @@ export enum WatchEvent {
   LIST = "list",
   /** List operation error */
   LIST_ERROR = "list_error",
+  /** Cache Misses */
+  CACHE_MISS = "cache_miss",
+  /** Increment resync failure count */
+  INC_RESYNC_FAILURE_COUNT = "inc_resync_failure_count",
+  /** Initialize a relist window */
+  INIT_CACHE_MISS = "init_cache_miss",
 }
 
 /** Configuration for the watch function. */
 export type WatchCfg = {
   /** The maximum number of times to retry the watch, the retry count is reset on success. Unlimited retries if not specified. */
-  retryMax?: number;
-  /** Seconds between each retry check. Defaults to 5. */
-  retryDelaySec?: number;
+  resyncFailureMax?: number;
+  /** Seconds between each resync check. Defaults to 5. */
+  resyncDelaySec?: number;
   /** Amount of seconds to wait before relisting the watch list. Defaults to 600 (10 minutes). */
   relistIntervalSec?: number;
-  /** Amount of seconds to wait before a forced-resyncing of the watch list. Defaults to 300 (5 minutes). */
-  resyncIntervalSec?: number;
+  /** Max amount of seconds to go without receiving an event before reconciliation starts. Defaults to 300 (5 minutes). */
+  lastSeenLimitSeconds?: number;
 };
 
 const NONE = 50;
@@ -58,6 +64,7 @@ export class Watcher<T extends GenericClass> {
   #filters: Filters;
   #callback: WatchAction<T>;
   #watchCfg: WatchCfg;
+  #latestRelistWindow: string = "";
 
   // Track the last time data was received
   #lastSeenTime = NONE;
@@ -67,7 +74,7 @@ export class Watcher<T extends GenericClass> {
   #abortController: AbortController;
 
   // Track the number of retries
-  #retryCount = 0;
+  #resyncFailureCount = 0;
 
   // Create a stream to read the response body
   #stream?: byline.LineStream;
@@ -104,25 +111,35 @@ export class Watcher<T extends GenericClass> {
    */
   constructor(model: T, filters: Filters, callback: WatchAction<T>, watchCfg: WatchCfg = {}) {
     // Set the retry delay to 5 seconds if not specified
-    watchCfg.retryDelaySec ??= 5;
+    watchCfg.resyncDelaySec ??= 5;
 
     // Set the relist interval to 30 minutes if not specified
     watchCfg.relistIntervalSec ??= 1800;
 
     // Set the resync interval to 10 minutes if not specified
-    watchCfg.resyncIntervalSec ??= 600;
+    watchCfg.lastSeenLimitSeconds ??= 600;
 
     // Set the last seen limit to the resync interval
-    this.#lastSeenLimit = watchCfg.resyncIntervalSec * 1000;
+    this.#lastSeenLimit = watchCfg.lastSeenLimitSeconds * 1000;
+
+    // Set the latest relist interval to now
+    this.#latestRelistWindow = new Date().toISOString();
 
     // Add random jitter to the relist/resync intervals (up to 1 second)
     const jitter = Math.floor(Math.random() * 1000);
 
     // Check every relist interval for cache staleness
-    this.$relistTimer = setInterval(this.#list, watchCfg.relistIntervalSec * 1000 + jitter);
-
-    // Rebuild the watch every retry delay interval
-    this.#resyncTimer = setInterval(this.#checkResync, watchCfg.retryDelaySec * 1000 + jitter);
+    this.$relistTimer = setInterval(
+      () => {
+        this.#latestRelistWindow = new Date().toISOString();
+        this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
+        this.#list;
+      },
+      watchCfg.relistIntervalSec * 1000 + jitter,
+    );
+
+    // Rebuild the watch every resync delay interval
+    this.#resyncTimer = setInterval(this.#checkResync, watchCfg.resyncDelaySec * 1000 + jitter);
 
     // Bind class properties
     this.#model = model;
@@ -140,6 +157,7 @@ export class Watcher<T extends GenericClass> {
    * @returns The AbortController for the watch.
    */
   public async start(): Promise<AbortController> {
+    this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
     await this.#watch();
     return this.#abortController;
   }
@@ -267,6 +285,7 @@ export class Watcher<T extends GenericClass> {
 
         // If the item does not exist, it is new and should be added
         if (!alreadyExists) {
+          this.#events.emit(WatchEvent.CACHE_MISS, this.#latestRelistWindow);
           // Send added event. Use void here because we don't care about the result (no consequences here if it fails)
           void this.#process(item, WatchPhase.Added);
           continue;
@@ -278,6 +297,7 @@ export class Watcher<T extends GenericClass> {
 
         // Check if the resource version is newer than the cached version
         if (itemRV > cachedRV) {
+          this.#events.emit(WatchEvent.CACHE_MISS, this.#latestRelistWindow);
           // Send a modified event if the resource version has changed
           void this.#process(item, WatchPhase.Modified);
         }
@@ -291,6 +311,7 @@ export class Watcher<T extends GenericClass> {
       } else {
         // Otherwise, process the removed items
         for (const item of removedItems.values()) {
+          this.#events.emit(WatchEvent.CACHE_MISS, this.#latestRelistWindow);
           void this.#process(item, WatchPhase.Deleted);
         }
       }
@@ -362,7 +383,8 @@ export class Watcher<T extends GenericClass> {
         const { body } = response;
 
         // Reset the retry count
-        this.#retryCount = 0;
+        this.#resyncFailureCount = 0;
+        this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
 
         // Listen for events and call the callback function
         this.#stream.on("data", async line => {
@@ -430,16 +452,20 @@ export class Watcher<T extends GenericClass> {
       this.#lastSeenTime = now;
 
       // If there are more attempts, retry the watch (undefined is unlimited retries)
-      if (this.#watchCfg.retryMax === undefined || this.#watchCfg.retryMax > this.#retryCount) {
+      if (
+        this.#watchCfg.resyncFailureMax === undefined ||
+        this.#watchCfg.resyncFailureMax > this.#resyncFailureCount
+      ) {
         // Increment the retry count
-        this.#retryCount++;
+        this.#resyncFailureCount++;
+        this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
 
         if (this.#pendingReconnect) {
           // wait for the connection to be re-established
           this.#events.emit(WatchEvent.RECONNECT_PENDING);
         } else {
           this.#pendingReconnect = true;
-          this.#events.emit(WatchEvent.RECONNECT, this.#retryCount);
+          this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
           this.#streamCleanup();
 
           void this.#watch();
@@ -448,7 +474,7 @@ export class Watcher<T extends GenericClass> {
         // Otherwise, call the finally function if it exists
         this.#events.emit(
           WatchEvent.GIVE_UP,
-          new Error(`Retry limit (${this.#watchCfg.retryMax}) exceeded, giving up`),
+          new Error(`Retry limit (${this.#watchCfg.resyncFailureMax}) exceeded, giving up`),
         );
         this.close();
       }