Improve closing behavior for cache/informer.

Author: brendanburns

examples/typescript/watch/watch-example.ts

@@ -3,6 +3,7 @@ import * as k8s from '@kubernetes/client-node';
 const kc = new k8s.KubeConfig();
 kc.loadFromDefault();
 
+let request: k8s.RequestResult = null;
 const watch = new k8s.Watch(kc);
 watch.watch('/api/v1/namespaces',
     // optional query parameters can go here.
@@ -34,8 +35,12 @@ watch.watch('/api/v1/namespaces',
     (err) => {
         // tslint:disable-next-line:no-console
         console.log(err);
+        if (request != null) {
+            request!.destroy();
+        }
     })
 .then((req) => {
+    request = req;
     // watch returns a request object which you can use to abort the watch.
-    setTimeout(() => { req.abort(); }, 10 * 1000);
+    setTimeout(() => { req.abort(); req.destroy(); }, 10 * 1000);
 });

src/cache.ts

@@ -1,6 +1,6 @@
 import { ADD, DELETE, ERROR, Informer, ListPromise, ObjectCallback, UPDATE } from './informer';
 import { KubernetesObject } from './types';
-import { Watch } from './watch';
+import { RequestResult, Watch } from './watch';
 
 export interface ObjectCache<T> {
     get(name: string, namespace?: string): T | undefined;
@@ -12,6 +12,7 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
     private resourceVersion: string;
     private readonly indexCache: { [key: string]: T[] } = {};
     private readonly callbackCache: { [key: string]: Array<ObjectCallback<T>> } = {};
+    private request: RequestResult | null;
 
     public constructor(
         private readonly path: string,
@@ -23,6 +24,7 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
         this.callbackCache[UPDATE] = [];
         this.callbackCache[DELETE] = [];
         this.callbackCache[ERROR] = [];
+        this.request = null;
         this.resourceVersion = '';
         if (autoStart) {
             this.doneHandler(null);
@@ -73,6 +75,10 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
     }
 
     private async doneHandler(err: any) {
+        if (this.request != null) {
+            this.request.destroy();
+            this.request = null;
+        }
         if (err) {
             this.callbackCache[ERROR].forEach((elt: ObjectCallback<T>) => elt(err));
             return;
@@ -85,7 +91,7 @@ export class ListWatch<T extends KubernetesObject> implements ObjectCache<T>, In
         const list = result.body;
         deleteItems(this.objects, list.items, this.callbackCache[DELETE].slice());
         this.addOrUpdateItems(list.items);
-        await this.watch.watch(
+        this.request = await this.watch.watch(
             this.path,
             { resourceVersion: list.metadata!.resourceVersion },
             this.watchHandler.bind(this),

src/watch.ts

@@ -1,18 +1,24 @@
 import byline = require('byline');
 import request = require('request');
+import { Duplex } from 'stream';
 import { KubeConfig } from './config';
 
 export interface WatchUpdate {
     type: string;
     object: object;
 }
 
+export interface RequestResult {
+    pipe(stream: Duplex);
+    destroy();
+}
+
 export interface RequestInterface {
-    webRequest(opts: request.Options, callback: (err, response, body) => void): any;
+    webRequest(opts: request.Options, callback: (err, response, body) => void): RequestResult;
 }
 
 export class DefaultRequest implements RequestInterface {
-    public webRequest(opts: request.Options, callback: (err, response, body) => void): any {
+    public webRequest(opts: request.Options, callback: (err, response, body) => void): RequestResult {
         return request(opts, callback);
     }
 }

src/watch_test.ts

@@ -47,6 +47,7 @@ describe('Watch', () => {
 
         const fakeRequest = {
             pipe: (stream) => {},
+            destroy: () => {},
         };
 
         when(fakeRequestor.webRequest(anything(), anyFunction())).thenReturn(fakeRequest);
@@ -112,6 +113,7 @@ describe('Watch', () => {
                 stream.write(JSON.stringify(obj1) + '\n');
                 stream.write(JSON.stringify(obj2) + '\n');
             },
+            destroy: () => {},
         };
 
         when(fakeRequestor.webRequest(anything(), anyFunction())).thenReturn(fakeRequest);
@@ -180,6 +182,7 @@ describe('Watch', () => {
                 stream.emit('error', errIn);
                 stream.emit('close');
             },
+            destroy: () => {},
         };
 
         when(fakeRequestor.webRequest(anything(), anyFunction())).thenReturn(fakeRequest);
@@ -240,6 +243,7 @@ describe('Watch', () => {
                 stream.write(JSON.stringify(obj1) + '\n');
                 stream.emit('close');
             },
+            destroy: () => {},
         };
 
         when(fakeRequestor.webRequest(anything(), anyFunction())).thenReturn(fakeRequest);
@@ -298,6 +302,7 @@ describe('Watch', () => {
                 stream.write(JSON.stringify(obj) + '\n');
                 stream.write('{"truncated json\n');
             },
+            destroy: () => {},
         };
 
         when(fakeRequestor.webRequest(anything(), anyFunction())).thenReturn(fakeRequest);