fix: timeoutSignal is lost after being overriden with controller.signal

Author: sachiniyer

src/watch.ts

@@ -6,7 +6,7 @@ import { KubeConfig } from './config.js';
 export class Watch {
     public static SERVER_SIDE_CLOSE: object = { error: 'Connection closed on server' };
     public config: KubeConfig;
-    private defaultRequestTimeoutMs: number = 30000;
+    private requestTimeoutMs: number = 30000;
 
     public constructor(config: KubeConfig) {
         this.config = config;
@@ -40,7 +40,7 @@ export class Watch {
         const requestInit = await this.config.applyToFetchOptions({});
 
         const controller = new AbortController();
-        const timeoutSignal = AbortSignal.timeout(this.defaultRequestTimeoutMs);
+        const timeoutSignal = AbortSignal.timeout(this.requestTimeoutMs);
         requestInit.signal = AbortSignal.any([controller.signal, timeoutSignal]);
         requestInit.method = 'GET';
 

src/watch_test.ts

@@ -457,8 +457,9 @@ describe('Watch', () => {
             // Don't respond - simulate a hanging server
         });
         const watch = new Watch(kc);
-        // Hack around type system to make the default timeout shorter.
-        (watch as any).timeoutMs = 100;
+
+        // NOTE: Hack around the type system to make the timeout shorter
+        (watch as any).requestTimeoutMs = 100;
 
         let doneCalled = false;
         let doneErr: any;