Skip to content

Commit c0da468

Browse files
uttamukkojiuttamukkoji
authored
Merge pull request #18 from contentstack/bug/formdata-request-timeout
Bug/formdata request timeout
2 parents 07eefc3 + 54bfd8b commit c0da468

File tree

82 files changed

+2043
-743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2043
-743
lines changed

‎.talismanrc‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
fileignoreconfig:
2-
- filename: jsdocs/stack_environment_index.js.html
3-
checksum: ef24cd9f2e12802a1abbbc440e22c486863b90823050bf0c7ed17cd95d6d0669
4-
- filename: dist/node/contentstack-management.js
5-
checksum: 8313dfeaa7e856ae355b2ef9d9beac095c8b1c7c93aafb9ab73f0d86c23e29ec
6-
- filename: dist/nativescript/contentstack-management.js
7-
checksum: bb55ba77624c3f000c56c9f9730016883be9863973e9177c4e8a3a70fa9796e1
8-
- filename: dist/react-native/contentstack-management.js
9-
checksum: 8edb4ff3adf9f4a4d21047e8aeac28231a3711fae001ef805c8fd093bd211634
10-
- filename: dist/web/contentstack-management.js
11-
checksum: a04259dd778b2f49aa5652299bdc7828e402de2167f24c33acfa8604ce662c0a
2+
- filename: package-lock.json
3+
checksum: dc2cccebfb5ca8c6330c9c5b3300633c804876a5487c41f326a2c750f500c18b

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ export function ConcurrencyQueue(_ref) {
8484

8585

8686
var requestHandler = function requestHandler(request) {
87+
if (typeof request.data === 'function') {
88+
request.formdata = request.data;
89+
request.data = transformFormData(request);
90+
}
91+
92+
console.log(request.data);
8793
request.retryCount = request.retryCount || 0;
8894

8995
if (request.headers.authorization && request.headers.authorization !== undefined) {
@@ -108,6 +114,13 @@ export function ConcurrencyQueue(_ref) {
108114
}
109115

110116
return new Promise(function (resolve) {
117+
request.onComplete = function () {
118+
_this.running.pop({
119+
request: request,
120+
resolve: resolve
121+
});
122+
};
123+
111124
_this.push({
112125
request: request,
113126
resolve: resolve
@@ -141,8 +154,7 @@ export function ConcurrencyQueue(_ref) {
141154

142155

143156
var responseHandler = function responseHandler(response) {
144-
_this.running.shift();
145-
157+
response.config.onComplete();
146158
shift();
147159
return response;
148160
};
@@ -247,10 +259,21 @@ export function ConcurrencyQueue(_ref) {
247259
}
248260
}
249261

262+
requestConfig.data = transformFormData(requestConfig);
250263
requestConfig.transformRequest = [function (data) {
251264
return data;
252265
}];
253266
return requestConfig;
267+
};
268+
269+
var transformFormData = function transformFormData(request) {
270+
if (request.formdata) {
271+
var formdata = request.formdata();
272+
request.headers = _objectSpread(_objectSpread({}, request.headers), formdata.getHeaders());
273+
return formdata;
274+
}
275+
276+
return request.data;
254277
}; // Adds interseptors in axios to queue request
255278

256279

‎dist/es-modules/entity.js‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export var upload = /*#__PURE__*/function () {
147147
case 0:
148148
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;
149149
headers = {
150-
headers: _objectSpread(_objectSpread(_objectSpread({}, params), formData.getHeaders()), cloneDeep(stackHeaders))
150+
headers: _objectSpread(_objectSpread({}, params), cloneDeep(stackHeaders))
151151
} || {};
152152

153153
if (!(method === 'POST')) {
@@ -186,38 +186,39 @@ export var create = function create(_ref8) {
186186
headers: _objectSpread(_objectSpread({}, cloneDeep(params)), cloneDeep(this.stackHeaders)),
187187
params: _objectSpread({}, cloneDeep(param))
188188
} || {};
189-
_context5.prev = 1;
190-
_context5.next = 4;
189+
console.log('Entry ', data);
190+
_context5.prev = 2;
191+
_context5.next = 5;
191192
return http.post(this.urlPath, data, headers);
192193

193-
case 4:
194+
case 5:
194195
response = _context5.sent;
195196

196197
if (!response.data) {
197-
_context5.next = 9;
198+
_context5.next = 10;
198199
break;
199200
}
200201

201202
return _context5.abrupt("return", new this.constructor(http, parseData(response, this.stackHeaders, this.content_type_uid)));
202203

203-
case 9:
204+
case 10:
204205
throw error(response);
205206

206-
case 10:
207-
_context5.next = 15;
207+
case 11:
208+
_context5.next = 16;
208209
break;
209210

210-
case 12:
211-
_context5.prev = 12;
212-
_context5.t0 = _context5["catch"](1);
211+
case 13:
212+
_context5.prev = 13;
213+
_context5.t0 = _context5["catch"](2);
213214
throw error(_context5.t0);
214215

215-
case 15:
216+
case 16:
216217
case "end":
217218
return _context5.stop();
218219
}
219220
}
220-
}, _callee5, this, [[1, 12]]);
221+
}, _callee5, this, [[2, 13]]);
221222
}));
222223

