Update node typings, remove 'abort-controller' and remove node 14

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '18', '16', '14' ]
+        node: [ '20', '18', '16' ]
     name: Node ${{ matrix.node }} validation
     steps:
       - uses: actions/checkout@v2

package.json

@@ -55,13 +55,12 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@types/js-yaml": "^4.0.1",
-        "@types/node": "^10.12.0",
+        "@types/node": "^20.3.1",
         "@types/node-fetch": "^2.6.3",
         "@types/stream-buffers": "^3.0.3",
         "@types/tar": "^6.1.1",
         "@types/underscore": "^1.8.9",
         "@types/ws": "^8.5.4",
-        "abort-controller": "^3.0.0",
         "byline": "^5.0.0",
         "execa": "5.0.0",
         "form-data": "^4.0.0",

src/auth.ts

@@ -1,8 +1,9 @@
 import https = require('https');
 
 import { User } from './config_types';
+import WebSocket = require('isomorphic-ws');
 
 export interface Authenticator {
     isAuthProvider(user: User): boolean;
-    applyAuthentication(user: User, opts: https.RequestOptions): Promise<void>;
+    applyAuthentication(user: User, opts: https.RequestOptions | WebSocket.ClientOptions): Promise<void>;
 }

src/cache.ts

@@ -1,4 +1,3 @@
-import AbortController from 'abort-controller';
 import {
     ADD,
     CHANGE,

src/cache_test.ts

@@ -13,7 +13,6 @@ import { ListPromise } from './informer';
 
 use(chaiAsPromised);
 
-import AbortController from 'abort-controller';
 import nock = require('nock');
 import { Watch } from './watch';
 

src/config.ts

@@ -34,6 +34,7 @@ import {
     ServerConfiguration,
 } from './gen';
 import { OpenIDConnectAuth } from './oidc_auth';
+import WebSocket = require('isomorphic-ws');
 
 const SERVICEACCOUNT_ROOT: string = '/var/run/secrets/kubernetes.io/serviceaccount';
 const SERVICEACCOUNT_CA_PATH: string = SERVICEACCOUNT_ROOT + '/ca.crt';
@@ -170,13 +171,16 @@ export class KubeConfig implements SecurityAuthentication {
         };
     }
 
