wait for proxy

Author: michaljaz

lib/server.js

@@ -5,6 +5,10 @@ const port = process.env.PORT || 8080
 
 app.use(netApi({ allowOrigin: '*' }))
 
+app.use("/proxyCheck",(req,res,next)=>{
+	res.send("OK")
+})
+
 app.listen(port, () => {
   console.log(`Server is running on \x1b[34m*:${port}\x1b[0m`)
 })

src/scripts/Setup.js

@@ -54,7 +54,27 @@ function Setup (game) {
   game.inv_bar = new InventoryBar(game)
   game.tl = new TabList(game)
   game.ls = new LoadingScreen(game)
-  game.ls.show(`Connecting to ${game.server}...`)
+  game.ls.show(`Waiting for proxy...`)
+	let hostname, port, pars
+	if (game.proxy === 'local') {
+		hostname = document.location.hostname
+		port = document.location.port
+	} else if (game.proxy === 'production') {
+		pars = game.al.get('config').proxy.split(':')
+		hostname = pars[0]
+		port = pars[1]
+	} else {
+		pars = game.proxy.split(':')
+		hostname = pars[0]
+		port = pars[1]
+	}
+	fetch(`${document.location.protocol}//${hostname}:${port}/proxyCheck`)
+	  .then(response => response.text())
+	  .then(data => {
+			if(data=="OK"){
+				game.ls.show(`Connecting to ${game.server}...`)
+			}
+		});
   game.distanceBasedFog.addShaderToMaterials([
     game.world.material,
     game.ent.mobMaterial,

src/scripts/rendering/DistanceBasedFog.js

@@ -10,7 +10,7 @@ class DistanceBasedFog {
   }
 
   updateDistance (val) {
-    this.farnear.x = (Math.sqrt(val)) * 16
+    this.farnear.x = (Math.sqrt(val-1.5)) * 16
     this.farnear.y = (val - 1) * 16
   }