sfmc-sdk 0.5.0 → 0.5.1

package/lib/auth.js

@@ -154,17 +154,17 @@ module.exports = class Auth {
         }
         if (Boolean(forceRefresh) || _isExpired(this.authObject)) {
             try {
+                remainingAttempts--;
                 this.authObject = await _requestToken(this.authObject);
             } catch (ex) {
                 if (
                     this.options.retryOnConnectionError &&
-                    remainingAttempts &&
+                    remainingAttempts > 0 &&
                     isConnectionError(ex.code)
                 ) {
                     if (this.options?.eventHandlers?.onConnectionError) {
                         this.options.eventHandlers.onConnectionError(ex, remainingAttempts);
                     }
-                    remainingAttempts--;
                     return this.getAccessToken(forceRefresh, remainingAttempts);
                 } else {
                     throw ex;

package/lib/rest.js

@@ -175,21 +175,24 @@ module.exports = class Rest {
             requestOptions.headers = {
                 Authorization: `Bearer ` + this.auth.authObject.access_token,
             };
+            remainingAttempts--;
             const res = await axios(requestOptions);
             return res.data;
         } catch (ex) {
             if (
                 this.options.retryOnConnectionError &&
-                remainingAttempts &&
+                remainingAttempts > 0 &&
                 isConnectionError(ex.code)
             ) {
-                remainingAttempts--;
+                if (this.options?.eventHandlers?.onConnectionError) {
+                    this.options.eventHandlers.onConnectionError(ex, remainingAttempts);
+                }
                 return this._apiRequest(requestOptions, remainingAttempts);
             } else if (ex.response && ex.response.status === 401 && remainingAttempts) {
                 // force refresh due to url related issue
                 await this.auth.getAccessToken(true);
                 //only retry once on refresh since there should be no reason for this token to be invalid
-                return this._apiRequest(requestOptions, 0);
+                return this._apiRequest(requestOptions, 1);
             } else {
                 throw ex;
             }

package/lib/soap.js

@@ -367,15 +367,18 @@ module.exports = class Soap {
             this.options.eventHandlers.logRequest(requestOptions);
         }
         let response;
+        remainingAttempts--;
         try {
             response = await axios(requestOptions);
         } catch (ex) {
             if (
                 this.options.retryOnConnectionError &&
-                remainingAttempts &&
+                remainingAttempts > 0 &&
                 isConnectionError(ex.code)
             ) {
-                remainingAttempts--;
+                if (this.options?.eventHandlers?.onConnectionError) {
+                    this.options.eventHandlers.onConnectionError(ex, remainingAttempts);
+                }
                 return this._apiRequest(options, remainingAttempts);
             } else if (ex.response) {
                 // if the response is received, then continue parsing and check for errors later
@@ -403,7 +406,7 @@ module.exports = class Soap {
                 // force refresh due to url related issue
                 await this.auth.getAccessToken(true);
                 // set to no more retries as after token refresh it should always work
-                return this._apiRequest(options, 0);
+                return this._apiRequest(options, 1);
             } else {
                 throw ex;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sfmc-sdk",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "description": "Libarary to simplify SFMC requests with updated dependencies and less overhead",
     "main": "./lib/index.js",
     "scripts": {
@@ -15,8 +15,8 @@
     "author": "Doug Midgley <douglasmidgley@gmail.com>",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "axios": "^0.26.0",
-        "fast-xml-parser": "4.0.3",
+        "axios": "^0.26.1",
+        "fast-xml-parser": "4.0.7",
         "p-limit": "3.1.0"
     },
     "keywords": [
@@ -34,11 +34,11 @@
         "assert": "2.0.0",
         "axios-mock-adapter": "1.20.0",
         "chai": "4.3.6",
-        "eslint-config-prettier": "8.4.0",
-        "eslint-plugin-jsdoc": "37.9.4",
+        "eslint-config-prettier": "8.5.0",
+        "eslint-plugin-jsdoc": "38.0.8",
         "eslint-plugin-mocha": "10.0.3",
         "eslint-plugin-prettier": "4.0.0",
-        "mocha": "9.2.1",
+        "mocha": "9.2.2",
         "nyc": "15.1.0",
         "prettier-eslint": "13.0.0",
         "sinon": "13.0.1"

package/test/rest.test.js

@@ -250,7 +250,7 @@ describe('rest', () => {
         assert.lengthOf(mock.history.get, 2);
         return;
     });
-    it('FAILED RETRY: should return error, after 2 connection errors', async () => {
+    it('FAILED RETRY: should return error, after 2 connection timeout errors', async () => {
         //given
         const { journeysPage1 } = resources;
         mock.onGet(journeysPage1.url).timeout();
@@ -265,6 +265,28 @@ describe('rest', () => {
         assert.lengthOf(mock.history.post, 1);
         assert.lengthOf(mock.history.get, 2);
 
+        return;
+    });
+    it('FAILED RETRY: should return error, after 2 ECONNRESET errors', async () => {
+        //given
+        const { journeysPage1 } = resources;
+
+        mock.onGet(journeysPage1.url).reply((res) => {
+            const connectionError = new Error();
+            connectionError.code = 'ECONNRESET';
+            throw connectionError;
+        });
+        // when
+        try {
+            await defaultSdk().rest.get('interaction/v1/interactions?$pageSize=5&$page=1');
+            assert.fail();
+        } catch (ex) {
+            // then
+            assert.isTrue(isConnectionError(ex.code));
+        }
+        assert.lengthOf(mock.history.post, 1);
+        assert.lengthOf(mock.history.get, 2);
+
         return;
     });
 });

package/test/utils.js

@@ -113,7 +113,7 @@ exports.defaultSdk = () => {
                 },
             },
             retryOnConnectionError: true,
-            requestAttempts: 1,
+            requestAttempts: 2,
         }
     );
 };