kubernetes-fluent-client 3.0.3 → 4.0.0-rc-http2-watch

package/.prettierignore

@@ -0,0 +1,4 @@
+e2e/crds
+e2e/crds/**/*.ts
+e2e/generated
+generated/**/*.ts

package/README.md

@@ -105,6 +105,30 @@ Promise.all([
   });
 ```
 
+### Generating TypeScript Definitions from CRDs
+
+The Kubernetes Fluent Client can generate TypeScript definitions from Custom Resource Definitions (CRDs) using the `generate` command. This command will generate TypeScript interfaces for the CRDs in the cluster and save them to a file.
+
+To generate TypeScript definitions from CRDs, run the following command:
+
+```bash
+kubernetes-fluent-client crd /path/to/input.yaml /path/to/output/folder
+```
+
+If you have a CRD in a file named `crd.yaml` and you want to generate TypeScript definitions in a folder named `types`, you can run the following command:
+
+```bash
+kubernetes-fluent-client crd crd.yaml types
+```
+
+This will generate TypeScript interfaces for the CRD in the `crd.yaml` file and save them to the `types` folder.
+
+By default, the generated TypeScript interfaces will be post-processed to make them more user-friendly. If you want to disable this post-processing, you can use the `--noPost` flag:
+
+```bash
+kubernetes-fluent-client crd crd.yaml types --noPost
+```
+
 ### Community
 
 To chat with other users & see some examples of the fluent client in active use, go to [Kubernetes Slack](https://communityinviter.com/apps/kubernetes/community) and join `#pepr` channel.

package/dist/cli.js

@@ -10,6 +10,8 @@ const helpers_1 = require("yargs/helpers");
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const generate_1 = require("./generate");
 const package_json_1 = require("../package.json");
