Set Content-Length manually for postBinary (#42)

* Add test case to check content-length for postBinary

* Set Content-Type for postBinary properly with stream

Author: Hyunje Jun

lib/http.ts

@@ -3,8 +3,6 @@ import { Readable, PassThrough } from "stream";
 import { HTTPError, ReadError, RequestError } from "./exceptions";
 import * as fileType from "file-type";
 
-const fileTypeStream = require("file-type-stream").default;
-
 const pkg = require("../package.json");
 
 function wrapError(err: AxiosError) {
@@ -59,27 +57,30 @@ export function postBinary(
   data: Buffer | Readable,
   contentType?: string,
 ): Promise<any> {
-  let contentTypeGetter;
-  if (contentType) {
-    contentTypeGetter = Promise.resolve(contentType);
-  } else if (Buffer.isBuffer(data)) {
-    contentTypeGetter = Promise.resolve(fileType(data).mime);
+  let getBuffer: Promise<Buffer>;
+
+  if (Buffer.isBuffer(data)) {
+    getBuffer = Promise.resolve(data);
   } else {
-    contentTypeGetter = new Promise(resolve => {
+    getBuffer = new Promise((resolve, reject) => {
       if (data instanceof Readable) {
-        const passThrough = new PassThrough();
-        data
-          .pipe(fileTypeStream((result: any) => resolve(result.mime)))
-          .pipe(passThrough);
-        data = passThrough;
+        const buffers: Buffer[] = [];
+        let size = 0;
+        data.on("data", (chunk: Buffer) => {
+          buffers.push(chunk);
+          size += chunk.length;
+        });
+        data.on("end", () => resolve(Buffer.concat(buffers, size)));
+        data.on("error", reject);
       } else {
-        throw new Error("invalid data type for postBinary");
+        reject(new Error("invalid data type for postBinary"));
       }
     });
   }
 
-  return contentTypeGetter.then((contentType: string) => {
-    headers["Content-Type"] = contentType;
+  return getBuffer.then(data => {
+    headers["Content-Type"] = contentType || fileType(data).mime;
+    headers["Content-Length"] = data.length;
     headers["User-Agent"] = userAgent;
     return axios
       .post(url, data, { headers })

package-lock.json

@@ -42,8 +42,7 @@
     "@types/node": "^7.0.31",
     "axios": "^0.16.2",
     "body-parser": "^1.18.2",
-    "file-type": "^7.2.0",
-    "file-type-stream": "^1.0.0"
+    "file-type": "^7.2.0"
   },
   "devDependencies": {
     "@types/express": "^4.0.35",

package.json

@@ -114,6 +114,7 @@ describe("http", () => {
         equal(req.headers["test-header-key"], testHeaders["test-header-key"]);
         equal(req.headers["user-agent"], `${pkg.name}/${pkg.version}`);
         equal(req.headers["content-type"], "image/png");
+        equal(req.headers["content-length"], buffer.length);
       },
     );
   });
@@ -126,6 +127,7 @@ describe("http", () => {
         const req = getRecentReq();
         equal(req.body, buffer.toString("base64"));
         equal(req.headers["content-type"], "image/jpeg");
+        equal(req.headers["content-length"], buffer.length);
       },
     );
   });
@@ -134,9 +136,12 @@ describe("http", () => {
     const filepath = join(__dirname, "/helpers/line-icon.png");
     const stream = createReadStream(filepath);
     return postBinary(`${TEST_URL}/post/binary`, {}, stream).then(() => {
+      const buffer = readFileSync(filepath);
+
       const req = getRecentReq();
-      equal(req.body, readFileSync(filepath).toString("base64"));
+      equal(req.body, buffer.toString("base64"));
       equal(req.headers["content-type"], "image/png");
+      equal(req.headers["content-length"], buffer.length);
     });
   });