kubernetes-fluent-client 1.3.2 → 1.4.0

package/dist/fluent/index.js

@@ -92,8 +92,8 @@ function K8s(model, filters = {}) {
         }
         return (0, utils_1.k8sExec)(model, filters, "PATCH", payload);
     }
-    async function Watch(callback) {
-        return (0, watch_1.ExecWatch)(model, filters, callback);
+    async function Watch(callback, watchCfg) {
+        return (0, watch_1.ExecWatch)(model, filters, callback, watchCfg);
     }
     return { InNamespace, Apply, Create, Patch, ...withFilters };
 }

package/dist/fluent/types.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="node" />
 import { KubernetesListObject, KubernetesObject } from "@kubernetes/client-node";
 import { Operation } from "fast-json-patch";
 import type { PartialDeep } from "type-fest";
 import { GenericClass, GroupVersionKind } from "../types";
+import { WatchCfg, WatchController } from "./watch";
 /**
  * The Phase matched when using the K8s Watch API.
  */
@@ -41,7 +41,7 @@ export type K8sFilteredActions<K extends KubernetesObject> = {
      * @param callback
      * @returns
      */
-    Watch: (callback: (payload: K, phase: WatchPhase) => void) => Promise<AbortController>;
+    Watch: (callback: (payload: K, phase: WatchPhase) => void, watchCfg?: WatchCfg) => Promise<WatchController>;
 };
 export type K8sUnfilteredActions<K extends KubernetesObject> = {
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fluent/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fluent/types.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fluent/utils.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAIhD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,UAAQ,OAsDpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY;;;GAqBhD;AAED,wBAAsB,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,EACrD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,cA8BtB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fluent/utils.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAIhD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,UAAQ,OAsDpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY;;;GAwBhD;AAED,wBAAsB,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,EACrD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,cA8BtB"}

package/dist/fluent/utils.js

@@ -86,6 +86,8 @@ async function k8sCfg(method) {
             "User-Agent": `kubernetes-fluent-client`,
         },
     });
+    // Enable compression
+    opts.compress = true;
     return { opts, serverUrl: cluster.server };
 }
 exports.k8sCfg = k8sCfg;

package/dist/fluent/watch.d.ts

@@ -1,8 +1,45 @@
 /// <reference types="node" />
-import { GenericClass } from "../types";
+import { GenericClass, LogFn } from "../types";
 import { Filters, WatchAction } from "./types";
+/**
+ * Wrapper for the AbortController to allow the watch to be aborted externally.
+ */
+export type WatchController = {
+    /**
+     * Abort the watch.
+     * @param reason optional reason for aborting the watch
+     * @returns
+     */
+    abort: (reason?: string) => void;
+    /**
+     * Get the AbortSignal for the watch.
+     * @returns
+     */
+    signal: () => AbortSignal;
+};
+/**
+ * Configuration for the watch function.
+ */
+export type WatchCfg = {
+    /**
+     * The maximum number of times to retry the watch, the retry count is reset on success.
+     */
+    retryMax?: number;
+    /**
+     * The delay between retries in seconds.
+     */
+    retryDelaySec?: number;
+    /**
+     * A function to log errors.
+     */
+    logFn?: LogFn;
+    /**
+     * A function to call when the watch fails after the maximum number of retries.
+     */
+    retryFail?: (e: Error) => void;
+};
 /**
  * Execute a watch on the specified resource.
  */
-export declare function ExecWatch<T extends GenericClass>(model: T, filters: Filters, callback: WatchAction<T>): Promise<AbortController>;
+export declare function ExecWatch<T extends GenericClass>(model: T, filters: Filters, callback: WatchAction<T>, watchCfg?: WatchCfg): Promise<WatchController>;
 //# sourceMappingURL=watch.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAG3D;;GAEG;AACH,wBAAsB,SAAS,CAAC,CAAC,SAAS,YAAY,EACpD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,4BA6EzB"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAG3D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;OAIG;IACH,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC;;;OAGG;IACH,MAAM,EAAE,MAAM,WAAW,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,wBAAsB,SAAS,CAAC,CAAC,SAAS,YAAY,EACpD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EACxB,QAAQ,GAAE,QAAa,4BAwJxB"}

package/dist/fluent/watch.js

