git.iko.soy/jsaddle
on master help sign in
Make jsaddle-warp compatible with websockets-0.12
commite77d303880917a66e593dc2d0d5c8718cfb085c4 authorRyan Trinkle <ryan.trinkle@gmail.com> dateMon 22 Jan 2018, 17:39 (9 years ago) parent37051d6
3 files changed+34−4
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-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)
4342
4443import Language.Javascript.JSaddle.Types (JSM(..), JSContextRef(..))
@@ -65,6 +64,8 @@ import Foreign.Store (newStore, readStore, lookupStore)
6564import Language.Javascript.JSaddle (askJSM)
6665import Control.Monad.IO.Class (MonadIO(..))
6766
67+import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
68+
6869jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
6970jsaddleOr opts entryPoint otherApp = do
7071 syncHandlers <- newIORef M.empty
@@ -77,8 +78,8 @@ jsaddleOr opts entryPoint otherApp = do
7778 liftIO $ sendTextData conn (encode syncKey)
7879 entryPoint
7980 _ <- forkIO . forever $
80− receiveDataMessage conn >>= \case
81− (WS.Text t) ->
81+ receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of
82+ Just t ->
8283 case decode t of
8384 Nothing -> error $ "jsaddle Results decode failed : " <> show t
8485 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