Procházet zdrojové kódy

Replace localhost with current url in FE and with environment variable in BE.

niels před 4 roky
rodič
revize
f2c7a5693b
2 změnil soubory, kde provedl 6 přidání a 3 odebrání
  1. 4 2
      chube_ws.py
  2. 2 1
      static/js/websocketResolver.js

+ 4 - 2
chube_ws.py

@@ -1,11 +1,13 @@
 import asyncio
 import json
+import os
 
 import websockets
 
 from chube_enums import Message
 
-PORT = 3821  # CHU
+PORT = os.environ.get("CHUBE_WS_PORT") or 3821  # CHU
+HOST = os.environ.get("CHUBE_WS_HOST") or "localhost"
 
 
 class Resolver:
@@ -68,6 +70,6 @@ def make_message(message_type, body=None):
 def start_server(resolver: Resolver, on_new_connection, on_connection_close):
     ws_server = websockets.serve(
         resolver.make_handler(on_open=on_new_connection, on_close=on_connection_close),
-        "localhost", PORT)
+        HOST, PORT)
     asyncio.get_event_loop().run_until_complete(ws_server)
     asyncio.get_event_loop().run_forever()

+ 2 - 1
static/js/websocketResolver.js

@@ -1,4 +1,5 @@
 const PORT = 3821
+const HOST = location.hostname
 
 export class Resolver {
     registerMap = new Map()
@@ -41,7 +42,7 @@ export class Resolver {
 
     connectSocket() {
         const self = this;
-        const socket = new WebSocket(`ws://localhost:${PORT}`)
+        const socket = new WebSocket(`ws://${HOST}:${PORT}`)
 
         function handler(event) {
             self.resolve(event.data, socket)