src/js/login.js

@@ -71,7 +71,6 @@ class Form extends ElemJS {
 		this.on("submit", this.submit.bind(this))
 	}
 
-
 	async submit() {
 		if (this.processing) return
 		this.processing = true
@@ -114,12 +113,11 @@ class Form extends ElemJS {
 	}
 
 	async findHomeserver(address, maxDepth = 5) {
-	
-		//Protects us from servers sending us on a redirect loop
+		// Protects us from servers sending us on a redirect loop
 		maxDepth--
-		if(maxDepth<=0) throw new Error(`Failed to look up homeserver, maximum search depth reached`)
+		if (maxDepth <= 0) throw new Error(`Failed to look up homeserver, maximum search depth reached`)
 
-		//Preprocess the address
+		// Normalise the address
 		if (!address.match(/^https?:\/\//)) {
 			console.warn(`${address} doesn't specify the protocol, assuming https`)
 			address = "https://" + address
@@ -129,17 +127,17 @@ class Form extends ElemJS {
 		this.status(`Looking up homeserver... trying ${address}`)
 
 		// Check if we found the actual matrix server
-		const versionsReq = await fetch(`${address}/_matrix/client/versions`).catch(()=>{})
-		/* jshint ignore:start */
-		//JsHint doesn't support optional chaining
-		// https://github.com/jshint/jshint/issues/3448
-		if(versionsReq?.ok) {
-			const versions = await versionsReq.json().catch(()=>{})
-			if (Array.isArray(versions?.versions)) return address
-		}
-		/* jshint ignore:end */
+		try {
+			const versionsReq = await fetch(`${address}/_matrix/client/versions`)
+			if (versionsReq.ok) {
+				const versions = await versionsReq.json()
+				if (Array.isArray(versions.versions)) {
+					return address
+				}
+			}
+		} catch(e) {}
 
-		// find the next matrix server in the chain
+		// Find the next matrix server in the chain
 		const root = await fetch(`${address}/.well-known/matrix/client`).then(res => res.json()).catch(e => {
  			console.error(e)
 			throw new Error(`Failed to look up server ${address}`)
@@ -155,7 +153,6 @@ class Form extends ElemJS {
 		return this.findHomeserver(nextAddress, maxDepth)
 	}
 
-	
 	status(message) {
 		feedback.setLoading(true)
 		feedback.message(message)
@@ -169,6 +166,3 @@ class Form extends ElemJS {
 }
 
 const form = new Form()
-
-
-