@@ -20,9 +20,12 @@ module Language.Javascript.JSaddle.WebSockets (
2020 , jsaddleApp
2121 , jsaddleWithAppOr
2222 , jsaddleAppWithJs
23+ , jsaddleAppWithJsOr
2324 , jsaddleAppPartial
2425 , jsaddleJs
26+ , jsaddleJs'
2527 , debug
28+ , debugOr
2629 , debugWrapper
2730) where
2831
@@ -57,45 +60,57 @@ import qualified Data.Map as M (empty, insert, lookup)
5760import Data.IORef
5861 (readIORef, newIORef, atomicModifyIORef')
5962import Data.ByteString.Lazy (ByteString)
60−import qualified Data.ByteString.Lazy as LBS (stripPrefix)
63+import qualified Data.ByteString.Lazy as LBS
64+ (toStrict, stripPrefix)
6165import Control.Concurrent.MVar
6266 (tryTakeMVar, MVar, tryPutMVar, modifyMVar_, putMVar, takeMVar,
6367 readMVar, newMVar, newEmptyMVar, modifyMVar)
6468import Network.Wai.Handler.Warp
6569 (defaultSettings, setTimeout, setPort, runSettings)
66−import Foreign.Store (newStore, readStore, lookupStore, writeStore, Store(..))
70+import Foreign.Store (readStore, lookupStore, writeStore, Store(..))
6771import Language.Javascript.JSaddle (askJSM)
6872import Control.Monad.IO.Class (MonadIO(..))
6973
7074import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
75+import qualified Data.Text.Encoding as T (decodeUtf8)
7176
7277jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
7378jsaddleOr opts entryPoint otherApp = do
7479 syncHandlers <- newIORef M.empty
80+ asyncHandlers <- newIORef M.empty
7581 let wsApp :: ServerApp
7682 wsApp pending_conn = do
7783 conn <- acceptRequest pending_conn
78− rec (processResult, processSyncResult, start) <- runJavaScript (sendTextData conn . encode) $ do
79− syncKey <- T.pack . show . contextId <$> askJSM
80− liftIO $ atomicModifyIORef' syncHandlers (\m -> (M.insert syncKey processSyncResult m, ()))
81− liftIO $ sendTextData conn (encode syncKey)
82− entryPoint
83− _ <- forkIO . forever $
84− receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of
85− Just t ->
86− case decode t of
87− Nothing -> error $ "jsaddle Results decode failed : " <> show t
88− Just r -> processResult r
89− _ -> error "jsaddle WebSocket unexpected binary data"
90− start
91− waitTillClosed conn
84+ initMsg <- receiveDataMessage conn
85+ case getTextMessageByteString initMsg of
86+ Just "" -> do
87+ rec (processResult, processSyncResult, start) <- runJavaScript (sendTextData conn . encode) $ do
88+ syncKey <- T.pack . show . contextId <$> askJSM
89+ liftIO $ atomicModifyIORef' syncHandlers (\m -> (M.insert syncKey processSyncResult m, ()))
90+ liftIO $ atomicModifyIORef' asyncHandlers (\m -> (M.insert syncKey processResult m, ()))
91+ liftIO $ sendTextData conn (encode syncKey)
92+ entryPoint
93+ start
94+ waitTillClosed conn
95+ Just syncKey ->
96+ M.lookup (T.decodeUtf8 $ LBS.toStrict syncKey) <$> readIORef syncHandlers >>= \case
97+ Nothing -> error "jsaddle missing sync message handler"
98+ Just processResult ->
99+ forever $
100+ receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of
101+ Just t ->
102+ case decode t of
103+ Nothing -> error $ "jsaddle Results decode failed : " <> show t
104+ Just r -> processResult r
105+ _ -> error "jsaddle WebSocket unexpected binary data"
106+ _ -> error "jsaddle WebSocket unexpected binary data"
92107
93108 -- Based on Network.WebSocket.forkPingThread
94109 waitTillClosed conn = ignore `handle` go 1
95110 where
96111 go :: Int -> IO ()
97112 go i = do
98− threadDelay (1 * 1000 * 1000)
113+ threadDelay (10 * 1000 * 1000)
99114 sendPing conn (T.pack $ show i)
100115 go (i + 1)
101116
@@ -128,9 +143,14 @@ jsaddleApp = jsaddleAppWithJs $ jsaddleJs False
128143
129144jsaddleAppWithJs :: ByteString -> Application
130145jsaddleAppWithJs js req sendResponse =
131− fromMaybe
132− (sendResponse $ W.responseLBS H.status403 [("Content-Type", "text/plain")] "Forbidden")
133− (jsaddleAppPartialWithJs js req sendResponse)
146+ jsaddleAppWithJsOr js
147+ (\_ _ -> sendResponse $ W.responseLBS H.status403 [("Content-Type", "text/plain")] "Forbidden")
148+ req sendResponse
149+
150+jsaddleAppWithJsOr :: ByteString -> Application -> Application
151+jsaddleAppWithJsOr js otherApp req sendResponse =
152+ fromMaybe (otherApp req sendResponse)
153+ (jsaddleAppPartialWithJs js req sendResponse)
134154
135155jsaddleWithAppOr :: ConnectionOptions -> JSM () -> Application -> IO Application
136156jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sendResponse ->
@@ -156,7 +176,7 @@ jsaddleJs = jsaddleJs' Nothing
156176-- sed -e 's|\\|\\\\|g' -e 's|^| \\|' -e 's|$|\\n\\|' -e 's|"|\\"|g' data/jsaddle.js | pbcopy
157177jsaddleJs' :: Maybe ByteString -> Bool -> ByteString
158178jsaddleJs' jsaddleUri refreshOnLoad = "\
159− \if(typeof global !== \"undefined\") {\n\
179+ \if(typeof global !== \"undefined\" && typeof require === \"function\") {\n\
160180 \ global.window = global;\n\
161181 \ global.WebSocket = require('ws');\n\
162182 \}\n\
@@ -168,20 +188,30 @@ jsaddleJs' jsaddleUri refreshOnLoad = "\
168188 (jsaddleUri >>= LBS.stripPrefix "http")
169189 <> ";\n\
170190 \\n\
171− \ var ws = new WebSocket(wsaddress);\n\
191+ \ var ws0 = new WebSocket(wsaddress);\n\
172192 \ var syncKey = \"\";\n\
173193 \\n\
174− \ ws.onopen = function(e) {\n\
194+ \ ws0.onopen = function(e) {\n\
195+ \ ws0.send(\"\");\n\
196+ \ var initialResults = [];\n\
197+ \ var ws = {send: function(m) {initialResults.push(m);}};\n\
175198 \ " <> initState <> "\n\
176199 \\n\
177− \ ws.onmessage = function(e) {\n\
200+ \ ws0.onmessage = function(e) {\n\
178201 \ var batch = JSON.parse(e.data);\n\
179202 \ if(inCallback > 0) {\n\
180203 \ asyncBatch = batch;\n\
181204 \ return;\n\
182205 \ }\n\
183206 \ if(typeof batch === \"string\") {\n\
184− \ syncKey = batch;\n" <>
207+ \ syncKey = batch;\n\
208+ \ var ws1 = new WebSocket(wsaddress);\n\
209+ \ ws1.onopen = function(e) {\n\
210+ \ ws1.send(syncKey);\n\
211+ \ initialResults.forEach(function(m){ ws1.send(m); });\n\
212+ \ initialResults = null;\n\
213+ \ ws = ws1;\n\
214+ \ }\n" <>
185215 (if refreshOnLoad
186216 then " var xhr = new XMLHttpRequest();\n\
187217 \ xhr.open('POST', '/reload/'+syncKey, true);\n\
@@ -203,7 +233,7 @@ jsaddleJs' jsaddleUri refreshOnLoad = "\
203233 \ return JSON.parse(xhr.response);})()")) <> "\
204234 \ };\n\
205235 \ };\n\
206− \ ws.onerror = function() {\n\
236+ \ ws0.onerror = function() {\n\
207237 \ setTimeout(connect, 1000);\n\
208238 \ };\n\
209239 \}\n\
@@ -222,6 +252,13 @@ debug port f = do
222252 jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJs $ jsaddleJs True)
223253 putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
224254
255+debugOr :: Int -> JSM () -> Application -> IO ()
256+debugOr port f b = do
257+ debugWrapper $ \withRefresh registerContext ->
258+ runSettings (setPort port (setTimeout 3600 defaultSettings)) =<<
259+ jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJsOr (jsaddleJs True) b)
260+ putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
261+
225262refreshMiddleware :: ((Response -> IO ResponseReceived) -> IO ResponseReceived) -> Middleware
226263refreshMiddleware refresh otherApp req sendResponse = case (W.requestMethod req, W.pathInfo req) of
227264 ("POST", ["reload", _syncKey]) -> refresh sendResponse