fix http proxy in production

Author: michaljaz

assets/mineflayer.tar.xz

@@ -8,10 +8,7 @@ function UrlParams (game) {
     game.server = new URL(document.location).searchParams.get('server')
     game.serverPort = new URL(document.location).searchParams.get('port')
     game.premium = new URL(document.location).searchParams.get('premium')
-    game.proxy = {
-      hostname: new URL(document.location).searchParams.get('proxyHost'),
-      port: new URL(document.location).searchParams.get('proxyPort')
-    }
+    game.proxy = new URL(document.location).searchParams.get('proxy')
     let reload = false
     if (game.nick === '' || game.nick === null) {
       reload = true
@@ -33,17 +30,20 @@ function UrlParams (game) {
       reload = true
       game.premium = 'false'
     }
-    if (game.proxy.hostname === '' || game.proxy.hostname === null) {
-      reload = true
-      game.proxy.hostname = game.production ? 'web-minecraft-proxy.herokuapp.com' : 'local'
-    }
-    if (game.proxy.port === '' || game.proxy.port === null) {
+    if (game.proxy === '' || game.proxy === null) {
       reload = true
-
-      game.proxy.port = game.production ? (document.location.protocol === 'https:' ? '443' : '80') : 'local'
+      if (game.production) {
+        if (document.location.protocol === 'https:') {
+          game.proxy = 'wss:web-minecraft-proxy.herokuapp.com:443'
+        } else {
+          game.proxy = 'ws:web-minecraft-proxy.herokuapp.com:80'
+        }
+      } else {
+        game.proxy = 'local'
+      }
     }
     if (reload) {
-      document.location.href = `?server=${game.server}&port=${game.serverPort}&nick=${game.nick}&premium=${game.premium}&proxyHost=${game.proxy.hostname}&proxyPort=${game.proxy.port}`
+      document.location.href = `?server=${game.server}&port=${game.serverPort}&nick=${game.nick}&premium=${game.premium}&proxy=${game.proxy}`
     } else {
       if (game.premium === 'true') {
         swal({

src/scripts/UrlParams.js

@@ -20,7 +20,7 @@ addEventListener('message', function (e) {
     case 'init':
       data = data[0]
       console.log(data)
-      bot = self.mineflayer(data.hostname, data.port, {
+      bot = self.mineflayer(data.connection, data.hostname, data.port, {
         host: data.server,
         port: data.serverPort,
         username: data.nick

src/scripts/proxy/Proxy.worker.js

@@ -5,11 +5,21 @@ class Socket {
     this.game = game
     this.worker = new Proxy()
     this.handlers = new Map()
-    const hostname = this.game.proxy.hostname === 'local' ? document.location.hostname : this.game.proxy.hostname
-    const port = this.game.proxy.port === 'local' ? document.location.port : this.game.proxy.port
+    let connection, hostname, port
+    if (this.game.proxy === 'local') {
+      connection = document.location.protocol === 'https:' ? 'wss' : 'ws'
+      hostname = document.location.hostname
+      port = document.location.port
+    } else {
+      const pars = this.game.proxy.split(':')
+      connection = pars[0]
+      hostname = pars[1]
+      port = pars[2]
+    }
     this.emit('init', {
-      hostname: hostname,
-      port: port,
+      connection,
+      hostname,
+      port,
       nick: this.game.nick,
       server: this.game.server,
       serverPort: this.game.serverPort,

src/scripts/proxy/Socket.js

@@ -37,7 +37,7 @@ class DistanceBasedFog {
           'float dist = length(u_viewPos - vViewPosition);',
           'float fogFactor = smoothstep(u_farnear.x, u_farnear.y, dist);',
           'gl_FragColor = vec4(outgoingLight, diffuseColor.a );',
-          'gl_FragColor = mix(gl_FragColor, u_fogColor, max(0.1, fogFactor));'
+          'gl_FragColor = mix(gl_FragColor, u_fogColor, max(0.05, fogFactor));'
         ].join('\n')
       )
     }