Merge cc68db743d into d5e4d97f4f

Update to use the new layout from api

src/index.pug

@@ -37,6 +37,7 @@ html(lang="en")
 			table
 				thead
 					tr
+						th(scope="col") Type
 						th(scope="col") Region
 						th(scope="col") Domain
 						th(scope="col") Health

src/main.js

@@ -52,19 +52,31 @@
 			return {
 				name: entry[0],
 				details: entry[1],
-				health: +(healthKnown ? entry[1].monitor["30dRatio"].ratio : 95),
+				health: +(healthKnown ? entry[1].monitor.uptime : 95),
 				healthKnown
 			}
 		}).filter(entry => {
-			return entry.details.type === "https" && entry.health > 0
+			return entry.health > 0
 		}).sort((a, b) => {
 			return b.health - a.health
 		}).forEach(entry => {
-			let target = entry.details.uri.replace(/\/*$/, "") + destinationPath
+			let address = entry.details.uri.replace(/\/*$/, "")
+			let target = address + destinationPath
 			const healthUnknown = entry.healthKnown ? "" : "health-unknown "
+			let type = "default"
+			switch(address.substr(address.lastIndexOf('.')+1))
+			{
+				case "onion":
+					type = "onion"
+					break
+				case "i2p":
+					type = "i2p"
+					break
+			}
 			const health = entry.healthKnown ? entry.health.toFixed(0) : "(unknown)"
 			q("#instances-tbody").appendChild(
 				createElement("tr", {}, [
+					createElement("td", {className: "column-center", textContent: type}),
 					createElement("td", {textContent: `${entry.details.flag} ${entry.details.region}`}),
 					createElement("td", {textContent: entry.name}),
 					createElement("td", {className: "column-center "+healthUnknown, textContent: health}),