git.iko.soy/jsaddle
on master help sign in
Merge pull request #52 from reflex-frp/websockets-0.12

Websockets 0.12

commit1d575e3e310a8cd36c4bd2f61b89fe936868d6de authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateThu 25 Jan 2018, 15:24 (9 years ago) parent3f8b32814e90cf
4 files changed+35−5
compare with master
unifiedsplit
jsaddle-warp/jsaddle-warp.cabal+1−1 jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets.hs+4−3 jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets/Compat.hs+29 jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+1−1
jsaddle-warp/jsaddle-warp.cabal+1−1
@@ -38,7 +38,7 @@ library
3838 wai >=3.0.3.0 && <3.3,
3939 wai-websockets >=3.0.0.6 && <3.1,
4040 warp >=3.1.2 && <3.3,
41− websockets >=0.9.5.0 && <0.11
41+ websockets >=0.9.5.0 && <0.13
4242 exposed-modules:
4343 Language.Javascript.JSaddle.Warp
4444 build-depends:
jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets.hs+4−3
@@ -38,7 +38,6 @@ import Network.Wai
3838import Network.WebSockets
3939 (defaultConnectionOptions, ConnectionOptions(..), sendTextData,
4040 receiveDataMessage, acceptRequest, ServerApp, sendPing)
41−import qualified Network.WebSockets as WS (DataMessage(..))
4241import Network.Wai.Handler.WebSockets (websocketsOr)
4342import Network.HTTP.Types (Status(..))
4443
@@ -66,6 +65,8 @@ import Foreign.Store (newStore, readStore, lookupStore)
6665import Language.Javascript.JSaddle (askJSM)
6766import Control.Monad.IO.Class (MonadIO(..))
6867
68+import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
69+
6970jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
7071jsaddleOr opts entryPoint otherApp = do
7172 syncHandlers <- newIORef M.empty
@@ -78,8 +79,8 @@ jsaddleOr opts entryPoint otherApp = do
7879 liftIO $ sendTextData conn (encode syncKey)
7980 entryPoint
8081 _ <- forkIO . forever $
81− receiveDataMessage conn >>= \case
82− (WS.Text t) ->
82+ receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of
83+ Just t ->
8384 case decode t of
8485 Nothing -> error $ "jsaddle Results decode failed : " <> show t
8586 Just r -> processResult r
jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets/Compat.hsnew file+29
@@ -0,0 +1,29 @@
1+{-# LANGUAGE CPP #-}
2+-----------------------------------------------------------------------------
3+--
4+-- Module : Language.Javascript.JSaddle.WebSockets.Compat
5+-- Copyright : (c) Hamish Mackenzie
6+-- License : MIT
7+--
8+-- Maintainer : Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
9+--
10+-- | This module is necessary to harmonize various versions of the websockets
11+-- package; we can't do this CPP inline in
12+-- Language.Javascript.JSaddle.WebSockets because that module uses multi-line
13+-- strings, which are incompatible with CPP
14+--
15+-----------------------------------------------------------------------------
16+module Language.Javascript.JSaddle.WebSockets.Compat where
17+
18+import Data.ByteString.Lazy (ByteString)
19+import qualified Network.WebSockets as WS (DataMessage(..))
20+
21+getTextMessageByteString :: WS.DataMessage -> Maybe ByteString
22+getTextMessageByteString msg = case msg of
23+#if MIN_VERSION_websockets(0,11,0)
24+ (WS.Text t _) ->
25+#else
26+ (WS.Text t) ->
27+#endif
28+ Just t
29+ _ -> Nothing
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+1−1
@@ -35,7 +35,7 @@ library
3535 gi-gtk >=3.0.17 && <3.1,
3636 gi-webkit2 >=4.0.14 && <4.1,
3737 gi-javascriptcore >=4.0.14 && <4.1,
38− haskell-gi-base >=0.20 && <0.21,
38+ haskell-gi-base >=0.20 && <0.22,
3939 haskell-gi-overloading ==0.0.*,
4040 jsaddle >=0.9.4.0 && <0.10,
4141 text >=1.2.1.3 && <1.3,