Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
a8291febec | |||
c0704eb2d8 | |||
9eeb9c16b6 | |||
52bf520eb9 | |||
c9f6198114 | |||
0a17591eae | |||
3417f09cdb | |||
20dc3c9230 | |||
6f865a356f | |||
71a6ffef96 | |||
189916e62b | |||
33e36b5d44 |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartrequest",
|
"name": "@pushrocks/smartrequest",
|
||||||
"version": "1.1.6",
|
"version": "1.1.12",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartrequest",
|
"name": "@pushrocks/smartrequest",
|
||||||
"version": "1.1.6",
|
"version": "1.1.12",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "dropin replacement for request",
|
"description": "dropin replacement for request",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
|
@ -11,35 +11,18 @@ 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
|
||||||
) => {
|
) => {
|
||||||
if (formDataField.type === "filePath") {
|
if (formDataField.type === "filePath") {
|
||||||
formDataArg.append("type", "image");
|
let fileData = plugins.fs.readFileSync(
|
||||||
let fileData = plugins.fs.createReadStream(
|
|
||||||
plugins.path.join(process.cwd(), formDataField.payload)
|
plugins.path.join(process.cwd(), formDataField.payload)
|
||||||
);
|
);
|
||||||
formDataArg.append("media", fileData, "upload.pdf");
|
formDataArg.append("file", fileData, {
|
||||||
|
filename: 'upload.pdf',
|
||||||
|
contentType: 'application/pdf'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -52,11 +35,16 @@ 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) => {
|
const requestOptions = Object.assign({}, optionsArg, {
|
||||||
console.log(args);
|
method: 'POST',
|
||||||
};
|
headers: {
|
||||||
const requestOptions = Object.assign({}, optionsArg, { requestBody: form });
|
...(optionsArg.headers),
|
||||||
|
...form.getHeaders()
|
||||||
|
},
|
||||||
|
requestBody: form
|
||||||
|
});
|
||||||
|
|
||||||
// lets fire the actual request for sending the formdata
|
// lets fire the actual request for sending the formdata
|
||||||
request(urlArg, requestOptions);
|
const response = await request(urlArg, requestOptions);
|
||||||
|
return response;
|
||||||
};
|
};
|
||||||
|
@ -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();
|
||||||
|
Reference in New Issue
Block a user