e77d303 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

Make jsaddle-warp compatible with websockets-0.12

e77d303Ryan Trinkle9 years ago

jsaddle-warp/jsaddle-warp.cabal+1−1

compare with master

unifiedsplit

@@ -38,7 +38,7 @@ library

38 wai >=3.0.3.0 && <3.3,

39 wai-websockets >=3.0.0.6 && <3.1,

40 warp >=3.1.2 && <3.3,

41− websockets >=0.9.5.0 && <0.11

41+ websockets >=0.9.5.0 && <0.13

42 exposed-modules:

43 Language.Javascript.JSaddle.Warp

44 build-depends:

jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets.hs+4−3

@@ -38,7 +38,6 @@ import Network.Wai

38import Network.WebSockets

39 (defaultConnectionOptions, ConnectionOptions(..), sendTextData,

40 receiveDataMessage, acceptRequest, ServerApp, sendPing)

41−import qualified Network.WebSockets as WS (DataMessage(..))

42import Network.Wai.Handler.WebSockets (websocketsOr)

41import Network.Wai.Handler.WebSockets (websocketsOr)

44import Language.Javascript.JSaddle.Types (JSM(..), JSContextRef(..))

43import Language.Javascript.JSaddle.Types (JSM(..), JSContextRef(..))

@@ -65,6 +64,8 @@ import Foreign.Store (newStore, readStore, lookupStore)

65import Language.Javascript.JSaddle (askJSM)

64import Language.Javascript.JSaddle (askJSM)

66import Control.Monad.IO.Class (MonadIO(..))

65import Control.Monad.IO.Class (MonadIO(..))

67+import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)

68+

68jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application

69jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application

69jsaddleOr opts entryPoint otherApp = do

70jsaddleOr opts entryPoint otherApp = do

70 syncHandlers <- newIORef M.empty

71 syncHandlers <- newIORef M.empty

@@ -77,8 +78,8 @@ jsaddleOr opts entryPoint otherApp = do

77 liftIO $ sendTextData conn (encode syncKey)

78 liftIO $ sendTextData conn (encode syncKey)

78 entryPoint

79 entryPoint

79 _ <- forkIO . forever $

80 _ <- forkIO . forever $

80− receiveDataMessage conn >>= \case

81+ receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of

81− (WS.Text t) ->

82+ Just t ->

82 case decode t of

83 case decode t of

83 Nothing -> error $ "jsaddle Results decode failed : " <> show t

84 Nothing -> error $ "jsaddle Results decode failed : " <> show t

84 Just r -> processResult r

85 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