@@ -6,13 +6,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecWatch = void 0;
-const readline_1 = __importDefault(require("readline"));
+const byline_1 = __importDefault(require("byline"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const utils_1 = require("./utils");
 /**
  * Execute a watch on the specified resource.
  */
-async function ExecWatch(model, filters, callback) {
+async function ExecWatch(model, filters, callback, watchCfg = {}) {
+    watchCfg.logFn?.({ model, filters, watchCfg }, "ExecWatch");
     // Build the path and query params for the resource, excluding the name
     const { opts, serverUrl } = await (0, utils_1.k8sCfg)("GET");
     const url = (0, utils_1.pathBuilder)(serverUrl, model, filters, true);
@@ -24,55 +25,110 @@ async function ExecWatch(model, filters, callback) {
     if (filters.name) {
         url.searchParams.set("fieldSelector", `metadata.name=${filters.name}`);
     }
-    // Add abort controller to the long-running request
-    const controller = new AbortController();
-    opts.signal = controller.signal;
-    // Close the connection and make the callback function no-op
-    let close = (err) => {
-        controller.abort();
-        close = () => { };
-        if (err) {
-            throw err;
-        }
-    };
-    try {
-        // 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) {
-            const { body } = response;
-            // Bind connection events to the close function
-            body.on("error", close);
-            body.on("close", close);
-            body.on("finish", close);
-            // Create a readline interface to parse the stream
-            const rl = readline_1.default.createInterface({
-                input: response.body,
-                terminal: false,
-            });
-            // Listen for events and call the callback function
-            rl.on("line", line => {
-                try {
-                    // Parse the event payload
-                    const { object: payload, type: phase } = JSON.parse(line);
-                    // Call the callback function with the parsed payload
-                    void callback(payload, phase);
+    // Set the initial timeout to 15 seconds
+    opts.timeout = 15 * 1000;
+    // Enable keep alive
+    opts.agent.keepAlive = true;
+    // Track the number of retries
+    let retryCount = 0;
+    // Set the maximum number of retries to 5 if not specified
+    watchCfg.retryMax ??= 5;
+    // Set the retry delay to 5 seconds if not specified
+    watchCfg.retryDelaySec ??= 5;
+    // Create a throwaway AbortController to setup the wrapped AbortController
+    let abortController;
+    // Create a wrapped AbortController to allow the watch to be aborted externally
+    const abortWrapper = {};
+    function bindAbortController() {
+        // Create a new AbortController
+        abortController = new AbortController();
+        // Update the abort wrapper
+        abortWrapper.abort = reason => abortController.abort(reason);
+        abortWrapper.signal = () => abortController.signal;
+        // Add the abort signal to the request options
+        opts.signal = abortController.signal;
+    }
+    async function runner() {
+        let doneCalled = false;
+        bindAbortController();
+        // Create a stream to read the response body
+        const stream = byline_1.default.createStream();
+        const onError = (err) => {
+            stream.removeAllListeners();
+            if (!doneCalled) {
+                doneCalled = true;
+                // If the error is not an AbortError, reload the watch
+                if (err.name !== "AbortError") {
+                    watchCfg.logFn?.(err, "stream error");
+                    void reload(err);
                 }
-                catch (ignore) {
-                    // ignore parse errors
+                else {
+                    watchCfg.logFn?.("watch aborted via WatchController.abort()");
                 }
-            });
+            }
+        };
+        const cleanup = () => {
+            if (!doneCalled) {
+                doneCalled = true;
+                stream.removeAllListeners();
+            }
+        };
+        try {
+            // 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) {
+                const { body } = response;
+                // Reset the retry count
+                retryCount = 0;
+                stream.on("error", onError);
+                stream.on("close", cleanup);
+                stream.on("finish", cleanup);
+                // Listen for events and call the callback function
+                stream.on("data", line => {
+                    try {
+                        // Parse the event payload
+                        const { object: payload, type: phase } = JSON.parse(line);
+                        // Call the callback function with the parsed payload
+                        void callback(payload, phase);
+                    }
+                    catch (err) {
+                        watchCfg.logFn?.(err, "watch callback error");
+                    }
+                });
+                body.on("error", onError);
+                body.on("close", cleanup);
+                body.on("finish", cleanup);
+                // Pipe the response body to the stream
+                body.pipe(stream);
+            }
+            else {
+                throw new Error(`watch failed: ${response.status} ${response.statusText}`);
+            }
         }
-        else {
-            // If the request fails, throw an error
-            const error = new Error(response.statusText);
-            error.statusCode = response.status;
-            throw error;
+        catch (e) {
+            onError(e);
+        }
+        // On unhandled errors, retry the watch
+        async function reload(e) {
+            // If there are more attempts, retry the watch
+            if (watchCfg.retryMax > retryCount) {
+                retryCount++;
+                watchCfg.logFn?.(`retrying watch ${retryCount}/${watchCfg.retryMax}`);
+                // Sleep for the specified delay or 5 seconds
+                await new Promise(r => setTimeout(r, watchCfg.retryDelaySec * 1000));
+                // Retry the watch after the delay
+                await runner();
+            }
+            else {
+                // Otherwise, call the finally function if it exists
+                if (watchCfg.retryFail) {
+                    watchCfg.retryFail(e);
+                }
+            }
         }
     }
-    catch (e) {
-        close(e);
-    }
-    return controller;
+    await runner();
+    return abortWrapper;
 }
 exports.ExecWatch = ExecWatch;

package/dist/kinds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kinds.d.ts","sourceRoot":"","sources":["../src/kinds.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA0fzD,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAErE;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,UAAW,YAAY,oBAAoB,gBAAgB,SAUnF,CAAC"}
+{"version":3,"file":"kinds.d.ts","sourceRoot":"","sources":["../src/kinds.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAwgBzD,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAErE;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,UAAW,YAAY,oBAAoB,gBAAgB,SAUnF,CAAC"}

package/dist/kinds.js

@@ -4,6 +4,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RegisterKind = exports.modelToGroupVersionKind = void 0;
 const gvkMap = {
+    /**
+     * Represents a K8s Event resource.
+     * Event is a report of an event somewhere in the cluster. It generally denotes some state change in the system.
+     * Events have a limited retention time and triggers and messages may evolve with time. Event consumers should not
+     * rely on the timing of an event with a given Reason reflecting a consistent underlying trigger, or the continued
+     * existence of events with that Reason. Events should be treated as informative, best-effort, supplemental data.
+     * @see {@link https://kubernetes.io/docs/reference/kubernetes-api/cluster-resources/event-v1/}
+     */
+    CoreV1Event: {
+        kind: "Event",
+        version: "v1",
+        group: "events.k8s.io",
+    },
     /**
      * Represents a K8s ClusterRole resource.
      * ClusterRole is a set of permissions that can be bound to a user or group in a cluster-wide scope.

package/dist/kinds.test.js

@@ -6,6 +6,10 @@ const globals_1 = require("@jest/globals");
 const index_1 = require("./index");
 const kinds_1 = require("./kinds");
 const testCases = [
+    {
+        name: index_1.kind.Event,
+        expected: { group: "events.k8s.io", version: "v1", kind: "Event" },
+    },
     {
         name: index_1.kind.ClusterRole,
         expected: { group: "rbac.authorization.k8s.io", version: "v1", kind: "ClusterRole" },

package/dist/types.d.ts

@@ -24,4 +24,9 @@ export interface GroupVersionKind {
     /** Optional, override the plural name for use in Webhook rules generation */
     readonly plural?: string;
 }
+export interface LogFn {
+    <T extends object>(obj: T, msg?: string, ...args: never[]): void;
+    (obj: unknown, msg?: string, ...args: never[]): void;
+    (msg: string, ...args: never[]): void;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAGjF,MAAM,MAAM,YAAY,GAAG,QAAQ,WAAW,GAAG,CAAC;AAElD;;;;GAIG;AACH,qBAAa,WAAY,YAAW,gBAAgB;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED;;;IAGI;AACJ,MAAM,WAAW,gBAAgB;IAC/B,yCAAyC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,6EAA6E;IAC7E,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAGjF,MAAM,MAAM,YAAY,GAAG,QAAQ,WAAW,GAAG,CAAC;AAElD;;;;GAIG;AACH,qBAAa,WAAY,YAAW,gBAAgB;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED;;;IAGI;AACJ,MAAM,WAAW,gBAAgB;IAC/B,yCAAyC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,6EAA6E;IAC7E,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,KAAK;IAEpB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACjE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACrD,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;CACvC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,15 +35,17 @@
   "homepage": "https://github.com/defenseunicorns/kubernetes-fluent-client#readme",
   "dependencies": {
     "@kubernetes/client-node": "1.0.0-rc3",
+    "byline": "5.0.0",
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
     "type-fest": "4.3.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.7.1",
+    "@commitlint/cli": "17.7.2",
     "@commitlint/config-conventional": "17.7.0",
     "@jest/globals": "29.7.0",
+    "@types/byline": "4.2.34",
     "@typescript-eslint/eslint-plugin": "6.7.3",
     "@typescript-eslint/parser": "6.7.3",
     "jest": "29.7.0",

package/src/fluent/index.ts

@@ -10,7 +10,7 @@ import { modelToGroupVersionKind } from "../kinds";
 import { GenericClass } from "../types";
 import { Filters, K8sInit, Paths, WatchAction } from "./types";
 import { k8sExec } from "./utils";
-import { ExecWatch } from "./watch";
+import { ExecWatch, WatchCfg } from "./watch";
 
 /**
  * Kubernetes fluent API inspired by Kubectl. Pass in a model, then call filters and actions on it.
@@ -119,8 +119,8 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
     return k8sExec<T, K>(model, filters, "PATCH", payload);
   }
 
-  async function Watch(callback: WatchAction<T>): Promise<AbortController> {
-    return ExecWatch(model, filters, callback);
+  async function Watch(callback: WatchAction<T>, watchCfg?: WatchCfg) {
+    return ExecWatch(model, filters, callback, watchCfg);
   }
 
   return { InNamespace, Apply, Create, Patch, ...withFilters };

package/src/fluent/types.ts

@@ -6,6 +6,7 @@ import { Operation } from "fast-json-patch";
 import type { PartialDeep } from "type-fest";
 
 import { GenericClass, GroupVersionKind } from "../types";
+import { WatchCfg, WatchController } from "./watch";
 
 /**
  * The Phase matched when using the K8s Watch API.
@@ -51,7 +52,10 @@ export type K8sFilteredActions<K extends KubernetesObject> = {
    * @param callback
    * @returns
    */
-  Watch: (callback: (payload: K, phase: WatchPhase) => void) => Promise<AbortController>;
+  Watch: (
+    callback: (payload: K, phase: WatchPhase) => void,
+    watchCfg?: WatchCfg,
+  ) => Promise<WatchController>;
 };
 
 export type K8sUnfilteredActions<K extends KubernetesObject> = {

package/src/fluent/utils.ts

@@ -112,6 +112,9 @@ export async function k8sCfg(method: FetchMethods) {
     },
   });
 
+  // Enable compression
+  opts.compress = true;
+
   return { opts, serverUrl: cluster.server };
 }
 

package/src/fluent/watch.ts

@@ -1,13 +1,52 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors
 
-import readline from "readline";
-
+import byline from "byline";
 import fetch from "node-fetch";
-import { GenericClass } from "../types";
+
+import { GenericClass, LogFn } from "../types";
 import { Filters, WatchAction, WatchPhase } from "./types";
 import { k8sCfg, pathBuilder } from "./utils";
 
+/**
+ * Wrapper for the AbortController to allow the watch to be aborted externally.
+ */
+export type WatchController = {
+  /**
+   * Abort the watch.
+   * @param reason optional reason for aborting the watch
+   * @returns
+   */
+  abort: (reason?: string) => void;
+  /**
+   * Get the AbortSignal for the watch.
+   * @returns
+   */
+  signal: () => AbortSignal;
+};
+
+/**
+ * Configuration for the watch function.
+ */
+export type WatchCfg = {
+  /**
+   * The maximum number of times to retry the watch, the retry count is reset on success.
+   */
+  retryMax?: number;
+  /**
+   * The delay between retries in seconds.
+   */
+  retryDelaySec?: number;
+  /**
+   * A function to log errors.
+   */
+  logFn?: LogFn;
+  /**
+   * A function to call when the watch fails after the maximum number of retries.
+   */
+  retryFail?: (e: Error) => void;
+};
+
 /**
  * Execute a watch on the specified resource.
  */
@@ -15,7 +54,10 @@ export async function ExecWatch<T extends GenericClass>(
   model: T,
   filters: Filters,
   callback: WatchAction<T>,
+  watchCfg: WatchCfg = {},
 ) {
+  watchCfg.logFn?.({ model, filters, watchCfg }, "ExecWatch");
+
   // Build the path and query params for the resource, excluding the name
   const { opts, serverUrl } = await k8sCfg("GET");
   const url = pathBuilder(serverUrl, model, filters, true);
@@ -31,64 +73,137 @@ export async function ExecWatch<T extends GenericClass>(
     url.searchParams.set("fieldSelector", `metadata.name=${filters.name}`);
   }
 
-  // Add abort controller to the long-running request
-  const controller = new AbortController();
-  opts.signal = controller.signal;
+  // Set the initial timeout to 15 seconds
+  opts.timeout = 15 * 1000;
+
+  // Enable keep alive
+  (opts.agent as unknown as { keepAlive: boolean }).keepAlive = true;
+
+  // Track the number of retries
+  let retryCount = 0;
+
+  // Set the maximum number of retries to 5 if not specified
+  watchCfg.retryMax ??= 5;
+
+  // Set the retry delay to 5 seconds if not specified
+  watchCfg.retryDelaySec ??= 5;
+
+  // Create a throwaway AbortController to setup the wrapped AbortController
+  let abortController: AbortController;
+
+  // Create a wrapped AbortController to allow the watch to be aborted externally
+  const abortWrapper = {} as WatchController;
+
+  function bindAbortController() {
+    // Create a new AbortController
+    abortController = new AbortController();
+
+    // Update the abort wrapper
+    abortWrapper.abort = reason => abortController.abort(reason);
+    abortWrapper.signal = () => abortController.signal;
+
+    // Add the abort signal to the request options
+    opts.signal = abortController.signal;
+  }
+
+  async function runner() {
+    let doneCalled = false;
 
-  // Close the connection and make the callback function no-op
-  let close = (err?: Error) => {
-    controller.abort();
-    close = () => {};
-    if (err) {
-      throw err;
+    bindAbortController();
+
+    // Create a stream to read the response body
+    const stream = byline.createStream();
+
+    const onError = (err: Error) => {
+      stream.removeAllListeners();
+
+      if (!doneCalled) {
+        doneCalled = true;
+
+        // If the error is not an AbortError, reload the watch
+        if (err.name !== "AbortError") {
+          watchCfg.logFn?.(err, "stream error");
+          void reload(err);
+        } else {
+          watchCfg.logFn?.("watch aborted via WatchController.abort()");
+        }
+      }
+    };
+
+    const cleanup = () => {
+      if (!doneCalled) {
+        doneCalled = true;
+        stream.removeAllListeners();
+      }
+    };
+
+    try {
+      // Make the actual request
+      const response = await fetch(url, { ...opts });
+
+      // If the request is successful, start listening for events
+      if (response.ok) {
+        const { body } = response;
+
+        // Reset the retry count
+        retryCount = 0;
+
+        stream.on("error", onError);
+        stream.on("close", cleanup);
+        stream.on("finish", cleanup);
+
+        // Listen for events and call the callback function
+        stream.on("data", line => {
+          try {
+            // Parse the event payload
+            const { object: payload, type: phase } = JSON.parse(line) as {
+              type: WatchPhase;
+              object: InstanceType<T>;
+            };
+
+            // Call the callback function with the parsed payload
+            void callback(payload, phase as WatchPhase);
+          } catch (err) {
+            watchCfg.logFn?.(err, "watch callback error");
+          }
+        });
+
+        body.on("error", onError);
+        body.on("close", cleanup);
+        body.on("finish", cleanup);
+
+        // Pipe the response body to the stream
+        body.pipe(stream);
+      } else {
+        throw new Error(`watch failed: ${response.status} ${response.statusText}`);
+      }
+    } catch (e) {
+      onError(e);
     }
-  };
-
-  try {
-    // Make the actual request
-    const response = await fetch(url, opts);
-
-    // If the request is successful, start listening for events
-    if (response.ok) {
-      const { body } = response;
-
-      // Bind connection events to the close function
-      body.on("error", close);
-      body.on("close", close);
-      body.on("finish", close);
-
-      // Create a readline interface to parse the stream
-      const rl = readline.createInterface({
-        input: response.body!,
-        terminal: false,
-      });
-
-      // Listen for events and call the callback function
-      rl.on("line", line => {
-        try {
-          // Parse the event payload
-          const { object: payload, type: phase } = JSON.parse(line) as {
-            type: WatchPhase;
-            object: InstanceType<T>;
-          };
-
-          // Call the callback function with the parsed payload
-          void callback(payload, phase as WatchPhase);
-        } catch (ignore) {
-          // ignore parse errors
+
+    // On unhandled errors, retry the watch
+    async function reload(e: Error) {
+      // If there are more attempts, retry the watch
+      if (watchCfg.retryMax! > retryCount) {
+        retryCount++;
+
+        watchCfg.logFn?.(`retrying watch ${retryCount}/${watchCfg.retryMax}`);
+
+        // Sleep for the specified delay or 5 seconds
+        await new Promise(r => setTimeout(r, watchCfg.retryDelaySec! * 1000));
+
+        // Retry the watch after the delay
+        await runner();
+      } else {
+        // Otherwise, call the finally function if it exists
+        if (watchCfg.retryFail) {
+          watchCfg.retryFail(e);
         }
-      });
-    } else {
-      // If the request fails, throw an error
-      const error = new Error(response.statusText) as Error & {
-        statusCode: number | undefined;
-      };
-      error.statusCode = response.status;
-      throw error;
+      }
     }
-  } catch (e) {
-    close(e);
   }
 
-  return controller;
+  await runner();
+
+  return abortWrapper;
 }

package/src/kinds.test.ts

@@ -8,6 +8,10 @@ import { RegisterKind } from "./kinds";
 import { GroupVersionKind } from "./types";
 
 const testCases = [
+  {
+    name: kind.Event,
+    expected: { group: "events.k8s.io", version: "v1", kind: "Event" },
+  },
   {
     name: kind.ClusterRole,
     expected: { group: "rbac.authorization.k8s.io", version: "v1", kind: "ClusterRole" },

package/src/kinds.ts

@@ -4,6 +4,20 @@
 import { GenericClass, GroupVersionKind } from "./types";
 
 const gvkMap: Record<string, GroupVersionKind> = {
+  /**
+   * Represents a K8s Event resource.
+   * Event is a report of an event somewhere in the cluster. It generally denotes some state change in the system.
+   * Events have a limited retention time and triggers and messages may evolve with time. Event consumers should not
+   * rely on the timing of an event with a given Reason reflecting a consistent underlying trigger, or the continued
+   * existence of events with that Reason. Events should be treated as informative, best-effort, supplemental data.
+   * @see {@link https://kubernetes.io/docs/reference/kubernetes-api/cluster-resources/event-v1/}
+   */
+  CoreV1Event: {
+    kind: "Event",
+    version: "v1",
+    group: "events.k8s.io",
+  },
+
   /**
    * Represents a K8s ClusterRole resource.
    * ClusterRole is a set of permissions that can be bound to a user or group in a cluster-wide scope.

package/src/types.ts

@@ -33,3 +33,10 @@ export interface GroupVersionKind {
   /** Optional, override the plural name for use in Webhook rules generation */
   readonly plural?: string;
 }
+
+export interface LogFn {
+  /* tslint:disable:no-unnecessary-generics */
+  <T extends object>(obj: T, msg?: string, ...args: never[]): void;
+  (obj: unknown, msg?: string, ...args: never[]): void;
+  (msg: string, ...args: never[]): void;
+}

package/__mocks__/@kubernetes/client-node.ts

@@ -1,22 +0,0 @@
-// __mocks__/@kubernetes/client-node.ts
-
-import { jest } from "@jest/globals";
-
-const actual = jest.requireActual("@kubernetes/client-node") as any;
-
-const cloned = { ...actual };
-
-cloned.KubeConfig = class MockedKubeConfig {
-  loadFromDefault = jest.fn();
-
-  applyToFetchOptions = jest.fn(data => data);
-
-  getCurrentCluster() {
-    return {
-      server: "http://jest-test:8080",
-    };
-  }
-};
-
-// export all elements of the mocked module
-module.exports = cloned;

package/commitlint.config.js

@@ -1 +0,0 @@
-module.exports = { extends: ["@commitlint/config-conventional"] };