kubernetes-fluent-client 3.10.12-nightly.5 → 3.10.12-nightly.7

package/dist/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,WAAW,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAExE,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,CAAC,EAC3B,GAAG,EAAE,GAAG,GAAG,WAAW,EACtB,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CA+B3B"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,WAAW,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAExE,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,CAAC,EAC3B,GAAG,EAAE,GAAG,GAAG,WAAW,EACtB,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAuC3B"}

package/dist/fetch.js

@@ -20,6 +20,11 @@ export async function fetch(url, init) {
     try {
         const resp = await undiciFetch(url, init);
         const contentType = resp.headers.get("content-type") || "";
+        console.log(`FETCH_HEADERS: `, JSON.stringify([...resp.headers]) +
+            "\nFETCH_URL: " +
+            url.toString() +
+            "\nFETCH_STATUS: " +
+            resp.status);
         // Parse the response as JSON if the content type is JSON
         if (contentType.includes("application/json")) {
             data = (await resp.json());

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;AAGtC,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;IA6CzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CA6WF"}

package/dist/fluent/watch.js

@@ -6,6 +6,9 @@ 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));
+let startSleep = 5000;
+const maxSleep = 120000;
 export var WatchEvent;
 (function (WatchEvent) {
     /** Watch is connected successfully */
@@ -100,7 +103,7 @@ export class Watcher {
             void this.#list();
         }, watchCfg.relistIntervalSec * 1000 + jitter);
         // Rebuild the watch every resync delay interval
-        this.#resyncTimer = setInterval(this.#checkResync, watchCfg.resyncDelaySec * 1000 + jitter);
+        this.#resyncTimer = setInterval(async () => await this.#checkResync(), watchCfg.resyncDelaySec * 1000 + jitter);
         // Bind class properties
         this.#model = model;
         this.#filters = filters;
@@ -183,6 +186,10 @@ export class Watcher {
             const list = response.data;
             // If the request fails, emit an error event and return
             if (!response.ok) {
+                // Backoff here
+                await sleep(startSleep);
+                startSleep = Math.min(startSleep * 2, maxSleep);
+                await this.#list(continueToken, removedItems);
                 this.#events.emit(WatchEvent.LIST_ERROR, new Error(`list failed: ${response.status} ${response.statusText}`));
                 return;
             }
@@ -302,6 +309,11 @@ export class Watcher {
                 headers: await getHeaders(),
                 ...opts,
             });
+            console.log(`WATCH_FETCH: `, JSON.stringify([...response.headers]) +
+                "\nWATCH_URL: " +
+                serverUrl.toString() +
+                "\nWATCH_STATUS: " +
+                response.status);
             const url = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
             // If the request is successful, start listening for events
             if (response.ok) {
@@ -313,6 +325,7 @@ export class Watcher {
                     throw new Error("No response body found");
                 }
                 // Reset the retry count
+                startSleep = 5000;
                 this.#resyncFailureCount = 0;
                 this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
                 this.#stream = Readable.from(body);
@@ -332,21 +345,24 @@ export class Watcher {
                         void this.#errHandler(err);
                     }
                 });
-                this.#stream.on("close", this.#cleanupAndReconnect);
-                this.#stream.on("end", this.#cleanupAndReconnect);
+                this.#stream.on("close", async () => await this.#cleanupAndReconnect());
+                this.#stream.on("end", async () => await this.#cleanupAndReconnect());
                 this.#stream.on("error", this.#errHandler);
-                this.#stream.on("finish", this.#cleanupAndReconnect);
+                this.#stream.on("finish", async () => await this.#cleanupAndReconnect());
             }
             else {
                 throw new Error(`watch connect failed: ${response.status} ${response.statusText}`);
             }
         }
         catch (e) {
+            // await sleep(startSleep);
+            // startSleep = Math.min(startSleep * 2, maxSleep);
+            console.log(`WATCH_ERROR: `, e);
             void this.#errHandler(e);
         }
     };
     /** Clear the resync timer and schedule a new one. */
