Merge pull request #4 from contentstack/development

Request failure retry count

Author: uttamukkoji

.npmignore

@@ -15,4 +15,9 @@ typings
 webpack/
 tsconfig.json
 .jsdoc.json
-jsdocs/
+jsdocs/
+docdash-template/
+.env
+.babelrc
+.babel-preset.js
+.eslintrc.js

CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog
+
+## [v1.1.2](https://github.com/contentstack/contentstack-management-javascript/tree/v1.1.2) (2021-01-07)
+ - Bug Fix
+   - Retry count on multiple request failuer
+## [v1.1.1](https://github.com/contentstack/contentstack-management-javascript/tree/v1.1.1) (2020-10-23)
+ - Bug Fix
+   - Stack initialization issue
 ## [v1.1.0](https://github.com/contentstack/contentstack-management-javascript/tree/v1.1.0) (2020-10-23)
  - Bug Fix
    - Owner of organization can access stack function

lib/contentstackClient.js

@@ -82,7 +82,7 @@ export default function contentstackClient ({ http }) {
    * import * as contentstack from '@contentstack/management'
    * const client = contentstack.client()
    *
-   * client.stack({ api_key: 'api_key', management_token: 'management_token' }).fetch()
+   * client.stack({ api_key: 'api_key', management_token: 'management_token' }).contentType('content_type_uid').fetch()
    * .then((stack) => console.log(stack))
    *
    */

lib/core/contentstack-retry.js

@@ -2,6 +2,7 @@
 export default function contentstckRetry (axios, defaultOptions, retryLimit = 5, retryDelay = 300) {
   var networkError = 0
   axios.interceptors.request.use(function (config) {
+    config.retryCount = config.retryCount || 0
     if (config.headers.authorization && config.headers.authorization !== undefined) {
       delete config.headers.authtoken
     }
@@ -13,15 +14,23 @@ export default function contentstckRetry (axios, defaultOptions, retryLimit = 5,
   }, function (error) {
     var wait = retryDelay
     let retryErrorType = null
-    if (!defaultOptions.retryOnError) {
-      return Promise.reject(error)
-    }
-
     var response = error.response
+    networkError = error.config.retryCount
     if (!response) {
-      retryErrorType = `Server connection`
+      if (error.code === 'ECONNABORTED') {
+        error.response = {
+          ...error.response,
+          status: 408,
+          statusText: `timeout of ${defaultOptions.timeout}ms exceeded`
+        }
+      }else {
+        return Promise.reject(error)
+      }
+    }
+    if (!defaultOptions.retryOnError) {
       return Promise.reject(error)
     }
+      
     if (defaultOptions.retryCondition && defaultOptions.retryCondition(error)) {
       retryErrorType = `Error with status: ${error.response.status}`
       networkError++
@@ -46,6 +55,8 @@ export default function contentstckRetry (axios, defaultOptions, retryLimit = 5,
       networkError = 0
     }
 
+    error.config.retryCount = networkError
+
     if (retryErrorType && error.config !== undefined) {
       var config = error.config
       defaultOptions.logHandler('warning', `${retryErrorType} error occurred. Waiting for ${wait} ms before retrying...`)

lib/entity.js

@@ -186,7 +186,7 @@ export const fetch = (http, type) => {
           response.data[type]['content_type'] = response.data['content_type']
           response.data[type]['schema'] = response.data['schema']
         }
-        return Object.assign(this, cloneDeep(response.data[type]))
+        return new this.constructor(http, parseData(response, this.stackHeaders))
       } else {
         throw error(response)
       }

lib/organization/index.js

@@ -75,7 +75,7 @@ export function Organization (http, data) {
        * import * as contentstack from '@contentstack/management'
        * const client = contentstack.client()
        *
-       * client.stack({ api_key: 'api_key'}).transferOwnership('emailId')
+       * client.organization('organization_uid').transferOwnership('emailId')
        * .then((response) => console.log(response.notice))
        *
        */

lib/stack/index.js

@@ -579,13 +579,6 @@ export function Stack (http, data) {
      * import * as contentstack from '@contentstack/management'
      * const client = contentstack.client()
      *
-     * client.organization('org_uid').stack().create({name: 'My New Stack'})
-     * .then((stack) => console.log(stack))
-     *
-     * @example
-     * import * as contentstack from '@contentstack/management'
-     * const client = contentstack.client()
-     *
      * client.stack().create({name: 'My New Stack'}, { organization_uid: 'org_uid' })
      * .then((stack) => console.log(stack))
      */