1.1.10

package-lock.json

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

package.json

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

ts/smartrequest.formdata.ts

@@ -11,35 +11,18 @@ export interface IFormField {
   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 (
   formDataArg: plugins.formData,
   formDataField: IFormField
 ) => {
   if (formDataField.type === "filePath") {
-    formDataArg.append("type", "image");
-    let fileData = plugins.fs.createReadStream(
-      plugins.path.join(__dirname, formDataField.payload)
+    let fileData = plugins.fs.readFileSync(
+      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,15 @@ export const postFormData = async (
   for (const formField of payloadArg) {
     await appendFormField(form, formField);
   }
-  const pipeLog: any = async (...args) => {
-    console.log(args);
-  };
-  const requestOptions = Object.assign({}, optionsArg, { requestBody: form });
+  const requestOptions = Object.assign({}, optionsArg, {
+    headers: {
+      ...(optionsArg.headers),
+      ...form.getHeaders()
+    },
+    requestBody: form
+  });
 
   // lets fire the actual request for sending the formdata
-  request(urlArg, requestOptions);
+  const response = await request(urlArg, requestOptions);
+  return response;
 };

ts/smartrequest.request.ts

@@ -96,9 +96,12 @@ export let request = async (
     ) {
       optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
       request.write(optionsArg.requestBody);
+      request.end();
     } else if (optionsArg.requestBody instanceof plugins.formData) {
       optionsArg.requestBody.pipe(request);
     }
+  } else {
+    request.end();
   }
 
   // lets handle an error
@@ -116,8 +119,6 @@ export let request = async (
     }
   });
 
-  request.end();
-
   const result = await done.promise;
   return result;
 };