-    #checkResync = () => {
+    #checkResync = async () => {
         // Ignore if the last seen time is not set
         if (this.#lastSeenTime === NONE) {
             return;
@@ -369,7 +385,7 @@ export class Watcher {
                 else {
                     this.#pendingReconnect = true;
                     this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
-                    this.#cleanupAndReconnect();
+                    await this.#cleanupAndReconnect();
                 }
             }
             else {
@@ -405,8 +421,10 @@ export class Watcher {
         this.#lastSeenTime = OVERRIDE;
     };
     /** Cleanup the stream and connect */
-    #cleanupAndReconnect = () => {
+    #cleanupAndReconnect = async () => {
         this.#streamCleanup();
+        await sleep(startSleep);
+        startSleep = Math.min(startSleep * 2, maxSleep);
         void this.#watch();
     };
     /** Cleanup the stream and listeners. */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,CAAC;AAGpB,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAEtC,oGAAoG;AACpG,OAAO,EAAE,IAAI,EAAE,CAAC;AAGhB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGnC,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG/D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,cAAc,YAAY,CAAC;AAG3B,OAAO,KAAK,MAAM,MAAM,gDAAgD,CAAC;AAEzE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,CAAC;AAGpB,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAEtC,oGAAoG;AACpG,OAAO,EAAE,IAAI,EAAE,CAAC;AAGhB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGnC,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAI/D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,cAAc,YAAY,CAAC;AAG3B,OAAO,KAAK,MAAM,MAAM,gDAAgD,CAAC;AAEzE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -10,6 +10,7 @@ export { fetch } from "./fetch.js";
 // Export the HTTP status codes
 export { StatusCodes as fetchStatus } from "http-status-codes";
 // Export the Watch Config and Event types
+// export { WatchCfg, WatchEvent, type DisposableWatcher } from "./fluent/watch.js";
 export { WatchEvent } from "./fluent/watch.js";
 // Export the fluent API entrypoint
 export { K8s } from "./fluent/index.js";

package/package.json

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

package/src/fetch.ts

@@ -32,6 +32,14 @@ export async function fetch<T>(
   try {
     const resp = await undiciFetch(url, init);
     const contentType = resp.headers.get("content-type") || "";
+    console.log(
+      `FETCH_HEADERS: `,
+      JSON.stringify([...resp.headers]) +
+        "\nFETCH_URL: " +
+        url.toString() +
+        "\nFETCH_STATUS: " +
+        resp.status,
+    );
 
     // Parse the response as JSON if the content type is JSON
     if (contentType.includes("application/json")) {

package/src/fluent/watch.ts

@@ -14,6 +14,10 @@ import {
   Filters,
   FetchMethods,
 } from "./shared-types.js";
+
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+let startSleep = 5000;
+const maxSleep = 120000;
 export enum WatchEvent {
   /** Watch is connected successfully */
   CONNECT = "connect",
@@ -142,7 +146,10 @@ export class Watcher<T extends GenericClass> {
     );
 
     // Rebuild the watch every resync delay interval
-    this.#resyncTimer = setInterval(this.#checkResync, watchCfg.resyncDelaySec * 1000 + jitter);
+    this.#resyncTimer = setInterval(
+      async () => await this.#checkResync(),
+      watchCfg.resyncDelaySec * 1000 + jitter,
+    );
 
     // Bind class properties
     this.#model = model;
@@ -246,6 +253,10 @@ export class Watcher<T extends GenericClass> {
 
       // If the request fails, emit an error event and return
       if (!response.ok) {
+        // Backoff here
+        await sleep(startSleep);
+        startSleep = Math.min(startSleep * 2, maxSleep);
+        await this.#list(continueToken, removedItems);
         this.#events.emit(
           WatchEvent.LIST_ERROR,
           new Error(`list failed: ${response.status} ${response.statusText}`),
@@ -394,6 +405,15 @@ export class Watcher<T extends GenericClass> {
         ...opts,
       });
 
+      console.log(
+        `WATCH_FETCH: `,
+        JSON.stringify([...response.headers]) +
+          "\nWATCH_URL: " +
+          serverUrl.toString() +
+          "\nWATCH_STATUS: " +
+          response.status,
+      );
+
       const url = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
 
       // If the request is successful, start listening for events
@@ -410,6 +430,7 @@ export class Watcher<T extends GenericClass> {
         }
 
         // Reset the retry count
+        startSleep = 5000;
         this.#resyncFailureCount = 0;
         this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
 
@@ -432,20 +453,23 @@ export class Watcher<T extends GenericClass> {
           }
         });
 
-        this.#stream.on("close", this.#cleanupAndReconnect);
-        this.#stream.on("end", this.#cleanupAndReconnect);
+        this.#stream.on("close", async () => await this.#cleanupAndReconnect());
+        this.#stream.on("end", async () => await this.#cleanupAndReconnect());
         this.#stream.on("error", this.#errHandler);
-        this.#stream.on("finish", this.#cleanupAndReconnect);
+        this.#stream.on("finish", async () => await this.#cleanupAndReconnect());
       } else {
         throw new Error(`watch connect failed: ${response.status} ${response.statusText}`);
       }
     } catch (e) {
+      // await sleep(startSleep);
+      // startSleep = Math.min(startSleep * 2, maxSleep);
+      console.log(`WATCH_ERROR: `, e);
       void this.#errHandler(e);
     }
   };
 
   /** Clear the resync timer and schedule a new one. */
-  #checkResync = () => {
+  #checkResync = async () => {
     // Ignore if the last seen time is not set
     if (this.#lastSeenTime === NONE) {
       return;
@@ -473,7 +497,7 @@ export class Watcher<T extends GenericClass> {
         } else {
           this.#pendingReconnect = true;
           this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
-          this.#cleanupAndReconnect();
+          await this.#cleanupAndReconnect();
         }
       } else {
         // Otherwise, call the finally function if it exists
@@ -518,8 +542,10 @@ export class Watcher<T extends GenericClass> {
   };
 
   /** Cleanup the stream and connect */
-  #cleanupAndReconnect = () => {
+  #cleanupAndReconnect = async () => {
     this.#streamCleanup();
+    await sleep(startSleep);
+    startSleep = Math.min(startSleep * 2, maxSleep);
     void this.#watch();
   };
 

package/src/index.ts

@@ -16,6 +16,7 @@ export { fetch } from "./fetch.js";
 export { StatusCodes as fetchStatus } from "http-status-codes";
 
 // Export the Watch Config and Event types
+// export { WatchCfg, WatchEvent, type DisposableWatcher } from "./fluent/watch.js";
 export { WatchCfg, WatchEvent } from "./fluent/watch.js";
 
 // Export the fluent API entrypoint