Merge branch 'master' into feature/content-branching

Author: uttamukkoji

.npmignore

@@ -20,4 +20,5 @@ docdash-template/
 .env
 .babelrc
 .babel-preset.js
-.eslintrc.js
+.eslintrc.js
+.talismanrc

.talismanrc

@@ -0,0 +1,13 @@
+fileignoreconfig:
+- filename: jsdocs/stack_environment_index.js.html
+  checksum: 1eac06c1c56f00422a548245f1c92fe505174fb349d85584d81508028117f53c
+- filename: dist/node/contentstack-management.js
+  checksum: 0cc6ad62a7f0cef0882d7416e9ec966b34e56ef906592e11aa9a5dc4a6e443b9
+- filename: package-lock.json
+  checksum: 99fcfcea623a71f7b8b8537e19ff32f2e20bc17a21dfe861ce5697c5e928bae7
+- filename: dist/nativescript/contentstack-management.js
+  checksum: fbf96bf31cc89c74e3e239b8c330dd9be336af20973a0ec56dd11c463447ddf1
+- filename: dist/react-native/contentstack-management.js
+  checksum: 4eeba7bb1f57f6031334d4394ce2a40890fdc8e96101f8c01441fca2e2708baa
+- filename: dist/web/contentstack-management.js
+  checksum: 394411bc4d75c6ec6fc001cd2aea9747b91a065daa5b770dff0c1e58ef095465

CHANGELOG.md

@@ -1,4 +1,20 @@
 # Changelog
+
+## [v1.2.4](https://github.com/contentstack/contentstack-management-javascript/tree/v1.2.4) (2021-07-19)
+ - Bug Fix
+   - Form data upload timeout on retrying rate limit error issue resolved
+
+## [v1.2.3](https://github.com/contentstack/contentstack-management-javascript/tree/v1.2.3) (2021-06-21)
+ - Bug Fix
+   - Request Timeout retry support added
+## [v1.2.2](https://github.com/contentstack/contentstack-management-javascript/tree/v1.2.2) (2021-05-26)
+ - Bug Fix
+   - Organization Specific get all Stack: Get Stack for specific organization from org_uid
+   - Resolved: Entry Publish and Update not work after find function
+   - Resolved: Workflow update issue on fetchAll function
+ - Document Update
+   - `update` Entry example code update
+
 ## [v1.2.1](https://github.com/contentstack/contentstack-management-javascript/tree/v1.2.1) (2021-03-19)
  - Bug Fix
    - User get details: Include organization functions for `is_owner` of the organization

lib/core/concurrency-queue.js

@@ -69,8 +69,12 @@ export function ConcurrencyQueue ({ axios, config }) {
     }
   }
 
