Make getLength work with file streams

felixge · felixge · commit 6f6b1e9b6595 · 2011-05-28T21:10:33.000+02:00
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -1,12 +1,15 @@
 var CombinedStream = require('combined-stream');
 var util = require('util');
 var path = require('path');
+var fs = require('fs');
 var mime = require('mime');
+var async = require('async');
 
 module.exports = FormData;
 function FormData() {
   this._overheadLength = 0;
   this._valueLength = 0;
+  this._lengthRetrievers = [];
 
   CombinedStream.call(this);
 }
@@ -39,6 +42,21 @@ FormData.prototype._trackLength = function(header, value) {
   this._overheadLength +=
     Buffer.byteLength(header) +
     + FormData.LINE_BREAK.length;
+
+  if (!value || !value.path) {
+    return;
+  }
+
+  this._lengthRetrievers.push(function(next) {
+    fs.stat(value.path, function(err, stat) {
+      if (err) {
+        next(err);
+        return;
+      }
+
+      next(null, stat.size);
+    });
+  });
 };
 
 FormData.prototype._multiPartHeader = function(field, value) {
@@ -112,5 +130,21 @@ FormData.prototype.getLength = function(cb) {
     knownLength += this._lastBoundary().length;
   }
 
-  process.nextTick(cb.bind(this, null, knownLength));
+  if (!this._lengthRetrievers.length) {
+    process.nextTick(cb.bind(this, null, knownLength));
+    return;
+  }
+
+  async.parallel(this._lengthRetrievers, function(err, values) {
+    if (err) {
+      cb(err);
+      return;
+    }
+
+    values.forEach(function(length) {
+      knownLength += length;
+    });
+
+    cb(null, knownLength);
+  });
 };
diff --git a/test/fixture/bacon.txt b/test/fixture/bacon.txt
@@ -0,0 +1 @@
+Bacon is delicious.
diff --git a/test/integration/test-form-get-length.js b/test/integration/test-form-get-length.js
@@ -2,11 +2,12 @@ var common = require('../common');
 var assert = common.assert;
 var FormData = require(common.dir.lib + '/form_data');
 var fake = require('fake').create();
+var fs = require('fs');
 
 (function testEmptyForm() {
   var form = new FormData();
   var callback = fake.callback(arguments.callee.name + '-getLength');
-  var calls = fake.expect(callback, [null, 0]).calls;
+  var calls = fake.expectAnytime(callback, [null, 0]).calls;
 
   form.getLength(callback);
 
@@ -27,7 +28,7 @@ var fake = require('fake').create();
     Buffer.byteLength(VALUE) +
     form._lastBoundary().length;
 
-  fake.expect(callback, [null, expectedLength]);
+  fake.expectAnytime(callback, [null, expectedLength]);
   form.getLength(callback);
 })();
 
@@ -44,7 +45,48 @@ var fake = require('fake').create();
     VALUE.length +
     form._lastBoundary().length;
 
-  fake.expect(callback, [null, expectedLength]);
+  fake.expectAnytime(callback, [null, expectedLength]);
+  form.getLength(callback);
+})();
+
+
+(function testStringFileBufferFile() {
+  var fields = [
+    {
+      name: 'my_field',
+      value: 'Test 123',
+    },
+    {
+      name: 'my_image',
+      value: fs.createReadStream(common.dir.fixture + '/unicycle.jpg'),
+    },
+    {
+      name: 'my_buffer',
+      value: new Buffer('123'),
+    },
+    {
+      name: 'my_txt',
+      value: fs.createReadStream(common.dir.fixture + '/bacon.txt'),
+    },
+  ];
+
+  var form = new FormData();
+  var expectedLength = 0;
+
+  fields.forEach(function(field) {
+    form.append(field.name, field.value);
+    if (field.value.path) {
+      var stat = fs.statSync(field.value.path);
+      expectedLength += stat.size;
+    } else {
+      expectedLength += field.value.length;
+    }
+  });
+
+  expectedLength += form._overheadLength + form._lastBoundary().length;
+
+  var callback = fake.callback(arguments.callee.name + '-getLength');
+  fake.expectAnytime(callback, [null, expectedLength]);
   form.getLength(callback);
 })();
 
