FetchService throws dedicated exception when server unreachable

+ Clears up confusion on app init / first auth check call if back-end UI server is down + Fixes #315
xh · May 24, 2018 · c0b7ec4 · c0b7ec4
1 parent ef9cea3
commit c0b7ec4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/core/XH.js b/core/XH.js
@@ -272,8 +272,7 @@ class XhModel {
     async getAuthUserFromServerAsync() {
         return await this.fetchService
             .fetchJson({url: 'auth/authUser'})
-            .then(r => r.authUser)
-            .catch(() => null);
+            .then(r => r.authUser);
     }
 
     async initServicesAsync() {

diff --git a/exception/Exception.js b/exception/Exception.js
@@ -83,6 +83,20 @@ export class Exception {
         return this.createInternal(defaults, {});
     }
 
+    static serverUnavailable(url, requestOptions, e) {
+        const match = url.match(/^[a-z]+:\/\/[^/]+/i),
+            origin = match ? match[0] : window.location.origin,
+            message = `Unable to contact the server at ${origin}`;
+
+        return this.createInternal({
+            name: 'Server Unavailable',
+            message: message,
+            originalMessage: e.message,
+            url: url,
+            requestOptions: requestOptions
+        });
+    }
+
     //-----------------------
     // Implementation
     //-----------------------

diff --git a/svc/FetchService.js b/svc/FetchService.js
@@ -78,9 +78,15 @@ export class FetchService {
             }
         }
 
-        const ret = await fetch(url, opts);
+        let ret;
+        try {
+            ret = await fetch(url, opts);
+        } catch (e) {
+            throw Exception.serverUnavailable(url, opts, e);
+        }
         if (!ret.ok) throw Exception.requestError(opts, ret);
         return ret;
+
     }
 
     /**