Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
36472b7306 | |||
e86f14b8d8 | |||
2b9e7f6dd2 | |||
5e4afccf9c |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartrequest",
|
"name": "@pushrocks/smartrequest",
|
||||||
"version": "1.1.33",
|
"version": "1.1.35",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartrequest",
|
"name": "@pushrocks/smartrequest",
|
||||||
"version": "1.1.33",
|
"version": "1.1.35",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "dropin replacement for request",
|
"description": "dropin replacement for request",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
|
@ -13,7 +13,7 @@ export interface IFormField {
|
|||||||
|
|
||||||
const appendFormField = async (formDataArg: plugins.formData, formDataField: IFormField) => {
|
const appendFormField = async (formDataArg: plugins.formData, formDataField: IFormField) => {
|
||||||
if (formDataField.type === 'filePath') {
|
if (formDataField.type === 'filePath') {
|
||||||
let fileData = plugins.fs.readFileSync(plugins.path.join(process.cwd(), formDataField.payload));
|
const fileData = plugins.fs.readFileSync(plugins.path.join(process.cwd(), formDataField.payload));
|
||||||
formDataArg.append('file', fileData, {
|
formDataArg.append('file', fileData, {
|
||||||
filename: 'upload.pdf',
|
filename: 'upload.pdf',
|
||||||
contentType: 'application/pdf'
|
contentType: 'application/pdf'
|
||||||
@ -30,14 +30,13 @@ export const postFormData = async (
|
|||||||
for (const formField of payloadArg) {
|
for (const formField of payloadArg) {
|
||||||
await appendFormField(form, formField);
|
await appendFormField(form, formField);
|
||||||
}
|
}
|
||||||
const requestOptions = Object.assign({}, optionsArg, {
|
const requestOptions = {...optionsArg,
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
...optionsArg.headers,
|
...optionsArg.headers,
|
||||||
...form.getHeaders()
|
...form.getHeaders()
|
||||||
},
|
},
|
||||||
requestBody: form
|
requestBody: form};
|
||||||
});
|
|
||||||
|
|
||||||
// lets fire the actual request for sending the formdata
|
// lets fire the actual request for sending the formdata
|
||||||
const response = await request(urlArg, requestOptions);
|
const response = await request(urlArg, requestOptions);
|
||||||
|
@ -85,7 +85,8 @@ const httpsAgentKeepAliveFalse = new plugins.https.Agent({
|
|||||||
export let request = async (
|
export let request = async (
|
||||||
domainArg: string,
|
domainArg: string,
|
||||||
optionsArg: interfaces.ISmartRequestOptions = {},
|
optionsArg: interfaces.ISmartRequestOptions = {},
|
||||||
streamArg: boolean = false
|
responseStreamArg: boolean = false,
|
||||||
|
requestDataFunc: (req: plugins.http.ClientRequest) => void = null
|
||||||
): Promise<IExtendedIncomingMessage> => {
|
): Promise<IExtendedIncomingMessage> => {
|
||||||
const done = plugins.smartpromise.defer<any>();
|
const done = plugins.smartpromise.defer<any>();
|
||||||
|
|
||||||
@ -138,7 +139,7 @@ export let request = async (
|
|||||||
|
|
||||||
// lets perform the actual request
|
// lets perform the actual request
|
||||||
const requestToFire = requestModule.request(optionsArg, async response => {
|
const requestToFire = requestModule.request(optionsArg, async response => {
|
||||||
if (streamArg) {
|
if (responseStreamArg) {
|
||||||
done.resolve(response);
|
done.resolve(response);
|
||||||
} else {
|
} else {
|
||||||
const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
|
const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
|
||||||
@ -159,6 +160,8 @@ export let request = async (
|
|||||||
requestToFire.write(optionsArg.requestBody);
|
requestToFire.write(optionsArg.requestBody);
|
||||||
requestToFire.end();
|
requestToFire.end();
|
||||||
}
|
}
|
||||||
|
} else if (requestDataFunc) {
|
||||||
|
requestDataFunc(requestToFire);
|
||||||
} else {
|
} else {
|
||||||
requestToFire.end();
|
requestToFire.end();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user