Merge pull request #364 from cloudant/check-valid-response-before-resume

Check valid response before resume

Author: smithsz

CHANGES.md

@@ -1,5 +1,6 @@
 # UNRELEASED
 - [NEW] Added option for client to authenticate with IAM token server.
+- [FIXED] Case where `.resume()` was called on an undefined response.
 
 # 3.0.2 (2019-01-07)
 - [FIXED] Remove unnecessary `@types/nano` dependancy.

lib/clientutils.js

@@ -108,14 +108,16 @@ var processState = function(r, callback) {
     return;
   }
 
-  // pass response events/data to awaiting client
-  if (r.eventRelay) {
-    r.eventRelay.resume();
-  }
-  if (r.clientStream.destinations.length > 0) {
-    r.response.pipe(r.clientStream.passThroughReadable);
+  if (r.response) {
+    // pass response events/data to awaiting client
+    if (r.eventRelay) {
+      r.eventRelay.resume();
+    }
+    if (r.clientStream.destinations.length > 0) {
+      r.response.pipe(r.clientStream.passThroughReadable);
+    }
+    r.response.resume();
   }
-  r.response.resume();
 
   // [5] => Return response to awaiting client.
   callback(new Error('No retry requested')); // no retry

test/client.js

@@ -201,6 +201,35 @@ describe('CloudantClient', function() {
     });
   });
 
+  describe('Error Handling', function() {
+    it('Propagate request error: Invalid protocol.', function(done) {
+      var cloudantClient = new Client();
+      cloudantClient.request('abc://localhost:5984', function(err) {
+        assert.equal(err.message, 'Invalid protocol: abc:');
+        done();
+      });
+    });
+
+    it('Propagate request error: Base URL must be type string.', function(done) {
+      var cloudantClient = new Client();
+      cloudantClient.request({ baseUrl: 123, url: '/_all_dbs' }, function(err) {
+        assert.equal(err.message, 'options.baseUrl must be a string');
+        done();
+      });
+    });
+
+    it('Propagate request error: `unix://` URL scheme is no longer supported.', function(done) {
+      var cloudantClient = new Client();
+      cloudantClient.request('unix://abc', function(err) {
+        assert.equal(
+          err.message,
+          '`unix://` URL scheme is no longer supported. Please use the format `http://unix:SOCKET:PATH`'
+        );
+        done();
+      });
+    });
+  });
+
   describe('aborts request', function() {
     it('during plugin execution phase', function(done) {
       if (process.env.NOCK_OFF) {