(pouchdb#4595) - Catch xhr errors and propagate

- Reject Promise - Emit error event
daedlock · Dec 30, 2015 · 7536e68 · 7536e68
1 parent 78db7d2
commit 7536e68
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/lib/deps/ajax/request-browser.js b/lib/deps/ajax/request-browser.js
@@ -120,7 +120,12 @@ function xhRequest(options, callback) {
     xhr = new XMLHttpRequest();
   }
 
-  xhr.open(options.method, options.url);
+  try {
+    xhr.open(options.method, options.url);
+  }
+  catch(exception) {
+    callback(exception,{x:'5',statusCode:413});
+  }
 
   xhr.withCredentials = ('withCredentials' in options) ?
     options.withCredentials : true;

diff --git a/lib/deps/errors.js b/lib/deps/errors.js
@@ -157,6 +157,12 @@ exports.MISSING_STUB = new PouchError({
   error: 'missing_stub'
 });
 
+exports.INVALID_URL = new PouchError({
+  status: 413,
+  error: 'invalid_url',
+  reason: 'Provided URL is invalid'
+});
+
 exports.error = function (error, reason, name) {
   function CustomPouchError(reason) {
     // inherit error properties from our parent error manually

diff --git a/tests/integration/test.basics.js b/tests/integration/test.basics.js
@@ -83,6 +83,22 @@ adapters.forEach(function (adapter) {
       });
     });
 
+    it('[4595] should reject xhr errors', function(done){
+      var invalidUrl = 'http:///';
+      new PouchDB(dbs.name).replicate.to(invalidUrl,{})
+      .catch(function(err,changes){
+        done();
+      });
+
+    });
+    it('[4595] should emit error event on xhr error', function(done){
+      var invalidUrl = 'http:///';
+      new PouchDB(dbs.name).replicate.to(invalidUrl,{})
+      .on('error',function(err,changes){
+        done();
+      });
+    });
+
     it('Add a doc', function (done) {
       var db = new PouchDB(dbs.name);
       db.post({test: 'somestuff'}, function (err, info) {