#47 return request from .submit()

alexindigo · alexindigo · commit 1d61c2da518b · 2013-08-21T00:24:26.000-07:00
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -251,49 +251,56 @@ FormData.prototype.getLength = function(cb) {
 };
 
 FormData.prototype.submit = function(params, cb) {
+
+  var request
+    , options
+    , defaults = {
+        method : 'post',
+        port   : 80,
+        headers: this.getHeaders()
+    };
+
+  // parse provided url if it's string
+  // or treat it as options object
+  if (typeof params == 'string') {
+    params = parseUrl(params);
+
+    options = populate({
+      port: params.port,
+      path: params.pathname,
+      host: params.hostname
+    }, defaults);
+  }
+  else // use custom params
+  {
+    options = populate(params, defaults);
+  }
+
+  // https if specified, fallback to http in any other case
+  if (params.protocol == 'https:') {
+    // override default port
+    if (!params.port) options.port = 443;
+    request = https.request(options);
+  } else {
+    request = http.request(options);
+  }
+
+  // get content length and fire away
   this.getLength(function(err, length) {
 
-    var request
-      , options
-      , defaults = {
-          method : 'post',
-          port   : 80,
-          headers: this.getHeaders({'Content-Length': length})
-      };
-
-    // parse provided url if it's string
-    // or treat it as options object
-    if (typeof params == 'string') {
-      params = parseUrl(params);
-
-      options = populate({
-        port: params.port,
-        path: params.pathname,
-        host: params.hostname
-      }, defaults);
-    }
-    else // use custom params
-    {
-      options = populate(params, defaults);
-    }
+    // TODO: Add chunked encoding when no length (if err)
 
-    // https if specified, fallback to http in any other case
-    if (params.protocol == 'https:') {
-      // override default port
-      if (!params.port) options.port = 443;
-      request = https.request(options);
-    } else {
-      request = http.request(options);
-    }
+    // add content length
+    request.setHeader('Content-Length', length);
 
     this.pipe(request);
     if (cb) {
       request.on('error', cb);
       request.on('response', cb.bind(this, null));
     }
-
-    return request;
   }.bind(this));
+
+  return request;
 };
 
 FormData.prototype._error = function(err) {
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "name": "form-data",
   "description": "A module to create readable \"multipart/form-data\" streams.  Can be used to submit forms and file uploads to other web applications.",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/felixge/node-form-data.git"
@@ -16,19 +16,19 @@
   },
   "dependencies": {
     "combined-stream": "~0.0.4",
-    "mime": "~1.2.9",
+    "mime": "~1.2.11",
     "async": "~0.2.9"
   },
   "licenses": [
     {
       "type": "MIT",
       "url": "https://raw.github.com/felixge/node-form-data/master/License"
     }
-  ],  
+  ],
   "devDependencies": {
     "fake": "~0.2.2",
     "far": "~0.0.7",
     "formidable": "~1.0.14",
-    "request": "~2.22.0"
+    "request": "~2.27.0"
   }
 }
diff --git a/test/integration/test-return-http-request.js b/test/integration/test-return-http-request.js
@@ -0,0 +1,86 @@
+/*
+test return http request, added for issue #47:
+https://github.com/felixge/node-form-data/issues/47
+
+Checking correct length header and request object
+*/
+
+var common = require('../common');
+var assert = common.assert;
+var http = require('http');
+
+var FormData = require(common.dir.lib + '/form_data');
+
+var CRLF = '\r\n';
+
+var expectedLength;
+
+var dataSize = 1000000;
+
+var server = http.createServer(function(req, res) {
+  var data = '', uploaded = 0;
+console.log(['R', req.headers['content-length']]);
+  assert.ok( typeof req.headers['content-length'] !== 'undefined' );
+  assert.equal(req.headers['content-length'], expectedLength);
+
+  // check for uploaded body
+  req.on('data', function(data) {
+    uploaded += data.length;
+  });
+  req.on('end', function()
+  {
+    // compare uploaded total to the expected length
+    assert.equal(uploaded, expectedLength);
+
+    res.writeHead(200);
+    res.end('done');
+  });
+
+});
+
+
+server.listen(common.port, function() {
+  var R, oWrite, progress = 0, form = new FormData();
+
+  var bufferData = [];
+  for (var z = 0; z < dataSize; z++) {
+    bufferData.push(1);
+  }
+  var buffer = new Buffer(bufferData);
+
+  form.append('my_buffer', buffer);
+
+  // (available to req handler)
+  expectedLength = form._lastBoundary().length + form._overheadLength + dataSize;
+
+  R = form.submit('http://localhost:' + common.port + '/', function(err, res) {
+    if (err) {
+      throw err;
+    }
+
+    assert.strictEqual(res.statusCode, 200);
+
+    // unstuck new streams
+    res.resume();
+
+    server.close();
+
+    // compare progress total to the expected length
+    assert.equal(progress, expectedLength);
+  });
+
+  // augment into request
+  oWrite = R.write;
+  R.write = function(chunk) {
+    return oWrite.call(this, chunk, function() {
+      form.emit('progress', chunk);
+    });
+  };
+
+  // track progres
+  form.on('progress', function(chunk) {
+    progress += chunk.length;
+    assert.ok(progress <= expectedLength);
+  });
+
+});
