Prevent 404 HTTP code from throwing an exception (#4446)

* Prevent 404 HTTP statuses from triggering an exception * Revert debug/index.html * Revert src/source/vector_tile_source.js
mapbox · Mar 20, 2017 · 9e3397a · 9e3397a
1 parent 6945214
commit 9e3397a
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 6 deletions.
diff --git a/src/source/source_cache.js b/src/source/source_cache.js
@@ -165,7 +165,7 @@ class SourceCache extends Evented {
     _tileLoaded(tile, id, previousState, err) {
         if (err) {
             tile.state = 'errored';
-            this._source.fire('error', {tile: tile, error: err});
+            if (err.status !== 404) this._source.fire('error', {tile: tile, error: err});
             return;
         }
 

diff --git a/src/util/ajax.js b/src/util/ajax.js
@@ -2,6 +2,13 @@
 
 const window = require('./window');
 
+class AJAXError extends Error {
+    constructor(message, status) {
+        super(message);
+        this.status = status;
+    }
+}
+
 exports.getJSON = function(url, callback) {
     const xhr = new window.XMLHttpRequest();
     xhr.open('GET', url, true);
@@ -19,7 +26,7 @@ exports.getJSON = function(url, callback) {
             }
             callback(null, data);
         } else {
-            callback(new Error(xhr.statusText));
+            callback(new AJAXError(xhr.statusText, xhr.status));
         }
     };
     xhr.send();
@@ -44,7 +51,7 @@ exports.getArrayBuffer = function(url, callback) {
                 expires: xhr.getResponseHeader('Expires')
             });
         } else {
-            callback(new Error(xhr.statusText));
+            callback(new AJAXError(xhr.statusText, xhr.status));
         }
     };
     xhr.send();

diff --git a/test/unit/source/source_cache.test.js b/test/unit/source/source_cache.test.js
@@ -284,6 +284,13 @@ test('SourceCache / Source lifecycle', (t) => {
         sourceCache.onAdd();
     });
 
+    t.test('suppress 404 errors', (t) => {
+        const sourceCache = createSourceCache({status: 404, message: 'Not found'})
+        .on('error', t.fail);
+        sourceCache.onAdd();
+        t.end();
+    });
+
     t.test('loaded() true after source error', (t) => {
         const sourceCache = createSourceCache({ error: 'Error loading source' })
         .on('error', () => {

diff --git a/test/unit/util/ajax.test.js b/test/unit/util/ajax.test.js
@@ -14,17 +14,63 @@ test('ajax', (t) => {
         window.restore();
         callback();
     });
-    t.test('getArrayBuffer', (t) => {
-        const url = '/buffer-request';
+
+    t.test('getArrayBuffer, no content error', (t) => {
         window.server.respondWith(request => {
             request.respond(200, {'Content-Type': 'image/png'}, '');
         });
-        ajax.getArrayBuffer(url, (error) => {
+        ajax.getArrayBuffer('', (error) => {
             t.pass('called getArrayBuffer');
             t.ok(error, 'should error when the status is 200 without content.');
             t.end();
         });
         window.server.respond();
     });
+
+    t.test('getArrayBuffer, 404', (t) => {
+        window.server.respondWith(request => {
+            request.respond(404);
+        });
+        ajax.getArrayBuffer('', (error) => {
+            t.equal(error.status, 404);
+            t.end();
+        });
+        window.server.respond();
+    });
+
+    t.test('getJSON', (t) => {
+        window.server.respondWith(request => {
+            request.respond(200, {'Content-Type': 'application/json'}, '{"foo": "bar"}');
+        });
+        ajax.getJSON('', (error, body) => {
+            t.error(error);
+            t.deepEqual(body, {foo: 'bar'});
+            t.end();
+        });
+        window.server.respond();
+    });
+
+    t.test('getJSON, invalid syntax', (t) => {
+        window.server.respondWith(request => {
+            request.respond(200, {'Content-Type': 'application/json'}, 'how do i even');
+        });
+        ajax.getJSON('', (error) => {
+            t.ok(error);
+            t.end();
+        });
+        window.server.respond();
+    });
+
+    t.test('getJSON, 404', (t) => {
+        window.server.respondWith(request => {
+            request.respond(404);
+        });
+        ajax.getJSON('', (error) => {
+            t.equal(error.status, 404);
+            t.end();
+        });
+        window.server.respond();
+    });
+
     t.end();
 });