Return empty .json() object on 204. Fix node-fetch#165.

CHANGELOG.md

@@ -5,7 +5,11 @@ Changelog
 
 # 1.x release
 
-## v1.6.1 (master)
+## v1.6.2
+
+- Fix: response.json() returns empty object on 204 no-content response instead of throwing a syntax error
+
+## v1.6.1
 
 - Fix: if `res.body` is a non-stream non-formdata object, we will call `body.toString` and send it as a string
 - Fix: `counter` value is incorrectly set to `follow` value when wrapping Request instance
@@ -22,7 +26,7 @@ Changelog
 
 ## v1.5.3
 
-- Fix: handles 204 and 304 responses when body is empty but content-encoding is gzip/deflate
+- Fix: handle 204 and 304 responses when body is empty but content-encoding is gzip/deflate
 - Fix: allow resolving response and cloned response in any order
 - Fix: avoid setting `content-length` when `form-data` body use streams
 - Fix: send DELETE request with content-length when body is present

lib/body.js

@@ -40,7 +40,8 @@ function Body(body, opts) {
 Body.prototype.json = function() {
 
 	return this._decode().then(function(buffer) {
-		return JSON.parse(buffer.toString());
+		var string = buffer.toString();
+		return string === ''? {} : JSON.parse(string);
 	});
 
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-fetch",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "A light-weight module that brings window.fetch to node.js and io.js",
   "main": "index.js",
   "scripts": {

test/server.js

@@ -1,4 +1,3 @@
-
 var http = require('http');
 var parse = require('url').parse;
 var zlib = require('zlib');

test/test.js

@@ -1,4 +1,3 @@
-
 // test tools
 var chai = require('chai');
 var cap = require('chai-as-promised');
@@ -441,6 +440,16 @@ describe('node-fetch', function() {
 		});
 	});
 
+	it('should return empty object on no-content response', function() {
+		url = base + '/no-content';
+		return fetch(url).then(function(res) {
+			return res.json().then(function(result) {
+				expect(result).to.be.an('object');
+				expect(result).to.be.empty;
+			});
+		});
+	});
+
 	it('should handle no content response with gzip encoding', function() {
 		url = base + '/no-content/gzip';
 		return fetch(url).then(function(res) {
@@ -1380,7 +1389,8 @@ describe('node-fetch', function() {
 		return req.text().then(function(result) {
 			expect(result).to.equal('a=1');
 		});
-	});

+	});
+
 
 	it('should support json() method in Request constructor', function() {
 		url = base;
@@ -1391,7 +1401,8 @@ describe('node-fetch', function() {
 		return req.json().then(function(result) {
 			expect(result.a).to.equal(1);
 		});
-	});

+	});
+
 
 	it('should support buffer() method in Request constructor', function() {
 		url = base;
@@ -1402,7 +1413,8 @@ describe('node-fetch', function() {
 		return req.buffer().then(function(result) {
 			expect(result.toString()).to.equal('a=1');
 		});
-	});

+	});
+
 
 	it('should support arbitrary url in Request constructor', function() {
 		url = 'anything';
@@ -1449,7 +1461,8 @@ describe('node-fetch', function() {
 		expect(body).to.have.property('text');
 		expect(body).to.have.property('json');
 		expect(body).to.have.property('buffer');
-	});

+	});
+
 
 	it('should create custom FetchError', function() {
 		var systemError = new Error('system');
@@ -1463,7 +1476,8 @@ describe('node-fetch', function() {
 		expect(err.type).to.equal('test-error');
 		expect(err.code).to.equal('ESOMEERROR');
 		expect(err.errno).to.equal('ESOMEERROR');
-	});

+	});
+
 
 	it('should support https request', function() {
 		this.timeout(5000);