kubernetes-fluent-client 3.10.12 → 3.10.13

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAwB,MAAM,aAAa,CAAC;AAGjE,OAAO,EAGL,WAAW,EACX,OAAO,EAER,MAAM,mBAAmB,CAAC;AAC3B,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;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CA0VF"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAwB,MAAM,aAAa,CAAC;AAGjE,OAAO,EAGL,WAAW,EACX,OAAO,EAER,MAAM,mBAAmB,CAAC;AAK3B,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;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CAwXF"}

package/dist/fluent/watch.js

@@ -2,10 +2,11 @@
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 import { EventEmitter } from "events";
 import { fetch } from "undici";
-import { fetch as wrappedFetch } from "../fetch.js";
 import { k8sCfg, pathBuilder, getHeaders } from "./utils.js";
 import { Readable } from "stream";
 import { WatchPhase, FetchMethods, } from "./shared-types.js";
+const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+const startSleep = 5000;
 export var WatchEvent;
 (function (WatchEvent) {
     /** Watch is connected successfully */
@@ -174,16 +175,28 @@ export class Watcher {
      *
      * @param continueToken - the continue token for the list
      * @param removedItems - the list of items that have been removed
+     * @param retryCount - current retry attempt count
      */
-    #list = async (continueToken, removedItems) => {
+    #list = async (continueToken, removedItems, retryCount = 0) => {
+        const maxRetries = 5;
+        const maxPages = 10;
         try {
             const { opts, serverUrl } = await this.#buildURL(false, undefined, continueToken);
             // Make the request to list the resources
-            const response = await wrappedFetch(serverUrl, opts);
-            const list = response.data;
+            const response = await fetch(serverUrl, opts);
+            const list = (await response.json());
             // If the request fails, emit an error event and return
             if (!response.ok) {
-                this.#events.emit(WatchEvent.LIST_ERROR, new Error(`list failed: ${response.status} ${response.statusText}`));
+                this.#events.emit(WatchEvent.LIST_ERROR, new Error(`list failed: ${response.status} ${response.statusText} ${JSON.stringify([...response.headers])}`));
+                // Retry with exponential backoff if under retry limit to prevent infinite recursion if the server is returning errors
+                if (retryCount < maxRetries) {
+                    const retryAfterHeader = response.headers.get("retry-after");
+                    const backoffTime = retryAfterHeader
+                        ? parseInt(retryAfterHeader) * 1000
+                        : Math.min(startSleep * Math.pow(2, retryCount), 30000);
+                    await sleep(backoffTime);
+                    return this.#list(continueToken, removedItems, retryCount + 1);
+                }
                 return;
             }
             // Gross hack, thanks upstream library :<
@@ -220,8 +233,13 @@ export class Watcher {
             }
             // If there is a continue token, call the list function again with the same removed items
             if (continueToken) {
-                // If there is a continue token, call the list function again with the same removed items
-                await this.#list(continueToken, removedItems);
+                // Safeguard against infinite pagination
+                if (retryCount >= maxPages) {
+                    this.#events.emit(WatchEvent.LIST_ERROR, new Error(`Maximum pagination limit (${maxPages}) reached, stopping list operation`));
+                    return;
+                }
+                // Continue pagination (not a retry, so reset retryCount to 0)
+                await this.#list(continueToken, removedItems, 0);
             }
             else {
                 // Otherwise, process the removed items

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.10.12",
+  "version": "3.10.13",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -61,8 +61,8 @@
     "yargs": "18.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.3.0",
-    "@commitlint/config-conventional": "20.3.0",
+    "@commitlint/cli": "20.3.1",
+    "@commitlint/config-conventional": "20.3.1",
     "@defenseunicorns/eslint-config": "^1.1.2",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
@@ -72,15 +72,15 @@
     "@types/urijs": "^1.19.25",
     "@types/ws": "^8.18.1",
     "@types/yargs": "17.0.35",
-    "@typescript-eslint/eslint-plugin": "8.52.0",
-    "@typescript-eslint/parser": "8.52.0",
+    "@typescript-eslint/eslint-plugin": "8.53.1",
+    "@typescript-eslint/parser": "8.53.1",
     "@vitest/coverage-v8": "^4.0.1",
     "command-line-args": "^6.0.1",
-    "eslint-plugin-jsdoc": "61.5.0",
+    "eslint-plugin-jsdoc": "62.2.0",
     "globals": "^17.0.0",
     "husky": "^9.1.6",
     "lint-staged": "^16.0.0",
-    "prettier": "3.7.4",
+    "prettier": "3.8.0",
     "semantic-release": "25.0.2",
     "typescript": "5.9.3",
     "vitest": "^4.0.1"

package/src/fluent/watch.ts

@@ -3,7 +3,6 @@
 
 import { EventEmitter } from "events";
 import { fetch } from "undici";
-import { fetch as wrappedFetch } from "../fetch.js";
 import { GenericClass, KubernetesListObject } from "../types.js";
 import { k8sCfg, pathBuilder, getHeaders } from "./utils.js";
 import { Readable } from "stream";
@@ -14,6 +13,10 @@ import {
   Filters,
   FetchMethods,
 } from "./shared-types.js";
+
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+const startSleep = 5000;
+
 export enum WatchEvent {
   /** Watch is connected successfully */
   CONNECT = "connect",
@@ -235,22 +238,43 @@ export class Watcher<T extends GenericClass> {
    *
    * @param continueToken - the continue token for the list
    * @param removedItems - the list of items that have been removed
+   * @param retryCount - current retry attempt count
    */
-  #list = async (continueToken?: string, removedItems?: Map<string, InstanceType<T>>) => {
+  #list = async (
+    continueToken?: string,
+    removedItems?: Map<string, InstanceType<T>>,
+    retryCount = 0,
+  ): Promise<void> => {
+    const maxRetries = 5;
+    const maxPages = 10;
+
     try {
       const { opts, serverUrl } = await this.#buildURL(false, undefined, continueToken);
 
       // Make the request to list the resources
-      const response = await wrappedFetch<KubernetesListObject<InstanceType<T>>>(serverUrl, opts);
-      const list = response.data;
+      const response = await fetch(serverUrl, opts);
+      const list = (await response.json()) as KubernetesListObject<InstanceType<T>>;
 
       // If the request fails, emit an error event and return
       if (!response.ok) {
         this.#events.emit(
           WatchEvent.LIST_ERROR,
-          new Error(`list failed: ${response.status} ${response.statusText}`),
+          new Error(
+            `list failed: ${response.status} ${response.statusText} ${JSON.stringify([...response.headers])}`,
+          ),
         );
 
+        // Retry with exponential backoff if under retry limit to prevent infinite recursion if the server is returning errors
+        if (retryCount < maxRetries) {
+          const retryAfterHeader = response.headers.get("retry-after");
+          const backoffTime = retryAfterHeader
+            ? parseInt(retryAfterHeader) * 1000
+            : Math.min(startSleep * Math.pow(2, retryCount), 30000);
+
+          await sleep(backoffTime);
+          return this.#list(continueToken, removedItems, retryCount + 1);
+        }
+
         return;
       }
 
@@ -297,8 +321,17 @@ export class Watcher<T extends GenericClass> {
 
       // If there is a continue token, call the list function again with the same removed items
       if (continueToken) {
-        // If there is a continue token, call the list function again with the same removed items
-        await this.#list(continueToken, removedItems);
+        // Safeguard against infinite pagination
+        if (retryCount >= maxPages) {
+          this.#events.emit(
+            WatchEvent.LIST_ERROR,
+            new Error(`Maximum pagination limit (${maxPages}) reached, stopping list operation`),
+          );
+          return;
+        }
+
+        // Continue pagination (not a retry, so reset retryCount to 0)
+        await this.#list(continueToken, removedItems, 0);
       } else {
         // Otherwise, process the removed items
         for (const item of removedItems.values()) {