Merge pull request #18 from contentstack/bug/formdata-request-timeout

Bug/formdata request timeout

Author: uttamukkoji

.talismanrc

@@ -1,11 +1,3 @@
 fileignoreconfig:
-- filename: jsdocs/stack_environment_index.js.html
-  checksum: ef24cd9f2e12802a1abbbc440e22c486863b90823050bf0c7ed17cd95d6d0669
-- filename: dist/node/contentstack-management.js
-  checksum: 8313dfeaa7e856ae355b2ef9d9beac095c8b1c7c93aafb9ab73f0d86c23e29ec
-- filename: dist/nativescript/contentstack-management.js
-  checksum: bb55ba77624c3f000c56c9f9730016883be9863973e9177c4e8a3a70fa9796e1
-- filename: dist/react-native/contentstack-management.js
-  checksum: 8edb4ff3adf9f4a4d21047e8aeac28231a3711fae001ef805c8fd093bd211634
-- filename: dist/web/contentstack-management.js
-  checksum: a04259dd778b2f49aa5652299bdc7828e402de2167f24c33acfa8604ce662c0a
+- filename: package-lock.json
+  checksum: dc2cccebfb5ca8c6330c9c5b3300633c804876a5487c41f326a2c750f500c18b

lib/core/concurrency-queue.js

@@ -71,6 +71,10 @@ export function ConcurrencyQueue ({ axios, config }) {
 
   // 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
   }
@@ -210,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
+  }
 }