Move client to server

1 files changed, 42 insertions, 46 deletions

diff --git a/server/lib/Uplcg/Views.hs b/server/lib/Uplcg/Views.hs
index 3cb9ebe..772c83b 100644
--- a/server/lib/Uplcg/Views.hs
+++ b/server/lib/Uplcg/Views.hs
@@ -2,15 +2,18 @@
 module Uplcg.Views
     ( RoomView (..)
     , rooms
+    , client
     ) where
 
-import           Data.Foldable               (for_)
-import           Data.Text                   (Text)
-import qualified Text.Blaze.Html5            as H
-import qualified Text.Blaze.Html5.Attributes as A
 import qualified Data.ByteString.Lazy.Builder as BLB
-import qualified Uplcg.BaseUrl               as BaseUrl
+import           Data.Foldable                (for_)
+import           Data.Text                    (Text)
+import qualified Data.Text.Encoding           as T
+import qualified Text.Blaze.Html5             as H
+import qualified Text.Blaze.Html5.Attributes  as A
+import qualified Uplcg.BaseUrl                as BaseUrl
 import           Uplcg.Config
+import           Uplcg.Version                (version)
 
 data RoomView = RoomView Text Int
 
@@ -25,7 +28,7 @@ template conf title body = H.docTypeHtml $ do
         H.meta H.! A.name "viewport" H.! A.content "width=device-width"
     H.body $ do
         body
-        H.footer $ "Untitled PL Card Game version " <> H.toHtml (cVersion conf)
+        H.footer $ "Untitled PL Card Game version " <> H.toHtml version
 
 rooms :: Config -> [RoomView] -> H.Html
 rooms conf rids = template conf "Untitled PL Card Game" $ do
@@ -43,44 +46,37 @@ client conf roomId = template conf "Untitled PL Card Game" $ do
     H.div H.! A.id "main" $ ""
     H.script H.! A.type_ "text/JavaScript"
         H.! A.src (H.toValue $
-            BaseUrl.render (cBaseUrl conf) <> "/assets/client.js")
-    H.script $ H.unsafeLazyByteString $ clientScript $ BLB.toLazyByteString $
-      var app = Elm.Client.init({node: document.querySelector("main")});
+            BaseUrl.render (cBaseUrl conf) <> "/assets/client.js") $ ""
+    H.script H.! A.type_ "text/JavaScript" $ H.unsafeLazyByteString entryPoint
+  where
+    t2b = BLB.byteString . T.encodeUtf8
+    entryPoint = BLB.toLazyByteString $
+      "var app = Elm.Client.init({node: document.querySelector('main')});" <>
 
-      function connect() {
-        var protocol = "ws:";
-        if(document.location.protocol == "https:") {
-          protocol = "wss:"
-        }
-        var path = document.location.pathname;
-        if(path.startsWith("$UPLCG_BASE")) {
-          path = path.substr("$UPLCG_BASE".length);
-        }
-        var roomId = path.split("/")[2];
-        var url = protocol + "//" + document.location.host +
-          "$UPLCG_BASE/rooms/" + roomId + "/events";
-
-        var socket = new WebSocket(url);
-        var socketSend = function(message) {
-          socket.send(message);
-        };
-        app.ports.webSocketOut.subscribe(socketSend);
-        socket.onmessage = function(event) {
-          app.ports.webSocketIn.send(event.data);
-        };
-        socket.onclose = function(event) {
-          app.ports.webSocketOut.unsubscribe(socketSend);
-          setTimeout(function() {
-            connect();
-          }, 1000);
-        };
-        socket.onerror = function(event) {
-          socket.close();
-        };
-      }
-
-      connect();
-    </script>
-    <footer>Untitled PL Card Game version $UPLCG_VERSION</footer>
-  </body>
-</html>
+      "function connect() {" <>
+      "  var protocol = 'ws:';" <>
+      "  if(document.location.protocol == 'https:') {" <>
+      "    protocol = 'wss:'" <>
+      "  }" <>
+      "  var url = protocol + '//' + document.location.host +" <>
+      "    '" <> t2b (BaseUrl.render $ cBaseUrl conf) <> "/rooms/" <>
+          t2b roomId <> "/events';" <>
+      "  var socket = new WebSocket(url);" <>
+      "  var socketSend = function(message) {" <>
+      "    socket.send(message);" <>
+      "  };" <>
+      "  app.ports.webSocketOut.subscribe(socketSend);" <>
+      "  socket.onmessage = function(event) {" <>
+      "    app.ports.webSocketIn.send(event.data);" <>
+      "  };" <>
+      "  socket.onclose = function(event) {" <>
+      "    app.ports.webSocketOut.unsubscribe(socketSend);" <>
+      "    setTimeout(function() {" <>
+      "      connect();" <>
+      "    }, 1000);" <>
+      "  };" <>
+      "  socket.onerror = function(event) {" <>
+      "    socket.close();" <>
+      "  };" <>
+      "}" <>
+      "connect();"