-  // Request interseptor to queue the request
+  // Request interceptor to queue the request
   const requestHandler = request => {
+    if (typeof request.data === 'function') {
+      request.formdata = request.data
+      request.data = transformFormData(request)
+    }
     request.retryCount = request.retryCount || 0
     if (request.headers.authorization && request.headers.authorization !== undefined) {
       delete request.headers.authtoken
@@ -91,6 +95,9 @@ export function ConcurrencyQueue ({ axios, config }) {
     }
 
     return new Promise(resolve => {
+      request.onComplete = () => {
+        this.running.pop({ request, resolve })
+      }
       this.push({ request, resolve })
     })
   }
@@ -117,7 +124,7 @@ export function ConcurrencyQueue ({ axios, config }) {
 
   // Response interceptor used for
   const responseHandler = (response) => {
-    this.running.shift()
+    response.config.onComplete()
     shift()
     return response
   }
@@ -130,15 +137,16 @@ export function ConcurrencyQueue ({ axios, config }) {
     }
 
     // Error handling
-    let wait = this.config.retryDelay
-    const response = error.response
+    const wait = this.config.retryDelay
+    var response = error.response
     if (!response) {
       if (error.code === 'ECONNABORTED') {
         error.response = {
           ...error.response,
           status: 408,
           statusText: `timeout of ${this.config.timeout}ms exceeded`
         }
+        response = error.response
       } else {
         return Promise.reject(responseHandler(error))
       }
@@ -150,38 +158,43 @@ export function ConcurrencyQueue ({ axios, config }) {
         return Promise.reject(responseHandler(error))
       }
       this.running.shift()
-      wait = 1000
-      // Cooldown the running requests
+      // Cool down the running requests
       delay(wait)
       error.config.retryCount = networkError
 
       return axios(updateRequestConfig(error, retryErrorType, wait))
-    } else if (this.config.retryCondition && this.config.retryCondition(error)) {
-      retryErrorType = `Error with status: ${response.status}`
+    }
+    if (this.config.retryCondition && this.config.retryCondition(error)) {
+      retryErrorType = error.response ? `Error with status: ${response.status}` : `Error Code:${error.code}`
       networkError++
-      if (networkError > this.config.retryLimit) {
-        return Promise.reject(responseHandler(error))
-      }
-      if (this.config.retryDelayOptions) {
-        if (this.config.retryDelayOptions.customBackoff) {
-          wait = this.config.retryDelayOptions.customBackoff(networkError, error)
-          if (wait && wait <= 0) {
-            return Promise.reject(responseHandler(error))
-          }
-        } else if (this.config.retryDelayOptions.base) {
-          wait = this.config.retryDelayOptions.base * networkError
+      return this.retry(error, retryErrorType, networkError, wait)
+    }
+    return Promise.reject(responseHandler(error))
+  }
+
+  this.retry = (error, retryErrorType, retryCount, waittime) => {
+    let delaytime = waittime
+    if (retryCount > this.config.retryLimit) {
+      return Promise.reject(responseHandler(error))
+    }
+    if (this.config.retryDelayOptions) {
+      if (this.config.retryDelayOptions.customBackoff) {
+        delaytime = this.config.retryDelayOptions.customBackoff(retryCount, error)
+        if (delaytime && delaytime <= 0) {
+          return Promise.reject(responseHandler(error))
         }
-      } else {
-        wait = this.config.retryDelay
+      } else if (this.config.retryDelayOptions.base) {
+        delaytime = this.config.retryDelayOptions.base * retryCount
       }
-      error.config.retryCount = networkError
-      return new Promise(function (resolve) {
-        return setTimeout(function () {
-          return resolve(axios(updateRequestConfig(error, retryErrorType, wait)))
-        }, wait)
-      })
+    } else {
+      delaytime = this.config.retryDelay
     }
-    return Promise.reject(responseHandler(error))
+    error.config.retryCount = retryCount
+    return new Promise(function (resolve) {
+      return setTimeout(function () {
+        return resolve(axios(updateRequestConfig(error, retryErrorType, delaytime)))
+      }, delaytime)
+    })
   }
 
   this.interceptors = {
@@ -204,12 +217,25 @@ export function ConcurrencyQueue ({ axios, config }) {
       }
     }
 
+    requestConfig.data = transformFormData(requestConfig)
     requestConfig.transformRequest = [function (data) {
       return data
     }]
     return requestConfig
   }
 
+  const transformFormData = (request) => {
+    if (request.formdata) {
+      const formdata = request.formdata()
+      request.headers = {
+        ...request.headers,
+        ...formdata.getHeaders()
+      }
+      return formdata
+    }
+    return request.data
+  }
+
   // Adds interseptors in axios to queue request
   this.interceptors.request = axios.interceptors.request.use(requestHandler)
   this.interceptors.response = axios.interceptors.response.use(responseHandler, responseErrorHandler)

lib/entity.js

@@ -57,7 +57,6 @@ export const upload = async ({ http, urlPath, stackHeaders, formData, params, me
   const headers = {
     headers: {
       ...params,
-      ...formData.getHeaders(),
       ...cloneDeep(stackHeaders)
     }
   } || {}

lib/stack/asset/index.js

@@ -233,28 +233,25 @@ export function AssetCollection (http, data) {
   return assetCollection
 }
 
-function createFormData (data) {
-  const formData = new FormData()
-  if (typeof data['parent_uid'] === 'string') {
-    formData.append('asset[parent_uid]', data['parent_uid'])
-  }
-
-  if (typeof data.description === 'string') {
-    formData.append('asset[description]', data.description)
-  }
-
-  if (data.tags instanceof Array) {
-    formData.append('asset[tags]', data.tags.join(','))
-  } else if (typeof data.tags === 'string') {
-    formData.append('asset[tags]', data.tags)
-  }
-
-  if (typeof data.title === 'string') {
-    formData.append('asset[title]', data.title)
+export function createFormData (data) {
+  return () => {
+    const formData = new FormData()
+    if (typeof data['parent_uid'] === 'string') {
+      formData.append('asset[parent_uid]', data['parent_uid'])
+    }
+    if (typeof data.description === 'string') {
+      formData.append('asset[description]', data.description)
+    }
+    if (data.tags instanceof Array) {
+      formData.append('asset[tags]', data.tags.join(','))
+    } else if (typeof data.tags === 'string') {
+      formData.append('asset[tags]', data.tags)
+    }
+    if (typeof data.title === 'string') {
+      formData.append('asset[title]', data.title)
+    }
+    const uploadStream = createReadStream(data.upload)
+    formData.append('asset[upload]', uploadStream)
+    return formData
   }
-
-  const uploadStream = createReadStream(data.upload)
-  formData.append('asset[upload]', uploadStream)
-
-  return formData
 }

lib/stack/contentType/index.js

@@ -198,9 +198,11 @@ export function ContentTypeCollection (http, data) {
   return contentTypeCollection
 }
 
-function createFormData (data) {
-  const formData = new FormData()
-  const uploadStream = createReadStream(data.content_type)
-  formData.append('content_type', uploadStream)
-  return formData
+export function createFormData (data) {
+  return () => {
+    const formData = new FormData()
+    const uploadStream = createReadStream(data.content_type)
+    formData.append('content_type', uploadStream)
+    return formData
+  }
 }

lib/stack/extension/index.js

@@ -155,34 +155,35 @@ export function ExtensionCollection (http, data) {
   return extensionCollection
 }
 
-function createExtensionFormData (data) {
-  const formData = new FormData()
+export function createExtensionFormData (data) {
+  return () => {
+    const formData = new FormData()
 
-  if (typeof data.title === 'string') {
-    formData.append('extension[title]', data.title)
-  }
-  if (typeof data.scope === 'object') {
-    formData.append('extension[scope]', `${data.scope}`)
-  }
-  if (typeof data['data_type'] === 'string') {
-    formData.append('extension[data_type]', data['data_type'])
-  }
-  if (typeof data.type === 'string') {
-    formData.append('extension[type]', data.type)
-  }
-  if (data.tags instanceof Array) {
-    formData.append('extension[tags]', data.tags.join(','))
-  } else if (typeof data.tags === 'string') {
-    formData.append('extension[tags]', data.tags)
-  }
-  if (typeof data.multiple === 'boolean') {
-    formData.append('extension[multiple]', `${data.multiple}`)
-  }
-  if (typeof data.enable === 'boolean') {
-    formData.append('extension[enable]', `${data.enable}`)
+    if (typeof data.title === 'string') {
+      formData.append('extension[title]', data.title)
+    }
+    if (typeof data.scope === 'object') {
+      formData.append('extension[scope]', `${data.scope}`)
+    }
+    if (typeof data['data_type'] === 'string') {
+      formData.append('extension[data_type]', data['data_type'])
+    }
+    if (typeof data.type === 'string') {
+      formData.append('extension[type]', data.type)
+    }
+    if (data.tags instanceof Array) {
+      formData.append('extension[tags]', data.tags.join(','))
+    } else if (typeof data.tags === 'string') {
+      formData.append('extension[tags]', data.tags)
+    }
+    if (typeof data.multiple === 'boolean') {
+      formData.append('extension[multiple]', `${data.multiple}`)
+    }
+    if (typeof data.enable === 'boolean') {
+      formData.append('extension[enable]', `${data.enable}`)
+    }
+    const uploadStream = createReadStream(data.upload)
+    formData.append('extension[upload]', uploadStream)
+    return formData
   }
-
-  const uploadStream = createReadStream(data.upload)
-  formData.append('extension[upload]', uploadStream)
-  return formData
 }

lib/stack/globalField/index.js

@@ -148,9 +148,11 @@ export function GlobalFieldCollection (http, data) {
   return globalFieldCollection
 }
 
-function createFormData (data) {
-  const formData = new FormData()
-  const uploadStream = createReadStream(data.global_field)
-  formData.append('global_field', uploadStream)
-  return formData
+export function createFormData (data) {
+  return () => {
+    const formData = new FormData()
+    const uploadStream = createReadStream(data.global_field)
+    formData.append('global_field', uploadStream)
+    return formData
+  }
 }

lib/stack/webhook/index.js

@@ -231,9 +231,11 @@ export function WebhookCollection (http, data) {
   return webhookCollection
 }
 
-function createFormData (data) {
-  const formData = new FormData()
-  const uploadStream = createReadStream(data.webhook)
-  formData.append('webhook', uploadStream)
-  return formData
+export function createFormData (data) {
+  return () => {
+    const formData = new FormData()
+    const uploadStream = createReadStream(data.webhook)
+    formData.append('webhook', uploadStream)
+    return formData
+  }
 }