@@ -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
@@ -43,11 +39,10 @@ import Network.WebSockets
4339 (defaultConnectionOptions, ConnectionOptions(..), sendTextData,
4440 receiveDataMessage, acceptRequest, ServerApp, sendPing)
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)
@@ -60,57 +55,44 @@ import qualified Data.Map as M (empty, insert, lookup)
6055import Data.IORef
6156 (readIORef, newIORef, atomicModifyIORef')
6257import Data.ByteString.Lazy (ByteString)
63−import qualified Data.ByteString.Lazy as LBS
64− (toStrict, stripPrefix)
6558import Control.Concurrent.MVar
6659 (tryTakeMVar, MVar, tryPutMVar, modifyMVar_, putMVar, takeMVar,
6760 readMVar, newMVar, newEmptyMVar, modifyMVar)
6861import Network.Wai.Handler.Warp
6962 (defaultSettings, setTimeout, setPort, runSettings)
70−import Foreign.Store (readStore, lookupStore, writeStore, Store(..))
63+import Foreign.Store (newStore, readStore, lookupStore)
7164import Language.Javascript.JSaddle (askJSM)
7265import Control.Monad.IO.Class (MonadIO(..))
7366
7467import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
75−import qualified Data.Text.Encoding as T (decodeUtf8)
7668
7769jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
7870jsaddleOr opts entryPoint otherApp = do
7971 syncHandlers <- newIORef M.empty
80− asyncHandlers <- newIORef M.empty
8172 let wsApp :: ServerApp
8273 wsApp pending_conn = do
8374 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"
75+ rec (processResult, processSyncResult, start) <- runJavaScript (sendTextData conn . encode) $ do
76+ syncKey <- T.pack . show . contextId <$> askJSM
77+ liftIO $ atomicModifyIORef' syncHandlers (\m -> (M.insert syncKey processSyncResult m, ()))
78+ liftIO $ sendTextData conn (encode syncKey)
79+ entryPoint
80+ _ <- forkIO . forever $
81+ receiveDataMessage conn >>= \msg -> case getTextMessageByteString msg of
82+ Just t ->
83+ case decode t of
84+ Nothing -> error $ "jsaddle Results decode failed : " <> show t
85+ Just r -> processResult r
86+ _ -> error "jsaddle WebSocket unexpected binary data"
87+ start
88+ waitTillClosed conn
10789
10890 -- Based on Network.WebSocket.forkPingThread
10991 waitTillClosed conn = ignore `handle` go 1
11092 where
11193 go :: Int -> IO ()
11294 go i = do
113− threadDelay (10 * 1000 * 1000)
95+ threadDelay (1 * 1000 * 1000)
11496 sendPing conn (T.pack $ show i)
11597 go (i + 1)
11698
@@ -130,11 +112,7 @@ jsaddleOr opts entryPoint otherApp = do
130112 Just handler -> do
131113 next <- encode <$> handler result
132114 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
115+ _ -> otherApp req sendResponse
138116 return $ websocketsOr opts wsApp syncHandler
139117
140118
@@ -143,14 +121,9 @@ jsaddleApp = jsaddleAppWithJs $ jsaddleJs False
143121
144122jsaddleAppWithJs :: ByteString -> Application
145123jsaddleAppWithJs 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)
124+ fromMaybe
125+ (sendResponse $ W.responseLBS H.status403 [("Content-Type", "text/plain")] "Forbidden")
126+ (jsaddleAppPartialWithJs js req sendResponse)
154127
155128jsaddleWithAppOr :: ConnectionOptions -> JSM () -> Application -> IO Application
156129jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sendResponse ->
@@ -160,58 +133,38 @@ jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sen
160133jsaddleAppPartial :: Request -> (Response -> IO ResponseReceived) -> Maybe (IO ResponseReceived)
161134jsaddleAppPartial = jsaddleAppPartialWithJs $ jsaddleJs False
162135
163−indexResponse :: Response
164−indexResponse = W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
165−
166136jsaddleAppPartialWithJs :: ByteString -> Request -> (Response -> IO ResponseReceived) -> Maybe (IO ResponseReceived)
167137jsaddleAppPartialWithJs js req sendResponse = case (W.requestMethod req, W.pathInfo req) of
168− ("GET", []) -> Just $ sendResponse indexResponse
138+ ("GET", []) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
169139 ("GET", ["jsaddle.js"]) -> Just $ sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] js
170140 _ -> Nothing
171141
172−jsaddleJs :: Bool -> ByteString
173−jsaddleJs = jsaddleJs' Nothing
174−
175142-- Use this to generate this string for embedding
176143-- 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\
144+jsaddleJs :: Bool -> ByteString
145+jsaddleJs refreshOnLoad = "\
146+ \if(typeof global !== \"undefined\") {\n\
180147 \ global.window = global;\n\
181148 \ global.WebSocket = require('ws');\n\
182149 \}\n\
183150 \\n\
184151 \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\
152+ \ var wsaddress = window.location.protocol.replace('http', 'ws')+\"//\"+window.location.hostname+(window.location.port?(\":\"+window.location.port):\"\");\n\
190153 \\n\
191− \ var ws0 = new WebSocket(wsaddress);\n\
154+ \ var ws = new WebSocket(wsaddress);\n\
192155 \ var syncKey = \"\";\n\
193156 \\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\
157+ \ ws.onopen = function(e) {\n\
198158 \ " <> initState <> "\n\
199159 \\n\
200− \ ws0.onmessage = function(e) {\n\
160+ \ ws.onmessage = function(e) {\n\
201161 \ var batch = JSON.parse(e.data);\n\
202162 \ if(inCallback > 0) {\n\
203163 \ asyncBatch = batch;\n\
204164 \ return;\n\
205165 \ }\n\
206166 \ 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" <>
167+ \ syncKey = batch;\n" <>
215168 (if refreshOnLoad
216169 then " var xhr = new XMLHttpRequest();\n\
217170 \ xhr.open('POST', '/reload/'+syncKey, true);\n\
@@ -227,13 +180,13 @@ jsaddleJs' jsaddleUri refreshOnLoad = "\
227180 \ " <> runBatch (\a -> "ws.send(JSON.stringify(" <> a <> "));")
228181 (Just (\a -> "(function(){\n\
229182 \ var xhr = new XMLHttpRequest();\n\
230− \ xhr.open('POST', '" <> fromMaybe "" jsaddleUri <> "/sync/'+syncKey, false);\n\
183+ \ xhr.open('POST', '/sync/'+syncKey, false);\n\
231184 \ xhr.setRequestHeader(\"Content-type\", \"application/json\");\n\
232185 \ xhr.send(JSON.stringify(" <> a <> "));\n\
233186 \ return JSON.parse(xhr.response);})()")) <> "\
234187 \ };\n\
235188 \ };\n\
236− \ ws0.onerror = function() {\n\
189+ \ ws.onerror = function() {\n\
237190 \ setTimeout(connect, 1000);\n\
238191 \ };\n\
239192 \}\n\
@@ -252,13 +205,6 @@ debug port f = do
252205 jsaddleOr defaultConnectionOptions (registerContext >> f >> syncPoint) (withRefresh $ jsaddleAppWithJs $ jsaddleJs True)
253206 putStrLn $ "<a href=\"http://localhost:" <> show port <> "\">run</a>"
254207
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−
262208refreshMiddleware :: ((Response -> IO ResponseReceived) -> IO ResponseReceived) -> Middleware
263209refreshMiddleware refresh otherApp req sendResponse = case (W.requestMethod req, W.pathInfo req) of
264210 ("POST", ["reload", _syncKey]) -> refresh sendResponse
@@ -307,13 +253,13 @@ debugWrapper run = do
307253 start' <- takeMVar mvar
308254 n <- stop
309255 start' n >>= restarter mvar
310− lookupStore storeId >>= \case
256+ lookupStore shutdown_0 >>= \case
311257 Nothing -> do
312258 restartMVar <- newMVar start
313259 void . forkIO $ restarter restartMVar (return 0)
314− void $ writeStore (Store storeId) restartMVar
260+ void $ newStore restartMVar
315261 Just shutdownStore -> do
316262 restartMVar :: MVar (Int -> IO (IO Int)) <- readStore shutdownStore
317263 void $ tryTakeMVar restartMVar
318264 putMVar restartMVar start
319− where storeId = 354
265+ where shutdown_0 = 0