Change "Connection does not exist" to more user-friendly error.

[guacamole-common-js.git] / src / main / resources / tunnel.js

diff --git a/src/main/resources/tunnel.js b/src/main/resources/tunnel.js
index f44110d..87155eb 100644 (file)
--- a/src/main/resources/tunnel.js
+++ b/src/main/resources/tunnel.js
@@ -207,10 +207,28 @@ Guacamole.HTTPTunnel = function(tunnelURL) {
 
         var status = xmlhttprequest.status;
 
-        if (status >= 200 && status <= 299) return "Success";
-        if (status >= 400 && status <= 499) return "Unauthorized";
-        if (status >= 500 && status <= 599) return "Connection lost";
-
+        // Special cases
+        if (status == 0)   return "Disconnected";
+        if (status == 200) return "Success";
+        if (status == 403) return "Unauthorized";
+        if (status == 404) return "Connection closed"; /* While it may be more
+                                                        * accurate to say the
+                                                        * connection does not
+                                                        * exist, it is confusing
+                                                        * to the user.
+                                                        * 
+                                                        * In general, this error
+                                                        * will only happen when
+                                                        * the tunnel does not
+                                                        * exist, which happens
+                                                        * after the connection
+                                                        * is closed and the
+                                                        * tunnel is detached.
+                                                        */
+        // Internal server errors
+        if (status >= 500 && status <= 599) return "Server error";
+
+        // Otherwise, unknown
         return "Unknown error";
 
     }