Merge pull request node-fetch#5 from johnsto/feature/formdata

Add support for `Body.formData`

Author: hankjacobs

package.json

@@ -59,7 +59,9 @@
     "whatwg-url": "^5.0.0"
   },
   "dependencies": {
-    "web-streams-polyfill": "^2.1.1"
+    "web-streams-polyfill": "^2.1.1",
+    "busboy": "^0.3.0",
+    "formdata-node": "^1.5.1"
   },
   "peerDependencies": {
     "form-data": ">= 2.1.0"

src/body.js

@@ -10,6 +10,8 @@ import { ReadableStream, TransformStream} from "web-streams-polyfill";
 import Blob, { BUFFER } from './blob.js';
 import FetchError from './fetch-error.js';
 import Stream, { PassThrough } from "stream";
+import Busboy from "busboy";
+import FormData from "formdata-node";
 
 let convert;
 try { convert = require('encoding').convert; } catch(e) {}
@@ -281,6 +283,24 @@ Body.prototype = {
 		return consumeBody.call(this).then(buffer => convertBody(buffer, this.headers));
 	},
 
+	formData() {
+		return consumeBody.call(this).then(buffer => {
+			return new Promise((resolve, reject) => {
+				var formdata = new FormData();
+				var busboy = new Busboy({headers: {
+					'content-type': this.headers.get('content-type'),
+				}});
+				busboy.on('field', (fieldname, val) => formdata.append(fieldname, val));
+				busboy.on('file', function(fieldname, file, filename, encoding, mimetype) {
+					let val = "";
+					file.on('data', (data) => val += data);
+					file.on('end', () => formdata.append(fieldname, val, filename));
+				});
+				busboy.on('finish', () => resolve(formdata));
+				writeToStream(busboy, this);
+			});
+		});
+	},
 
 };
 

test/test.js

@@ -2141,6 +2141,7 @@ describe("Request", function() {
       "arrayBuffer",
       "blob",
       "json",
+      "formData",
       "text",
       "method",
       "url",
@@ -2295,6 +2296,22 @@ describe("Request", function() {
     });
   });
 
+  it("should support formData() method", function() {
+    const url = base;
+    const req = new Request(url, {
+      method: "POST",
+      body: 'a=1&b=2',
+	  headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+	  }
+    });
+    expect(req.url).to.equal(url);
+    return req.formData().then(result => {
+      expect(result.get('a')).to.equal('1');
+      expect(result.get('b')).to.equal('2');
+    });
+  });
+
   it("should support buffer() method", function() {
     const url = base;
     const req = new Request(url, {