Bug/formdata request timeout

.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

dist/es-modules/core/concurrency-queue.js

@@ -84,6 +84,12 @@ export function ConcurrencyQueue(_ref) {
 
 
   var requestHandler = function requestHandler(request) {
+    if (typeof request.data === 'function') {
+      request.formdata = request.data;
+      request.data = transformFormData(request);
+    }
+
+    console.log(request.data);
     request.retryCount = request.retryCount || 0;
 
     if (request.headers.authorization && request.headers.authorization !== undefined) {
@@ -108,6 +114,13 @@ export function ConcurrencyQueue(_ref) {
     }
 
     return new Promise(function (resolve) {
+      request.onComplete = function () {
+        _this.running.pop({
+          request: request,
+          resolve: resolve
+        });
+      };
+
       _this.push({
         request: request,
         resolve: resolve
@@ -141,8 +154,7 @@ export function ConcurrencyQueue(_ref) {
 
 
   var responseHandler = function responseHandler(response) {
-    _this.running.shift();
-
+    response.config.onComplete();
     shift();
     return response;
   };
@@ -247,10 +259,21 @@ export function ConcurrencyQueue(_ref) {
       }
     }
 
+    requestConfig.data = transformFormData(requestConfig);
     requestConfig.transformRequest = [function (data) {
       return data;
     }];
     return requestConfig;
+  };
+
+  var transformFormData = function transformFormData(request) {
+    if (request.formdata) {
+      var formdata = request.formdata();
+      request.headers = _objectSpread(_objectSpread({}, request.headers), formdata.getHeaders());
+      return formdata;
+    }
+
+    return request.data;
   }; // Adds interseptors in axios to queue request
 
 

dist/es-modules/entity.js

@@ -147,7 +147,7 @@ export var upload = /*#__PURE__*/function () {
           case 0:
             http = _ref6.http, urlPath = _ref6.urlPath, stackHeaders = _ref6.stackHeaders, formData = _ref6.formData, params = _ref6.params, _ref6$method = _ref6.method, method = _ref6$method === void 0 ? 'POST' : _ref6$method;
             headers = {
-              headers: _objectSpread(_objectSpread(_objectSpread({}, params), formData.getHeaders()), cloneDeep(stackHeaders))
+              headers: _objectSpread(_objectSpread({}, params), cloneDeep(stackHeaders))
             } || {};
 
             if (!(method === 'POST')) {
@@ -186,38 +186,39 @@ export var create = function create(_ref8) {
                 headers: _objectSpread(_objectSpread({}, cloneDeep(params)), cloneDeep(this.stackHeaders)),
                 params: _objectSpread({}, cloneDeep(param))
               } || {};
-              _context5.prev = 1;
-              _context5.next = 4;
+              console.log('Entry ', data);
+              _context5.prev = 2;
+              _context5.next = 5;
               return http.post(this.urlPath, data, headers);
 
-            case 4:
+            case 5:
               response = _context5.sent;
 
               if (!response.data) {
-                _context5.next = 9;
+                _context5.next = 10;
                 break;
               }
 
               return _context5.abrupt("return", new this.constructor(http, parseData(response, this.stackHeaders, this.content_type_uid)));
 
-            case 9:
+            case 10:
               throw error(response);
 
-            case 10:
-              _context5.next = 15;
+            case 11:
+              _context5.next = 16;
               break;
 
-            case 12:
-              _context5.prev = 12;
-              _context5.t0 = _context5["catch"](1);
+            case 13:
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](2);
               throw error(_context5.t0);
 
-            case 15:
+            case 16:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, this, [[1, 12]]);
+      }, _callee5, this, [[2, 13]]);
     }));
 
     return function (_x8, _x9) {

dist/es-modules/stack/asset/index.js

@@ -327,27 +327,29 @@ export function AssetCollection(http, data) {
 }
 
 function createFormData(data) {
-  var 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);
-  }
-
-  var uploadStream = createReadStream(data.upload);
-  formData.append('asset[upload]', uploadStream);
-  return formData;
+  return function () {
+    var 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);
+    }
+
+    var uploadStream = createReadStream(data.upload);
+    formData.append('asset[upload]', uploadStream);
+    return formData;
+  };
 }

dist/es-modules/stack/contentType/entry/index.js

@@ -356,8 +356,10 @@ export function EntryCollection(http, data) {
 }
 
 function createFormData(entry) {
-  var formData = new FormData();
-  var uploadStream = createReadStream(entry);
-  formData.append('entry', uploadStream);
-  return formData;
+  return function () {
+    var formData = new FormData();
+    var uploadStream = createReadStream(entry);
+    formData.append('entry', uploadStream);
+    return formData;
+  };
 }

