External ws port

Author: easafe

src/Client/Im/WebSocket/WebSocket.js

@@ -1,20 +1,16 @@
 module Client.Im.WebSocket where
 
 import Prelude
-import Shared.Im.Types (WebSocketPayloadServer)
 
 import Client.Common.Location as CCD
 import Effect (Effect)
-import Effect.Uncurried (EffectFn3)
-import Effect.Uncurried as EU
 import Environment (production)
+import Shared.Im.Types (WebSocketPayloadServer)
 import Shared.Json as SJ
-import Shared.Options.WebSocket (port)
+import Shared.Options.WebSocket (externalPort, localPort)
 import Web.Socket.WebSocket (WebSocket)
 import Web.Socket.WebSocket as WSWS
 
-foreign import closeWith_ ∷ EffectFn3 WebSocket Int String Unit
-
 createWebSocket ∷ Effect WebSocket
 createWebSocket = do
       hostName ← CCD.hostName
@@ -24,11 +20,8 @@ createWebSocket = do
             | production = "wss://"
             | otherwise = "ws://"
       endpoint
-            | production = "/ws"
-            | otherwise = ":" <> show port
+            | production = "/ws:" <> show externalPort
+            | otherwise = ":" <> show localPort
 
 sendPayload ∷ WebSocket → WebSocketPayloadServer → Effect Unit
 sendPayload ws = WSWS.sendString ws <<< SJ.toJson
-
-closeWith ∷ WebSocket → Int → String → Effect Unit
-closeWith = EU.runEffectFn3 closeWith_

src/Client/Im/WebSocket/WebSocket.purs

@@ -4,7 +4,7 @@ import Prelude
 
 import Debug (spy)
 import Effect.Class (liftEffect)
-import Environment (production)
+
 import Run.Reader as RR
 import Server.Response as SR
 import Server.Token as ST
@@ -13,15 +13,15 @@ import Server.WebSocket (WebSocketMessage(..))
 import Server.WebSocket as SW
 import Shared.Im.Types (WebSocketPayloadServer(..))
 import Shared.Json as SJ
-import Shared.Options.WebSocket (port)
+import Shared.Options.WebSocket (localPort)
 
 ban ∷ Int → { id ∷ Int, secret ∷ String } → ServerEffect Unit
 ban loggedUserId query = do
       { configuration: { adminSecret } } ← RR.ask
       if query.secret == adminSecret then do
             cookie ← ST.createToken loggedUserId
             liftEffect do
-                  connection ← SW.createWebSocket ("ws://localhost:" <> show port) cookie
+                  connection ← SW.createWebSocket ("ws://localhost:" <> show localPort) cookie
                   SW.onOpen connection $ \_ → SW.sendMessage connection <<< WebSocketMessage <<< SJ.toJson $ Ban query
       else
             SR.throwBadRequest "nope"

src/Server/Admin/Action.purs

@@ -19,7 +19,7 @@ import Server.WebSocket (Port(..))
 import Server.WebSocket as SW
 import Server.WebSocket.Events (aliveDelay, inactiveDelay)
 import Server.WebSocket.Events as SWE
-import Shared.Options.WebSocket (port)
+import Shared.Options.WebSocket (localPort)
 import Shared.Spec (spec)
 
 main ∷ Effect Unit
@@ -31,7 +31,7 @@ main = do
 startWebSocketServer ∷ Configuration → Effect Unit
 startWebSocketServer configuration = do
       allUsersAvailabilityRef ← ER.new DH.empty
-      webSocketServer ← SW.createWebSocketServerWithPort (Port port) {} $ const (EC.log $ "Web socket now up on ws://localhost:" <> show port)
+      webSocketServer ← SW.createWebSocketServerWithPort (Port localPort) {} $ const (EC.log $ "Web socket now up on ws://localhost:" <> show localPort)
       SW.onServerError webSocketServer SWE.handleError
       pool ← SD.newPool configuration
       SW.onConnection webSocketServer (SWE.handleConnection configuration pool allUsersAvailabilityRef)

src/Server/Main.purs

@@ -1,4 +1,7 @@
 module Shared.Options.WebSocket where
 
-port ∷ Int
-port = 1339
+localPort ∷ Int
+localPort = 1339
+
+externalPort ∷ Int
+externalPort = 1443