SNOW-1944643 - network error retries

Author: sfc-gh-pmotacki

lib/connection/statement.js

@@ -1492,7 +1492,9 @@ function sendSfRequest(statementContext, options, appendQueryParamOnRetry) {
     // if we haven't exceeded the maximum number of retries yet and the server
     // came back with a retryable error code
     if (numRetries < maxNumRetries &&
-      err && (Util.isRetryableHttpError(err.response, false) || Util.isNetworkError(err))
+      err && (!err.response || (Util.isRetryableHttpError(err.response, false))
+    // || Util.isNetworkError(err)
+    )
     ) {
       // increment the retry count
       numRetries++;

lib/util.ts

@@ -380,11 +380,7 @@ export function isRetryableHttpError(response: any, retry403: boolean) {
       (response.statusCode === 429));
 };
 
-exports.isNetworkError = function (err) {
-  return err.code === Errors.codes.ERR_SF_NETWORK_COULD_NOT_CONNECT;
-};
-
-exports.validateClientSessionKeepAliveHeartbeatFrequency = function (input, masterValidity) {
+export function validateClientSessionKeepAliveHeartbeatFrequency(input: number, masterValidity: number) {
   let heartbeatFrequency = input;
   const realMax = Math.floor(masterValidity / 4);
   const realMin = Math.floor(realMax / 4);

test/integration/testConnectionRetries.js

@@ -32,13 +32,13 @@ describe('Connection test', function () {
 
   it('Test retries after connection reset - success', async function () {
     await addWireMockMappingsFromFile(wireMock, 'wiremock/mappings/six_reset_connection_and_correct_response.json');
-    const connectionOption = { ...connParameters.wiremock, password: 'MOCK_TOKEN', port: port, sfRetryMaxSleepTime: 2 };
+    const connectionOption = { ...connParameters.wiremock, password: 'MOCK_TOKEN', port: port, sfRetryMaxSleepTime: 2, sfRetryMaxNumRetries: 10 };
     const connection = testUtil.createConnection(connectionOption);
     await testUtil.connectAsync(connection);
     await assert.doesNotReject(async () => await testUtil.executeCmdAsync(connection, ' Select 1'));
   });
 
-  it('Test retries after alformed response', async function () {
+  it('Test retries after malformed response', async function () {
     await addWireMockMappingsFromFile(wireMock, 'wiremock/mappings/six_malformed_and_correct.json');
     const connectionOption = { ...connParameters.wiremock, password: 'MOCK_TOKEN', port: port, sfRetryMaxSleepTime: 2 };
     const connection = testUtil.createConnection(connectionOption);