dist/es-modules/stack/contentType/index.js

@@ -246,8 +246,10 @@ export function ContentTypeCollection(http, data) {
 }
 
 function createFormData(data) {
-  var formData = new FormData();
-  var uploadStream = createReadStream(data.content_type);
-  formData.append('content_type', uploadStream);
-  return formData;
+  return function () {
+    var formData = new FormData();
+    var uploadStream = createReadStream(data.content_type);
+    formData.append('content_type', uploadStream);
+    return formData;
+  };
 }

dist/es-modules/stack/extension/index.js

@@ -209,39 +209,41 @@ export function ExtensionCollection(http, data) {
 }
 
 function createExtensionFormData(data) {
-  var formData = new FormData();
-
-  if (typeof data.title === 'string') {
-    formData.append('extension[title]', data.title);
-  }
-
-  if (_typeof(data.scope) === 'object') {
-    formData.append('extension[scope]', "".concat(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]', "".concat(data.multiple));
-  }
-
-  if (typeof data.enable === 'boolean') {
-    formData.append('extension[enable]', "".concat(data.enable));
-  }
-
-  var uploadStream = createReadStream(data.upload);
-  formData.append('extension[upload]', uploadStream);
-  return formData;
+  return function () {
+    var formData = new FormData();
+
+    if (typeof data.title === 'string') {
+      formData.append('extension[title]', data.title);
+    }
+
+    if (_typeof(data.scope) === 'object') {
+      formData.append('extension[scope]', "".concat(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]', "".concat(data.multiple));
+    }
+
+    if (typeof data.enable === 'boolean') {
+      formData.append('extension[enable]', "".concat(data.enable));
+    }
+
+    var uploadStream = createReadStream(data.upload);
+    formData.append('extension[upload]', uploadStream);
+    return formData;
+  };
 }

dist/es-modules/stack/globalField/index.js

@@ -193,8 +193,10 @@ export function GlobalFieldCollection(http, data) {
 }
 
 function createFormData(data) {
-  var formData = new FormData();
-  var uploadStream = createReadStream(data.global_field);
-  formData.append('global_field', uploadStream);
-  return formData;
+  return function () {
+    var formData = new FormData();
+    var uploadStream = createReadStream(data.global_field);
+    formData.append('global_field', uploadStream);
+    return formData;
+  };
 }

dist/es-modules/stack/webhook/index.js

@@ -346,8 +346,10 @@ export function WebhookCollection(http, data) {
 }
 
 function createFormData(data) {
-  var formData = new FormData();
-  var uploadStream = createReadStream(data.webhook);
-  formData.append('webhook', uploadStream);
-  return formData;
+  return function () {
+    var formData = new FormData();
+    var uploadStream = createReadStream(data.webhook);
+    formData.append('webhook', uploadStream);
+    return formData;
+  };
 }

dist/es5/core/concurrency-queue.js

@@ -102,6 +102,12 @@ function ConcurrencyQueue(_ref) {
 
 
   var requestHandler = function requestHandler(request) {
+    if (typeof request.data === 'function') {
+      request.formdata = request.data;
+      request.data = transformFormData(request);
+    }
+
+    console.log(request.data);
     request.retryCount = request.retryCount || 0;
 
     if (request.headers.authorization && request.headers.authorization !== undefined) {
@@ -127,6 +133,13 @@ function ConcurrencyQueue(_ref) {
     }
 
     return new Promise(function (resolve) {
+      request.onComplete = function () {
+        _this.running.pop({
+          request: request,
+          resolve: resolve
+        });
+      };
+
       _this.push({
         request: request,
         resolve: resolve
@@ -160,8 +173,7 @@ function ConcurrencyQueue(_ref) {
 
 
   var responseHandler = function responseHandler(response) {
-    _this.running.shift();
-
+    response.config.onComplete();
     shift();
     return response;
   };
@@ -266,10 +278,21 @@ function ConcurrencyQueue(_ref) {
       }
     }
 
+    requestConfig.data = transformFormData(requestConfig);
     requestConfig.transformRequest = [function (data) {
       return data;
     }];
     return requestConfig;
+  };
+
+  var transformFormData = function transformFormData(request) {
+    if (request.formdata) {
+      var formdata = request.formdata();
+      request.headers = _objectSpread(_objectSpread({}, request.headers), formdata.getHeaders());
+      return formdata;
+    }
+
+    return request.data;
   }; // Adds interseptors in axios to queue request