@@ -19,13 +19,9 @@ module Language.Javascript.JSaddle.WebSockets (
1919 jsaddleOr
2020 , jsaddleApp
2121 , jsaddleWithAppOr
22− , jsaddleAppWithJs
23− , jsaddleAppWithJsOr
2422 , jsaddleAppPartial
2523 , jsaddleJs
26− , jsaddleJs'
2724 , debug
28− , debugOr
2925 , debugWrapper
3026) where
3127
@@ -60,57 +56,44 @@ import qualified Data.Map as M (empty, insert, lookup)
6056import Data.IORef
6157 (readIORef, newIORef, atomicModifyIORef')
6258import Data.ByteString.Lazy (ByteString)
63−import qualified Data.ByteString.Lazy as LBS
64− (toStrict, stripPrefix)
6559import Control.Concurrent.MVar
6660 (tryTakeMVar, MVar, tryPutMVar, modifyMVar_, putMVar, takeMVar,
6761 readMVar, newMVar, 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
7468import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
75−import qualified Data.Text.Encoding as T (decodeUtf8)
7669
7770jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
7871jsaddleOr opts entryPoint otherApp = do
7972 syncHandlers <- newIORef M.empty
80− asyncHandlers <- newIORef M.empty
8173 let wsApp :: ServerApp
8274 wsApp pending_conn = do
8375 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"
76+ rec (processResult, processSyncResult, start) <- runJavaScript (sendTextData conn . encode) $ do
77+ syncKey <- T.pack . show . contextId <$> askJSM
78+ liftIO $ atomicModifyIORef' syncHandlers (\m -> (M.insert syncKey processSyncResult m, ()))
79+ liftIO $ sendTextData conn (encode syncKey)
80+ entryPoint
81+ _ <- forkIO . forever $
82+ receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of
83+ Just t ->
84+ case decode t of
85+ Nothing -> error $ "jsaddle Results decode failed : " <> show t
86+ Just r -> processResult r
87+ _ -> error "jsaddle WebSocket unexpected binary data"
88+ start
89+ waitTillClosed conn
10790
10891 -- Based on Network.WebSocket.forkPingThread
10992 waitTillClosed conn = ignore `handle` go 1
11093 where
11194 go :: Int -> IO ()
11295 go i = do
113− threadDelay (10 * 1000 * 1000)
96+ threadDelay (1 * 1000 * 1000)
11497 sendPing conn (T.pack $ show i)
11598 go (i + 1)
11699
@@ -143,14 +126,9 @@ jsaddleApp = jsaddleAppWithJs $ jsaddleJs False
143126
144127jsaddleAppWithJs :: ByteString -> Application
145128jsaddleAppWithJs 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)
129+ fromMaybe
130+ (sendResponse $ W.responseLBS H.status403 [("Content-Type", "text/plain")] "Forbidden")
131+ (jsaddleAppPartialWithJs js req sendResponse)
154132
155133jsaddleWithAppOr :: ConnectionOptions -> JSM () -> Application -> IO Application
156134jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sendResponse ->
@@ -169,49 +147,32 @@ jsaddleAppPartialWithJs js req sendResponse = case (W.requestMethod req, W.pathI
169147 ("GET", ["jsaddle.js"]) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] js
170148 _ -> Nothing
171149
172−jsaddleJs :: Bool -> ByteString
173−jsaddleJs = jsaddleJs' Nothing
174−
175150-- Use this to generate this string for embedding
176151-- 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\
152+jsaddleJs :: Bool -> ByteString
153+jsaddleJs refreshOnLoad = "\
154+ \if(typeof global !== \"undefined\") {\n\
180155 \ global.window = global;\n\
181156 \ global.WebSocket = require('ws');\n\
182157 \}\n\
183158 \\n\
184159 \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\
160+ \ var wsaddress = window.location.protocol.replace('http', 'ws')+\"//\"+window.location.hostname+(window.location.port?(\":\"+window.location.port):\"\");\n\
190161 \\n\
191− \ var ws0 = new WebSocket(wsaddress);\n\
162+ \ var ws = new WebSocket(wsaddress);\n\
192163 \ var syncKey = \"\";\n\
193164 \\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\
165+ \ ws.onopen = function(e) {\n\
198166 \ " <> initState <> "\n\
199167 \\n\
200− \ ws0.onmessage = function(e) {\n\
168+ \ ws.onmessage = function(e) {\n\
201169 \ var batch = JSON.parse(e.data);\n\
202170 \ if(inCallback > 0) {\n\
203171 \ asyncBatch = batch;\n\
204172 \ return;\n\
205173 \ }\n\
206174 \ if(typeof batch === \"string\") {\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" <>
175+ \ syncKey = batch;\n" <>
215176 (if refreshOnLoad
216177 then " var xhr = new XMLHttpRequest();\n\
217178 \ xhr.open('POST', '/reload/'+syncKey, true);\n\
@@ -227,13 +188,13 @@ jsaddleJs' jsaddleUri refreshOnLoad = "\
227188 \ " <> runBatch (\a -> "ws.send(JSON.stringify(" <> a <> "));")
228189 (Just (\a -> "(function(){\n\
229190 \ var xhr = new XMLHttpRequest();\n\
230− \ xhr.open('POST', '" <> fromMaybe "" jsaddleUri <> "/sync/'+syncKey, false);\n\
191+ \ xhr.open('POST', '/sync/'+syncKey, false);\n\
231192 \ xhr.setRequestHeader(\"Content-type\", \"application/json\");\n\
232193 \ xhr.send(JSON.stringify(" <> a <> "));\n\
233194 \ return JSON.parse(xhr.response);})()")) <> "\
234195 \ };\n\
235196 \ };\n\
236− \ ws0.onerror = function() {\n\
197+ \ ws.onerror = function() {\n\
237198 \ setTimeout(connect, 1000);\n\
238199 \ };\n\
239200 \}\n\
@@ -252,13 +213,6 @@ debug port f = do
252213 jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJs $ jsaddleJs True)
253214 putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
254215
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−
262216refreshMiddleware :: ((Response -> IO ResponseReceived) -> IO ResponseReceived) -> Middleware
263217refreshMiddleware refresh otherApp req sendResponse = case (W.requestMethod req, W.pathInfo req) of
264218 ("POST", ["reload", _syncKey]) -> refresh sendResponse
@@ -307,13 +261,13 @@ debugWrapper run = do
307261 start' <- takeMVar mvar
308262 n <- stop
309263 start' n >>= restarter mvar
310− lookupStore storeId >>= \case
264+ lookupStore shutdown_0 >>= \case
311265 Nothing -> do
312266 restartMVar <- newMVar start
313267 void . forkIO $ restarter restartMVar (return 0)
314− void $ writeStore (Store storeId) restartMVar
268+ void $ newStore restartMVar
315269 Just shutdownStore -> do
316270 restartMVar :: MVar (Int -> IO (IO Int)) <- readStore shutdownStore
317271 void $ tryTakeMVar restartMVar
318272 putMVar restartMVar start
319− where storeId = 354
273+ where shutdown_0 = 0