31af40c · project-m36 · git.iko.soy

git.iko.soy/project-m36

fix hardcoded websocket server port

resolves #66

commit31af40c5ba619695fe32b6502821f67213b7d3d1 authorAgentM <agentm@themactionfaction.com> dateFri 27 Jan 2017, 20:58 (10 years ago) parent79e6fff

2 files changed+9−4

unifiedsplit

src/bin/ProjectM36/Server/WebSocket/project-m36.js+1−1

@@ -3,7 +3,7 @@ var ProjectM36Connection = function (host, port, dbname, openCallback, errorCall

33 this.port = port

44 this.dbname = dbname

55 var connectURL = "ws://" + host + ":" + port + "/";

6− var socket = new WebSocket("ws://localhost:8888/");

6+ var socket = new WebSocket(connectURL);

77 var self = this;

88 socket.onopen = function(event) {

99 self.socket.send("connectdb:" + self.dbname);

src/bin/ProjectM36/Server/WebSocket/websocket-server.hs+8−3

@@ -5,17 +5,22 @@ import ProjectM36.Server

55import Control.Concurrent

66import qualified Network.WebSockets as WS

77import Network.Transport.TCP (decodeEndPointAddress)

8+import Debug.Trace

910main :: IO ()

1011main = do

1112 -- launch normal project-m36-server

1213 addressMVar <- newEmptyMVar

1314 serverConfig <- parseConfig

14− let serverHost = bindHost serverConfig

15− _ <- forkFinally (launchServer serverConfig (Just addressMVar)) failureHandler

15+ --usurp the serverConfig for our websocket server and make the proxied server run locally

16+ let wsHost = bindHost serverConfig

17+ wsPort = bindPort serverConfig

18+ serverHost = "127.0.0.1"

19+ serverConfig' = serverConfig {bindPort = 0, bindHost = serverHost}

20+ _ <- forkFinally (launchServer serverConfig' (Just addressMVar)) failureHandler

1621 --wait for server to be listening

1722 address <- takeMVar addressMVar

1823 let Just (_, serverPort, _) = decodeEndPointAddress address

1924 --this built-in server is apparently not meant for production use, but it's easier to test than starting up the wai or snap interfaces

20− WS.runServer "0.0.0.0" 8888 (websocketProxyServer (read serverPort) serverHost)

25+ WS.runServer (traceShowId wsHost) (traceShowId (fromIntegral wsPort)) (websocketProxyServer (read serverPort) serverHost)

2126