on develop help sign in
Accept both text and binary data from WebSocket messages

Still only send binary

commit84d8a359bd6b2b4f8105e1e2a34dfec9b3f4effd authorRyan Trinkle <ryan.trinkle@gmail.com> dateSat 23 Jan 2016, 03:17 (11 years ago) parent53d9e1c
1 file changed+5−2
src-ghcjs/Reflex/Dom/WebSocket/Foreign.hs+5−2
src-ghcjs/Reflex/Dom/WebSocket/Foreign.hs+5−2
@@ -30,8 +30,11 @@ newWebSocket _ url onMessage onOpen onClose = do
3030 _ <- on ws message $ do
3131 e <- ask
3232 d <- getData e
33− ab <- liftIO $ unsafeFreeze $ pFromJSVal d
34− liftIO $ onMessage $ toByteString 0 Nothing $ createFromArrayBuffer ab
33+ liftIO $ case jsTypeOf d of
34+ String -> onMessage $ encodeUtf8 $ pFromJSVal d
35+ _ -> do
36+ ab <- unsafeFreeze $ pFromJSVal d
37+ onMessage $ toByteString 0 Nothing $ createFromArrayBuffer ab
3538 _ <- on ws closeEvent $ liftIO onClose
3639 return $ JSWebSocket ws
3740