FFM-9097 Don't set global Axios timeout

docs/further_reading.md

@@ -129,6 +129,7 @@ enableAnalytics: boolean;    // enable analytics
 cache: KeyValueStore;        // set custom cache (default lru cache)
 store: AsyncKeyValueStore;   // set custom persistent store (default file store)
 logger: Logger;              // set logger (default console)
+axiosTimeout: number;        // set timeout for requests to Harness (default 30s) 
 ```
 
 ## Singleton example

src/client.ts

@@ -1,6 +1,6 @@
 import EventEmitter from 'events';
 import jwt_decode from 'jwt-decode';
-import axios, { AxiosInstance } from 'axios';
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 import axiosRetry from 'axios-retry';
 import { Claims, Options, StreamEvent, Target } from './types';
 import { Configuration, ClientApi, FeatureConfig, Variation } from './openapi';
@@ -109,22 +109,13 @@ export default class Client {
     );
     this.evaluator = new Evaluator(this.repository, this.log);
 
-    if (options.tlsTrustedCa) {
-      this.httpsCa = fs.readFileSync(options.tlsTrustedCa);
-      this.httpsClient = axios.create({
-        httpsAgent: new https.Agent({
-          ca: this.httpsCa,
-        }),
-      });
-
-      this.api = new ClientApi(
-        this.configuration,
-        this.options.baseUrl,
-        this.httpsClient,
-      );
-    } else {
-      this.api = new ClientApi(this.configuration);
-    }
+    // Setup https client for sass or on-prem connections
+    this.httpsClient = this.createAxiosInstanceWithRetries(options);
+    this.api = new ClientApi(
+      this.configuration,
+      this.options.baseUrl,
+      this.httpsClient,
+    );
 
     this.processEvents();
     this.run();
@@ -297,6 +288,30 @@ export default class Client {
     return this.waitForInitializePromise;
   }
 
+  private createAxiosInstanceWithRetries(options: Options): AxiosInstance {
+    let axiosConfig: AxiosRequestConfig = {
+      timeout: options.axiosTimeout,
+    };
+
+    if (options.tlsTrustedCa) {
+      const httpsCa = fs.readFileSync(options.tlsTrustedCa);
+      // Expanding axiosConfig with httpsAgent when TLS config is provided
+      axiosConfig = {
+        ...axiosConfig,
+        httpsAgent: new https.Agent({
+          ca: httpsCa,
+        }),
+      };
+    }
+
+    const instance = axios.create(axiosConfig);
+    axiosRetry(instance, {
+      retries: 3,
+      retryDelay: axiosRetry.exponentialDelay,
+    });
+    return instance;
+  }
+
   private initialize(processor: Processor): void {
     switch (processor) {
       case Processor.POLL:

src/constants.ts

@@ -44,4 +44,5 @@ export const defaultOptions: Options = {
   cache: new LRU({ max: 100 }),
   store: new FileStore(),
   logger: new ConsoleLog(),
+  axiosTimeout: 3000,
 };

src/types.ts

@@ -13,6 +13,7 @@ export interface Options {
   store?: AsyncKeyValueStore;
   logger?: Logger;
   tlsTrustedCa?: string;
+  axiosTimeout?: number;
 }
 
 export interface Claims {

src/version.ts

@@ -1 +1 @@
-export const VERSION = '1.7.0';
+export const VERSION = '1.8.0';