Merge pull request #76 from kacole2/fixForNoContentLength

fix for no content-length in header for download
andrewrk · Oct 9, 2015 · 6dca5b8 · 6dca5b8
2 parents 8e9cd92 + 0b7ecef
commit 6dca5b8
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 36 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -460,47 +460,68 @@ Client.prototype.downloadFile = function(params) {
       if (statusCode >= 300) {
         handleError(new Error("http status code " + statusCode));
         return;
-      }
-      var contentLength = parseInt(headers['content-length'], 10);
-      downloader.progressTotal = contentLength;
-      downloader.progressAmount = 0;
-      downloader.emit('progress');
-      downloader.emit('httpHeaders', statusCode, headers, resp);
-      var eTag = cleanETag(headers.etag);
-      var eTagCount = getETagCount(eTag);
+      } 
+      if (headers['content-length'] == undefined) {
+        var outStream = fs.createWriteStream(localFile);
+        outStream.on('error', handleError);
+        downloader.progressTotal = 0
+        downloader.progressAmount = -1;
+        request.on('httpData', function(chunk) {
+          downloader.progressTotal += chunk.length;
+          downloader.progressAmount += chunk.length;
+          downloader.emit('progress');
+          outStream.write(chunk); 
+        })
+
+        request.on('httpDone', function() { 
+          if (errorOccurred) return;
+          downloader.progressAmount += 1;
+          downloader.emit('progress');
+          outStream.end(); 
+          cb();
+        })
+      } else {
+        var contentLength = parseInt(headers['content-length'], 10);
+        downloader.progressTotal = contentLength;
+        downloader.progressAmount = 0;
+        downloader.emit('progress');
+        downloader.emit('httpHeaders', statusCode, headers, resp);
+        var eTag = cleanETag(headers.etag);
+        var eTagCount = getETagCount(eTag);
 
-      var outStream = fs.createWriteStream(localFile);
-      var multipartETag = new MultipartETag({size: contentLength, count: eTagCount});
-      var httpStream = resp.httpResponse.createUnbufferedStream();
+        var outStream = fs.createWriteStream(localFile);
+        var multipartETag = new MultipartETag({size: contentLength, count: eTagCount});
+        var httpStream = resp.httpResponse.createUnbufferedStream();
 
-      httpStream.on('error', handleError);
-      outStream.on('error', handleError);
+        httpStream.on('error', handleError);
+        outStream.on('error', handleError);
 
-      hashCheckPend.go(function(cb) {
-        multipartETag.on('end', function() {
-          if (multipartETag.bytes !== contentLength) {
-            handleError(new Error("Downloaded size does not match Content-Length"));
-            return;
-          }
-          if (eTagCount === 1 && !multipartETag.anyMatch(eTag)) {
-            handleError(new Error("ETag does not match MD5 checksum"));
-            return;
-          }
-          cb();
+        hashCheckPend.go(function(cb) {
+          multipartETag.on('end', function() {
+            if (multipartETag.bytes !== contentLength) {
+              handleError(new Error("Downloaded size does not match Content-Length"));
+              return;
+            }
+            if (eTagCount === 1 && !multipartETag.anyMatch(eTag)) {
+              handleError(new Error("ETag does not match MD5 checksum"));
+              return;
+            }
+            cb();
+          });
+        });
+        multipartETag.on('progress', function() {
+          downloader.progressAmount = multipartETag.bytes;
+          downloader.emit('progress');
+        });
+        outStream.on('close', function() {
+          if (errorOccurred) return;
+          hashCheckPend.wait(cb);
         });
-      });
-      multipartETag.on('progress', function() {
-        downloader.progressAmount = multipartETag.bytes;
-        downloader.emit('progress');
-      });
-      outStream.on('close', function() {
-        if (errorOccurred) return;
-        hashCheckPend.wait(cb);
-      });
 
-      httpStream.pipe(multipartETag);
-      httpStream.pipe(outStream);
-      multipartETag.resume();
+        httpStream.pipe(multipartETag);
+        httpStream.pipe(outStream);
+        multipartETag.resume();
+      }
     });
 
     request.send(handleError);

diff --git a/test/test.js b/test/test.js
@@ -36,6 +36,7 @@ function createClient() {
     s3Options: {
       accessKeyId: process.env.S3_KEY,
       secretAccessKey: process.env.S3_SECRET,
+      endpoint: process.env.S3_ENDPOINT,
     },
   });
 }