@@ -19,17 +19,12 @@ module Language.Javascript.JSaddle.WebSockets (
1919 jsaddleOr
2020 , jsaddleApp
2121 , jsaddleWithAppOr
22− , jsaddleAppWithJs
23− , jsaddleAppWithJsOr
2422 , jsaddleAppPartial
25− , jsaddleJs
26− , jsaddleJs'
2723 , debug
28− , debugOr
2924 , debugWrapper
3025) where
3126
32−import Control.Monad (when, void, forever)
27+import Control.Monad (when, join, void, forever)
3328import Control.Concurrent (killThread, forkIO, threadDelay)
3429import Control.Exception (handle, AsyncException, throwIO, fromException, finally)
3530
@@ -42,12 +37,12 @@ import Network.Wai
4237import Network.WebSockets
4338 (defaultConnectionOptions, ConnectionOptions(..), sendTextData,
4439 receiveDataMessage, acceptRequest, ServerApp, sendPing)
40+import qualified Network.WebSockets as WS (DataMessage(..))
4541import Network.Wai.Handler.WebSockets (websocketsOr)
46−import Network.HTTP.Types (Status(..))
4742
4843import Language.Javascript.JSaddle.Types (JSM(..), JSContextRef(..))
4944import qualified Network.Wai as W
50− (responseLBS, requestMethod, pathInfo, modifyResponse, responseStatus)
45+ (responseLBS, requestMethod, pathInfo)
5146import qualified Data.Text as T (pack)
5247import qualified Network.HTTP.Types as H
5348 (status403, status200)
@@ -58,59 +53,45 @@ import Language.Javascript.JSaddle.Debug
5853import Data.Maybe (fromMaybe)
5954import qualified Data.Map as M (empty, insert, lookup)
6055import Data.IORef
61− (readIORef, newIORef, atomicModifyIORef')
56+ (writeIORef, IORef, readIORef, newIORef, atomicModifyIORef')
6257import Data.ByteString.Lazy (ByteString)
63−import qualified Data.ByteString.Lazy as LBS
64− (toStrict, stripPrefix)
58+import Data.UUID.Types (toText)
6559import Control.Concurrent.MVar
66− (tryTakeMVar, MVar, tryPutMVar, modifyMVar_, putMVar, takeMVar,
67− readMVar, newMVar, newEmptyMVar, modifyMVar)
60+ (tryPutMVar, modifyMVar_, putMVar, takeMVar, readMVar, newMVar,
61+ newEmptyMVar, modifyMVar)
6862import Network.Wai.Handler.Warp
6963 (defaultSettings, setTimeout, setPort, runSettings)
70−import Foreign.Store (readStore, lookupStore, writeStore, Store(..))
64+import Foreign.Store (newStore, readStore, lookupStore)
7165import Language.Javascript.JSaddle (askJSM)
7266import Control.Monad.IO.Class (MonadIO(..))
7367
74−import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
75−import qualified Data.Text.Encoding as T (decodeUtf8)
76−
7768jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
7869jsaddleOr opts entryPoint otherApp = do
7970 syncHandlers <- newIORef M.empty
80− asyncHandlers <- newIORef M.empty
8171 let wsApp :: ServerApp
8272 wsApp pending_conn = do
8373 conn <- acceptRequest pending_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"
74+ rec (processResult, processSyncResult, start) <- runJavaScript (sendTextData conn . encode) $ do
75+ syncKey <- toText . contextId <$> askJSM
76+ liftIO $ atomicModifyIORef' syncHandlers (\m -> (M.insert syncKey processSyncResult m, ()))
77+ liftIO $ sendTextData conn (encode syncKey)
78+ entryPoint
79+ _ <- forkIO . forever $
80+ receiveDataMessage conn >>= \case
81+ (WS.Text t) ->
82+ case decode t of
83+ Nothing -> error $ "jsaddle Results decode failed : " <> show t
84+ Just r -> processResult r
85+ _ -> error "jsaddle WebSocket unexpected binary data"
86+ start
87+ waitTillClosed conn
10788
10889 -- Based on Network.WebSocket.forkPingThread
10990 waitTillClosed conn = ignore `handle` go 1
11091 where
11192 go :: Int -> IO ()
11293 go i = do
113− threadDelay (10 * 1000 * 1000)
94+ threadDelay (1 * 1000 * 1000)
11495 sendPing conn (T.pack $ show i)
11596 go (i + 1)
11697
@@ -130,27 +111,15 @@ jsaddleOr opts entryPoint otherApp = do
130111 Just handler -> do
131112 next <- encode <$> handler result
132113 sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/json")] next
133− (method, _) -> (catch404 otherApp) req sendResponse
134− where catch404 = W.modifyResponse $ \resp ->
135− case (method, W.responseStatus resp) of
136− ("GET", Status 404 _) -> indexResponse
137− _ -> resp
114+ _ -> otherApp req sendResponse
138115 return $ websocketsOr opts wsApp syncHandler
139116
140117
141118jsaddleApp :: Application
142−jsaddleApp = jsaddleAppWithJs $ jsaddleJs False
143−
144−jsaddleAppWithJs :: ByteString -> Application
145−jsaddleAppWithJs 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)
119+jsaddleApp req sendResponse =
120+ fromMaybe
121+ (sendResponse $ W.responseLBS H.status403 [("Content-Type", "text/plain")] "Forbidden")
122+ (jsaddleAppPartial req sendResponse)
154123
155124jsaddleWithAppOr :: ConnectionOptions -> JSM () -> Application -> IO Application
156125jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sendResponse ->
@@ -158,82 +127,57 @@ jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sen
158127 (jsaddleAppPartial req sendResponse))
159128
160129jsaddleAppPartial :: Request -> (Response -> IO ResponseReceived) -> Maybe (IO ResponseReceived)
161−jsaddleAppPartial = jsaddleAppPartialWithJs $ jsaddleJs False
162−
163−indexResponse :: Response
164−indexResponse = W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
165−
166−jsaddleAppPartialWithJs :: ByteString -> Request -> (Response -> IO ResponseReceived) -> Maybe (IO ResponseReceived)
167−jsaddleAppPartialWithJs js req sendResponse = case (W.requestMethod req, W.pathInfo req) of
168− ("GET", []) -> Just $ sendResponse indexResponse
169− ("GET", ["jsaddle.js"]) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] js
130+jsaddleAppPartial req sendResponse = case (W.requestMethod req, W.pathInfo req) of
131+ ("GET", []) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
132+ ("GET", ["jsaddle.js"]) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] jsaddleJs
170133 _ -> Nothing
171134
172−jsaddleJs :: Bool -> ByteString
173−jsaddleJs = jsaddleJs' Nothing
174−
175135-- Use this to generate this string for embedding
176136-- sed -e 's|\\|\\\\|g' -e 's|^| \\|' -e 's|$|\\n\\|' -e 's|"|\\"|g' data/jsaddle.js | pbcopy
177−jsaddleJs' :: Maybe ByteString -> Bool -> ByteString
178−jsaddleJs' jsaddleUri refreshOnLoad = "\
179− \if(typeof global !== \"undefined\" && typeof require === \"function\") {\n\
137+jsaddleJs :: ByteString
138+jsaddleJs = "\
139+ \if(typeof global !== \"undefined\") {\n\
180140 \ global.window = global;\n\
181141 \ global.WebSocket = require('ws');\n\
182142 \}\n\
183143 \\n\
184144 \var connect = function() {\n\
185− \ var wsaddress = "
186− <> maybe "window.location.protocol.replace('http', 'ws')+\"//\"+window.location.hostname+(window.location.port?(\":\"+window.location.port):\"\")"
187− (\ s -> "\"ws" <> s <> "\"")
188− (jsaddleUri >>= LBS.stripPrefix "http")
189− <> ";\n\
145+ \ var wsaddress = window.location.protocol.replace('http', 'ws')+\"//\"+window.location.hostname+(window.location.port?(\":\"+window.location.port):\"\");\n\
190146 \\n\
191− \ var ws0 = new WebSocket(wsaddress);\n\
147+ \ var ws = new WebSocket(wsaddress);\n\
192148 \ var syncKey = \"\";\n\
193149 \\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\
150+ \ ws.onopen = function(e) {\n\
198151 \ " <> initState <> "\n\
152+ \ var inXhrSend = false;\n\
199153 \\n\
200− \ ws0.onmessage = function(e) {\n\
154+ \ ws.onmessage = function(e) {\n\
155+ \ if(inXhrSend) return;\n\
201156 \ var batch = JSON.parse(e.data);\n\
202− \ if(inCallback > 0) {\n\
203− \ asyncBatch = batch;\n\
204− \ return;\n\
205− \ }\n\
206157 \ if(typeof batch === \"string\") {\n\
207158 \ 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" <>
215− (if refreshOnLoad
216− then " var xhr = new XMLHttpRequest();\n\
217− \ xhr.open('POST', '/reload/'+syncKey, true);\n\
218− \ xhr.onreadystatechange = function() {\n\
219− \ if(xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200)\n\
220− \ setTimeout(function(){window.location.reload();}, 100);\n\
221− \ };\n\
222− \ xhr.send();\n"
223− else "") <>
224− " return;\n\
159+ \ var xhr = new XMLHttpRequest();\n\
160+ \ xhr.open('POST', '/reload/'+syncKey, true);\n\
161+ \ xhr.onreadystatechange = function() {\n\
162+ \ if(xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200)\n\
163+ \ setTimeout(function(){window.location.reload();}, 500);\n\
164+ \ };\n\
165+ \ xhr.send();\n\
166+ \ return;\n\
225167 \ }\n\
226168 \\n\
227169 \ " <> runBatch (\a -> "ws.send(JSON.stringify(" <> a <> "));")
228170 (Just (\a -> "(function(){\n\
171+ \ inXhrSend = true;\n\
229172 \ var xhr = new XMLHttpRequest();\n\
230− \ xhr.open('POST', '" <> fromMaybe "" jsaddleUri <> "/sync/'+syncKey, false);\n\
173+ \ xhr.open('POST', '/sync/'+syncKey, false);\n\
231174 \ xhr.setRequestHeader(\"Content-type\", \"application/json\");\n\
232175 \ xhr.send(JSON.stringify(" <> a <> "));\n\
176+ \ inXhrSend = false;\n\
233177 \ return JSON.parse(xhr.response);})()")) <> "\
234178 \ };\n\
235179 \ };\n\
236− \ ws0.onerror = function() {\n\
180+ \ ws.onerror = function() {\n\
237181 \ setTimeout(connect, 1000);\n\
238182 \ };\n\
239183 \}\n\
@@ -247,35 +191,26 @@ jsaddleJs' jsaddleUri refreshOnLoad = "\
247191-- > :def! reload (const $ return "::reload\nLanguage.Javascript.JSaddle.Warp.debug 3708 SomeMainModule.someMainFunction")
248192debug :: Int -> JSM () -> IO ()
249193debug port f = do
250− debugWrapper $ \withRefresh registerContext ->
251− runSettings (setPort port (setTimeout 3600 defaultSettings)) =<<
252− jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJs $ jsaddleJs True)
253− putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
254−
255−debugOr :: Int -> JSM () -> Application -> IO ()
256−debugOr port f b = do
257− debugWrapper $ \withRefresh registerContext ->
194+ debugWrapper $ \refreshMiddleware registerContext ->
258195 runSettings (setPort port (setTimeout 3600 defaultSettings)) =<<
259− jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJsOr (jsaddleJs True) b)
196+ jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (refreshMiddleware jsaddleApp)
260197 putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
261198
262−refreshMiddleware :: ((Response -> IO ResponseReceived) -> IO ResponseReceived) -> Middleware
263−refreshMiddleware refresh otherApp req sendResponse = case (W.requestMethod req, W.pathInfo req) of
264− ("POST", ["reload", _syncKey]) -> refresh sendResponse
265− _ -> otherApp req sendResponse
266−
267199debugWrapper :: (Middleware -> JSM () -> IO ()) -> IO ()
268200debugWrapper run = do
269201 reloadMVar <- newEmptyMVar
270202 reloadDoneMVars <- newMVar []
271203 contexts <- newMVar []
272− let refresh sendResponse = do
273− reloadDone <- newEmptyMVar
274− modifyMVar_ reloadDoneMVars (return . (reloadDone:))
275− readMVar reloadMVar
276− r <- sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/json")] ("reload" :: ByteString)
277− putMVar reloadDone ()
278− return r
204+ let refreshMiddleware :: Middleware
205+ refreshMiddleware otherApp req sendResponse = case (W.requestMethod req, W.pathInfo req) of
206+ ("POST", ["reload", _syncKey]) -> do
207+ reloadDone <- newEmptyMVar
208+ modifyMVar_ reloadDoneMVars (return . (reloadDone:))
209+ readMVar reloadMVar
210+ r <- sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/json")] ("reload" :: ByteString)
211+ putMVar reloadDone ()
212+ return r
213+ _ -> otherApp req sendResponse
279214 start :: Int -> IO (IO Int)
280215 start expectedConnections = do
281216 serverDone <- newEmptyMVar
@@ -287,7 +222,7 @@ debugWrapper run = do
287222 addContext
288223 when (browsersConnected == expectedConnections) . void . liftIO $ tryPutMVar ready ()
289224 thread <- forkIO $
290− finally (run (refreshMiddleware refresh) registerContext)
225+ finally (run refreshMiddleware registerContext)
291226 (putMVar serverDone ())
292227 _ <- forkIO $ threadDelay 10000000 >> void (tryPutMVar ready ())
293228 when (expectedConnections /= 0) $ takeMVar ready
@@ -296,24 +231,15 @@ debugWrapper run = do
296231 ctxs <- takeMVar contexts
297232 mapM_ removeContext ctxs
298233 takeMVar reloadDoneMVars >>= mapM_ takeMVar
299− tryTakeMVar serverDone >>= \case
300− Nothing -> do
301− killThread thread
302− takeMVar serverDone
303− Just _ -> return ()
234+ killThread thread
235+ takeMVar serverDone
304236 return $ length ctxs
305− restarter :: MVar (Int -> IO (IO Int)) -> IO Int -> IO ()
306− restarter mvar stop = do
307− start' <- takeMVar mvar
308− n <- stop
309− start' n >>= restarter mvar
310− lookupStore storeId >>= \case
237+ lookupStore shutdown_0 >>= \case
311238 Nothing -> do
312− restartMVar <- newMVar start
313− void . forkIO $ restarter restartMVar (return 0)
314− void $ writeStore (Store storeId) restartMVar
239+ shutdownRef <- newIORef =<< start 0
240+ void $ newStore shutdownRef
315241 Just shutdownStore -> do
316− restartMVar :: MVar (Int -> IO (IO Int)) <- readStore shutdownStore
317− void $ tryTakeMVar restartMVar
318− putMVar restartMVar start
319− where storeId = 354
242+ shutdownRef :: IORef (IO Int) <- readStore shutdownStore
243+ expectedConnections <- join (readIORef shutdownRef)
244+ writeIORef shutdownRef =<< start expectedConnections
245+ where shutdown_0 = 0