kubernetes-fluent-client 3.3.0 → 3.3.2

package/dist/fluent/watch.d.ts

@@ -43,8 +43,6 @@ export type WatchCfg = {
     relistIntervalSec?: number;
     /** Max amount of seconds to go without receiving an event before reconciliation starts. Defaults to 300 (5 minutes). */
     lastSeenLimitSeconds?: number;
-    /** Watch Mechansism */
-    useLegacyWatch?: boolean;
 };
 /** 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":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAoB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,KAAK,EAAS,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAK3D,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;IAC9B,uBAAuB;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IA0BzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAgB9B;;;;;;;;;;;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;IAU9C,gGAAgG;IACzF,KAAK;IAWZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;IA+PD,MAAM,CAAC,aAAa,SAAU,WAAW,WAqBvC;CA+KH"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,KAAK,EAAS,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAK3D,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;IAgB9B;;;;;;;;;;;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;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;IA2MD,MAAM,CAAC,aAAa,SAAU,WAAW,WAqBvC;CAiKH"}

package/dist/fluent/watch.js

@@ -9,9 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Watcher = exports.WatchEvent = void 0;
 const crypto_1 = require("crypto");
 const events_1 = require("events");
-const byline_1 = __importDefault(require("byline"));
 const https_1 = __importDefault(require("https"));
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const undici_1 = require("undici");
 const fetch_1 = require("../fetch");
 const types_1 = require("./types");
@@ -59,7 +57,6 @@ class Watcher {
     #callback;
     #watchCfg;
     #latestRelistWindow = "";
-    #useLegacyWatch = false;
     // Track the last time data was received
     #lastSeenTime = NONE;
     #lastSeenLimit;
@@ -69,7 +66,6 @@ class Watcher {
     #resyncFailureCount = 0;
     // Create a stream to read the response body
     #stream;
-    #legacyStream;
     // Create an EventEmitter to emit events
     #events = new events_1.EventEmitter();
     // Create a timer to relist the watch
@@ -103,8 +99,6 @@ class Watcher {
         watchCfg.relistIntervalSec ??= 600;
         // Set the resync interval to 10 minutes if not specified
         watchCfg.lastSeenLimitSeconds ??= 600;
-        // Set the watch mechanism
-        this.#useLegacyWatch = watchCfg.useLegacyWatch || false;
         // Set the last seen limit to the resync interval
         this.#lastSeenLimit = watchCfg.lastSeenLimitSeconds * 1000;
         // Set the latest relist interval to now
@@ -134,24 +128,14 @@ class Watcher {
      */
     async start() {
         this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
-        if (this.#useLegacyWatch) {
-            await this.#legacyWatch();
-        }
-        else {
-            await this.#watch();
-        }
+        await this.#watch();
         return this.#abortController;
     }
     /** Close the watch. Also available on the AbortController returned by {@link Watcher.start}. */
     close() {
         clearInterval(this.$relistTimer);
         clearInterval(this.#resyncTimer);
-        if (this.#useLegacyWatch) {
-            this.#legacyStreamCleanup();
-        }
-        else {
-            this.#streamCleanup();
-        }
+        this.#streamCleanup();
         this.#abortController.abort();
     }
     /**
@@ -344,49 +328,6 @@ class Watcher {
             this.#events.emit(WatchEvent.DATA_ERROR, err);
         }
     };
-    /** node-fetch watch */
-    #legacyWatch = async () => {
-        try {
-            // Start with a list operation
-            await this.#list();
-            // Build the URL and request options
-            const { opts, url } = await this.#buildURL(true, this.#resourceVersion);
-            // Create a stream to read the response body
-            this.#legacyStream = byline_1.default.createStream();
-            // Bind the stream events
-            this.#legacyStream.on("error", this.#errHandler);
-            this.#legacyStream.on("close", this.#legacyStreamCleanup);
-            this.#legacyStream.on("finish", this.#legacyStreamCleanup);
-            // Make the actual request
-            const response = await (0, node_fetch_1.default)(url, { ...opts });
-            // If the request is successful, start listening for events
-            if (response.ok) {
-                // Reset the pending reconnect flag
-                this.#pendingReconnect = false;
-                this.#events.emit(WatchEvent.CONNECT, url.pathname);
-                const { body } = response;
-                // Reset the retry count
-                this.#resyncFailureCount = 0;
-                this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
-                // Listen for events and call the callback function
-                this.#legacyStream.on("data", async (line) => {
-                    await this.#processLine(line, this.#process);
-                });
-                // Bind the body events
-                body.on("error", this.#errHandler);
-                body.on("close", this.#legacyStreamCleanup);
-                body.on("finish", this.#legacyStreamCleanup);
-                // Pipe the response body to the stream
-                body.pipe(this.#legacyStream);
-            }
-            else {
-                throw new Error(`watch connect failed: ${response.status} ${response.statusText}`);
-            }
-        }
-        catch (e) {
-            void this.#errHandler(e);
-        }
-    };
     static getHTTPSAgent = (opts) => {
         // In cluster there will be agent - testing or dev no
         const agentOptions = opts.agent instanceof https_1.default.Agent
@@ -494,13 +435,7 @@ class Watcher {
                 else {
                     this.#pendingReconnect = true;
                     this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
-                    if (this.#useLegacyWatch) {
-                        this.#legacyStreamCleanup();
-                        void this.#legacyWatch();
-                    }
-                    else {
-                        this.#cleanupAndReconnect();
-                    }
+                    this.#cleanupAndReconnect();
                 }
             }
             else {
@@ -520,12 +455,7 @@ class Watcher {
             case "AbortError":
                 clearInterval(this.$relistTimer);
                 clearInterval(this.#resyncTimer);
-                if (this.#useLegacyWatch) {
-                    this.#legacyStreamCleanup();
-                }
-                else {
-                    this.#streamCleanup();
-                }
+                this.#streamCleanup();
                 this.#events.emit(WatchEvent.ABORT, err);
                 return;
             case "TooOld":
@@ -552,12 +482,6 @@ class Watcher {
             this.#stream.destroy();
         }
     };
-    #legacyStreamCleanup = () => {
-        if (this.#legacyStream) {
-            this.#legacyStream.removeAllListeners();
-            this.#legacyStream.destroy();
-        }
-    };
 }
 exports.Watcher = Watcher;
 _a = Watcher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -38,13 +38,12 @@
   "homepage": "https://github.com/defenseunicorns/kubernetes-fluent-client#readme",
   "dependencies": {
     "@kubernetes/client-node": "1.0.0-rc7",
-    "byline": "5.0.0",
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
     "quicktype-core": "23.0.170",
     "type-fest": "4.26.1",
-    "undici": "6.20.1",
+    "undici": "6.21.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -57,14 +56,14 @@
     "@types/readable-stream": "4.0.18",
     "@types/urijs": "^1.19.25",
     "@types/yargs": "17.0.33",
-    "@typescript-eslint/eslint-plugin": "8.13.0",
-    "@typescript-eslint/parser": "8.13.0",
-    "eslint-plugin-jsdoc": "50.4.3",
+    "@typescript-eslint/eslint-plugin": "8.14.0",
+    "@typescript-eslint/parser": "8.14.0",
+    "eslint-plugin-jsdoc": "50.5.0",
     "globals": "^15.12.0",
     "husky": "^9.1.6",
     "jest": "29.7.0",
     "lint-staged": "^15.2.10",
-    "nock": "13.5.5",
+    "nock": "13.5.6",
     "prettier": "3.3.3",
     "semantic-release": "24.2.0",
     "ts-jest": "29.2.5",

package/src/fluent/watch.ts

@@ -3,9 +3,8 @@
 
 import { createHash } from "crypto";
 import { EventEmitter } from "events";
-import byline from "byline";
 import https from "https";
-import legacyFetch, { RequestInit } from "node-fetch";
+import { RequestInit } from "node-fetch";
 import { Agent, fetch } from "undici";
 import { fetch as wrappedFetch } from "../fetch";
 import { GenericClass, KubernetesListObject } from "../types";
@@ -55,8 +54,6 @@ export type WatchCfg = {
   relistIntervalSec?: number;
   /** Max amount of seconds to go without receiving an event before reconciliation starts. Defaults to 300 (5 minutes). */
   lastSeenLimitSeconds?: number;
-  /** Watch Mechansism */
-  useLegacyWatch?: boolean;
 };
 
 const NONE = 50;
@@ -70,7 +67,7 @@ export class Watcher<T extends GenericClass> {
   #callback: WatchAction<T>;
   #watchCfg: WatchCfg;
   #latestRelistWindow: string = "";
-  #useLegacyWatch = false;
+
   // Track the last time data was received
   #lastSeenTime = NONE;
   #lastSeenLimit: number;
@@ -83,7 +80,6 @@ export class Watcher<T extends GenericClass> {
 
   // Create a stream to read the response body
   #stream?: Readable;
-  #legacyStream?: byline.LineStream;
 
   // Create an EventEmitter to emit events
   #events = new EventEmitter();
@@ -127,9 +123,6 @@ export class Watcher<T extends GenericClass> {
     // Set the resync interval to 10 minutes if not specified
     watchCfg.lastSeenLimitSeconds ??= 600;
 
-    // Set the watch mechanism
-    this.#useLegacyWatch = watchCfg.useLegacyWatch || false;
-
     // Set the last seen limit to the resync interval
     this.#lastSeenLimit = watchCfg.lastSeenLimitSeconds * 1000;
 
@@ -169,11 +162,8 @@ export class Watcher<T extends GenericClass> {
    */
   public async start(): Promise<AbortController> {
     this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
-    if (this.#useLegacyWatch) {
-      await this.#legacyWatch();
-    } else {
-      await this.#watch();
-    }
+    await this.#watch();
+
     return this.#abortController;
   }
 
@@ -181,11 +171,8 @@ export class Watcher<T extends GenericClass> {
   public close() {
     clearInterval(this.$relistTimer);
     clearInterval(this.#resyncTimer);
-    if (this.#useLegacyWatch) {
-      this.#legacyStreamCleanup();
-    } else {
-      this.#streamCleanup();
-    }
+
+    this.#streamCleanup();
     this.#abortController.abort();
   }
 
@@ -417,58 +404,6 @@ export class Watcher<T extends GenericClass> {
       this.#events.emit(WatchEvent.DATA_ERROR, err);
     }
   };
-  /** node-fetch watch */
-  #legacyWatch = async () => {
-    try {
-      // Start with a list operation
-      await this.#list();
-
-      // Build the URL and request options
-      const { opts, url } = await this.#buildURL(true, this.#resourceVersion);
-
-      // Create a stream to read the response body
-      this.#legacyStream = byline.createStream();
-
-      // Bind the stream events
-      this.#legacyStream.on("error", this.#errHandler);
-      this.#legacyStream.on("close", this.#legacyStreamCleanup);
-      this.#legacyStream.on("finish", this.#legacyStreamCleanup);
-
-      // Make the actual request
-      const response = await legacyFetch(url, { ...opts });
-
-      // If the request is successful, start listening for events
-      if (response.ok) {
-        // Reset the pending reconnect flag
-        this.#pendingReconnect = false;
-
-        this.#events.emit(WatchEvent.CONNECT, url.pathname);
-
-        const { body } = response;
-
-        // Reset the retry count
-        this.#resyncFailureCount = 0;
-        this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
-
-        // Listen for events and call the callback function
-        this.#legacyStream.on("data", async line => {
-          await this.#processLine(line, this.#process);
-        });
-
-        // Bind the body events
-        body.on("error", this.#errHandler);
-        body.on("close", this.#legacyStreamCleanup);
-        body.on("finish", this.#legacyStreamCleanup);
-
-        // Pipe the response body to the stream
-        body.pipe(this.#legacyStream);
-      } else {
-        throw new Error(`watch connect failed: ${response.status} ${response.statusText}`);
-      }
-    } catch (e) {
-      void this.#errHandler(e);
-    }
-  };
 
   static getHTTPSAgent = (opts: RequestInit) => {
     // In cluster there will be agent - testing or dev no
@@ -595,12 +530,7 @@ export class Watcher<T extends GenericClass> {
         } else {
           this.#pendingReconnect = true;
           this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
-          if (this.#useLegacyWatch) {
-            this.#legacyStreamCleanup();
-            void this.#legacyWatch();
-          } else {
-            this.#cleanupAndReconnect();
-          }
+          this.#cleanupAndReconnect();
         }
       } else {
         // Otherwise, call the finally function if it exists
@@ -623,11 +553,9 @@ export class Watcher<T extends GenericClass> {
       case "AbortError":
         clearInterval(this.$relistTimer);
         clearInterval(this.#resyncTimer);
-        if (this.#useLegacyWatch) {
-          this.#legacyStreamCleanup();
-        } else {
-          this.#streamCleanup();
-        }
+
+        this.#streamCleanup();
+
         this.#events.emit(WatchEvent.ABORT, err);
         return;
 
@@ -659,11 +587,4 @@ export class Watcher<T extends GenericClass> {
       this.#stream.destroy();
     }
   };
-
-  #legacyStreamCleanup = () => {
-    if (this.#legacyStream) {
-      this.#legacyStream.removeAllListeners();
-      this.#legacyStream.destroy();
-    }
-  };
 }