+const postProcessing_1 = require("./postProcessing");
+const fileSystem_1 = require("./fileSystem"); // Import your new file system
 void (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .version("version", "Display version number", `kubernetes-fluent-client v${package_json_1.version}`)
     .alias("version", "V")
@@ -33,13 +35,31 @@ void (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
         type: "string",
         default: "ts",
         description: "the language to generate types in, see https://github.com/glideapps/quicktype#target-languages for a list of supported languages",
+    })
+        .option("noPost", {
+        alias: "x",
+        type: "boolean",
+        default: false,
+        description: "disable post-processing after generating the types",
     })
         .demandOption(["source", "directory"]);
 }, async (argv) => {
     const opts = argv;
     opts.logFn = console.log;
+    // Pass the `post` flag to opts
+    opts.noPost = argv.noPost;
+    // Use NodeFileSystem as the file system for post-processing
+    const fileSystem = new fileSystem_1.NodeFileSystem(); // Create an instance of NodeFileSystem
+    if (!opts.noPost) {
+        console.log("\n✅ Post-processing has been enabled.\n");
+    }
     try {
-        await (0, generate_1.generate)(opts);
+        // Capture the results returned by generate
+        const allResults = await (0, generate_1.generate)(opts);
+        // If noPost is false, run post-processing
+        if (!opts.noPost) {
+            await (0, postProcessing_1.postProcessing)(allResults, opts, fileSystem); // Pass the file system to postProcessing
+        }
     }
     catch (e) {
         console.log(`\n❌ ${e.message}`);

package/dist/fileSystem.d.ts

@@ -0,0 +1,11 @@
+export interface FileSystem {
+    readFile(filePath: string): string;
+    writeFile(filePath: string, content: string): void;
+    readdirSync(directory: string): string[];
+}
+export declare class NodeFileSystem implements FileSystem {
+    readFile(filePath: string): string;
+    writeFile(filePath: string, content: string): void;
+    readdirSync(directory: string): string[];
+}
+//# sourceMappingURL=fileSystem.d.ts.map

package/dist/fileSystem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileSystem.d.ts","sourceRoot":"","sources":["../src/fileSystem.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACnD,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC1C;AAGD,qBAAa,cAAe,YAAW,UAAU;IAC/C,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIlC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAIlD,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;CAGzC"}

package/dist/fileSystem.js

@@ -0,0 +1,42 @@
+"use strict";
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeFileSystem = void 0;
+const fs = __importStar(require("fs"));
+/* eslint class-methods-use-this: "off" */
+class NodeFileSystem {
+    readFile(filePath) {
+        return fs.readFileSync(filePath, "utf8");
+    }
+    writeFile(filePath, content) {
+        fs.writeFileSync(filePath, content, "utf8");
+    }
+    readdirSync(directory) {
+        return fs.readdirSync(directory);
+    }
+}
+exports.NodeFileSystem = NodeFileSystem;

package/dist/fileSystem.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=fileSystem.test.d.ts.map

package/dist/fileSystem.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fileSystem.test.d.ts","sourceRoot":"","sources":["../src/fileSystem.test.ts"],"names":[],"mappings":""}

package/dist/fileSystem.test.js

@@ -0,0 +1,75 @@
+"use strict";
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const fileSystem_1 = require("./fileSystem");
+const globals_1 = require("@jest/globals");
+// Mock the fs module
+globals_1.jest.mock("fs");
+(0, globals_1.describe)("NodeFileSystem", () => {
+    let nodeFileSystem;
+    (0, globals_1.beforeEach)(() => {
+        nodeFileSystem = new fileSystem_1.NodeFileSystem();
+        globals_1.jest.clearAllMocks(); // Clear all mocks before each test
+    });
+    (0, globals_1.describe)("readFile", () => {
+        (0, globals_1.test)("should call fs.readFileSync with correct arguments", () => {
+            const mockFilePath = "test-file.txt";
+            const mockFileContent = "This is a test file";
+            // Mock the fs.readFileSync method to return the mock file content
+            fs.readFileSync.mockReturnValue(mockFileContent);
+            const result = nodeFileSystem.readFile(mockFilePath);
+            // Assert that fs.readFileSync was called with the correct file path and encoding
+            (0, globals_1.expect)(fs.readFileSync).toHaveBeenCalledWith(mockFilePath, "utf8");
+            // Assert that the returned content matches the mock file content
+            (0, globals_1.expect)(result).toBe(mockFileContent);
+        });
+    });
+    (0, globals_1.describe)("writeFile", () => {
+        (0, globals_1.test)("should call fs.writeFileSync with correct arguments", () => {
+            const mockFilePath = "test-file.txt";
+            const mockFileContent = "This is a test file";
+            // Call the writeFile method
+            nodeFileSystem.writeFile(mockFilePath, mockFileContent);
+            // Assert that fs.writeFileSync was called with the correct arguments
+            (0, globals_1.expect)(fs.writeFileSync).toHaveBeenCalledWith(mockFilePath, mockFileContent, "utf8");
+        });
+    });
+    (0, globals_1.describe)("readdirSync", () => {
+        (0, globals_1.test)("should call fs.readdirSync with correct arguments and return file list", () => {
+            const mockDirectoryPath = "test-directory";
+            const mockFileList = ["file1.txt", "file2.txt"];
+            // Mock the fs.readdirSync method to return the mock file list
+            fs.readdirSync.mockReturnValue(mockFileList);
+            const result = nodeFileSystem.readdirSync(mockDirectoryPath);
+            // Assert that fs.readdirSync was called with the correct directory path
+            (0, globals_1.expect)(fs.readdirSync).toHaveBeenCalledWith(mockDirectoryPath);
+            // Assert that the returned file list matches the mock file list
+            (0, globals_1.expect)(result).toEqual(mockFileList);
+        });
+    });
+});

package/dist/fluent/watch.d.ts

@@ -41,6 +41,8 @@ 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;
+    /** Use http2 for the Watch */
+    useHTTP2?: 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":"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"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAKtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAI3D,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,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,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;IAOZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CA8bF"}

package/dist/fluent/watch.js

@@ -9,10 +9,13 @@ exports.Watcher = exports.WatchEvent = void 0;
 const byline_1 = __importDefault(require("byline"));
 const crypto_1 = require("crypto");
 const events_1 = require("events");
+const https_1 = __importDefault(require("https"));
+const http2_1 = __importDefault(require("http2"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const fetch_1 = require("../fetch");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
+const fs_1 = __importDefault(require("fs"));
 var WatchEvent;
 (function (WatchEvent) {
     /** Watch is connected successfully */
@@ -54,6 +57,7 @@ class Watcher {
     #callback;
     #watchCfg;
     #latestRelistWindow = "";
+    #useHTTP2 = false;
     // Track the last time data was received
     #lastSeenTime = NONE;
     #lastSeenLimit;
@@ -75,6 +79,8 @@ class Watcher {
     #resourceVersion;
     // Track the list of items in the cache
     #cache = new Map();
+    // Token Path
+    #TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
     /**
      * Setup a Kubernetes watcher for the specified model and filters. The callback function will be called for each event received.
      * The watch can be aborted by calling {@link Watcher.close} or by calling abort() on the AbortController returned by {@link Watcher.start}.
@@ -98,6 +104,8 @@ class Watcher {
         this.#lastSeenLimit = watchCfg.lastSeenLimitSeconds * 1000;
         // Set the latest relist interval to now
         this.#latestRelistWindow = new Date().toISOString();
+        // Set the latest relist interval to now
+        this.#useHTTP2 = watchCfg.useHTTP2 ?? false;
         // 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
@@ -123,7 +131,12 @@ class Watcher {
      */
     async start() {
         this.#events.emit(WatchEvent.INIT_CACHE_MISS, this.#latestRelistWindow);
-        await this.#watch();
+        if (this.#useHTTP2) {
+            await this.#http2Watch();
+        }
+        else {
+            await this.#watch();
+        }
         return this.#abortController;
     }
     /** Close the watch. Also available on the AbortController returned by {@link Watcher.start}. */
@@ -158,6 +171,19 @@ class Watcher {
     get events() {
         return this.#events;
     }
+    /**
+     * Read the serviceAccount Token
+     *
+     * @returns token or null
+     */
+    async #getToken() {
+        try {
+            return (await fs_1.default.promises.readFile(this.#TOKEN_PATH, "utf8")).trim();
+        }
+        catch {
+            return null;
+        }
+    }
     /**
      * Build the URL and request options for the watch.
      *
@@ -285,6 +311,32 @@ class Watcher {
             this.#events.emit(WatchEvent.DATA_ERROR, err);
         }
     };
+    // process a line from the chunk
+    #processLine = async (line, process) => {
+        try {
+            // Parse the event payload
+            const { object: payload, type: phase } = JSON.parse(line);
+            // Update the last seen time
+            this.#lastSeenTime = Date.now();
+            // If the watch is too old, remove the resourceVersion and reload the watch
+            if (phase === types_1.WatchPhase.Error && payload.code === 410) {
+                throw {
+                    name: "TooOld",
+                    message: this.#resourceVersion,
+                };
+            }
+            // Process the event payload, do not update the resource version as that is handled by the list operation
+            await process(payload, phase);
+        }
+        catch (err) {
+            if (err.name === "TooOld") {
+                // Reload the watch
+                void this.#errHandler(err);
+                return;
+            }
+            this.#events.emit(WatchEvent.DATA_ERROR, err);
+        }
+    };
     /**
      * Watch for changes to the resource.
      */
@@ -313,31 +365,7 @@ class Watcher {
                 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 {
-                        // Parse the event payload
-                        const { object: payload, type: phase } = JSON.parse(line);
-                        // Update the last seen time
-                        this.#lastSeenTime = Date.now();
-                        // If the watch is too old, remove the resourceVersion and reload the watch
-                        if (phase === types_1.WatchPhase.Error && payload.code === 410) {
-                            throw {
-                                name: "TooOld",
-                                message: this.#resourceVersion,
-                            };
-                        }
-                        // Process the event payload, do not update the resource version as that is handled by the list operation
-                        await this.#process(payload, phase);
-                    }
-                    catch (err) {
-                        if (err.name === "TooOld") {
-                            // Prevent any body events from firing
-                            body.removeAllListeners();
-                            // Reload the watch
-                            void this.#errHandler(err);
-                            return;
-                        }
-                        this.#events.emit(WatchEvent.DATA_ERROR, err);
-                    }
+                    await this.#processLine(line, this.#process);
                 });
                 // Bind the body events
                 body.on("error", this.#errHandler);
@@ -354,6 +382,93 @@ class Watcher {
             void this.#errHandler(e);
         }
     };
+    /**
+     * Watch for changes to the resource.
+     */
+    #http2Watch = 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);
+            let agentOptions;
+            if (opts.agent && opts.agent instanceof https_1.default.Agent) {
+                agentOptions = {
+                    key: opts.agent.options.key,
+                    cert: opts.agent.options.cert,
+                    ca: opts.agent.options.ca,
+                    rejectUnauthorized: false,
+                };
+            }
+            // HTTP/2 client connection setup
+            const client = http2_1.default.connect(url.origin, {
+                ca: agentOptions?.ca,
+                cert: agentOptions?.cert,
+                key: agentOptions?.key,
+                rejectUnauthorized: agentOptions?.rejectUnauthorized,
+            });
+            // Set up headers for the HTTP/2 request
+            const token = await this.#getToken();
+            const headers = {
+                ":method": "GET",
+                ":path": url.pathname + url.search,
+                "content-type": "application/json",
+                "user-agent": "kubernetes-fluent-client",
+            };
+            if (token) {
+                headers["Authorization"] = `Bearer ${token}`;
+            }
+            // Make the HTTP/2 request
+            const req = client.request(headers);
+            req.setEncoding("utf8");
+            let buffer = "";
+            // Handle response data
+            req.on("response", headers => {
+                const statusCode = headers[":status"];
+                if (statusCode && statusCode >= 200 && statusCode < 300) {
+                    this.#pendingReconnect = false;
+                    this.#events.emit(WatchEvent.CONNECT, url.pathname);
+                    // Reset the retry count
+                    this.#resyncFailureCount = 0;
+                    this.#events.emit(WatchEvent.INC_RESYNC_FAILURE_COUNT, this.#resyncFailureCount);
+                    req.on("data", async (chunk) => {
+                        try {
+                            buffer += chunk;
+                            const lines = buffer.split("\n");
+                            // Avoid  Watch event data_error received. Unexpected end of JSON input.
+                            buffer = lines.pop();
+                            for (const line of lines) {
+                                await this.#processLine(line, this.#process);
+                            }
+                        }
+                        catch (err) {
+                            void this.#errHandler(err);
+                        }
+                    });
+                    req.on("end", () => {
+                        this.#streamCleanup();
+                        client.close();
+                    });
+                    req.on("close", () => {
+                        this.#streamCleanup();
+                        client.close();
+                    });
+                    req.on("error", err => {
+                        void this.#errHandler(err);
+                        client.close();
+                    });
+                }
+                else {
+                    const statusMessage = headers[":status-text"] || "Unknown";
+                    throw new Error(`watch connect failed: ${statusCode} ${statusMessage}`);
+                }
+            });
+            req.end();
+        }
+        catch (e) {
+            void this.#errHandler(e);
+        }
+    };
     /** Clear the resync timer and schedule a new one. */
     #checkResync = () => {
         // Ignore if the last seen time is not set
@@ -379,7 +494,9 @@ class Watcher {
                     this.#pendingReconnect = true;
                     this.#events.emit(WatchEvent.RECONNECT, this.#resyncFailureCount);
                     this.#streamCleanup();
-                    void this.#watch();
+                    if (!this.#useHTTP2) {
+                        void this.#watch();
+                    }
                 }
             }
             else {
@@ -420,6 +537,9 @@ class Watcher {
             this.#stream.removeAllListeners();
             this.#stream.destroy();
         }
+        if (this.#useHTTP2) {
+            void this.#http2Watch();
+        }
     };
 }
 exports.Watcher = Watcher;

package/dist/generate.d.ts

@@ -1,24 +1,84 @@
-import { TargetLanguage } from "quicktype-core";
+import { InputData, TargetLanguage } from "quicktype-core";
+import { CustomResourceDefinition } from "./upstream";
 import { LogFn } from "./types";
 export interface GenerateOptions {
-    /** The source URL, yaml file path or K8s CRD name */
     source: string;
-    /** The output directory path */
     directory?: string;
-    /** Disable kubernetes-fluent-client wrapping */
     plain?: boolean;
-    /** The language to generate types in */
     language?: string | TargetLanguage;
-    /** Override the NPM package to import when generating formatted Typescript */
     npmPackage?: string;
-    /** Log function callback */
     logFn: LogFn;
+    noPost?: boolean;
 }
 /**
- * Generate TypeScript types from a K8s CRD
+ * Converts a CustomResourceDefinition to TypeScript types
  *
- * @param opts The options to use when generating
- * @returns A promise that resolves when the TypeScript types have been generated
+ * @param crd - The CustomResourceDefinition object to convert.
+ * @param opts - The options for generating the TypeScript types.
+ * @returns A promise that resolves to a record of generated TypeScript types.
  */
-export declare function generate(opts: GenerateOptions): Promise<Record<string, string[]>>;
+export declare function convertCRDtoTS(crd: CustomResourceDefinition, opts: GenerateOptions): Promise<{
+    results: Record<string, string[]>;
+    name: string;
+    crd: CustomResourceDefinition;
+    version: string;
+}[]>;
+/**
+ * Prepares the input data for quicktype from the provided schema.
+ *
+ * @param name - The name of the schema.
+ * @param schema - The JSON schema as a string.
+ * @returns A promise that resolves to the input data for quicktype.
+ */
+export declare function prepareInputData(name: string, schema: string): Promise<InputData>;
+/**
+ * Generates TypeScript types using quicktype.
+ *
+ * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
+ * @returns A promise that resolves to an array of generated TypeScript type lines.
+ */
+export declare function generateTypes(inputData: InputData, opts: GenerateOptions): Promise<string[]>;
+/**
+ * Writes the processed lines to the output file.
+ *
+ * @param fileName - The name of the file to write.
+ * @param directory - The directory where the file will be written.
+ * @param content - The content to write to the file.
+ * @param language - The programming language of the file.
+ */
+export declare function writeGeneratedFile(fileName: string, directory: string, content: string[], language: string | TargetLanguage): void;
+/**
+ * Reads or fetches a CustomResourceDefinition from a file, URL, or the cluster.
+ *
+ * @param opts - The options for generating the TypeScript types.
+ * @returns A promise that resolves to an array of CustomResourceDefinition objects.
+ */
+export declare function readOrFetchCrd(opts: GenerateOptions): Promise<CustomResourceDefinition[]>;
+/**
+ * Resolves the source file path, treating relative paths as local files.
+ *
+ * @param source - The source path to resolve.
+ * @returns The resolved file path.
+ */
+export declare function resolveFilePath(source: string): string;
+/**
+ * Tries to parse the source as a URL.
+ *
+ * @param source - The source string to parse as a URL.
+ * @returns The parsed URL object or null if parsing fails.
+ */
+export declare function tryParseUrl(source: string): URL | null;
+/**
+ * Main generate function to convert CRDs to TypeScript types.
+ *
+ * @param opts - The options for generating the TypeScript types.
+ * @returns A promise that resolves to a record of generated TypeScript types.
+ */
+export declare function generate(opts: GenerateOptions): Promise<{
+    results: Record<string, string[]>;
+    name: string;
+    crd: CustomResourceDefinition;
+    version: string;
+}[]>;
 //# sourceMappingURL=generate.d.ts.map

package/dist/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,cAAc,EAEf,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,eAAe;IAC9B,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IACnC,8EAA8E;IAC9E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,KAAK,EAAE,KAAK,CAAC;CACd;AA0KD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,qCA4BnD"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EAEf,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CAuCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CAYnB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}