Skip to content

Commit 42e08e2

Browse files
committed
Bump flake, use connectText.
1 parent b43f0de commit 42e08e2

File tree

4 files changed

+22
-20
lines changed

4 files changed

+22
-20
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ flags: +template-haskell
99
source-repository-package
1010
type: git
1111
location: https://github.com/dmjio/miso
12-
tag: 62c1816d75e7a21ef0f9cb78d472cfa9e6fa30b4
12+
tag: b150a33493e45eba0c32a52d8115120bb0d9ec04

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Main.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ app = (component emptyModel update_ appView)
5151
#endif
5252
} where
5353
emptyModel = Model 0 mempty
54-
update_ (Close x) = do
54+
update_ (Close x) =
5555
connections %= IS.delete x
5656
update_ AddWebSocket = do
5757
nextConnection += 1

src/WebSocket.hs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module WebSocket (websocketComponent) where
1313
import Control.Monad (unless)
1414
import Data.Bool
1515
import GHC.Generics
16-
import Language.Javascript.JSaddle hiding (create)
1716
-----------------------------------------------------------------------------
1817
import Miso hiding (on)
1918
import Miso.Lens
@@ -36,11 +35,11 @@ instance ToMisoString Origin where
3635
-----------------------------------------------------------------------------
3736
data Action
3837
= OnOpen WebSocket
39-
| OnMessage JSVal
38+
| OnMessage MisoString
4039
| OnClosed Closed
41-
| OnError JSVal
40+
| OnError MisoString
4241
| Send
43-
| SendMessage JSVal
42+
| SendMessage MisoString
4443
| Update MisoString
4544
| Append Message
4645
| Connect
@@ -84,19 +83,23 @@ websocketComponent box =
8483
where
8584
updateModel = \case
8685
Send -> do
87-
message <- use msg
88-
unless (MS.null message) $ do
89-
io (SendMessage <$> toJSVal message)
86+
m <- use msg
87+
unless (MS.null m) $ do
88+
issue (SendMessage m)
9089
io $ do
9190
date <- newDate
9291
dateString <- date & toLocaleString
93-
pure $ Append (Message dateString message CLIENT)
94-
SendMessage message -> do
92+
pure $ Append (Message dateString m CLIENT)
93+
SendMessage m -> do
9594
socket <- use websocket
96-
send socket message
95+
sendText socket m
9796
Connect ->
98-
connect "wss://echo.websocket.org"
99-
OnOpen OnClosed OnMessage OnError
97+
connectText
98+
"wss://echo.websocket.org"
99+
OnOpen
100+
OnClosed
101+
OnMessage
102+
OnError
100103
OnOpen socket -> do
101104
websocket .= socket
102105
connected .= True
@@ -109,16 +112,15 @@ websocketComponent box =
109112
pure $ Append (Message dateString "Disconnected..." SYSTEM)
110113
OnMessage message ->
111114
io $ do
112-
message_ <- fromJSValUnchecked message
113115
date <- newDate
114116
dateString <- date & toLocaleString
115-
pure $ Append (Message dateString message_ SERVER)
117+
pure $ Append (Message dateString message SERVER)
116118
Append message ->
117119
received %= (message :)
118120
OnError err ->
119121
io_ $ do
120122
consoleLog "Error received"
121-
consoleLog' err
123+
consoleLog err
122124
Update input ->
123125
msg .= input
124126
NoOp ->

0 commit comments

Comments
 (0)