-
Notifications
You must be signed in to change notification settings - Fork 565
feat(api): Add watch_api.ts with async iterator support and Configuration pattern
#2738
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Rezrazi
wants to merge
1
commit into
kubernetes-client:main
Choose a base branch
from
Rezrazi:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+586
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,249 @@ | ||
| import { createInterface } from 'node:readline'; | ||
| import { KubernetesObject } from './types.js'; | ||
| import { ApiException, Configuration, HttpMethod } from './gen/index.js'; | ||
|
|
||
| /** | ||
| * Represents the type of watch event received from the Kubernetes API. | ||
| * | ||
| * - `ADDED`: A new object was added. | ||
| * - `MODIFIED`: An existing object was modified. | ||
| * - `DELETED`: An object was deleted. | ||
| * - `BOOKMARK`: A bookmark event for efficient reconnection (contains only resourceVersion). | ||
| * - `ERROR`: An error occurred during the watch. | ||
| */ | ||
| export type WatchEventType = 'ADDED' | 'MODIFIED' | 'DELETED' | 'BOOKMARK' | 'ERROR'; | ||
|
|
||
| /** | ||
| * Represents a single watch event from the Kubernetes API. | ||
| * | ||
| * @typeParam T - The Kubernetes object type (e.g., V1Pod, V1Deployment). | ||
| * | ||
| * @example | ||
| * ```typescript | ||
| * import { WatchEvent, V1Pod } from '@kubernetes/client-node'; | ||
| * | ||
| * const event: WatchEvent<V1Pod> = { | ||
| * type: 'ADDED', | ||
| * object: { apiVersion: 'v1', kind: 'Pod', metadata: { name: 'my-pod' } } | ||
| * }; | ||
| * ``` | ||
| */ | ||
| export interface WatchEvent<T extends KubernetesObject> { | ||
| /** | ||
| * The type of event that occurred. | ||
| */ | ||
| type: WatchEventType; | ||
|
|
||
| /** | ||
| * The Kubernetes object associated with this event. | ||
| * For ERROR events, this may contain error details rather than a standard K8s object. | ||
| */ | ||
| object: T; | ||
| } | ||
|
|
||
| /** | ||
| * A watch API implementation that uses async iterators and follows the generated | ||
| * Kubernetes API client pattern. This allows users to use it with `makeApiClient` | ||
| * and override the HTTP library via `wrapHttpLibrary` and `createConfiguration`. | ||
| * | ||
| * The class uses the configuration's `httpApi` to send requests, enabling custom | ||
| * HTTP implementations. For optimal streaming support, custom HTTP libraries should | ||
| * return a response body with a `stream()` method that returns a Readable stream. | ||
| * | ||
| * @example Using with makeApiClient: | ||
| * ```typescript | ||
| * import { KubeConfig, WatchApi, V1Pod } from '@kubernetes/client-node'; | ||
| * | ||
| * const kubeConfig = new KubeConfig(); | ||
| * kubeConfig.loadFromDefault(); | ||
| * | ||
| * const watchApi = kubeConfig.makeApiClient(WatchApi); | ||
| * | ||
| * for await (const event of watchApi.watch<V1Pod>('/api/v1/namespaces/default/pods')) { | ||
| * console.log(`${event.type}: ${event.object.metadata?.name}`); | ||
| * } | ||
| * ``` | ||
| * | ||
| * @example With custom HTTP library: | ||
| * ```typescript | ||
| * import { KubeConfig, WatchApi, V1Pod, wrapHttpLibrary, createConfiguration, ServerConfiguration, ResponseContext } from '@kubernetes/client-node'; | ||
| * import { Readable } from 'node:stream'; | ||
| * import ky from 'ky'; | ||
| * | ||
| * const httpApi = wrapHttpLibrary({ | ||
| * async send(request) { | ||
| * const response = await ky(request.getUrl(), { | ||
| * method: request.getHttpMethod(), | ||
| * headers: request.getHeaders(), | ||
| * body: request.getBody(), | ||
| * }); | ||
| * | ||
| * return new ResponseContext( | ||
| * response.status, | ||
| * Object.fromEntries(response.headers.entries()), | ||
| * { | ||
| * text: () => response.text(), | ||
| * binary: async () => Buffer.from(await response.arrayBuffer()), | ||
| * stream: () => Readable.fromWeb(response.body), // Enable streaming for watch | ||
| * }, | ||
| * ); | ||
| * }, | ||
| * }); | ||
| * | ||
| * const kubeConfig = new KubeConfig(); | ||
| * kubeConfig.loadFromDefault(); | ||
| * | ||
| * const configuration = createConfiguration({ | ||
| * baseServer: new ServerConfiguration(kubeConfig.getCurrentCluster()!.server, {}), | ||
| * authMethods: { default: kubeConfig }, | ||
| * httpApi, | ||
| * }); | ||
| * | ||
| * const watchApi = new WatchApi(configuration); | ||
| * | ||
| * for await (const event of watchApi.watch<V1Pod>('/api/v1/namespaces/default/pods')) { | ||
| * console.log(`${event.type}: ${event.object.metadata?.name}`); | ||
| * } | ||
| * ``` | ||
| * | ||
| * @example With query parameters: | ||
| * ```typescript | ||
| * for await (const event of watchApi.watch<V1Pod>('/api/v1/namespaces/default/pods', { | ||
| * labelSelector: 'app=nginx', | ||
| * resourceVersion: '12345', | ||
| * allowWatchBookmarks: true, | ||
| * })) { | ||
| * switch (event.type) { | ||
| * case 'ADDED': | ||
| * console.log('Pod added:', event.object.metadata?.name); | ||
| * break; | ||
| * case 'MODIFIED': | ||
| * console.log('Pod modified:', event.object.metadata?.name); | ||
| * break; | ||
| * case 'DELETED': | ||
| * console.log('Pod deleted:', event.object.metadata?.name); | ||
| * break; | ||
| * } | ||
| * } | ||
| * ``` | ||
| */ | ||
| export class WatchApi { | ||
| private configuration: Configuration; | ||
| private requestTimeoutMs: number = 30000; | ||
|
|
||
| /** | ||
| * Creates a new WatchApi instance. | ||
| * | ||
| * @param configuration - The API configuration object from `createConfiguration()` or via `makeApiClient`. | ||
| */ | ||
| constructor(configuration: Configuration) { | ||
| this.configuration = configuration; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the request timeout in milliseconds. | ||
| * | ||
| * @param timeout - Timeout in milliseconds. | ||
| */ | ||
| public setRequestTimeout(timeout: number): void { | ||
| this.requestTimeoutMs = timeout; | ||
| } | ||
|
|
||
| /** | ||
| * Watches for changes to Kubernetes resources at the specified path. | ||
| * Returns an async iterator that yields watch events. | ||
| * | ||
| * @typeParam T - The Kubernetes object type to expect (e.g., V1Pod, V1Deployment). | ||
| * | ||
| * @param path - The API path to watch (e.g., '/api/v1/namespaces/default/pods'). | ||
| * @param queryParams - Optional query parameters for the watch request. | ||
| * Supports any query parameter accepted by the Kubernetes API. | ||
| * | ||
| * @yields {WatchEvent<T>} Events as they are received from the API server. | ||
| * | ||
| * @throws {ApiException} When the watch request fails or the server returns an error status. | ||
| * | ||
| * @example | ||
| * ```typescript | ||
| * for await (const event of watchApi.watch<V1Pod>('/api/v1/namespaces/default/pods', { | ||
| * labelSelector: 'app=nginx', | ||
| * resourceVersion: '12345', | ||
| * })) { | ||
| * console.log(`${event.type}: ${event.object.metadata?.name}`); | ||
| * } | ||
| * ``` | ||
| */ | ||
| async *watch<T extends KubernetesObject>( | ||
| path: string, | ||
| queryParams: Record<string, string | number | boolean | undefined> = {}, | ||
| ): AsyncGenerator<WatchEvent<T>, void, undefined> { | ||
| const requestContext = this.configuration.baseServer.makeRequestContext(path, HttpMethod.GET); | ||
|
|
||
| requestContext.setQueryParam('watch', 'true'); | ||
|
|
||
| for (const [key, val] of Object.entries(queryParams)) { | ||
| if (val !== undefined) { | ||
| requestContext.setQueryParam(key, val.toString()); | ||
| } | ||
| } | ||
|
|
||
| const authMethod = this.configuration.authMethods.default; | ||
|
|
||
| if (authMethod?.applySecurityAuthentication) { | ||
| await authMethod.applySecurityAuthentication(requestContext); | ||
| } | ||
|
|
||
| const controller = new AbortController(); | ||
|
|
||
| const timeoutSignal = AbortSignal.timeout(this.requestTimeoutMs); | ||
|
|
||
| requestContext.setSignal(AbortSignal.any([controller.signal, timeoutSignal])); | ||
|
|
||
| try { | ||
| const response = await this.configuration.httpApi.send(requestContext).toPromise(); | ||
|
|
||
| if (response.httpStatusCode !== 200) { | ||
| const body = await response.body.text(); | ||
|
|
||
| throw new ApiException( | ||
| response.httpStatusCode, | ||
| 'Watch request failed', | ||
| body, | ||
| response.headers, | ||
| ); | ||
| } | ||
|
|
||
| if (response.body.stream) { | ||
| // Use streaming if available, otherwise fall back to text parsing | ||
| const stream = response.body.stream(); | ||
|
|
||
| const lines = createInterface(stream); | ||
|
|
||
| for await (const line of lines) { | ||
| const data = JSON.parse(line.toString()) as { type: WatchEventType; object: T }; | ||
|
|
||
| yield { | ||
| type: data.type, | ||
| object: data.object, | ||
| }; | ||
| } | ||
| } else { | ||
| // Fallback: parse full text response line by line | ||
| const text = await response.body.text(); | ||
|
|
||
| const lines = text.split('\n').filter((line) => line.trim() !== ''); | ||
|
|
||
| for (const line of lines) { | ||
| const data = JSON.parse(line) as { type: WatchEventType; object: T }; | ||
|
|
||
| yield { | ||
| type: data.type, | ||
| object: data.object, | ||
| }; | ||
| } | ||
| } | ||
| } finally { | ||
| controller.abort(); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The timeout signal is applied to the entire watch operation including the streaming phase, which will cause the connection to abort after 30 seconds (the default timeout) even if data is actively being received. For long-lived watch connections that remain open for extended periods, this timeout should only apply to the initial connection establishment, not the entire stream duration. Consider using a pattern similar to other streaming implementations where the timeout is only applied until the first response is received, then cleared or replaced with an idle timeout.