Merge pull request #459 from snyk/fix/when_it_should_retry

Fix/when retry request

Author: agranado2k

src/transmitter/index.ts

@@ -8,6 +8,7 @@ import {
   IDependencyGraphPayload,
   IWorkloadMetadataPayload,
   IResponseWithAttempts,
+  IRequestError,
 } from './types';
 import { getProxyAgent } from './proxy';
 
@@ -73,10 +74,6 @@ async function retryRequest(verb: NeedleHttpVerbs, url: string, payload: object)
   const retry = {
     attempts: 3,
     intervalSeconds: 2,
-    networkErrorMessages: [
-      'socket hang up',
-      'Client network socket disconnected before secure TLS connection was established',
-    ],
   };
   const options: NeedleOptions = {
     json: true,
@@ -97,11 +94,7 @@ async function retryRequest(verb: NeedleHttpVerbs, url: string, payload: object)
         break;
       }
     } catch (err) {
-      if (!(
-        err.code === 'ECONNRESET' &&
-        retry.networkErrorMessages.includes(err.message) &&
-        stillHaveRetries
-      )) {
+      if (!shouldRetryRequest(err, stillHaveRetries)) {
         throw err;
       }
     }
@@ -114,3 +107,24 @@ async function retryRequest(verb: NeedleHttpVerbs, url: string, payload: object)
 
   return {response, attempt};
 }
+
+function shouldRetryRequest(err: IRequestError, stillHaveRetries: boolean): boolean {
+  const networkErrorMessages: string[] = [
+    'socket hang up',
+    'Client network socket disconnected before secure TLS connection was established',
+  ];
+
+  if (!stillHaveRetries) {
+    return false;
+  }
+
+  if (err.code === 'ECONNRESET' && networkErrorMessages.includes(err.message)) {
+    return true;
+  }
+
+  if (err.code === 'EAI_AGAIN') {
+    return true;
+  }
+
+  return false;
+}

src/transmitter/types.ts

@@ -72,3 +72,8 @@ export interface IResponseWithAttempts {
   response: NeedleResponse;
   attempt: number;
 }
+
+export interface IRequestError {
+  code: string;
+  message: string;
+}

test/system/kind.test.ts

@@ -103,6 +103,14 @@ tap.test('Kubernetes-Monitor with KinD', async (t) => {
       message: 'socket hang up',
     });
 
+  nock('https://kubernetes-upstream.snyk.io')
+    .post('/api/v1/dependency-graph')
+    .times(1)
+    .replyWithError({
+      code: 'EAI_AGAIN',
+      message: 'getaddrinfo EAI_AGAIN kubernetes-upstream.snyk.io',
+    });
+
   nock('https://kubernetes-upstream.snyk.io')
     .post('/api/v1/dependency-graph')
     .times(1)