Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Changes for jsaddle experimental core2 #391

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

WIP: Changes for jsaddle experimental core2 #391

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc41a85
Fixes for experimental-core2 branch
dfordivam May 15, 2020
43e0670
Fix for batching of requests
dfordivam May 22, 2020
294ce24
Merge branch 'dn-fixes-for-experimental-core2' of github.com:dfordiva…
3noch Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions reflex-dom/src-android/Reflex/Dom/Android/MainWidget.hsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ import Foreign.Marshal.Utils
import Foreign.Marshal.Array
import Foreign.Ptr
import Foreign.Storable
import Language.Javascript.JSaddle (JSM)
import Language.Javascript.JSaddle (JSM, runJSM)
import Language.Javascript.JSaddle.Run (runJavaScript)
import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
import Language.Javascript.JSaddle.Run.Files (jsaddleCoreJs, ghcjsHelpers)

#include "MainWidget.h"

-- TODO: Fix this in jsaddle
jsaddleCoreJsRenamed = "function jsaddleCoreJs" <> rem
where (Just rem) = LBS.stripPrefix "function jsaddle" jsaddleCoreJs

startMainWidget :: HaskellActivity -> ByteString -> JSM () -> IO ()
startMainWidget a url jsm = do
Expand All @@ -35,9 +38,9 @@ startMainWidget a url jsm = do
executor <- readIORef executorRef
BSU.unsafeUseAsCStringLen (LBS.toStrict $ "runJSaddleBatch(" <> encode batch <> ");") $ \(cstr, len) -> do
runJS executor cstr (fromIntegral len)
(processResult, processSyncResult, start) <- runJavaScript go jsm
(processResult, processSyncResult, env) <- runJavaScript go
callbacks <- new <=< jsaddleCallbacksToPtrs $ JSaddleCallbacks
{ _jsaddleCallbacks_jsaddleStart = void $ forkIO start
{ _jsaddleCallbacks_jsaddleStart = void $ forkIO $ runJSM jsm env
, _jsaddleCallbacks_jsaddleResult = \s -> do
case decode $ LBS.fromStrict s of
Nothing -> error $ "jsaddle message decode failed: " <> show s
Expand All @@ -46,12 +49,15 @@ startMainWidget a url jsm = do
case decode $ LBS.fromStrict s of
Nothing -> error $ "jsaddle message decode failed: " <> show s
Just r -> LBS.toStrict . encode <$> processSyncResult r
, _jsaddleCallbacks_jsaddleJsData = LBS.toStrict $ ghcjsHelpers <> "\
, _jsaddleCallbacks_jsaddleJsData = LBS.toStrict $ jsaddleCoreJsRenamed <> ghcjsHelpers <> "\
\runJSaddleBatch = (function() {\n\
\ " <> initState <> "\n\
\ var core = jsaddleCoreJs(window, function(a) {\n\
\ jsaddle.postMessage(JSON.stringify(a));\n\
\ }, function(a) {\n\
\ return JSON.parse(jsaddle.syncMessage(JSON.stringify(a)));\n\
\ });\n\
\ return function(batch) {\n\
\ " <> runBatch (\a -> "jsaddle.postMessage(JSON.stringify(" <> a <> "));")
(Just (\a -> "JSON.parse(jsaddle.syncMessage(JSON.stringify(" <> a <> ")))")) <> "\
\ for (req of batch) { core.processReq(req); }\n\
\ };\n\
\})();\n\
\jsaddle.postReady();\n"
Expand Down