223224
return function (_x8, _x9) {

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -327,27 +327,29 @@ export function AssetCollection(http, data) {
327327
}
328328

329329
function createFormData(data) {
330-
var formData = new FormData();
331-
332-
if (typeof data['parent_uid'] === 'string') {
333-
formData.append('asset[parent_uid]', data['parent_uid']);
334-
}
335-
336-
if (typeof data.description === 'string') {
337-
formData.append('asset[description]', data.description);
338-
}
339-
340-
if (data.tags instanceof Array) {
341-
formData.append('asset[tags]', data.tags.join(','));
342-
} else if (typeof data.tags === 'string') {
343-
formData.append('asset[tags]', data.tags);
344-
}
345-
346-
if (typeof data.title === 'string') {
347-
formData.append('asset[title]', data.title);
348-
}
349-
350-
var uploadStream = createReadStream(data.upload);
351-
formData.append('asset[upload]', uploadStream);
352-
return formData;
330+
return function () {
331+
var formData = new FormData();
332+
333+
if (typeof data['parent_uid'] === 'string') {
334+
formData.append('asset[parent_uid]', data['parent_uid']);
335+
}
336+
337+
if (typeof data.description === 'string') {
338+
formData.append('asset[description]', data.description);
339+
}
340+
341+
if (data.tags instanceof Array) {
342+
formData.append('asset[tags]', data.tags.join(','));
343+
} else if (typeof data.tags === 'string') {
344+
formData.append('asset[tags]', data.tags);
345+
}
346+
347+
if (typeof data.title === 'string') {
348+
formData.append('asset[title]', data.title);
349+
}
350+
351+
var uploadStream = createReadStream(data.upload);
352+
formData.append('asset[upload]', uploadStream);
353+
return formData;
354+
};
353355
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,10 @@ export function EntryCollection(http, data) {
356356
}
357357

358358
function createFormData(entry) {
359-
var formData = new FormData();
360-
var uploadStream = createReadStream(entry);
361-
formData.append('entry', uploadStream);
362-
return formData;
359+
return function () {
360+
var formData = new FormData();
361+
var uploadStream = createReadStream(entry);
362+
formData.append('entry', uploadStream);
363+
return formData;
364+
};
363365
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,10 @@ export function ContentTypeCollection(http, data) {
246246
}
247247

248248
function createFormData(data) {
249-
var formData = new FormData();
250-
var uploadStream = createReadStream(data.content_type);
251-
formData.append('content_type', uploadStream);
252-
return formData;
249+
return function () {
250+
var formData = new FormData();
251+
var uploadStream = createReadStream(data.content_type);
252+
formData.append('content_type', uploadStream);
253+
return formData;
254+
};
253255
}

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

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -209,39 +209,41 @@ export function ExtensionCollection(http, data) {
209209
}
210210

211211
function createExtensionFormData(data) {
212-
var formData = new FormData();
213-
214-
if (typeof data.title === 'string') {
215-
formData.append('extension[title]', data.title);
216-
}
217-
218-
if (_typeof(data.scope) === 'object') {
219-
formData.append('extension[scope]', "".concat(data.scope));
220-
}
221-
222-
if (typeof data['data_type'] === 'string') {
223-
formData.append('extension[data_type]', data['data_type']);
224-
}
225-
226-
if (typeof data.type === 'string') {
227-
formData.append('extension[type]', data.type);
228-
}
229-
230-
if (data.tags instanceof Array) {
231-
formData.append('extension[tags]', data.tags.join(','));
232-
} else if (typeof data.tags === 'string') {
233-
formData.append('extension[tags]', data.tags);
234-
}
235-
236-
if (typeof data.multiple === 'boolean') {
237-
formData.append('extension[multiple]', "".concat(data.multiple));
238-
}
239-
240-
if (typeof data.enable === 'boolean') {
241-
formData.append('extension[enable]', "".concat(data.enable));
242-
}
243-
244-
var uploadStream = createReadStream(data.upload);
245-
formData.append('extension[upload]', uploadStream);
246-
return formData;
212+
return function () {
213+
var formData = new FormData();
214+
215+
if (typeof data.title === 'string') {
216+
formData.append('extension[title]', data.title);
217+
}
218+
219+
if (_typeof(data.scope) === 'object') {
220+
formData.append('extension[scope]', "".concat(data.scope));
221+
}
222+
223+
if (typeof data['data_type'] === 'string') {
224+
formData.append('extension[data_type]', data['data_type']);
225+
}
226+
227+
if (typeof data.type === 'string') {
228+
formData.append('extension[type]', data.type);
229+
}
230+
231+
if (data.tags instanceof Array) {
232+
formData.append('extension[tags]', data.tags.join(','));
233+
} else if (typeof data.tags === 'string') {
234+
formData.append('extension[tags]', data.tags);
235+
}
236+
237+
if (typeof data.multiple === 'boolean') {
238+
formData.append('extension[multiple]', "".concat(data.multiple));
239+
}
240+
241+
if (typeof data.enable === 'boolean') {
242+
formData.append('extension[enable]', "".concat(data.enable));
243+
}
244+
245+
var uploadStream = createReadStream(data.upload);
246+
formData.append('extension[upload]', uploadStream);
247+
return formData;
248+
};
247249
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,10 @@ export function GlobalFieldCollection(http, data) {
193193
}
194194

195195
function createFormData(data) {
196-
var formData = new FormData();
197-
var uploadStream = createReadStream(data.global_field);
198-
formData.append('global_field', uploadStream);
199-
return formData;
196+
return function () {
197+
var formData = new FormData();
198+
var uploadStream = createReadStream(data.global_field);
199+
formData.append('global_field', uploadStream);
200+
return formData;
201+
};
200202
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,10 @@ export function WebhookCollection(http, data) {
346346
}
347347

348348
function createFormData(data) {
349-
var formData = new FormData();
350-
var uploadStream = createReadStream(data.webhook);
351-
formData.append('webhook', uploadStream);
352-
return formData;
349+
return function () {
350+
var formData = new FormData();
351+
var uploadStream = createReadStream(data.webhook);
352+
formData.append('webhook', uploadStream);
353+
return formData;
354+
};
353355
}

‎dist/es5/core/concurrency-queue.js‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ function ConcurrencyQueue(_ref) {
102102

103103

104104
var requestHandler = function requestHandler(request) {
105+
if (typeof request.data === 'function') {
106+
request.formdata = request.data;
107+
request.data = transformFormData(request);
108+
}
109+
110+
console.log(request.data);
105111
request.retryCount = request.retryCount || 0;
106112

107113
if (request.headers.authorization && request.headers.authorization !== undefined) {
@@ -127,6 +133,13 @@ function ConcurrencyQueue(_ref) {
127133
}
128134

129135
return new Promise(function (resolve) {
136+
request.onComplete = function () {
137+
_this.running.pop({
138+
request: request,
139+
resolve: resolve
140+
});
141+
};
142+
130143
_this.push({
131144
request: request,
132145
resolve: resolve
@@ -160,8 +173,7 @@ function ConcurrencyQueue(_ref) {
160173

161174

162175
var responseHandler = function responseHandler(response) {
163-
_this.running.shift();
164-
176+
response.config.onComplete();
165177
shift();
166178
return response;
167179
};
@@ -266,10 +278,21 @@ function ConcurrencyQueue(_ref) {
266278
}
267279
}
268280

281+
requestConfig.data = transformFormData(requestConfig);
269282
requestConfig.transformRequest = [function (data) {
270283
return data;
271284
}];
272285
return requestConfig;
286+
};
287+
288+
var transformFormData = function transformFormData(request) {
289+
if (request.formdata) {
290+
var formdata = request.formdata();
291+
request.headers = _objectSpread(_objectSpread({}, request.headers), formdata.getHeaders());
292+
return formdata;
293+
}
294+
295+
return request.data;
273296
}; // Adds interseptors in axios to queue request
274297

275298

0 commit comments

Comments
 (0)