Compare commits

...

4 Commits

Author SHA1 Message Date
9eeb9c16b6 1.1.11 2018-07-20 00:50:36 +02:00
52bf520eb9 fix(small fix): update 2018-07-20 00:50:36 +02:00
c9f6198114 1.1.10 2018-07-20 00:35:24 +02:00
0a17591eae fix(formData): refactor formData 2018-07-20 00:35:23 +02:00
4 changed files with 6 additions and 26 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartrequest", "name": "@pushrocks/smartrequest",
"version": "1.1.9", "version": "1.1.11",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartrequest", "name": "@pushrocks/smartrequest",
"version": "1.1.9", "version": "1.1.11",
"private": false, "private": false,
"description": "dropin replacement for request", "description": "dropin replacement for request",
"main": "dist/index.js", "main": "dist/index.js",

View File

@ -11,25 +11,6 @@ export interface IFormField {
payload: string; payload: string;
} }
/**
* retrieve the FormData headers in reliable way
* @param formDataArg
*/
const getFormDataHeaders = (formDataArg: plugins.formData) => {
const done = plugins.smartpromise.defer();
formDataArg.getLength((err, length) => {
if (err) {
done.reject(err);
}
const headers = Object.assign(
{ "Content-Length": length },
formDataArg.getHeaders()
);
done.resolve(headers);
});
return done.promise;
};
const appendFormField = async ( const appendFormField = async (
formDataArg: plugins.formData, formDataArg: plugins.formData,
formDataField: IFormField formDataField: IFormField
@ -54,13 +35,10 @@ export const postFormData = async (
for (const formField of payloadArg) { for (const formField of payloadArg) {
await appendFormField(form, formField); await appendFormField(form, formField);
} }
const pipeLog: any = async (...args) => {
console.log(args);
};
const requestOptions = Object.assign({}, optionsArg, { const requestOptions = Object.assign({}, optionsArg, {
headers: { headers: {
...(optionsArg.headers), ...(optionsArg.headers),
...getFormDataHeaders(form) ...form.getHeaders()
}, },
requestBody: form requestBody: form
}); });

View File

@ -98,7 +98,9 @@ export let request = async (
request.write(optionsArg.requestBody); request.write(optionsArg.requestBody);
request.end(); request.end();
} else if (optionsArg.requestBody instanceof plugins.formData) { } else if (optionsArg.requestBody instanceof plugins.formData) {
optionsArg.requestBody.pipe(request); optionsArg.requestBody.pipe(request).on('finish', event => {
request.end();
});
} }
} else { } else {
request.end(); request.end();