Merge pull request #326 from alaquepasa/mediaserver-with-one-port

[Mediaserver] Trabajar con un solo puerto: Usar un handler HTTP que gestiona WebSockets

mediaserver/platformcode/controllers/fileserver.py

@@ -20,7 +20,6 @@ class fileserver(Controller):
             self.handler.send_header('Content-type', 'text/html')
             self.handler.end_headers()
             respuesta = f.read()
-            respuesta = respuesta.replace("{$WSPORT}", str(config.get_setting("websocket.port")))
             self.handler.wfile.write(respuesta)
             f.close()
 

mediaserver/platformcode/controllers/html.py

@@ -33,7 +33,10 @@ class html(Controller):
         self.platformtools = platform(self)
         self.data = {}
         if self.handler:
-            self.client_ip = handler.client.getpeername()[0]
+            if hasattr(handler, "client"):
+                self.client_ip = handler.client.getpeername()[0]
+            else:
+                self.client_ip = handler.client_address[0]
             self.send_message({"action": "connect",
                                "data": {"version": "Alfa %s" % version,
                                         "date": "--/--/----"}})

mediaserver/platformcode/template/page.html

@@ -30,7 +30,7 @@
         <script type="text/javascript" src="/media/js/socket.js"></script>
         <script type="text/javascript" src="/media/js/utils.js"></script>
         <script type="text/javascript">
-            websocket_host = 'ws://' + window.location.hostname + ':{$WSPORT}'
+            websocket_host = 'ws://' + window.location.host
         </script>
     </head>