-    public async applyToHTTPSOptions(opts: https.RequestOptions): Promise<void> {
+    public async applyToHTTPSOptions(opts: https.RequestOptions | WebSocket.ClientOptions): Promise<void> {
         const user = this.getCurrentUser();
 
         await this.applyOptions(opts);
 
         if (user && user.username) {
-            opts.auth = `${user.username}:${user.password}`;
+            // The ws docs say that it accepts anything that https.RequestOptions accepts,
+            // but Typescript doesn't understand that idea (yet) probably could be fixed in
+            // the typings, but for now just cast to any
+            (opts as any).auth = `${user.username}:${user.password}`;
         }
 
         const agentOptions: https.AgentOptions = {};
@@ -188,8 +192,11 @@ export class KubeConfig implements SecurityAuthentication {
         agentOptions.pfx = opts.pfx;
         agentOptions.passphrase = opts.passphrase;
         agentOptions.rejectUnauthorized = opts.rejectUnauthorized;
-        agentOptions.timeout = opts.timeout;
-        agentOptions.servername = opts.servername;
+        // The ws docs say that it accepts anything that https.RequestOptions accepts,
+        // but Typescript doesn't understand that idea (yet) probably could be fixed in
+        // the typings, but for now just cast to any
+        agentOptions.timeout = (opts as any).timeout;
+        agentOptions.servername = (opts as any).servername;
         agentOptions.ciphers = opts.ciphers;
         agentOptions.honorCipherOrder = opts.honorCipherOrder;
         agentOptions.ecdhCurve = opts.ecdhCurve;
@@ -493,7 +500,7 @@ export class KubeConfig implements SecurityAuthentication {
         return this.getContextObject(this.currentContext);
     }
 
-    private applyHTTPSOptions(opts: https.RequestOptions): void {
+    private applyHTTPSOptions(opts: https.RequestOptions | WebSocket.ClientOptions): void {
         const cluster = this.getCurrentCluster();
         const user = this.getCurrentUser();
         if (!user) {
@@ -517,7 +524,9 @@ export class KubeConfig implements SecurityAuthentication {
         }
     }
 
-    private async applyAuthorizationHeader(opts: https.RequestOptions): Promise<void> {
+    private async applyAuthorizationHeader(
+        opts: https.RequestOptions | WebSocket.ClientOptions,
+    ): Promise<void> {
         const user = this.getCurrentUser();
         if (!user) {
             return;
@@ -538,7 +547,7 @@ export class KubeConfig implements SecurityAuthentication {
         }
     }
 
-    private async applyOptions(opts: https.RequestOptions): Promise<void> {
+    private async applyOptions(opts: https.RequestOptions | WebSocket.ClientOptions): Promise<void> {
         this.applyHTTPSOptions(opts);
         await this.applyAuthorizationHeader(opts);
     }

src/file_auth.ts

@@ -26,7 +26,7 @@ export class FileAuth implements Authenticator {
 
     private refreshToken(filePath: string): void {
         // TODO make this async?
-        this.token = fs.readFileSync(filePath).toString('UTF-8');
+        this.token = fs.readFileSync(filePath).toString('utf-8');
         this.lastRead = new Date();
     }
 

src/log.ts

@@ -1,11 +1,12 @@
-import AbortController from 'abort-controller';
 import fetch from 'node-fetch';
+import { AbortSignal } from 'node-fetch/externals';
 import { Writable } from 'stream';
 import { URL, URLSearchParams } from 'url';
 import { ApiException } from './api';
 import { KubeConfig } from './config';
 import { V1Status } from './gen';
 import { normalizeResponseHeaders } from './util';
+
 export interface LogOptions {
     /**
      * Follow the log stream of the pod. Defaults to false.
@@ -101,8 +102,6 @@ export class Log {
         doneOrOptions?: ((err: any) => void) | LogOptions,
         options?: LogOptions,
     ): Promise<AbortController> {
-        const AbortControllerCtor = globalThis.AbortController || (await import('abort-controller'));
-
         if (typeof doneOrOptions !== 'function') {
             options = doneOrOptions;
         }
@@ -122,8 +121,8 @@ export class Log {
 
         const requestInit = await this.config.applyToFetchOptions({});
 
-        const controller = new AbortControllerCtor();
-        requestInit.signal = controller.signal;
+        const controller = new AbortController();
+        requestInit.signal = controller.signal as AbortSignal;
         requestInit.method = 'GET';
 
         await fetch(requestURL.toString(), requestInit)

src/watch.ts

@@ -1,7 +1,7 @@
-import AbortController from 'abort-controller';
 import byline = require('byline');
 import { RequestOptions } from 'https';
 import fetch from 'node-fetch';
+import { AbortSignal } from 'node-fetch/externals';
 import { URL } from 'url';
 import { KubeConfig } from './config';
 
@@ -25,9 +25,6 @@ export class Watch {
         callback: (phase: string, apiObj: any, watchObj?: any) => void,
         done: (err: any) => void,
     ): Promise<AbortController> {
-        const AbortControllerCtor =
-            globalThis.AbortController || (await import('abort-controller')).AbortController;
-
         const cluster = this.config.getCurrentCluster();
         if (!cluster) {
             throw new Error('No currently active cluster');
@@ -43,8 +40,8 @@ export class Watch {
 
         const requestInit = await this.config.applyToFetchOptions({});
 
-        const controller = new AbortControllerCtor();
-        requestInit.signal = controller.signal;
+        const controller = new AbortController();
+        requestInit.signal = controller.signal as AbortSignal;
         requestInit.method = 'GET';
 
         let doneCalled: boolean = false;