on dd8eff2 help sign in
48 files changed+655−1315
since splitsnapshots
unifiedsplit
.travis.yml+24−40 README.md+14−34 cabal.project+35−3 default.nix+8 jsaddle-clib/cbits/include/jsaddle.h−1 jsaddle-clib/default.nix+9 jsaddle-clib/jsaddle-clib.cabal+3−4 jsaddle-clib/src-ghc/Language/Javascript/JSaddle/CLib.hs+4−19 jsaddle-clib/src/Language/Javascript/JSaddle/CLib/Internal.hsc−3 jsaddle-warp/default.nix+26 jsaddle-warp/jsaddle-warp.cabal+13−21 jsaddle-warp/src/Language/Javascript/JSaddle/Test.hs+12−13 jsaddle-warp/src/Language/Javascript/JSaddle/Warp.hs+4−3 jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets.hs+55−286 jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets/Compat.hs−29 jsaddle-warp/tests/DocTest.hs+7−20 jsaddle-webkit2gtk/default.nix+16 jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+9−10 jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+40−17 jsaddle-webkitgtk/default.nix+16 jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+2−57 jsaddle-wkwebview/cbits-uikit/AppDelegate.m+1−36 jsaddle-wkwebview/cbits/WKWebView.m+10−11 jsaddle-wkwebview/default.nix+20−14 jsaddle-wkwebview/jsaddle-wkwebview.cabal+11−20 jsaddle-wkwebview/src-ghc/Language/Javascript/JSaddle/WKWebView.hs+17−78 jsaddle-wkwebview/src/Language/Javascript/JSaddle/WKWebView/Internal.hs+4−35 jsaddle/default.nix+17 jsaddle/jsaddle.cabal+15−20 jsaddle/src-ghc/Data/JSString/Internal/Type.hs+1−2 jsaddle/src-ghc/GHCJS/Concurrent.hs−22 jsaddle/src-ghc/GHCJS/Foreign/Internal.hs+10−12 jsaddle/src-ghc/GHCJS/Prim/Internal.hs+3−5 jsaddle/src-ghc/GHCJS/Types.hs+3−5 jsaddle/src-ghc/JavaScript/Array.hs+2−2 jsaddle/src/Language/Javascript/JSaddle.hs+5−5 jsaddle/src/Language/Javascript/JSaddle/Debug.hs−48 jsaddle/src/Language/Javascript/JSaddle/Evaluate.hs+1−1 jsaddle/src/Language/Javascript/JSaddle/Monad.hs+26−3 jsaddle/src/Language/Javascript/JSaddle/Native/Internal.hs+25−40 jsaddle/src/Language/Javascript/JSaddle/Null.hs−56 jsaddle/src/Language/Javascript/JSaddle/Object.hs+13−22 jsaddle/src/Language/Javascript/JSaddle/Run.hs+74−116 jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+56−56 jsaddle/src/Language/Javascript/JSaddle/Types.hs+29−131 jsaddle/src/Language/Javascript/JSaddle/Value.hs+3−5 nix/hix.nix−8 travis/build.sh+12−2
.travis.yml+24−40
@@ -1,47 +1,31 @@
1−language: nix
2−nix: 2.2.2
1+sudo: required
2+services:
3+ - docker
34
4−jobs:
5− include:
6− - stage: Build
7− env: OS=linux GHCVER=ghc865
8− - stage: Build
9− env: OS=linux GHCVER=ghc881
10− - env: OS=macos GHCVER=ghc865
11− os: osx
12− # Fix OSX, see https://travis-ci.community/t/cannot-use-nix-support-on-osx/2927
13− language: generic
14− before_install:
15− - curl https://nixos.org/nix/install | sh
16− - source /Users/travis/.nix-profile/etc/profile.d/nix.sh
17− - env: OS=macos GHCVER=ghc881
18− os: osx
19− # Fix OSX, see https://travis-ci.community/t/cannot-use-nix-support-on-osx/2927
20− language: generic
21− before_install:
22− - curl https://nixos.org/nix/install | sh
23− - source /Users/travis/.nix-profile/etc/profile.d/nix.sh
5+cache:
6+ directories:
7+ - .cabal
8+ - .ghc
249
25−install:
26−- sudo mkdir -p /etc/nix
27−- echo "substituters = https://cache.nixos.org https://hydra.iohk.io" | sudo tee -a /etc/nix/nix.conf > /dev/null
28−- echo "trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" | sudo tee -a /etc/nix/nix.conf > /dev/null
10+env:
11+# - CABALVER=1.24 GHCVER=7.10.3 OSVER=xenial
12+ - CABALVER=1.24 GHCVER=8.0.1 OSVER=xenial
13+ - CABALVER=1.24 GHCVER=8.0.2 OSVER=xenial
14+ - CABALVER=1.24 GHCVER=7.10.3 OSVER=trusty
15+ - CABALVER=1.24 GHCVER=8.0.1 OSVER=trusty
16+ - CABALVER=1.24 GHCVER=8.0.2 OSVER=trusty
2917
30−script:
31−- nix-build --argstr haskellCompiler $GHCVER -A hsPkgs.jsaddle.components.library
32−- nix-build --argstr haskellCompiler $GHCVER -A hsPkgs.jsaddle-warp.components.library
33−- nix-build --argstr haskellCompiler $GHCVER -A hsPkgs.jsaddle-clib.components.library
34−- |
35− if [ "$OS" == "macos" ]; then
36− nix-build --argstr haskellCompiler $GHCVER -A hsPkgs.jsaddle-wkwebview.components.library
37− fi
38−# TODO try to find how to get working webkitgtk with nix on macOS
39−- |
40− if [ "$OS" != "macos" ]; then
41− nix-build --argstr haskellCompiler $GHCVER -A hsPkgs.jsaddle-webkit2gtk.components.library
42− fi
18+before_install:
19+ - docker build -t ghc -f travis/$OSVER.Dockerfile travis
4320
21+script:
22+ - docker run -v `pwd`:/build ghc
23+ sh -x -c "
24+ apt-get install -y cabal-install-$CABALVER ghc-$GHCVER &&
25+ export PATH=\$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:/opt/alex/3.1.7/bin:/opt/happy/1.19.5/bin:\$PATH &&
26+ ./travis/build.sh"
4427notifications:
4528 irc:
4629 channels: "irc.freenode.net#ghcjs"
47− email: true
30+ skip_join: true
31+ email: true
README.md+14−34
@@ -13,8 +13,7 @@ import Control.Monad.IO.Class (MonadIO(..))
1313import Control.Concurrent.MVar (takeMVar, putMVar, newEmptyMVar)
1414import Control.Lens ((^.))
1515import Language.Javascript.JSaddle
16− (jsg, js, js1, jss, fun, valToNumber, syncPoint)
17−import Language.Javascript.JSaddle.Warp (run)
16+ (run, jsg, js, js1, jss, fun, valToNumber, syncPoint)
1817
1918main = run 3709 $ do
2019 doc <- jsg "document"
@@ -80,7 +79,7 @@ main = run 3708 $ do
8079 appendChild newParagraph text
8180 appendChild body (Just newParagraph)
8281 return ()
83−
82+
8483 -- Make an exit button
8584 exitMVar <- liftIO newEmptyMVar
8685 Just exit <- createElement doc (Just "span")
@@ -103,31 +102,15 @@ When compiled with GHC this code will run a Warp web server you can connect to a
103102
104103## How does it work on GHC
105104
106−There are a number of different JSaddle runners to choose from
107−
108−* [jsaddle-warp](https://hackage.haskell.org/package/jsaddle-warp) - runs JSaddle in a warp server with a web browser connected to it.
109−* [jsaddle-webkit2gtk](https://hackage.haskell.org/package/jsaddle-webkit2gtk) - runs JSaddle in a WebKitGTK window.
110−* [jsaddle-wkwebview](https://hackage.haskell.org/package/jsaddle-wkwebview) - runs JSaddle in a WKWebView on iOS or macOS.
111−* [jsaddle-clib](https://hackage.haskell.org/package/jsaddle-clib) - C interface used to run JSaddle on Android using JNI.
112−
113−In all of these cases a web control or browser of some sort is used. An
114−[HTML file](./jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs#L24)
115−and a [small JavaScript command interpreter](./jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs#L340)
116−are loaded into it. Then the native GHC compiled JSaddle code runs. In order to interact with the browser
117−it sends commands to the JavaScript command interpreter. The mechanism for sending the commands differs
118−for the different runners, but they are always combined into batches and encoded in JSON.
105+As of version 0.5 it runs a small warp server that provides [index.html](https://github.com/ghcjs/jsaddle/blob/master/data/index.html) and
106+[jsaddle.js](https://github.com/ghcjs/jsaddle/blob/master/data/jsaddle.js). The [jsaddle.js](https://github.com/ghcjs/jsaddle/blob/master/data/jsaddle.js) code connects to the server using WebSockets and processes JSON commands from the server and sends the result back over the same WebSocket.
119107
120−Haskell callbacks from JavaScript are supported by sending JSON back from the command interpreter. These can be synchronous (blocking the
121−JavaScript thread until the Haskell callback completes) or asynchronous.
108+### Why use WebSockets?
122109
123−### Why use a JavaScript command interpreter?
124−
125−Older versions of JSaddle relied on the WebKit1 interface to WebKitGTK and JavaScriptCore that is only supported in older versions of
126−WebKitGTK. With the newer WebKit2 interface this level of access is only available to WebKit Extensions.
127−The general advice for people migrating from WebKit1 to WebKit2 seems to be to use JavaScript.
128−
129−As a bonus we have been able to support a number of different platforms with the JavaScript command interpreter and it should
130−be easy to support more in the future.
110+Older versions relied on WebKitGTK and JavaScriptCore, but in WekKit2 the interface JSaddle used is only available to WebKit Extensions
111+so most of the benefits of this interface are lost (extensions are not in the same process as Gtk and RPC would have been needed).
112+The general advice for people migrating from WebKit1 to WebKit2 seems to be to use JavaScript. There is an interface in WebKit2
113+to send JavaScript code from the host application, but it does not seem to provide any advantages over the WebSockets approach.
131114
132115### JSVal
133116
@@ -137,8 +120,8 @@ The first five keys `[0..4]` are
137120these values. Both the Haskell code and `jsaddle.js` can allocate new `JSVal` keys. The Haskell code allocates negative
138121keys and `jsaddle.js` allocates positive keys to avoid clashing.
139122
140−The haskell code will not know the value to go with the key, but it will include it in commands to the server
141−that are sort of "hey call this function and put the result in the map with this key"). This allows for the
123+The haskell code will not know the value of the to go with the key, but it will include it in commands to the server
124+that are sort of "hey call this function and and put the result in the map with this key"). This allows for the
142125lazy execution of the JSaddle code.
143126
144127A finalizer is added on the Haskell code and an asynchronous `FreeJSVal` command is automatically sent to `jsaddle.js`
@@ -146,7 +129,7 @@ when the JSVal is no longer reachable. The `jsaddle.js` code then deletes the k
146129
147130### JSStrings
148131
149−These are haskell `Text` type and so reside on the native side of the WebSocket. If you want to avoid transferring large string values over the WebSocket use `toJSVal` to convert it to a `JSVal`.
132+These are haskell `Text` type and so reside on the native side of the WebSocket. If you want to make avoid transferring large string values over the WebSocket use `toJSVal` to conevt it to a `JSVal`.
150133
151134### Lazy Execution
152135
@@ -178,7 +161,7 @@ force all the pending asynchronous commands to be executed.
178161It uses a handful of JS FFI calls to execute JavaScript functions indirectly. This indirection will be small compared to the overhead of the WebSockets approach (used when JSaddle is compiled with GHC), but it will be significant compared to hand crafted JS FFI calls.
179162
180163For the best performance you may want to write both JS FFI and JSaddle wrappers
181−for your JavaScript code. This is the approach taken by `ghcjs-dom`.
164+For your JavaScript code. This is the approach taken by recent versions of `ghcjs-dom`.
182165
183166For instance here is `getElementById` from the `ghcjs-dom-jsffi` (used by `ghcjs-dom` when compiled with GHCJS)
184167
@@ -213,10 +196,7 @@ JSaddle does not support exceptions well. When compiled with GHCJS an exception
213196at the point the exception is thrown.
214197
215198When using GHC the Haskell executions will probably continue for a while before the exception is received at all by the Haskell code
216−(because the lazy execution of the JS code). The exception will be thrown when the next synchronous command is executed.
199+(because the lazy execution of the JS code). The exception will be thrown when the the next synchronous command is executed.
217200When it reaches the synchronous command a haskell type JSException will be thrown (this may not be the thread that initiated the
218201command that caused the exception). You can use `syncPoint` and `syncAfter` to force the exception to be thrown.
219202There are `JSM` versions of `catch` and `bracket` that also include a `syncPoint` call.
220−
221−## Building with Stack
222−The `jsaddle-webkit2gtk` runner can be difficult to build with stack. See [this issue](https://github.com/ghcjs/jsaddle/issues/38#issuecomment-331392995) if you get stuck.
cabal.project+35−3
@@ -1,10 +1,42 @@
1+flags: -overloaded-methods -overloaded-signals -overloaded-properties
2+
13packages:
24 jsaddle/
35 jsaddle-warp/
46 jsaddle-wkwebview/
7+-- jsaddle-webkitgtk/
58 jsaddle-webkit2gtk/
69 jsaddle-clib/
710
8−constraints: haskell-gi-overloading == 0.0
9−
10−allow-newer: websockets:random, splitmix:time, *:time, *:unix, *:process, stm:base
11+package gi-atk
12+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
13+package gi-cairo
14+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
15+package gi-gdk
16+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
17+package gi-gdkpixbuf
18+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
19+package gi-gio
20+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
21+package gi-glib
22+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
23+package gi-gobject
24+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
25+package gi-gtk
26+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
27+package gi-gtk-hs
28+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
29+package gi-gtkosxapplication
30+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
31+package gi-gtksource
32+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
33+package gi-javascriptcore
34+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
35+package gi-pango
36+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
37+package gi-soup
38+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
39+package gi-webkit
40+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
41+package gi-webkit2
42+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
default.nixnew file+8
@@ -0,0 +1,8 @@
1+haskellPackages: {
2+ jsaddle = haskellPackages.callPackage ./jsaddle {};
3+ jsaddle-warp = haskellPackages.callPackage ./jsaddle-warp {};
4+ jsaddle-wkwebview = haskellPackages.callPackage ./jsaddle-wkwebview {};
5+ jsaddle-webkit2gtk = haskellPackages.callPackage ./jsaddle-webkit2gtk {};
6+ jsaddle-webkitgtk = haskellPackages.callPackage ./jsaddle-webkitgtk {};
7+ jsaddle-clib = haskellPackages.callPackage ./jsaddle-clib {};
8+}
jsaddle-clib/cbits/include/jsaddle.h−1
@@ -17,7 +17,6 @@ typedef struct app_callbacks {
1717 void (* mainActivity_onStop) ();
1818 void (* mainActivity_onDestroy) ();
1919 void (* mainActivity_onRestart) ();
20− void (* mainActivity_onNewIntent) (char *, char *);
2120 void (* firebaseInstanceIdService_sendRegistrationToServer) (char *);
2221} app_callbacks;
2322
jsaddle-clib/default.nixnew file+9
@@ -0,0 +1,9 @@
1+{ mkDerivation, aeson, base, bytestring, data-default, jsaddle, stdenv, text }:
2+mkDerivation {
3+ pname = "jsaddle-clib";
4+ version = "0.9.0.0";
5+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
6+ libraryHaskellDepends = [ aeson base bytestring data-default jsaddle text ];
7+ description = "Interface for JavaScript that works with GHCJS and GHC";
8+ license = stdenv.lib.licenses.mit;
9+}
jsaddle-clib/jsaddle-clib.cabal+3−4
@@ -1,5 +1,5 @@
11name: jsaddle-clib
2−version: 0.9.8.0
2+version: 0.9.0.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -21,9 +21,8 @@ library
2121 Language.Javascript.JSaddle.CLib
2222 Language.Javascript.JSaddle.CLib.Internal
2323 build-depends:
24− aeson >=0.8.0.2 && <1.6,
24+ aeson >=0.8.0.2 && <1.3,
2525 base <5,
26− base-compat >=0.9.0 && <0.12,
2726 bytestring >=0.10.6.0 && <0.11,
2827 jsaddle >= 0.9.0.0 && <0.10,
2928 data-default,
@@ -33,7 +32,7 @@ library
3332 Include-dirs: cbits/include
3433 Includes: jsaddle.h
3534 Install-includes: jsaddle.h
36− ghc-options: -ferror-spans -Wall
35+ ghc-options: -ferror-spans -Wall -Werror
3736 if impl(ghcjs)
3837 hs-source-dirs: src-ghcjs
3938 else
jsaddle-clib/src-ghc/Language/Javascript/JSaddle/CLib.hs+4−19
@@ -8,9 +8,6 @@ module Language.Javascript.JSaddle.CLib
88 , appConfigToAppCallbacks
99 ) where
1010
11−import Prelude ()
12−import Prelude.Compat
13−
1411import Control.Monad (void)
1512import Control.Concurrent (forkIO)
1613
@@ -19,10 +16,11 @@ import Data.ByteString (useAsCString, packCString)
1916import Data.ByteString.Char8 (unpack)
2017import Data.ByteString.Lazy (ByteString, toStrict, fromStrict)
2118import Data.Default (def, Default)
19+import Data.Monoid ((<>))
2220import Data.Text (Text)
23−import qualified Data.Text.Encoding as T
21+import qualified Data.Text as T
2422
25−import Foreign.C.String (CString, newCString)
23+import Foreign.C.String (CString, newCString, peekCString)
2624import Foreign.Ptr (FunPtr, Ptr)
2725import Foreign.Storable (poke)
2826import Foreign.Marshal.Utils (new)
@@ -42,9 +40,6 @@ foreign import ccall safe "wrapper"
4240foreign import ccall safe "wrapper"
4341 wrapMessageCallback :: (CString -> IO ()) -> IO (FunPtr (CString -> IO ()))
4442
45−foreign import ccall safe "wrapper"
46− wrapMessageCallback2 :: (CString -> CString -> IO ()) -> IO (FunPtr (CString -> CString -> IO ()))
47−
4843foreign import ccall safe "wrapper"
4944 wrapSyncCallback :: (CString -> IO CString) -> IO (FunPtr (CString -> IO CString))
5045
@@ -83,7 +78,6 @@ data AppConfig = AppConfig
8378 , _appConfig_mainActivityOnStop :: IO ()
8479 , _appConfig_mainActivityOnDestroy :: IO ()
8580 , _appConfig_mainActivityOnRestart :: IO ()
86− , _appConfig_mainActivityOnNewIntent :: (Text -> Text -> IO ())
8781 , _appConfig_firebaseInstanceIdServiceSendRegistrationToServer :: Text -> IO ()
8882 }
8983
@@ -96,7 +90,6 @@ instance Default AppConfig where
9690 , _appConfig_mainActivityOnStop = return ()
9791 , _appConfig_mainActivityOnDestroy = return ()
9892 , _appConfig_mainActivityOnRestart = return ()
99− , _appConfig_mainActivityOnNewIntent = \_ _ -> return ()
10093 , _appConfig_firebaseInstanceIdServiceSendRegistrationToServer = \_ -> return ()
10194 }
10295
@@ -109,12 +102,8 @@ appConfigToAppCallbacks c = do
109102 stop <- wrapStartCallback $ _appConfig_mainActivityOnStop c
110103 destroy <- wrapStartCallback $ _appConfig_mainActivityOnDestroy c
111104 restart <- wrapStartCallback $ _appConfig_mainActivityOnRestart c
112− newIntent <- wrapMessageCallback2 $ \intentAction intentData -> do
113− intentAction' <- fromUtf8CString intentAction
114− intentData' <- fromUtf8CString intentData
115− _appConfig_mainActivityOnNewIntent c intentAction' intentData'
116105 firebaseRegPtr <- wrapMessageCallback $ \token -> do
117− token' <- fromUtf8CString token
106+ token' <- T.pack <$> peekCString token
118107 _appConfig_firebaseInstanceIdServiceSendRegistrationToServer c token'
119108 return $ AppCallbacks
120109 { _appCallbacks_mainActivity_onCreate = create
@@ -124,13 +113,9 @@ appConfigToAppCallbacks c = do
124113 , _appCallbacks_mainActivity_onStop = stop
125114 , _appCallbacks_mainActivity_onDestroy = destroy
126115 , _appCallbacks_mainActivity_onRestart = restart
127− , _appCallbacks_mainActivity_onNewIntent = newIntent
128116 , _appCallbacks_firebaseInstanceIdService_sendRegistrationToServer = firebaseRegPtr
129117 }
130118
131−fromUtf8CString :: CString -> IO Text
132−fromUtf8CString = fmap T.decodeUtf8 . packCString
133−
134119pokeAppConfig :: Ptr AppCallbacks -> AppConfig -> IO ()
135120pokeAppConfig ptr cfg = poke ptr =<< appConfigToAppCallbacks cfg
136121
jsaddle-clib/src/Language/Javascript/JSaddle/CLib/Internal.hsc−3
@@ -38,7 +38,6 @@ data AppCallbacks = AppCallbacks
3838 , _appCallbacks_mainActivity_onStop :: !(FunPtr (IO ()))
3939 , _appCallbacks_mainActivity_onDestroy :: !(FunPtr (IO ()))
4040 , _appCallbacks_mainActivity_onRestart :: !(FunPtr (IO ()))
41− , _appCallbacks_mainActivity_onNewIntent :: !(FunPtr (CString -> CString -> IO ()))
4241 , _appCallbacks_firebaseInstanceIdService_sendRegistrationToServer :: !(FunPtr (CString -> IO ()))
4342 }
4443
@@ -53,7 +52,6 @@ instance Storable AppCallbacks where
5352 #{poke app_callbacks, mainActivity_onStop} p $ _appCallbacks_mainActivity_onStop nc
5453 #{poke app_callbacks, mainActivity_onDestroy} p $ _appCallbacks_mainActivity_onDestroy nc
5554 #{poke app_callbacks, mainActivity_onRestart} p $ _appCallbacks_mainActivity_onRestart nc
56− #{poke app_callbacks, mainActivity_onNewIntent} p $ _appCallbacks_mainActivity_onNewIntent nc
5755 #{poke app_callbacks, firebaseInstanceIdService_sendRegistrationToServer} p $ _appCallbacks_firebaseInstanceIdService_sendRegistrationToServer nc
5856 peek p = AppCallbacks
5957 <$> #{peek app_callbacks, mainActivity_onCreate} p
@@ -63,5 +61,4 @@ instance Storable AppCallbacks where
6361 <*> #{peek app_callbacks, mainActivity_onStop} p
6462 <*> #{peek app_callbacks, mainActivity_onDestroy} p
6563 <*> #{peek app_callbacks, mainActivity_onRestart} p
66− <*> #{peek app_callbacks, mainActivity_onNewIntent} p
6764 <*> #{peek app_callbacks, firebaseInstanceIdService_sendRegistrationToServer} p
jsaddle-warp/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ mkDerivation, aeson, base, bytestring, containers, deepseq
2+, doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive
3+, process, QuickCheck, ref-tf, stdenv, stm, text, time
4+, transformers, wai, wai-websockets, warp, websockets, osx_sdk
5+, darwin, webdriver, phantomjs, ghc
6+}:
7+mkDerivation {
8+ pname = "jsaddle-warp";
9+ version = "0.9.0.0";
10+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
11+ libraryHaskellDepends = [
12+ aeson base containers http-types jsaddle stm text time transformers
13+ wai wai-websockets warp websockets
14+ ] ++ (if ghc.isGhcjs or false then [
15+ ] else if stdenv.isDarwin then [
16+# osx_sdk darwin.libobjc darwin.apple_sdk.libs.xpc
17+ ] else [
18+ ]);
19+ testHaskellDepends = [
20+ base bytestring deepseq doctest filepath ghc-prim jsaddle lens
21+ primitive process QuickCheck ref-tf webdriver phantomjs
22+ ];
23+ testTarget = "--test-option=${jsaddle.src}";
24+ description = "Interface for JavaScript that works with GHCJS and GHC";
25+ license = stdenv.lib.licenses.mit;
26+}
jsaddle-warp/jsaddle-warp.cabal+13−21
@@ -1,5 +1,5 @@
11name: jsaddle-warp
2−version: 0.9.8.0
2+version: 0.9.0.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -10,7 +10,7 @@ description:
1010 This package provides an EDSL for calling JavaScript that
1111 can be used both from GHCJS and GHC. When using GHC
1212 the application is run using Warp and WebSockets to
13− drive a small JavaScript helper.
13+ drive a small JavaScipt helper.
1414category: Web, Javascript
1515author: Hamish Mackenzie
1616
@@ -24,23 +24,19 @@ library
2424 if !impl(ghcjs -any)
2525 exposed-modules:
2626 Language.Javascript.JSaddle.WebSockets
27− other-modules:
28− Language.Javascript.JSaddle.WebSockets.Compat
2927 build-depends:
30− aeson >=0.8.0.2 && <1.6,
31− bytestring >=0.10.6.0 && <0.11,
32− containers >=0.5.6.2 && <0.7,
33− foreign-store >=0.2 && <0.3,
34− http-types >=0.8.6 && <0.13,
35− jsaddle >=0.9.4.0 && <0.10,
36− stm >=2.4.4 && <2.6,
28+ aeson >=0.8.0.2 && <1.3,
29+ containers >=0.5.6.2 && <0.6,
30+ http-types >=0.8.6 && <0.10,
31+ jsaddle >=0.9.0.0 && <0.10,
32+ stm >=2.4.4 && <2.5,
3733 text >=1.2.1.3 && <1.3,
38− time >=1.5.0.1 && <1.11,
34+ time >=1.5.0.1 && <1.8,
3935 transformers >=0.4.2.0 && <0.6,
4036 wai >=3.0.3.0 && <3.3,
4137 wai-websockets >=3.0.0.6 && <3.1,
42− warp >=3.1.2 && <3.4,
43− websockets >=0.9.5.0 && <0.13
38+ warp >=3.1.2 && <3.3,
39+ websockets >=0.9.5.0 && <0.11
4440 exposed-modules:
4541 Language.Javascript.JSaddle.Warp
4642 build-depends:
@@ -59,10 +55,8 @@ test-suite test-tool
5955 bytestring -any,
6056 containers -any,
6157 deepseq -any,
62− doctest >=0.10.1 && <0.19,
63− exceptions -any,
58+ doctest >=0.10.1 && <0.12,
6459 filepath >=1.4.0.0 && <1.5,
65− foreign-store -any,
6660 ghc-prim -any,
6761 http-types -any,
6862 jsaddle -any,
@@ -71,17 +65,15 @@ test-suite test-tool
7165 network -any,
7266 ref-tf -any,
7367 primitive -any,
74− process >=1.2.3.0 && <1.7,
75− random -any,
68+ process >=1.2.3.0 && <1.5,
7669 stm -any,
7770 text -any,
7871 time -any,
7972 transformers -any,
80− unliftio-core -any,
8173 wai -any,
8274 wai-websockets -any,
8375 warp -any,
84− webdriver >=0.8.4 && <0.10,
76+ webdriver >=0.8.4 && <0.9,
8577 websockets -any
8678 type: exitcode-stdio-1.0
8779 main-is: DocTest.hs
jsaddle-warp/src/Language/Javascript/JSaddle/Test.hs+12−13
@@ -17,22 +17,21 @@ module Language.Javascript.JSaddle.Test (
1717 , listWindowProperties
1818) where
1919
20−import Prelude hiding((!!), catch)
2120import Control.Applicative
22−import Control.Concurrent (threadDelay, forkIO, ThreadId)
23−import Control.Concurrent.MVar
24− (tryTakeMVar, putMVar, takeMVar, newEmptyMVar, MVar)
25−import Control.Lens.Getter ((^.))
26−import Control.Monad (forever, forM)
27−import Control.Monad.IO.Class (MonadIO(..))
21+import Prelude hiding((!!), catch)
2822import Control.Monad.Trans.Reader (runReaderT)
23+import Language.Javascript.JSaddle
24+import qualified Data.Text as T
25+import Control.Monad.IO.Class (MonadIO(..))
26+import Control.Monad (forever, forM)
27+import Control.Lens.Getter ((^.))
2928import Data.Monoid ((<>))
29+import Control.Concurrent.MVar
30+ (tryTakeMVar, putMVar, takeMVar, newEmptyMVar, MVar)
31+import System.IO.Unsafe (unsafePerformIO)
32+import Control.Concurrent (threadDelay, forkIO, ThreadId)
3033import Data.Text (Text)
31−import qualified Data.Text as T
32−import Language.Javascript.JSaddle
3334import Language.Javascript.JSaddle.Warp (run)
34−import System.IO.Unsafe (unsafePerformIO)
35−import System.Timeout (timeout)
3635
3736context :: MVar JSContextRef
3837context = unsafePerformIO newEmptyMVar
@@ -53,12 +52,12 @@ startServer =
5352
5453-- >>> testJSaddle $ ((global ^. js "console" . js "log") # ["Hello"])
5554testJSaddle :: ToJSVal val => JSM val -> IO ()
56−testJSaddle f = timeout 10000000 (do
55+testJSaddle f = do
5756 startServer
5857 c <- takeMVar context
5958 runReaderT (unJSM $ (f >>= valToText >>= liftIO . putStrLn . T.unpack)
6059 `catch` \ (JSException e) -> valToText e >>= liftIO . putStrLn . T.unpack) c
61− putMVar context c) >>= maybe (putStrLn "testJSaddle timed out") return
60+ putMVar context c
6261
6362debugLog :: String -> IO ()
6463debugLog _ = return ()
jsaddle-warp/src/Language/Javascript/JSaddle/Warp.hs+4−3
@@ -17,7 +17,8 @@ module Language.Javascript.JSaddle.Warp (
1717 -- * Running JSM over WebSockets
1818 run
1919#ifndef ghcjs_HOST_OS
20− , module Language.Javascript.JSaddle.WebSockets
20+ , jsaddleOr
21+ , jsaddleApp
2122#endif
2223) where
2324
@@ -28,7 +29,7 @@ import Network.WebSockets (defaultConnectionOptions)
2829
2930import Language.Javascript.JSaddle.Types (JSM)
3031import Language.Javascript.JSaddle.Run (syncPoint)
31−import Language.Javascript.JSaddle.WebSockets
32+import Language.Javascript.JSaddle.WebSockets (jsaddleOr, jsaddleApp)
3233#endif
3334
3435-- | Run the given 'JSM' action as the main entry point. Either directly
@@ -39,6 +40,6 @@ run _port = id
3940#else
4041run :: Int -> JSM () -> IO ()
4142run port f =
42− runSettings (setPort port (setTimeout 3600 defaultSettings)) =<<
43+ runSettings (setPort port (setTimeout 3600 defaultSettings)) $
4344 jsaddleOr defaultConnectionOptions (f >> syncPoint) jsaddleApp
4445#endif
jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets.hs+55−286
@@ -1,7 +1,5 @@
11{-# LANGUAGE LambdaCase #-}
22{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4−{-# LANGUAGE RecursiveDo #-}
53-----------------------------------------------------------------------------
64--
75-- Module : Language.Javascript.JSaddle.WebSockets
@@ -18,302 +16,73 @@ module Language.Javascript.JSaddle.WebSockets (
1816 -- * Running JSM over WebSockets
1917 jsaddleOr
2018 , jsaddleApp
21− , jsaddleWithAppOr
22− , jsaddleAppWithJs
23− , jsaddleAppWithJsOr
24− , jsaddleAppPartial
25− , jsaddleJs
26− , jsaddleJs'
27− , debug
28− , debugOr
29− , debugWrapper
3019) where
3120
32−import Control.Monad (when, void, forever)
33−import Control.Concurrent (killThread, forkIO, threadDelay)
34−import Control.Exception (handle, AsyncException, throwIO, fromException, finally)
21+import Control.Monad (forever)
22+import Control.Concurrent (forkIO, threadDelay)
23+import Control.Exception (handle, AsyncException, throwIO, fromException)
3524
3625import Data.Monoid ((<>))
3726import Data.Aeson (encode, decode)
3827
39−import Network.Wai
40− (Middleware, lazyRequestBody, Application, Request, Response,
41− ResponseReceived)
28+import Network.Wai (Application)
4229import Network.WebSockets
43− (defaultConnectionOptions, ConnectionOptions(..), sendTextData,
44− receiveDataMessage, acceptRequest, ServerApp, sendPing)
30+ (ConnectionOptions(..), sendTextData, receiveDataMessage,
31+ acceptRequest, ServerApp, sendPing)
32+import qualified Network.WebSockets as WS (DataMessage(..))
4533import Network.Wai.Handler.WebSockets (websocketsOr)
46−import Network.HTTP.Types (Status(..))
4734
48−import Language.Javascript.JSaddle.Types (JSM(..), JSContextRef(..))
35+import Language.Javascript.JSaddle.Types (JSM(..))
4936import qualified Network.Wai as W
50− (responseLBS, requestMethod, pathInfo, modifyResponse, responseStatus)
37+ (responseLBS, requestMethod, Application, pathInfo)
38+import Data.Text (Text)
5139import qualified Data.Text as T (pack)
5240import qualified Network.HTTP.Types as H
53− (status403, status200)
54−import Language.Javascript.JSaddle.Run (syncPoint, runJavaScript)
55−import Language.Javascript.JSaddle.Run.Files (indexHtml, runBatch, ghcjsHelpers, initState)
56−import Language.Javascript.JSaddle.Debug
57− (removeContext, addContext)
58−import Data.Maybe (fromMaybe)
59−import qualified Data.Map as M (empty, insert, lookup)
60−import Data.IORef
61− (readIORef, newIORef, atomicModifyIORef')
62−import Data.ByteString.Lazy (ByteString)
63−import qualified Data.ByteString.Lazy as LBS
64− (toStrict, stripPrefix)
65−import Control.Concurrent.MVar
66− (tryTakeMVar, MVar, tryPutMVar, modifyMVar_, putMVar, takeMVar,
67− readMVar, newMVar, newEmptyMVar, modifyMVar)
68−import Network.Wai.Handler.Warp
69− (defaultSettings, setTimeout, setPort, runSettings)
70−import Foreign.Store (readStore, lookupStore, writeStore, Store(..))
71−import Language.Javascript.JSaddle (askJSM)
72−import Control.Monad.IO.Class (MonadIO(..))
73−
74−import Language.Javascript.JSaddle.WebSockets.Compat (getTextMessageByteString)
75−import qualified Data.Text.Encoding as T (decodeUtf8)
76−
77−jsaddleOr :: ConnectionOptions -> JSM () -> Application -> IO Application
78−jsaddleOr opts entryPoint otherApp = do
79− syncHandlers <- newIORef M.empty
80− asyncHandlers <- newIORef M.empty
81− let wsApp :: ServerApp
82− wsApp pending_conn = do
83− 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"
41+ (status403, status200, status405)
42+import Language.Javascript.JSaddle.Run (runJavaScript)
43+import Language.Javascript.JSaddle.Run.Files (indexHtml, jsaddleJs)
44+
45+jsaddleOr :: ConnectionOptions -> JSM () -> Application -> Application
46+jsaddleOr opts entryPoint = websocketsOr opts wsApp
47+ where
48+ wsApp :: ServerApp
49+ wsApp pending_conn = do
50+ conn <- acceptRequest pending_conn
51+ (processResult, _, start) <- runJavaScript (sendTextData conn . encode) entryPoint
52+ _ <- forkIO . forever $
53+ receiveDataMessage conn >>= \case
54+ (WS.Text t) ->
55+ case decode t of
56+ Nothing -> error $ "jsaddle Results decode failed : " <> show t
57+ Just r -> processResult r
10658 _ -> error "jsaddle WebSocket unexpected binary data"
107−
108− -- Based on Network.WebSocket.forkPingThread
109− waitTillClosed conn = ignore `handle` go 1
110− where
111− go :: Int -> IO ()
112− go i = do
113− threadDelay (10 * 1000 * 1000)
114− sendPing conn (T.pack $ show i)
115− go (i + 1)
116−
117− ignore e = case fromException e of
118− Just async -> throwIO (async :: AsyncException)
119− Nothing -> return ()
120−
121− syncHandler :: Application
122− syncHandler req sendResponse = case (W.requestMethod req, W.pathInfo req) of
123− ("POST", ["sync", syncKey]) -> do
124− body <- lazyRequestBody req
125− case decode body of
126− Nothing -> error $ "jsaddle sync message decode failed : " <> show body
127− Just result ->
128− M.lookup syncKey <$> readIORef syncHandlers >>= \case
129− Nothing -> error "jsaddle missing sync message handler"
130− Just handler -> do
131− next <- encode <$> handler result
132− 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
138− return $ websocketsOr opts wsApp syncHandler
139−
59+ start
60+ waitTillClosed conn
61+
62+ -- Based on Network.WebSocket.forkPingThread
63+ waitTillClosed conn = ignore `handle` go 1
64+ where
65+ go :: Int -> IO ()
66+ go i = do
67+ threadDelay (1 * 1000 * 1000)
68+ sendPing conn (T.pack $ show i)
69+ go (i + 1)
70+
71+ ignore e = case fromException e of
72+ Just async -> throwIO (async :: AsyncException)
73+ Nothing -> return ()
14074
14175jsaddleApp :: 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)
154−
155−jsaddleWithAppOr :: ConnectionOptions -> JSM () -> Application -> IO Application
156−jsaddleWithAppOr opts entryPoint otherApp = jsaddleOr opts entryPoint $ \req sendResponse ->
157− (fromMaybe (otherApp req sendResponse)
158− (jsaddleAppPartial req sendResponse))
159−
160−jsaddleAppPartial :: 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
170− _ -> Nothing
171−
172−jsaddleJs :: Bool -> ByteString
173−jsaddleJs = jsaddleJs' Nothing
174−
175−-- Use this to generate this string for embedding
176−-- 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\
180− \ global.window = global;\n\
181− \ global.WebSocket = require('ws');\n\
182− \}\n\
183− \\n\
184− \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\
190− \\n\
191− \ var ws0 = new WebSocket(wsaddress);\n\
192− \ var syncKey = \"\";\n\
193− \\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\
198− \ " <> initState <> "\n\
199− \\n\
200− \ ws0.onmessage = function(e) {\n\
201− \ var batch = JSON.parse(e.data);\n\
202− \ if(inCallback > 0) {\n\
203− \ asyncBatch = batch;\n\
204− \ return;\n\
205− \ }\n\
206− \ 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" <>
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\
225− \ }\n\
226− \\n\
227− \ " <> runBatch (\a -> "ws.send(JSON.stringify(" <> a <> "));")
228− (Just (\a -> "(function(){\n\
229− \ var xhr = new XMLHttpRequest();\n\
230− \ xhr.open('POST', '" <> fromMaybe "" jsaddleUri <> "/sync/'+syncKey, false);\n\
231− \ xhr.setRequestHeader(\"Content-type\", \"application/json\");\n\
232− \ xhr.send(JSON.stringify(" <> a <> "));\n\
233− \ return JSON.parse(xhr.response);})()")) <> "\
234− \ };\n\
235− \ };\n\
236− \ ws0.onerror = function() {\n\
237− \ setTimeout(connect, 1000);\n\
238− \ };\n\
239− \}\n\
240− \\n\
241− \ " <> ghcjsHelpers <> "\
242− \connect();\n\
243− \"
244−
245−-- | Start or restart the server.
246−-- To run this as part of every :reload use
247−-- > :def! reload (const $ return "::reload\nLanguage.Javascript.JSaddle.Warp.debug 3708 SomeMainModule.someMainFunction")
248−debug :: Int -> JSM () -> IO ()
249−debug 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 ->
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−
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−
267−debugWrapper :: (Middleware -> JSM () -> IO ()) -> IO ()
268−debugWrapper run = do
269− reloadMVar <- newEmptyMVar
270− reloadDoneMVars <- newMVar []
271− 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
279− start :: Int -> IO (IO Int)
280− start expectedConnections = do
281− serverDone <- newEmptyMVar
282− ready <- newEmptyMVar
283− let registerContext :: JSM ()
284− registerContext = do
285− uuid <- contextId <$> askJSM
286− browsersConnected <- liftIO $ modifyMVar contexts (\ctxs -> return (uuid:ctxs, length ctxs + 1))
287− addContext
288− when (browsersConnected == expectedConnections) . void . liftIO $ tryPutMVar ready ()
289− thread <- forkIO $
290− finally (run (refreshMiddleware refresh) registerContext)
291− (putMVar serverDone ())
292− _ <- forkIO $ threadDelay 10000000 >> void (tryPutMVar ready ())
293− when (expectedConnections /= 0) $ takeMVar ready
294− return $ do
295− putMVar reloadMVar ()
296− ctxs <- takeMVar contexts
297− mapM_ removeContext ctxs
298− takeMVar reloadDoneMVars >>= mapM_ takeMVar
299− tryTakeMVar serverDone >>= \case
300− Nothing -> do
301− killThread thread
302− takeMVar serverDone
303− Just _ -> return ()
304− 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
311− Nothing -> do
312− restartMVar <- newMVar start
313− void . forkIO $ restarter restartMVar (return 0)
314− void $ writeStore (Store storeId) restartMVar
315− Just shutdownStore -> do
316− restartMVar :: MVar (Int -> IO (IO Int)) <- readStore shutdownStore
317− void $ tryTakeMVar restartMVar
318− putMVar restartMVar start
319− where storeId = 354
76+jsaddleApp req = jsaddleAppPieces (W.pathInfo req) req
77+
78+jsaddleAppPieces :: [Text] -> W.Application
79+jsaddleAppPieces _ req sendResponse
80+ | W.requestMethod req `notElem` ["GET", "HEAD"] = sendResponse $ W.responseLBS
81+ H.status405
82+ [("Content-Type", "text/plain")]
83+ "Only GET or HEAD is supported"
84+jsaddleAppPieces [] _req sendResponse = sendResponse $ W.responseLBS H.status200 [("Content-Type", "text/html")] indexHtml
85+jsaddleAppPieces ["jsaddle.js"] _req sendResponse = sendResponse $ W.responseLBS H.status200 [("Content-Type", "application/javascript")] jsaddleJs
86+jsaddleAppPieces _rawPieces _req sendResponse = sendResponse $ W.responseLBS H.status403
87+ [ ("Content-Type", "text/plain")
88+ ] "Forbidden"
jsaddle-warp/src/Language/Javascript/JSaddle/WebSockets/Compat.hsdeleted−29
@@ -1,29 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−-----------------------------------------------------------------------------
3−--
4−-- Module : Language.Javascript.JSaddle.WebSockets.Compat
5−-- Copyright : (c) Hamish Mackenzie
6−-- License : MIT
7−--
8−-- Maintainer : Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
9−--
10−-- | This module is necessary to harmonize various versions of the websockets
11−-- package; we can't do this CPP inline in
12−-- Language.Javascript.JSaddle.WebSockets because that module uses multi-line
13−-- strings, which are incompatible with CPP
14−--
15−-----------------------------------------------------------------------------
16−module Language.Javascript.JSaddle.WebSockets.Compat where
17−
18−import Data.ByteString.Lazy (ByteString)
19−import qualified Network.WebSockets as WS (DataMessage(..))
20−
21−getTextMessageByteString :: WS.DataMessage -> Maybe ByteString
22−getTextMessageByteString msg = case msg of
23−#if MIN_VERSION_websockets(0,11,0)
24− (WS.Text t _) ->
25−#else
26− (WS.Text t) ->
27−#endif
28− Just t
29− _ -> Nothing
jsaddle-warp/tests/DocTest.hs+7−20
@@ -11,17 +11,18 @@ import System.IO (stderr, BufferMode(..), stdout, hSetBuffering)
1111import System.FilePath ((</>))
1212import System.Exit (exitFailure, exitWith, ExitCode(..))
1313import System.Process (readProcess, system)
14−import Control.Concurrent
15− (takeMVar, newEmptyMVar, forkIO, threadDelay, putMVar)
14+import Control.Concurrent (forkIO)
1615import Control.Monad (void)
1716import Control.Monad.IO.Class (MonadIO(..))
1817import Data.Monoid ((<>))
1918import System.Environment (getArgs)
19+import Language.Javascript.JSaddle.Run.Files (jsaddleJs)
20+import qualified Data.ByteString.Lazy.Char8 as BS (unpack)
2021import Test.WebDriver (runSession, defaultConfig, openPage, closeSession)
2122
2223main :: IO ()
2324main = do
24− putStrLn "Testing JSaddle"
25+ putStrLn "Hello"
2526 jsaddlePath <- getArgs >>= \case
2627 [arg] -> return arg
2728 _ -> do
@@ -29,18 +30,14 @@ main = do
2930 exitFailure
3031 hSetBuffering stdout LineBuffering
3132 hSetBuffering stderr LineBuffering
32− putStrLn "Checking for phantomjs"
3333 node <- system "phantomjs --version" >>= \case
3434 ExitSuccess -> return ()
3535 e -> do
3636 putStrLn "phantomjs not found"
3737 exitWith e
38− putStrLn "Starting phantomjs"
39− forkIO . void $ readProcess "phantomjs" ["--webdriver=4444"] "" >>= putStr
40− threadDelay 5000000
41− putStrLn "Running Tests"
42− done <- newEmptyMVar
43− forkIO $ do
38+ forkIO . void $ readProcess "phantomjs" ["--webdriver=4444"] (BS.unpack jsaddleJs) >>= putStr
39+ runSession defaultConfig $ do
40+ openPage "http://localhost:3709"
4441 liftIO $ doctest [
4542 "-hide-all-packages",
4643 "-package=base-" ++ VERSION_base,
@@ -64,10 +61,6 @@ main = do
6461 "-package=ref-tf-" ++ VERSION_ref_tf,
6562 "-package=deepseq-" ++ VERSION_deepseq,
6663 "-package=ghc-prim-" ++ VERSION_ghc_prim,
67− "-package=exceptions-" ++ VERSION_exceptions,
68− "-package=unliftio-core-" ++ VERSION_unliftio_core,
69− "-package=random-" ++ VERSION_random,
70− "-package=foreign-store-" ++ VERSION_foreign_store,
7164 "-i" <> "src",
7265 "-i" <> "src-ghc",
7366 "src/Language/Javascript/JSaddle/Test.hs",
@@ -90,7 +83,6 @@ main = do
9083 jsaddlePath </> "src/Language/Javascript/JSaddle/Arguments.hs",
9184 jsaddlePath </> "src/Language/Javascript/JSaddle/Classes.hs",
9285 jsaddlePath </> "src/Language/Javascript/JSaddle/Classes/Internal.hs",
93− jsaddlePath </> "src/Language/Javascript/JSaddle/Debug.hs",
9486 jsaddlePath </> "src/Language/Javascript/JSaddle/Evaluate.hs",
9587 jsaddlePath </> "src/Language/Javascript/JSaddle/Exception.hs",
9688 jsaddlePath </> "src/Language/Javascript/JSaddle/Monad.hs",
@@ -104,9 +96,4 @@ main = do
10496 jsaddlePath </> "src/Language/Javascript/JSaddle/String.hs",
10597 jsaddlePath </> "src/Language/Javascript/JSaddle/Types.hs",
10698 jsaddlePath </> "src/Language/Javascript/JSaddle/Value.hs" ]
107− putMVar done ()
108− threadDelay 5000000
109− runSession defaultConfig $ do
110− openPage "http://127.0.0.1:3709"
111− liftIO $ takeMVar done
11299 closeSession
jsaddle-webkit2gtk/default.nixnew file+16
@@ -0,0 +1,16 @@
1+{ mkDerivation, aeson, base, bytestring, directory, gi-gio, gi-glib
2+, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base, jsaddle
3+, stdenv, text, unix, webkit2gtk3-javascriptcore
4+}:
5+mkDerivation {
6+ pname = "jsaddle-webkit2gtk";
7+ version = "0.9.0.0";
8+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
9+ libraryHaskellDepends = [
10+ aeson base bytestring directory gi-gio gi-glib gi-gtk
11+ gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
12+ webkit2gtk3-javascriptcore
13+ ];
14+ description = "Interface for JavaScript that works with GHCJS and GHC";
15+ license = stdenv.lib.licenses.mit;
16+}
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+9−10
@@ -1,5 +1,5 @@
11name: jsaddle-webkit2gtk
2−version: 0.9.8.0
2+version: 0.9.0.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -26,18 +26,17 @@ library
2626 base <5
2727 if !impl(ghcjs -any)
2828 build-depends:
29− aeson >=0.8.0.2 && <1.6,
29+ aeson >=0.8.0.2 && <1.3,
3030 base <5,
3131 bytestring >=0.10.6.0 && <0.11,
3232 directory >=1.0.0.2 && <1.4,
33− gi-glib >=2.0.14 && <2.1,
34− gi-gio >=2.0.14 && <2.1,
35− gi-gtk >=3.0.17 && <3.1,
36− gi-webkit2 >=4.0.14 && <4.1,
37− gi-javascriptcore >=4.0.14 && <4.1,
38− haskell-gi-base >=0.20 && <0.26,
39− haskell-gi-overloading >=0.0 && < 2.0,
40− jsaddle >=0.9.4.0 && <0.10,
33+ gi-glib >=2.0.6 && <2.1,
34+ gi-gio >=2.0.6 && <2.1,
35+ gi-gtk >=3.0.6 && <3.1,
36+ gi-webkit2 >=4.0.6 && <4.1,
37+ gi-javascriptcore >=4.0.6 && <4.1,
38+ haskell-gi-base >=0.20 && <0.21,
39+ jsaddle >=0.9.0.0 && <0.10,
4140 text >=1.2.1.3 && <1.3,
4241 webkit2gtk3-javascriptcore >=0.14.0.0 && <0.15
4342 if !os(windows)
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+40−17
@@ -43,24 +43,29 @@ import Data.Monoid ((<>))
4343import Data.ByteString.Lazy (toStrict, fromStrict)
4444import qualified Data.ByteString.Lazy as LB (ByteString)
4545import Data.Aeson (encode, decode)
46+import Data.Text (Text)
4647import qualified Data.Text as T (pack)
48+import Data.Text.Foreign (fromPtr)
4749import Data.Text.Encoding (decodeUtf8, encodeUtf8)
4850
51+import Foreign.Ptr (castPtr, nullPtr)
52+
4953import Data.GI.Base.BasicTypes (GObject)
5054import Data.GI.Base.Signals
5155 (connectSignalFunPtr, SignalConnectMode(..), SignalConnectMode,
5256 SignalHandlerId)
57+import Data.GI.Base.ManagedPtr (withManagedPtr)
5358
5459import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEFAULT)
5560import qualified GI.Gtk as Gtk (main, init)
5661import GI.Gtk
5762 (windowSetPosition, windowSetDefaultSize, windowNew,
58− scrolledWindowNew, Adjustment, containerAdd,
63+ scrolledWindowNew, noAdjustment, containerAdd,
5964 WindowType(..), WindowPosition(..), widgetDestroy,
6065 widgetGetToplevel, widgetShowAll, onWidgetDestroy,
6166 mainQuit)
62−import GI.Gio (Cancellable)
63−import GI.JavaScriptCore (valueToString)
67+import GI.Gio (noCancellable)
68+import GI.JavaScriptCore (Value(..), GlobalContext(..))
6469import GI.WebKit2
6570 (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,
6671 scriptDialogGetMessage, scriptDialogGetDialogType,
@@ -69,7 +74,7 @@ import GI.WebKit2
6974 setSettingsEnableJavascript, webViewNewWithUserContentManager,
7075 userContentManagerNew,
7176 userContentManagerRegisterScriptMessageHandler,
72− javascriptResultGetJsValue,
77+ javascriptResultGetValue, javascriptResultGetGlobalContext,
7378 webViewGetUserContentManager,
7479 mk_UserContentManagerScriptMessageReceivedCallback,
7580 wrap_UserContentManagerScriptMessageReceivedCallback,
@@ -78,16 +83,17 @@ import GI.WebKit2
7883 onWebViewLoadChanged, setSettingsEnableDeveloperExtras,
7984 webViewSetSettings, webViewGetSettings, ScriptDialogType(..))
8085
86+import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSBase
87+ (JSValueRef, JSContextRef)
88+import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSStringRef
89+ (jsstringgetcharactersptr, jsstringgetlength, jsstringrelease)
90+import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSValueRef
91+ (jsvaluetostringcopy)
92+
8193import Language.Javascript.JSaddle (JSM, Results, Batch)
8294import Language.Javascript.JSaddle.Run (runJavaScript)
8395import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
8496
85−noAdjustment :: Maybe Adjustment
86−noAdjustment = Nothing
87−
88−noCancellable :: Maybe Cancellable
89−noCancellable = Nothing
90−
9197quitWebView :: WebView -> IO ()
9298quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
9399 widgetDestroy w
@@ -103,6 +109,21 @@ postGUIAsync :: IO () -> IO ()
103109postGUIAsync action =
104110 void . idleAdd PRIORITY_DEFAULT $ action >> return False
105111
112+withJSContextRef :: GlobalContext -> (JSContextRef -> IO a) -> IO a
113+withJSContextRef (GlobalContext ctx) f = withManagedPtr ctx (f . castPtr)
114+
115+withJSValueRef :: Value -> (JSValueRef -> IO a) -> IO a
116+withJSValueRef (Value ptr) f = withManagedPtr ptr (f . castPtr)
117+
118+valueToText :: JSContextRef -> JSValueRef -> IO Text
119+valueToText ctxRef s = do
120+ jsstring <- jsvaluetostringcopy ctxRef s nullPtr
121+ l <- jsstringgetlength jsstring
122+ p <- jsstringgetcharactersptr jsstring
123+ result <- fromPtr (castPtr p) (fromIntegral l)
124+ jsstringrelease jsstring
125+ return result
126+
106127run :: JSM () -> IO ()
107128run main = do
108129 _ <- Gtk.init Nothing
@@ -127,7 +148,7 @@ run main = do
127148 void . onWebViewLoadChanged webView $ \case
128149 LoadEventFinished -> runInWebView main webView
129150 _ -> return ()
130− webViewLoadHtml webView "" . Just $ "file://" <> T.pack pwd <> "/index.html"
151+ webViewLoadHtml webView "" . Just $ "file://" <> T.pack pwd <> "/"
131152 installQuitHandler webView
132153 Gtk.main
133154
@@ -151,16 +172,16 @@ connectUserContentManagerScriptMessageReceived obj cb after = liftIO $ do
151172 let cb' = wrap_UserContentManagerScriptMessageReceivedCallback cb
152173 cb'' <- mk_UserContentManagerScriptMessageReceivedCallback cb'
153174 connectSignalFunPtr obj "script-message-received::jsaddle" cb'' after
154−#if MIN_VERSION_haskell_gi_base(0,23,0)
155− Nothing
156−#endif
157175
158176addJSaddleHandler :: WebView -> (Results -> IO ()) -> (Results -> IO Batch) -> IO ()
159177addJSaddleHandler webView processResult syncResults = do
160178 manager <- webViewGetUserContentManager webView
161179 _ <- onUserContentManagerScriptMessageReceived manager $ \result -> do
162− arg <- javascriptResultGetJsValue result
163− bs <- encodeUtf8 <$> valueToString arg
180+ ctx <- javascriptResultGetGlobalContext result
181+ arg <- javascriptResultGetValue result
182+ bs <- withJSContextRef ctx $ \ctxRef ->
183+ withJSValueRef arg $ \argRef ->
184+ encodeUtf8 <$> valueToText ctxRef argRef
164185 mapM_ processResult (decode (fromStrict bs))
165186 _ <- onWebViewScriptDialog webView $ \dialog ->
166187 scriptDialogGetDialogType dialog >>= \case
@@ -185,7 +206,9 @@ jsaddleJs = ghcjsHelpers <> mconcat
185206 , initState
186207 , "\nreturn function(batch) {\n"
187208 , runBatch (\a -> "window.webkit.messageHandlers.jsaddle.postMessage(JSON.stringify(" <> a <> "));\n")
188− (Just (\a -> "JSON.parse(window.prompt(\"JSaddleSync\", JSON.stringify(" <> a <> ")))"))
209+ Nothing
210+ -- TODO fix https://github.com/haskell-gi/haskell-gi/issues/97 then use
211+ -- (Just (\a -> "JSON.parse(window.prompt(\"JSaddleSync\", JSON.stringify(" <> a <> ")))"))
189212 , "};\n"
190213 , "})()"
191214 ]
jsaddle-webkitgtk/default.nixnew file+16
@@ -0,0 +1,16 @@
1+{ mkDerivation, aeson, base, bytestring, directory, gi-glib, gi-gtk
2+, gi-javascriptcore, gi-webkit, haskell-gi-base, jsaddle, stdenv
3+, text, unix, webkitgtk3-javascriptcore
4+}:
5+mkDerivation {
6+ pname = "jsaddle-webkitgtk";
7+ version = "0.9.0.0";
8+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
9+ libraryHaskellDepends = [
10+ aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
11+ gi-webkit haskell-gi-base jsaddle text unix
12+ webkitgtk3-javascriptcore
13+ ];
14+ description = "Interface for JavaScript that works with GHCJS and GHC";
15+ license = stdenv.lib.licenses.mit;
16+}
jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+2−57
@@ -2,9 +2,6 @@
22#import <Cocoa/Cocoa.h>
33#import <WebKit/WebKit.h>
44
5−extern void callIO(HsStablePtr);
6−extern bool callWithCStringReturningBool(const char * _Nonnull, HsStablePtr);
7−extern void callWithCString(const char * _Nonnull, HsStablePtr);
85extern void callWithWebView(WKWebView *, HsStablePtr);
96
107@interface AppDelegate : NSObject <NSApplicationDelegate>
@@ -14,12 +11,6 @@ extern void callWithWebView(WKWebView *, HsStablePtr);
1411- (instancetype)initApp:(HsStablePtr)handler progName:(NSString *)progName;
1512@end
1613
17−HsStablePtr global_willFinishLaunchingWithOptions = 0;
18−HsStablePtr global_didFinishLaunchingWithOptions = 0;
19−HsStablePtr global_applicationUniversalLink = 0;
20−HsStablePtr global_applicationOpenFile = 0;
21−uint64_t global_developerExtrasEnabled = 1;
22−
2314@implementation AppDelegate
2415
2516- (void)applicationWillTerminate:(NSNotification *)aNotification {
@@ -40,39 +31,18 @@ uint64_t global_developerExtrasEnabled = 1;
4031 return self;
4132}
4233
43−-(BOOL)application:(NSApplication *)sender openFile:(NSString *)filename {
44− bool b = callWithCStringReturningBool([filename UTF8String], global_applicationOpenFile);
45− return b ? YES : NO;
46−}
47−
4834-(void)applicationWillFinishLaunching:(NSNotification *)notification {
4935 WKWebViewConfiguration *theConfiguration = [[WKWebViewConfiguration alloc] init];
50− if (global_developerExtrasEnabled) {
51− [theConfiguration.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
52− }
36+ [theConfiguration.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
5337 WKWebView *webView = [[WKWebView alloc] initWithFrame: [_window.contentView frame] configuration:theConfiguration];
5438 [_window setContentView:webView];
5539 callWithWebView(webView, _handler);
56− callIO(global_willFinishLaunchingWithOptions);
57− // Listen to URL events
58− NSAppleEventManager *manager = [NSAppleEventManager sharedAppleEventManager];
59− [manager
60− setEventHandler:self
61− andSelector:@selector(applicationUniversalLink:)
62− forEventClass:kInternetEventClass
63− andEventID:kAEGetURL];
64−}
65−
66−- (void)applicationUniversalLink:(NSAppleEventDescriptor *)event {
67− NSString *url = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
68− callWithCString([url UTF8String], global_applicationUniversalLink);
6940}
7041
7142-(void)applicationDidFinishLaunching:(NSNotification *)notification {
7243 [_window orderFrontRegardless];
7344 [_window center];
7445 [NSApp activateIgnoringOtherApps:YES];
75− callIO(global_didFinishLaunchingWithOptions);
7646}
7747
7848-(BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app {
@@ -81,33 +51,8 @@ uint64_t global_developerExtrasEnabled = 1;
8151
8252@end
8353
84−void runInWKWebView(HsStablePtr handler,
85− const char * _Nonnull progName,
86− HsStablePtr hs_willFinishLaunchingWithOptions,
87− HsStablePtr hs_didFinishLaunchingWithOptions,
88− HsStablePtr hs_applicationDidBecomeActive,
89− HsStablePtr hs_applicationWillResignActive,
90− HsStablePtr hs_applicationDidEnterBackground,
91− HsStablePtr hs_applicationWillEnterForeground,
92− HsStablePtr hs_applicationWillTerminate,
93− HsStablePtr hs_applicationSignificantTimeChange,
94− HsStablePtr hs_applicationUniversalLink,
95− const uint64_t hs_requestAuthorizationWithOptions,
96− const uint64_t hs_requestAuthorizationOptionBadge,
97− const uint64_t hs_requestAuthorizationOptionSound,
98− const uint64_t hs_requestAuthorizationOptionAlert,
99− const uint64_t hs_requestAuthorizationOptionCarPlay,
100− const uint64_t hs_registerForRemoteNotifications,
101− HsStablePtr hs_didRegisterForRemoteNotificationsWithDeviceToken,
102− HsStablePtr hs_didFailToRegisterForRemoteNotificationsWithError,
103− const uint64_t hs_developerExtrasEnabled,
104− HsStablePtr hs_applicationOpenFile) {
54+void runInWKWebView(HsStablePtr handler, const char * _Nonnull progName) {
10555 @autoreleasepool {
106− global_willFinishLaunchingWithOptions = hs_willFinishLaunchingWithOptions;
107− global_didFinishLaunchingWithOptions = hs_didFinishLaunchingWithOptions;
108− global_applicationUniversalLink = hs_applicationUniversalLink;
109− global_applicationOpenFile = hs_applicationOpenFile;
110− global_developerExtrasEnabled = hs_developerExtrasEnabled;
11156 NSApplication *application = [NSApplication sharedApplication];
11257 AppDelegate *appDelegate = [[AppDelegate alloc] initApp:handler progName:[NSString stringWithCString:progName encoding:NSUTF8StringEncoding]];
11358 [application setDelegate:appDelegate];
jsaddle-wkwebview/cbits-uikit/AppDelegate.m+1−36
@@ -5,7 +5,6 @@
55
66extern void callIO(HsStablePtr);
77extern void callWithCString(const char * _Nonnull, HsStablePtr);
8−extern void callWithCIntCString(int n, const char * _Nonnull, HsStablePtr);
98
109@interface AppDelegate ()
1110
@@ -20,8 +19,6 @@ HsStablePtr global_applicationDidEnterBackground = 0;
2019HsStablePtr global_applicationWillEnterForeground = 0;
2120HsStablePtr global_applicationWillTerminate = 0;
2221HsStablePtr global_applicationSignificantTimeChange = 0;
23−HsStablePtr global_applicationUniversalLink = 0;
24−HsStablePtr global_applicationDidReceiveRemoteNotification = 0;
2522uint64_t global_requestAuthorizationWithOptions = 0;
2623uint64_t global_requestAuthorizationOptionBadge = 0;
2724uint64_t global_requestAuthorizationOptionSound = 0;
@@ -111,23 +108,6 @@ HsStablePtr global_didFailToRegisterForRemoteNotificationsWithError = 0;
111108 callWithCString([deviceTokenString UTF8String], global_didRegisterForRemoteNotificationsWithDeviceToken);
112109}
113110
114−- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))completionHandler {
115− // Sent when the application receives remote notifications in the foreground or background
116− // TODO Allow a configurable CString -> IO () to be passed into AppDelegateConfig
117− if ([userInfo valueForKeyPath:@"aps.badge"] != nil) {
118− [UIApplication sharedApplication].applicationIconBadgeNumber=[[[userInfo objectForKey:@"aps"] objectForKey:@"badge"] intValue];
119− }
120− NSError *error;
121− NSData *jsonData = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
122− if (jsonData) {
123− NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
124− callWithCIntCString((int) application.applicationState, [jsonString UTF8String], global_applicationDidReceiveRemoteNotification);
125− } else {
126− NSLog(@"jsaddle-wkwebview didReceiveRemoteNotification handler: error while serialising push notification as JSON");
127− }
128− completionHandler(UIBackgroundFetchResultNewData);
129−}
130−
131111- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
132112 // Sent to the delegate when Apple Push Notification service cannot successfully complete the registration process.
133113 NSString *errorString = [error localizedDescription];
@@ -139,16 +119,6 @@ HsStablePtr global_didFailToRegisterForRemoteNotificationsWithError = 0;
139119 callIO(global_applicationSignificantTimeChange);
140120}
141121
142−- (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *restorableObjects))restorationHandler {
143− // TODO: Reroute universal links when they're clicked in-app.
144− // https://developer.apple.com/reference/webkit/wknavigationdelegate/1455643-webview?language=objc
145− if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb] && userActivity.webpageURL) {
146− callWithCString([userActivity.webpageURL.absoluteString UTF8String], global_applicationUniversalLink);
147− return YES;
148− }
149− return NO;
150−}
151−
152122@end
153123
154124void runInWKWebView(HsStablePtr handler,
@@ -161,8 +131,6 @@ void runInWKWebView(HsStablePtr handler,
161131 HsStablePtr hs_applicationWillEnterForeground,
162132 HsStablePtr hs_applicationWillTerminate,
163133 HsStablePtr hs_applicationSignificantTimeChange,
164− HsStablePtr hs_applicationUniversalLink,
165− HsStablePtr hs_applicationDidReceiveRemoteNotification,
166134 const uint64_t hs_requestAuthorizationWithOptions,
167135 const uint64_t hs_requestAuthorizationOptionBadge,
168136 const uint64_t hs_requestAuthorizationOptionSound,
@@ -170,8 +138,7 @@ void runInWKWebView(HsStablePtr handler,
170138 const uint64_t hs_requestAuthorizationOptionCarPlay,
171139 const uint64_t hs_registerForRemoteNotifications,
172140 HsStablePtr hs_didRegisterForRemoteNotificationsWithDeviceToken,
173− HsStablePtr hs_didFailToRegisterForRemoteNotificationsWithError,
174− const uint64_t hs_developerExtrasEnabled) {
141+ HsStablePtr hs_didFailToRegisterForRemoteNotificationsWithError) {
175142 @autoreleasepool {
176143 globalHandler = handler;
177144 global_willFinishLaunchingWithOptions = hs_willFinishLaunchingWithOptions;
@@ -182,8 +149,6 @@ void runInWKWebView(HsStablePtr handler,
182149 global_applicationWillEnterForeground = hs_applicationWillEnterForeground;
183150 global_applicationWillTerminate = hs_applicationWillTerminate;
184151 global_applicationSignificantTimeChange = hs_applicationSignificantTimeChange;
185− global_applicationUniversalLink = hs_applicationUniversalLink;
186− global_applicationDidReceiveRemoteNotification = hs_applicationDidReceiveRemoteNotification;
187152 global_requestAuthorizationWithOptions = hs_requestAuthorizationWithOptions;
188153 global_requestAuthorizationOptionBadge = hs_requestAuthorizationOptionBadge;
189154 global_requestAuthorizationOptionSound = hs_requestAuthorizationOptionSound;
jsaddle-wkwebview/cbits/WKWebView.m+10−11
@@ -61,9 +61,9 @@ extern void jsaddleSyncResult(HsStablePtr, JSaddleHandler *, const char * _Nonnu
6161
6262 if(!navigationAction.targetFrame && ![url.scheme isEqualToString:@"file"]) {
6363 if(openApp(url))
64− decisionHandler(WKNavigationActionPolicyCancel);
65− else
66− decisionHandler(WKNavigationActionPolicyAllow);
64+ decisionHandler(WKNavigationActionPolicyCancel);
65+ else
66+ decisionHandler(WKNavigationActionPolicyAllow);
6767 }
6868 else
6969 decisionHandler(WKNavigationActionPolicyAllow);
@@ -74,9 +74,6 @@ extern void jsaddleSyncResult(HsStablePtr, JSaddleHandler *, const char * _Nonnu
7474void addJSaddleHandler(WKWebView *webView, HsStablePtr startHandler, HsStablePtr resultHandler, HsStablePtr syncHandler) {
7575 JSaddleHandler * handler = [[JSaddleHandler alloc] initHandler:startHandler resultHandler:resultHandler syncHandler:syncHandler];
7676 [[[webView configuration] userContentController] addScriptMessageHandler:handler name:@"jsaddle"];
77−#ifdef USE_UIKIT
78− webView.scrollView.bounces = NO;
79−#endif
8077 webView.navigationDelegate = handler;
8178 webView.UIDelegate = handler;
8279}
@@ -95,11 +92,10 @@ void completeSync(JSaddleHandler *handler, const char * _Nonnull s) {
9592 handler.completionHandler = NULL;
9693}
9794
98−void loadHTMLStringWithBaseURL(WKWebView *webView, const char * _Nonnull html, const char * _Nonnull url) {
99− NSString *htmlString = [NSString stringWithCString:html encoding:NSUTF8StringEncoding];
100− NSURL *baseURL = [NSURL URLWithString:[[NSString alloc] initWithCString:url encoding:NSUTF8StringEncoding]];
101− dispatch_async(dispatch_get_main_queue(), ^{
102− [webView loadHTMLString:htmlString baseURL:baseURL];
95+void loadHTMLString(WKWebView *webView, const char * _Nonnull html) {
96+ NSString *htmlString = [NSString stringWithCString:html encoding:NSUTF8StringEncoding];
97+ dispatch_async(dispatch_get_main_queue(), ^{
98+ [webView loadHTMLString:htmlString baseURL:NULL];
10399 });
104100}
105101
@@ -122,3 +118,6 @@ void loadBundleFile(WKWebView *webView, const char * _Nonnull file, const char *
122118 }
123119 }
124120}
121+
122+
123+
jsaddle-wkwebview/default.nix+20−14
@@ -1,14 +1,20 @@
1−{ filterSource ? (x: x) }:
2−self: super:
3−let
4− pkgs = self.callPackage ({pkgs}: pkgs) {};
5− inherit (pkgs) lib;
6−in
7−with pkgs.haskell.lib;
8−overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (filterSource ./.) {}) (drv: {
9− libraryFrameworkDepends = (drv.libraryFrameworkDepends or []) ++
10− (if pkgs.stdenv.hostPlatform.useiOSPrebuilt then [
11− "${pkgs.buildPackages.darwin.xcode}/Contents/Developer/Platforms/${pkgs.stdenv.hostPlatform.xcodePlatform}.platform/Developer/SDKs/${pkgs.stdenv.hostPlatform.xcodePlatform}.sdk/System"
12− ] else (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ]));
13− buildDepends = lib.optional (!pkgs.stdenv.hostPlatform.useiOSPrebuilt) [ pkgs.buildPackages.darwin.cf-private ];
14−})
1+{ mkDerivation, stdenv, aeson, base, bytestring, jsaddle, data-default
2+, buildPackages
3+}:
4+
5+mkDerivation {
6+ pname = "jsaddle-wkwebview";
7+ version = "0.9.0.0";
8+ src = ./.;
9+ libraryHaskellDepends = [ aeson base bytestring jsaddle data-default ]
10+ # should use `librarySystemDepends` but it is not propagated
11+ ++ (with buildPackages; [
12+ darwin.libobjc
13+ darwin.apple_sdk.libs.xpc
14+ darwin.apple_sdk.frameworks.Foundation
15+ darwin.apple_sdk.frameworks.Cocoa
16+ darwin.apple_sdk.frameworks.WebKit
17+ ]);
18+ description = "Interface for JavaScript that works with GHCJS and GHC";
19+ license = stdenv.lib.licenses.mit;
20+}
jsaddle-wkwebview/jsaddle-wkwebview.cabal+11−20
@@ -1,5 +1,5 @@
11name: jsaddle-wkwebview
2−version: 0.9.8.0
2+version: 0.9.0.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -25,41 +25,32 @@ source-repository head
2525library
2626 exposed-modules:
2727 Language.Javascript.JSaddle.WKWebView
28+ Language.Javascript.JSaddle.WKWebView.Internal
2829 build-depends:
29− base <5
30+ aeson >=0.8.0.2 && <1.3,
31+ base <5,
32+ bytestring >=0.10.6.0 && <0.11,
33+ jsaddle >= 0.9.0.0 && <0.10,
34+ data-default,
35+ containers
3036 default-language: Haskell2010
3137 hs-source-dirs: src
38+ frameworks: Foundation, WebKit
3239 ghc-options: -ferror-spans -Wall
33− if os(linux)
34− buildable: False
40+ c-sources:
41+ cbits/WKWebView.m
3542 if impl(ghcjs)
3643 hs-source-dirs: src-ghcjs
3744 else
38− frameworks: Foundation, WebKit
39− build-depends:
40− aeson >=0.8.0.2 && <1.6,
41− bytestring >=0.10.6.0 && <0.11,
42− directory,
43− jsaddle >= 0.9.4.0 && <0.10,
44− text,
45− data-default,
46− containers
47− exposed-modules:
48− Language.Javascript.JSaddle.WKWebView.Internal
4945 hs-source-dirs: src-ghc
50− c-sources:
51− cbits/WKWebView.m
52− cc-options: -Wno-everything
5346 if os(ios)
5447 frameworks: UIKit, UserNotifications
5548 if flag(include-app-delegate)
5649 c-sources:
5750 cbits-uikit/AppDelegate.m
5851 cbits-uikit/ViewController.m
59− cpp-options: -DUSE_UIKIT
6052 else
6153 frameworks: Cocoa
6254 if flag(include-app-delegate)
6355 c-sources:
6456 cbits-cocoa/AppDelegate.m
65− cpp-options: -DUSE_COCOA
jsaddle-wkwebview/src-ghc/Language/Javascript/JSaddle/WKWebView.hs+17−78
@@ -1,15 +1,11 @@
11module Language.Javascript.JSaddle.WKWebView
22 ( jsaddleMain
3− , jsaddleMainHTMLWithBaseURL
43 , jsaddleMainFile
54 , WKWebView(..)
65 , run
7− , run'
86 , runWithAppConfig
9− , runHTMLWithBaseURL
107 , runFile
118 , mainBundleResourcePath
12− , ApplicationState (..)
139 , AppDelegateConfig (..)
1410 , AppDelegateNotificationConfig (..)
1511 , AuthorizationOption (..)
@@ -21,11 +17,9 @@ import Data.Set (Set)
2117import qualified Data.Set as Set
2218import Data.Word
2319import Foreign.Marshal.Utils (fromBool)
24−import Language.Javascript.JSaddle.WKWebView.Internal
25− (jsaddleMain, jsaddleMainHTMLWithBaseURL, jsaddleMainFile, WKWebView(..), mainBundleResourcePath)
20+import Language.Javascript.JSaddle.WKWebView.Internal (jsaddleMain, jsaddleMainFile, WKWebView(..), mainBundleResourcePath)
2621import System.Environment (getProgName)
2722import Foreign.C.String (CString, withCString)
28−import Foreign.C.Types (CBool, CInt)
2923import Foreign.StablePtr (StablePtr, newStablePtr)
3024import Language.Javascript.JSaddle (JSM)
3125
@@ -40,8 +34,6 @@ foreign import ccall runInWKWebView
4034 -> StablePtr (IO ()) -- applicationWillEnterForeground
4135 -> StablePtr (IO ()) -- applicationWillTerminate
4236 -> StablePtr (IO ()) -- applicationSignificantTimeChange
43− -> StablePtr (CString -> IO ()) -- applicationUniversalLink
44− -> StablePtr (CInt -> CString -> IO ()) -- applicationDidReceiveRemoteNotification
4537 -> Word64 -- whether to run requestAuthorizationWithOptions
4638 -> Word64 -- Ask for Badge authorization
4739 -> Word64 -- Ask for Sound authorization
@@ -50,8 +42,6 @@ foreign import ccall runInWKWebView
5042 -> Word64 -- registerForRemoteNotifications
5143 -> StablePtr (CString -> IO ()) -- didRegisterForRemoteNotificationsWithDeviceToken
5244 -> StablePtr (CString -> IO ()) -- didFailToRegisterForRemoteNotificationsWithError
53− -> Word64 -- developerExtrasEnabled
54− -> StablePtr (CString -> IO CBool) -- applicationOpenFile
5545 -> IO ()
5646
5747data AppDelegateConfig = AppDelegateConfig
@@ -63,26 +53,7 @@ data AppDelegateConfig = AppDelegateConfig
6353 , _appDelegateConfig_applicationWillEnterForeground :: IO ()
6454 , _appDelegateConfig_applicationWillTerminate :: IO ()
6555 , _appDelegateConfig_applicationSignificantTimeChange :: IO ()
66− , _appDelegateConfig_applicationUniversalLink :: CString -> IO ()
67− -- ^ Called when the app is launched from a URL. 'CString' contains the URL.
68− --
69− -- The Core Foundation plist key CFBundleURLTypes controls which URL schemes
70− -- the app should respond to.
71− , _appDelegateConfig_applicationDidReceiveRemoteNotification :: ApplicationState -> CString -> IO ()
72− -- ^ Called when the application receives a remote notification.
73− -- 'ApplicationState' is the current state of the app.
74− -- The 'CString' JSON-encoded user info contained in the notification.
75− -- For more information see https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1623117-application?language=objc
7656 , _appDelegateConfig_appDelegateNotificationConfig :: AppDelegateNotificationConfig
77− , _appDelegateConfig_developerExtrasEnabled :: Bool
78− -- ^ Allow devtools in the app. Defaults to 'True'
79− , _appDelegateConfig_applicationOpenFile :: CString -> IO Bool
80− -- ^ Called when the app is launched by opening a file. 'CString' contains
81− -- the file path. Return value is 'True' if the file was successfully
82− -- opened. Defaults to ignoring the file and returning 'False'.
83− --
84− -- The Core Foundation plist key CFBundleDocumentTypes controls which file
85− -- types should be associated with the app.
8657 }
8758
8859instance Default AppDelegateConfig where
@@ -95,11 +66,7 @@ instance Default AppDelegateConfig where
9566 , _appDelegateConfig_applicationWillEnterForeground = return ()
9667 , _appDelegateConfig_applicationWillTerminate = return ()
9768 , _appDelegateConfig_applicationSignificantTimeChange = return ()
98− , _appDelegateConfig_applicationUniversalLink = \_ -> return ()
99− , _appDelegateConfig_applicationDidReceiveRemoteNotification = \_ _ -> return ()
10069 , _appDelegateConfig_appDelegateNotificationConfig = def
101− , _appDelegateConfig_developerExtrasEnabled = True
102− , _appDelegateConfig_applicationOpenFile = \_ -> return False
10370 }
10471
10572data AuthorizationOption = AuthorizationOption_Badge
@@ -108,12 +75,6 @@ data AuthorizationOption = AuthorizationOption_Badge
10875 | AuthorizationOption_CarPlay
10976 deriving (Show, Read, Eq, Ord)
11077
111−data ApplicationState = ApplicationState_Active
112− | ApplicationState_Inactive
113− | ApplicationState_Background
114− | ApplicationState_Unknown CInt
115− deriving (Show, Read, Eq, Ord)
116−
11778data AppDelegateNotificationConfig = AppDelegateNotificationConfig
11879 { _appDelegateNotificationConfig_requestAuthorizationWithOptions :: Maybe (Set AuthorizationOption)
11980 , _appDelegateNotificationConfig_registerForRemoteNotifications :: Bool
@@ -132,38 +93,29 @@ instance Default AppDelegateNotificationConfig where
13293
13394-- | Run JSaddle in a WKWebView
13495run :: JSM () -> IO ()
135−run f = run' def (jsaddleMain f)
96+run = run' Nothing def
13697
13798-- | Run JSaddle in a WKWebView
13899runWithAppConfig :: AppDelegateConfig -> JSM () -> IO ()
139−runWithAppConfig cfg = run' cfg . jsaddleMain
100+runWithAppConfig = run' Nothing
140101
141102-- | Run JSaddle in a WKWebView first loading the specified file
142103-- from the mainBundle (relative to the resourcePath).
143−runFile
144− :: ByteString -- ^ The file to navigate to.
145− -> ByteString -- ^ The path to allow read access to.
146− -> AppDelegateConfig
147− -> JSM ()
148− -> IO ()
149−runFile url allowing cfg = run' cfg . jsaddleMainFile url allowing
150−
151−-- | Run JSaddle in a WKWebView first loading the specified html
152−-- as though it came from the specified URL
153−-- (calls WKWebKit function loadHTMLString).
154−runHTMLWithBaseURL
155− :: ByteString -- ^ HTML to load.
156− -> ByteString -- ^ pretend it came from this URL.
157− -> AppDelegateConfig
158− -> JSM ()
159− -> IO ()
160−runHTMLWithBaseURL url allowing cfg = run' cfg . jsaddleMainHTMLWithBaseURL url allowing
161−
162−run' :: AppDelegateConfig
163− -> (WKWebView -> IO ())
104+runFile :: ByteString -- ^ The file to navigate to.
105+ -> ByteString -- ^ The path to allow read access to.
106+ -> AppDelegateConfig
107+ -> JSM ()
108+ -> IO ()
109+runFile url allowing = run' $ Just (url, allowing)
110+
111+run' :: Maybe (ByteString, ByteString)
112+ -> AppDelegateConfig
113+ -> JSM ()
164114 -> IO ()
165−run' cfg main = do
166− handler <- newStablePtr main
115+run' mUrl cfg f = do
116+ handler <- case mUrl of
117+ Just (url, allowing) -> newStablePtr (jsaddleMainFile url allowing f)
118+ Nothing -> newStablePtr (jsaddleMain f)
167119 progName <- getProgName
168120
169121 -- AppDelegate callbacks
@@ -175,15 +127,6 @@ run' cfg main = do
175127 applicationWillEnterForeground <- newStablePtr $ _appDelegateConfig_applicationWillEnterForeground cfg
176128 applicationWillTerminate <- newStablePtr $ _appDelegateConfig_applicationWillTerminate cfg
177129 applicationSignificantTimeChange <- newStablePtr $ _appDelegateConfig_applicationSignificantTimeChange cfg
178− applicationUniversalLink <- newStablePtr $ _appDelegateConfig_applicationUniversalLink cfg
179− applicationDidReceiveRemoteNotification <- newStablePtr $ \n s -> do
180− let appState = case n of
181− 0 -> ApplicationState_Active
182− 1 -> ApplicationState_Inactive
183− 2 -> ApplicationState_Background
184− _ -> ApplicationState_Unknown n
185− _appDelegateConfig_applicationDidReceiveRemoteNotification cfg appState s
186− applicationOpenFile <- newStablePtr $ fmap fromBool . _appDelegateConfig_applicationOpenFile cfg
187130
188131 -- AppDelegate notification configuration
189132 let ncfg = _appDelegateConfig_appDelegateNotificationConfig cfg
@@ -205,8 +148,6 @@ run' cfg main = do
205148 applicationWillEnterForeground
206149 applicationWillTerminate
207150 applicationSignificantTimeChange
208− applicationUniversalLink
209− applicationDidReceiveRemoteNotification
210151 (fromBool requestAuthorizationWithOptions)
211152 (fromBool $ Set.member AuthorizationOption_Badge authorizationOptions)
212153 (fromBool $ Set.member AuthorizationOption_Sound authorizationOptions)
@@ -215,5 +156,3 @@ run' cfg main = do
215156 (fromBool registerForRemoteNotifications)
216157 didRegisterForRemoteNotificationsWithDeviceToken
217158 didFailToRegisterForRemoteNotificationsWithError
218− (fromBool $ _appDelegateConfig_developerExtrasEnabled cfg)
219− applicationOpenFile
jsaddle-wkwebview/src/Language/Javascript/JSaddle/WKWebView/Internal.hs+4−35
@@ -1,7 +1,6 @@
11{-# LANGUAGE ForeignFunctionInterface, OverloadedStrings #-}
22module Language.Javascript.JSaddle.WKWebView.Internal
33 ( jsaddleMain
4− , jsaddleMainHTMLWithBaseURL
54 , jsaddleMainFile
65 , WKWebView(..)
76 , mainBundleResourcePath
@@ -16,11 +15,8 @@ import Data.ByteString (useAsCString, packCString)
1615import qualified Data.ByteString as BS (ByteString)
1716import Data.ByteString.Lazy (ByteString, toStrict, fromStrict)
1817import Data.Aeson (encode, decode)
19−import qualified Data.Text as T (pack)
20−import Data.Text.Encoding (encodeUtf8)
2118
2219import Foreign.C.String (CString)
23−import Foreign.C.Types (CBool(..), CInt(..))
2420import Foreign.Ptr (Ptr, nullPtr)
2521import Foreign.StablePtr (StablePtr, newStablePtr, deRefStablePtr)
2622
@@ -28,8 +24,6 @@ import Language.Javascript.JSaddle (Results, Batch, JSM)
2824import Language.Javascript.JSaddle.Run (runJavaScript)
2925import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
3026
31−import System.Directory (getCurrentDirectory)
32−
3327newtype WKWebView = WKWebView (Ptr WKWebView)
3428newtype JSaddleHandler = JSaddleHandler (Ptr JSaddleHandler)
3529
@@ -37,12 +31,10 @@ foreign export ccall jsaddleStart :: StablePtr (IO ()) -> IO ()
3731foreign export ccall jsaddleResult :: StablePtr (Results -> IO ()) -> CString -> IO ()
3832foreign export ccall jsaddleSyncResult :: StablePtr (Results -> IO Batch) -> JSaddleHandler -> CString -> IO ()
3933foreign export ccall callWithWebView :: WKWebView -> StablePtr (WKWebView -> IO ()) -> IO ()
40−foreign export ccall callWithCIntCString :: CInt -> CString -> StablePtr (CInt -> CString -> IO ()) -> IO ()
4134foreign export ccall callWithCString :: CString -> StablePtr (CString -> IO ()) -> IO ()
42−foreign export ccall callWithCStringReturningBool :: CString -> StablePtr (CString -> IO CBool) -> IO CBool
4335foreign export ccall callIO :: StablePtr (IO ()) -> IO ()
4436foreign import ccall addJSaddleHandler :: WKWebView -> StablePtr (IO ()) -> StablePtr (Results -> IO ()) -> StablePtr (Results -> IO Batch) -> IO ()
45−foreign import ccall loadHTMLStringWithBaseURL :: WKWebView -> CString -> CString -> IO ()
37+foreign import ccall loadHTMLString :: WKWebView -> CString -> IO ()
4638foreign import ccall loadBundleFile :: WKWebView -> CString -> CString -> IO ()
4739foreign import ccall evaluateJavaScript :: WKWebView -> CString -> IO ()
4840foreign import ccall completeSync :: JSaddleHandler -> CString -> IO ()
@@ -50,23 +42,9 @@ foreign import ccall mainBundleResourcePathC :: IO CString
5042
5143-- | Run JSaddle in WKWebView
5244jsaddleMain :: JSM () -> WKWebView -> IO ()
53−jsaddleMain f webView = do
54− pwd <- getCurrentDirectory
55− let baseURL = encodeUtf8 $ "file://" <> T.pack pwd <> "/index.html"
56− jsaddleMainHTMLWithBaseURL (toStrict indexHtml) baseURL f webView
57−
58−-- | Run JSaddle in WKWebView with initial html and base url
59−jsaddleMainHTMLWithBaseURL
60− :: BS.ByteString -- ^ HTML
61− -> BS.ByteString -- ^ Base URL
62− -> JSM ()
63− -> WKWebView
64− -> IO ()
65−jsaddleMainHTMLWithBaseURL initialHTML baseURL f webView =
45+jsaddleMain f webView =
6646 jsaddleMain' f webView $
67− useAsCString baseURL $ \url ->
68− useAsCString initialHTML $ \html ->
69− loadHTMLStringWithBaseURL webView html url
47+ useAsCString (toStrict indexHtml) $ loadHTMLString webView
7048
7149-- | Run JSaddle in a WKWebView first loading the specified file
7250-- from the mainBundle (relative to the resourcePath).
@@ -129,16 +107,6 @@ callWithCString c fptr = do
129107 f <- deRefStablePtr fptr
130108 f c
131109
132−callWithCIntCString :: CInt -> CString -> StablePtr (CInt -> CString -> IO ()) -> IO ()
133−callWithCIntCString n s fptr = do
134− f <- deRefStablePtr fptr
135− f n s
136−
137−callWithCStringReturningBool :: CString -> StablePtr (CString -> IO CBool) -> IO CBool
138−callWithCStringReturningBool c fptr = do
139− f <- deRefStablePtr fptr
140− f c
141−
142110callIO :: StablePtr (IO ()) -> IO ()
143111callIO ptr = do
144112 f <- deRefStablePtr ptr
@@ -172,3 +140,4 @@ mainBundleResourcePath = do
172140 if bs == nullPtr
173141 then return Nothing
174142 else Just <$> packCString bs
143+
jsaddle/default.nixnew file+17
@@ -0,0 +1,17 @@
1+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
2+, bytestring, containers, deepseq, filepath, ghc-prim, http-types
3+, lens, primitive, process, ref-tf, scientific, stdenv, stm, text
4+, time, transformers, unordered-containers, vector
5+}:
6+mkDerivation {
7+ pname = "jsaddle";
8+ version = "0.9.0.0";
9+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
10+ libraryHaskellDepends = [
11+ aeson attoparsec base base64-bytestring bytestring containers
12+ deepseq filepath ghc-prim http-types lens primitive process ref-tf
13+ scientific stm text time transformers unordered-containers vector
14+ ];
15+ description = "Interface for JavaScript that works with GHCJS and GHC";
16+ license = stdenv.lib.licenses.mit;
17+}
jsaddle/jsaddle.cabal+15−20
@@ -1,5 +1,5 @@
11name: jsaddle
2−version: 0.9.8.0
2+version: 0.9.0.0
33cabal-version: >=1.10
44build-type: Simple
55license: MIT
@@ -10,7 +10,7 @@ description:
1010 This package provides an EDSL for calling JavaScript that
1111 can be used both from GHCJS and GHC. When using GHC
1212 the application is run using Warp and WebSockets to
13− drive a small JavaScript helper.
13+ drive a small JavaScipt helper.
1414category: Web, Javascript
1515author: Hamish Mackenzie
1616
@@ -36,20 +36,18 @@ library
3636 else
3737 build-depends:
3838 attoparsec >=0.11 && <0.14,
39− containers >=0.5.6.2 && <0.7,
39+ containers >=0.5.6.2 && <0.6,
4040 deepseq >=1.3 && < 1.5,
4141 filepath >=1.4.0.0 && <1.5,
4242 ghc-prim,
43− http-types >=0.8.6 && <0.13,
44− process >=1.2.3.0 && <1.7,
45− random >= 1.1 && < 1.3,
43+ http-types >=0.8.6 && <0.10,
44+ process >=1.2.3.0 && <1.5,
4645 ref-tf >=0.4.0.1 && <0.5,
4746 scientific >=0.3 && <0.4,
48− stm >=2.4.4 && <2.6,
49− time >=1.5.0.1 && <1.11,
47+ stm >=2.4.4 && <2.5,
48+ time >=1.5.0.1 && <1.8,
5049 unordered-containers >=0.2 && <0.3,
51− vector >=0.10 && <0.13,
52− unliftio-core >=0.1 && < 0.3
50+ vector >=0.10 && <0.13
5351 exposed-modules:
5452 Data.JSString
5553 Data.JSString.Internal
@@ -63,7 +61,6 @@ library
6361 GHCJS.Prim
6462 GHCJS.Prim.Internal
6563 GHCJS.Types
66− GHCJS.Concurrent
6764 GHCJS.Foreign
6865 GHCJS.Foreign.Internal
6966 GHCJS.Internal.Types
@@ -84,10 +81,8 @@ library
8481 JavaScript.Array.Internal
8582 JavaScript.Object
8683 JavaScript.Object.Internal
87− Language.Javascript.JSaddle.Debug
8884 Language.Javascript.JSaddle.Native
8985 Language.Javascript.JSaddle.Native.Internal
90− Language.Javascript.JSaddle.Null
9186 hs-source-dirs: src-ghc
9287 exposed-modules:
9388 Language.Javascript.JSaddle
@@ -107,14 +102,12 @@ library
107102 Language.Javascript.JSaddle.Value
108103 Language.Javascript.JSaddle.Types
109104 build-depends:
110− aeson >=0.11.3.0 && <1.6,
111− base >=4.9 && <5,
112− base-compat >=0.9.0 && <0.12,
113− base64-bytestring >=1.0.0.1 && <1.2,
105+ aeson >=0.8.0.2 && <1.3,
106+ base <5,
107+ base64-bytestring >=1.0.0.1 && <1.1,
114108 bytestring >=0.10.6.0 && <0.11,
115− exceptions >=0.8 && <0.11,
116− lens >=3.8.5 && <5.1,
117− primitive >=0.6.1.0 && <0.8,
109+ lens >=3.8.5 && <4.16,
110+ primitive >=0.6.1.0 && <0.7,
118111 text >=1.2.1.3 && <1.3,
119112 transformers >=0.4.2.0 && <0.6
120113 default-language: Haskell2010
@@ -124,3 +117,5 @@ library
124117 cpp-options: -DCHECK_UNCHECKED
125118 if flag(call-stacks) || flag(check-unchecked)
126119 cpp-options: -DJSADDLE_HAS_CALL_STACK
120+
121+
jsaddle/src-ghc/Data/JSString/Internal/Type.hs+1−2
@@ -38,11 +38,10 @@ import Data.Aeson (ToJSON(..), FromJSON(..))
3838import Data.Data (Data)
3939-- import Data.Text.Internal.Unsafe.Char (ord)
4040import Data.Typeable (Typeable)
41−import Data.Semigroup (Semigroup)
4241import GHC.Exts (Char(..), ord#, andI#, (/=#), isTrue#)
4342
4443-- | A wrapper around a JavaScript string
45−newtype JSString = JSString Text deriving(Show, Read, IsString, Semigroup, Monoid, Ord, Eq, Data, ToJSON, FromJSON, Typeable)
44+newtype JSString = JSString Text deriving(Show, Read, IsString, Monoid, Ord, Eq, Data, ToJSON, FromJSON, Typeable)
4645
4746instance NFData JSString where rnf !_ = ()
4847
jsaddle/src-ghc/GHCJS/Concurrent.hsdeleted−22
@@ -1,22 +0,0 @@
1−{-# LANGUAGE DeriveDataTypeable #-}
2−
3−module GHCJS.Concurrent ( OnBlocked(..)
4− , WouldBlockException(..)
5− ) where
6−
7−import GHCJS.Prim
8−
9−import Data.Data
10−
11−{- |
12− The runtime tries to run synchronous threads to completion. Sometimes it's
13− not possible to continue running a thread, for example when the thread
14− tries to take an empty 'MVar'. The runtime can then either throw a
15− 'WouldBlockException', aborting the blocking action, or continue the
16− thread asynchronously.
17− -}
18−
19−data OnBlocked = ContinueAsync -- ^ continue the thread asynchronously if blocked
20− | ThrowWouldBlock -- ^ throw 'WouldBlockException' if blocked
21− deriving (Data, Typeable, Enum, Show, Eq, Ord)
22−
jsaddle/src-ghc/GHCJS/Foreign/Internal.hs+10−12
@@ -27,28 +27,26 @@ import Language.Javascript.JSaddle.Native.Internal
2727 (valueToBool)
2828import Data.Typeable (Typeable)
2929import GHCJS.Prim (isNull, isUndefined)
30−import System.IO.Unsafe (unsafePerformIO)
31−import Data.IORef (newIORef)
3230
3331jsTrue :: JSVal
34−jsTrue = JSVal . unsafePerformIO $ newIORef 3
35−{-# NOINLINE jsTrue #-}
32+jsTrue = JSVal 3
33+{-# INLINE jsTrue #-}
3634
3735jsFalse :: JSVal
38−jsFalse = JSVal . unsafePerformIO $ newIORef 2
39−{-# NOINLINE jsFalse #-}
36+jsFalse = JSVal 2
37+{-# INLINE jsFalse #-}
4038
4139jsNull :: JSVal
42−jsNull = JSVal . unsafePerformIO $ newIORef 0
43−{-# NOINLINE jsNull #-}
40+jsNull = JSVal 0
41+{-# INLINE jsNull #-}
4442
4543toJSBool :: Bool -> JSVal
46−toJSBool b = JSVal . unsafePerformIO . newIORef $ if b then 3 else 2
47−{-# NOINLINE toJSBool #-}
44+toJSBool b = JSVal $ if b then 3 else 2
45+{-# INLINE toJSBool #-}
4846
4947jsUndefined :: JSVal
50−jsUndefined = JSVal . unsafePerformIO $ newIORef 1
51−{-# NOINLINE jsUndefined #-}
48+jsUndefined = JSVal 1
49+{-# INLINE jsUndefined #-}
5250
5351isTruthy :: JSVal -> GHCJSPure Bool
5452isTruthy = GHCJSPure . valueToBool
jsaddle/src-ghc/GHCJS/Prim/Internal.hs+3−5
@@ -17,8 +17,6 @@ import Unsafe.Coerce (unsafeCoerce)
1717import Data.Aeson (ToJSON(..), FromJSON(..))
1818
1919import qualified GHC.Exception as Ex
20−import Data.IORef (newIORef, IORef)
21−import System.IO.Unsafe (unsafePerformIO)
2220
2321-- A reference to a particular JavaScript value inside the JavaScript context
2422type JSValueRef = Int64
@@ -27,7 +25,7 @@ type JSValueRef = Int64
2725 JSVal is a boxed type that can be used as FFI
2826 argument or result.
2927-}
30−newtype JSVal = JSVal (IORef JSValueRef)
28+newtype JSVal = JSVal JSValueRef deriving(Show, ToJSON, FromJSON)
3129
3230instance NFData JSVal where
3331 rnf x = x `seq` ()
@@ -51,8 +49,8 @@ mkJSException ref =
5149 return (JSException (unsafeCoerce ref) "")
5250
5351jsNull :: JSVal
54−jsNull = JSVal . unsafePerformIO $ newIORef 0
55−{-# NOINLINE jsNull #-}
52+jsNull = JSVal 0
53+{-# INLINE jsNull #-}
5654
5755{- | If a synchronous thread tries to do something that can only
5856 be done asynchronously, and the thread is set up to not
jsaddle/src-ghc/GHCJS/Types.hs+3−5
@@ -27,21 +27,19 @@ import GHC.Int
2727import GHC.Types
2828import GHC.Prim
2929import GHC.Ptr
30−import GHC.IORef
31−import GHC.IO.Unsafe (unsafePerformIO)
3230
3331import Control.DeepSeq
3432import Unsafe.Coerce
3533
36−type Ref# = IORef Int64
34+type Ref# = Int64
3735
3836mkRef :: Ref# -> JSVal
3937mkRef = JSVal
4038{-# INLINE mkRef #-}
4139
4240nullRef :: JSVal
43−nullRef = JSVal . unsafePerformIO $ newIORef 0
44−{-# NOINLINE nullRef #-}
41+nullRef = JSVal 0
42+{-# INLINE nullRef #-}
4543
4644--toPtr :: JSVal -> Ptr a
4745--toPtr (JSVal x) = unsafeCoerce (Ptr' x 0#)
jsaddle/src-ghc/JavaScript/Array.hs+2−2
@@ -48,7 +48,7 @@ import Language.Javascript.JSaddle.Types
4848 (JSM, JSVal, SomeJSArray(..), JSArray,
4949 MutableJSArray, GHCJSPure(..))
5050import Control.Lens.Operators ((^.))
51−import Language.Javascript.JSaddle.Object (js2, js0, (<##), js1, js)
51+import Language.Javascript.JSaddle.Object (js2, js0, (##), js1, js)
5252import Language.Javascript.JSaddle.Value (valToNumber)
5353import JavaScript.Array.Internal (create, fromList, fromListIO, toList, toListIO, index, read, push)
5454
@@ -69,7 +69,7 @@ append (SomeJSArray x) (SomeJSArray y) = SomeJSArray <$> x ^. js1 "concat" y
6969{-# INLINE append #-}
7070
7171write :: Int -> JSVal -> MutableJSArray -> JSM ()
72−write n e (SomeJSArray x) = void $ (x <## n) e
72+write n e (SomeJSArray x) = void $ (x ## n) e
7373{-# INLINE write #-}
7474
7575pop :: MutableJSArray -> JSM JSVal
jsaddle/src/Language/Javascript/JSaddle.hs+5−5
@@ -9,7 +9,7 @@
99-- | This package provides an EDSL for calling JavaScript that
1010-- can be used both from GHCJS and GHC. When using GHC
1111-- the application is run using Warp and WebSockets to
12−-- drive a small JavaScript helper.
12+-- drive a small JavaScipt helper.
1313-----------------------------------------------------------------------------
1414
1515module Language.Javascript.JSaddle (
@@ -35,10 +35,10 @@ module Language.Javascript.JSaddle (
3535 --
3636 -- Where it makes sense code examples are given in two forms. One
3737 -- that uses 'eval' to run a purely JavaScript version and one that
38− -- uses more of the JSaddle EDSL feature being demonstrated.
38+ -- uses more of the JSaddle EDSL feature being demonstated.
3939
4040 -- * Calling Haskell from JavaScript
41− -- | You can call back into Haskell from JavaScript using 'fun' to
41+ -- | You can call back into haskell from JavaScript using 'fun' to
4242 -- convert a Haskell function in the JSM monad into a javascript
4343 -- value.
4444
@@ -52,8 +52,8 @@ module Language.Javascript.JSaddle (
5252 -- and the server will run the Haskell code. The JSaddle parts will
5353 -- be executed by sending commands back to the browser.
5454
55− -- Although the JavaScript code is executed in the strict order
56− -- set out by the EDSL it is done asynchronously to the Haskell code.
55+ -- Although the code JavaScript code is executed in the the strict order
56+ -- set out by the EDSL it done asynchonously to the Haskell code.
5757 -- This improves the performance by reducing the number of round trips
5858 -- needed between the Haskell and JavaScript code.
5959
jsaddle/src/Language/Javascript/JSaddle/Debug.hsdeleted−48
@@ -1,48 +0,0 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−-----------------------------------------------------------------------------
4−--
5−-- Module : Language.Javascript.JSaddle.WebSockets
6−-- Copyright : (c) Hamish Mackenzie
7−-- License : MIT
8−--
9−-- Maintainer : Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
10−--
11−-- |
12−--
13−-----------------------------------------------------------------------------
14−
15−module Language.Javascript.JSaddle.Debug (
16− contexts
17− , addContext
18− , removeContext
19− , runOnAll
20− , runOnAll_
21−) where
22−
23−import Language.Javascript.JSaddle
24− (runJSM, askJSM, JSM, JSContextRef(..))
25−import Data.IORef (readIORef, atomicModifyIORef', newIORef, IORef)
26−import System.IO.Unsafe (unsafePerformIO)
27−import Data.Monoid ((<>))
28−import Control.Monad.IO.Class (MonadIO(..))
29−import Data.Int (Int64)
30−
31−contexts :: IORef [JSContextRef]
32−contexts = unsafePerformIO $ newIORef []
33−{-# NOINLINE contexts #-}
34−
35−addContext :: JSM ()
36−addContext = do
37− ctx <- askJSM
38− liftIO $ atomicModifyIORef' contexts $ \c -> (c <> [ctx], ())
39−
40−removeContext :: MonadIO m => Int64 -> m ()
41−removeContext cid =
42− liftIO $ atomicModifyIORef' contexts $ \c -> (filter ((/= cid) . contextId) c, ())
43−
44−runOnAll :: MonadIO m => JSM a -> m [a]
45−runOnAll f = liftIO (readIORef contexts) >>= mapM (runJSM f)
46−
47−runOnAll_ :: MonadIO m => JSM a -> m ()
48−runOnAll_ f = liftIO (readIORef contexts) >>= mapM_ (runJSM f)
jsaddle/src/Language/Javascript/JSaddle/Evaluate.hs+1−1
@@ -50,7 +50,7 @@ eval :: (ToJSString script)
5050 -> JSM JSVal
5151#ifdef ghcjs_HOST_OS
5252eval script = liftIO $ js_eval (toJSString script)
53−foreign import javascript safe "$r = eval($1);"
53+foreign import javascript unsafe "$r = eval($1);"
5454 js_eval :: JSString -> IO JSVal
5555#else
5656eval = evaluateScript . toJSString
jsaddle/src/Language/Javascript/JSaddle/Monad.hs+26−3
@@ -38,12 +38,13 @@ module Language.Javascript.JSaddle.Monad (
3838 , bracket
3939) where
4040
41+import Prelude hiding (read)
4142#ifndef ghcjs_HOST_OS
42−import Control.Monad.Trans.Reader (runReaderT, ask)
43+import Control.Monad.Trans.Reader (runReaderT, ask, ReaderT(..))
4344#endif
4445import Control.Monad.IO.Class (MonadIO(..))
45−import Control.Monad.Catch (catch, bracket)
46−import Language.Javascript.JSaddle.Types (JSM(..), MonadJSM, liftJSM, JSContextRef)
46+import qualified Control.Exception as E (Exception, catch, bracket)
47+import Language.Javascript.JSaddle.Types (JSM(..), MonadJSM, liftJSM, JSContextRef(..))
4748import Language.Javascript.JSaddle.Run (syncPoint, syncAfter, waitForAnimationFrame, nextAnimationFrame)
4849
4950-- | Gets the JavaScript context from the monad
@@ -65,3 +66,25 @@ runJSM f = liftIO . runReaderT (unJSM f)
6566-- | Alternative version of 'runJSM'
6667runJSaddle :: MonadIO m => JSContextRef -> JSM a -> m a
6768runJSaddle = flip runJSM
69+
70+
71+-- | Wrapped version of 'E.catch' that runs in a MonadIO that works
72+-- a bit better with 'JSM'
73+catch :: E.Exception e
74+ => JSM b
75+ -> (e -> JSM b)
76+ -> JSM b
77+t `catch` c = do
78+ r <- askJSM
79+ liftIO (runJSM (syncAfter t) r `E.catch` \e -> runJSM (c e) r)
80+
81+-- | Wrapped version of 'E.bracket' that runs in a MonadIO that works
82+-- a bit better with 'JSM'
83+bracket :: JSM a -> (a -> JSM b) -> (a -> JSM c) -> JSM c
84+bracket aquire release f = do
85+ r <- askJSM
86+ liftIO $ E.bracket
87+ (runJSM (syncAfter aquire) r)
88+ (\x -> runJSM (syncAfter $ release x) r)
89+ (\x -> runJSM (syncAfter $ f x) r)
90+
jsaddle/src/Language/Javascript/JSaddle/Native/Internal.hs+25−40
@@ -1,6 +1,3 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE MagicHash #-}
3−{-# LANGUAGE UnboxedTuples #-}
41-----------------------------------------------------------------------------
52--
63-- Module : Language.Javascript.JSaddle.Native
@@ -48,6 +45,7 @@ module Language.Javascript.JSaddle.Native.Internal (
4845) where
4946
5047import Control.Monad.IO.Class (MonadIO(..))
48+import Control.Monad.Primitive (touch)
5149
5250import Data.Aeson (Value)
5351
@@ -59,34 +57,30 @@ import Language.Javascript.JSaddle.Monad (askJSM)
5957import Language.Javascript.JSaddle.Run
6058 (Command(..), Result(..), sendCommand,
6159 sendAsyncCommand, sendLazyCommand, wrapJSVal)
62−import GHC.IORef (IORef(..), readIORef)
63−import GHC.STRef (STRef(..))
64−import GHC.IO (IO(..))
65−import GHC.Base (touch#)
6660
6761wrapJSString :: MonadIO m => JSStringReceived -> m JSString
6862wrapJSString (JSStringReceived ref) = return $ JSString ref
6963
70−touchIORef :: IORef a -> IO ()
71−touchIORef (IORef (STRef r#)) = IO $ \s -> case touch# r# s of s' -> (# s', () #)
72−
7364withJSVal :: MonadIO m => JSVal -> (JSValueForSend -> m a) -> m a
74−withJSVal (JSVal ref) f = do
75− result <- (f . JSValueForSend) =<< liftIO (readIORef ref)
76− liftIO $ touchIORef ref
65+withJSVal v@(JSVal ref) f =
66+ do result <- f (JSValueForSend ref)
67+ liftIO $ touch v
7768 return result
7869
7970withJSVals :: MonadIO m => [JSVal] -> ([JSValueForSend] -> m a) -> m a
8071withJSVals v f =
81− do result <- f =<< mapM (\(JSVal ref) -> liftIO $ JSValueForSend <$> readIORef ref) v
82− liftIO $ mapM_ (\(JSVal ref) -> touchIORef ref) v
72+ do result <- f (map (\(JSVal ref) -> JSValueForSend ref) v)
73+ liftIO $ mapM_ touch v
8374 return result
8475
8576withObject :: MonadIO m => Object -> (JSObjectForSend -> m a) -> m a
8677withObject (Object o) f = withJSVal o (f . JSObjectForSend)
8778
8879withJSString :: MonadIO m => JSString -> (JSStringForSend -> m a) -> m a
89−withJSString (JSString ref) f = f (JSStringForSend ref)
80+withJSString v@(JSString ref) f =
81+ do result <- f (JSStringForSend ref)
82+ liftIO $ touch v
83+ return result
9084
9185setPropertyByName :: JSString -> JSVal -> Object -> JSM ()
9286setPropertyByName name val this =
@@ -172,14 +166,13 @@ deRefVal value = withJSVal value $ sendCommand . DeRefVal
172166{-# INLINE deRefVal #-}
173167
174168valueToBool :: JSVal -> JSM Bool
175−valueToBool v@(JSVal ref) = liftIO (readIORef ref) >>= \case
176− 0 -> return False -- null
177− 1 -> return False -- undefined
178− 2 -> return False -- false
179− 3 -> return True -- true
180− _ -> withJSVal v $ \rval -> do
181− ~(ValueToBoolResult result) <- sendCommand (ValueToBool rval)
182− return result
169+valueToBool (JSVal 0) = return False -- null
170+valueToBool (JSVal 1) = return False -- undefined
171+valueToBool (JSVal 2) = return False -- false
172+valueToBool (JSVal 3) = return True -- true
173+valueToBool v = withJSVal v $ \rval -> do
174+ ~(ValueToBoolResult result) <- sendCommand (ValueToBool rval)
175+ return result
183176{-# INLINE valueToBool #-}
184177
185178valueToNumber :: JSVal -> JSM Double
@@ -208,25 +201,17 @@ valueToJSONValue value = withJSVal value $ \rval -> do
208201{-# INLINE valueToJSONValue #-}
209202
210203isNull :: JSVal -> JSM Bool
211−isNull v@(JSVal ref) = liftIO (readIORef ref) >>= \case
212− 0 -> return True -- null
213− 1 -> return False -- undefined
214− 2 -> return False -- false
215− 3 -> return False -- true
216− _ -> withJSVal v $ \rval -> do
217− ~(IsNullResult result) <- sendCommand $ IsNull rval
218− return result
204+isNull (JSVal 0) = return True
205+isNull v = withJSVal v $ \rval -> do
206+ ~(IsNullResult result) <- sendCommand $ IsNull rval
207+ return result
219208{-# INLINE isNull #-}
220209
221210isUndefined :: JSVal -> JSM Bool
222−isUndefined v@(JSVal ref) = liftIO (readIORef ref) >>= \case
223− 0 -> return False -- null
224− 1 -> return True -- undefined
225− 2 -> return False -- false
226− 3 -> return False -- true
227− _ -> withJSVal v $ \rval -> do
228− ~(IsUndefinedResult result) <- sendCommand $ IsUndefined rval
229− return result
211+isUndefined (JSVal 1) = return True
212+isUndefined v = withJSVal v $ \rval -> do
213+ ~(IsUndefinedResult result) <- sendCommand $ IsUndefined rval
214+ return result
230215{-# INLINE isUndefined #-}
231216
232217strictEqual :: JSVal -> JSVal -> JSM Bool
jsaddle/src/Language/Javascript/JSaddle/Null.hsdeleted−56
@@ -1,56 +0,0 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−-----------------------------------------------------------------------------
4−--
5−-- Module : Language.Javascript.JSaddle.WebSockets
6−-- Copyright : (c) Hamish Mackenzie
7−-- License : MIT
8−--
9−-- Maintainer : Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
10−--
11−-- |
12−--
13−-----------------------------------------------------------------------------
14−
15−module Language.Javascript.JSaddle.Null (
16− run
17−) where
18−
19−import Language.Javascript.JSaddle.Types
20− (BatchResults(..), JSM, JSStringReceived(..), Batch(..),
21− Results(..), Result(..), Command(..))
22−import Control.Concurrent.Chan (readChan, writeChan, newChan)
23−import Language.Javascript.JSaddle.Run (runJavaScript)
24−import Control.Concurrent (forkIO)
25−import Control.Monad (forever)
26−import Data.Aeson (Value(..))
27−import Data.Maybe (mapMaybe)
28−
29−-- | This is for performance testing JSaddle code that does not need to
30−-- to read anything back from the JavaScript context.
31−-- Anthing that does try to read will get JS null, 0 or "" back (depending
32−-- on how the value is read).
33−run :: JSM () -> IO ()
34−run f = do
35− batches <- newChan
36− (processResult, _processSyncResult, start) <- runJavaScript (writeChan batches) f
37− _ <- forkIO $ forever $
38− readChan batches >>= \case
39− Batch commands _ batchNumber ->
40− processResult $ BatchResults batchNumber . Success [] $ mapMaybe (\case
41− Left _ -> Nothing
42− Right command -> Just $
43− case command of
44− DeRefVal _ -> DeRefValResult 0 ""
45− ValueToBool _ -> ValueToBoolResult False
46− ValueToNumber _ -> ValueToNumberResult 0
47− ValueToString _ -> ValueToStringResult (JSStringReceived "")
48− ValueToJSON _ -> ValueToJSONResult (JSStringReceived "null")
49− ValueToJSONValue _ -> ValueToJSONValueResult Null
50− IsNull _ -> IsNullResult True
51− IsUndefined _ -> IsUndefinedResult False
52− StrictEqual _ _ -> StrictEqualResult False
53− InstanceOf _ _ -> InstanceOfResult False
54− PropertyNames _ -> PropertyNamesResult []
55− Sync -> SyncResult) commands
56− start
jsaddle/src/Language/Javascript/JSaddle/Object.hs+13−22
@@ -119,10 +119,9 @@ import Language.Javascript.JSaddle.Native
119119 (newAsyncCallback, newSyncCallback, callAsFunction, callAsConstructor)
120120import Language.Javascript.JSaddle.Monad (askJSM, JSM)
121121import Language.Javascript.JSaddle.Types
122− (JSValueForSend(..), AsyncCommand(..), JSString, Object(..),
123− SomeJSArray(..), JSVal(..), JSCallAsFunction, JSContextRef(..))
122+ (JSString, Object(..), SomeJSArray(..),
123+ JSVal(..), JSCallAsFunction, JSContextRef(..))
124124import JavaScript.Object.Internal (create, listProps)
125−import Language.Javascript.JSaddle.Run (sendAsyncCommand)
126125#endif
127126import JavaScript.Array.Internal (fromListIO)
128127import Language.Javascript.JSaddle.Value (valToObject)
@@ -132,8 +131,6 @@ import Language.Javascript.JSaddle.Arguments (MakeArgs(..))
132131import Control.Monad.IO.Class (MonadIO(..))
133132import Language.Javascript.JSaddle.Properties
134133import Control.Lens (IndexPreservingGetter, to)
135−import Data.IORef (newIORef, readIORef)
136−import System.IO.Unsafe (unsafePerformIO)
137134
138135-- $setup
139136-- >>> import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar)
@@ -484,16 +481,9 @@ freeFunction :: Function -> JSM ()
484481freeFunction (Function callback _) = liftIO $
485482 releaseCallback callback
486483#else
487−freeFunction (Function (Object (JSVal objectRef))) = do
488− -- By now the callback should ideally have been removed from whatever
489− -- events it was added to.
490− -- In case a call to the callback is still pending (perhaps just being sent
491− -- on the JS side) we use FreeCallback to queue the callback to be freed when
492− -- the next batch of results comes back fro JS.
493− -- We are not using withJSVal to keep JS value "alive" because FreeCallback
494− -- does not use the it.
495− n <- liftIO $ readIORef objectRef
496− sendAsyncCommand (FreeCallback (JSValueForSend n))
484+freeFunction (Function object) = do
485+ free <- freeCallback <$> askJSM
486+ liftIO $ free object
497487#endif
498488
499489instance ToJSVal Function where
@@ -526,12 +516,13 @@ array args = do
526516 Object . coerce <$> fromListIO rargs
527517
528518-- | JavaScript's global object
519+global :: Object
529520#ifdef ghcjs_HOST_OS
530−foreign import javascript unsafe "$r = globalThis"
531− global :: Object
521+global = js_window
522+foreign import javascript unsafe "$r = window"
523+ js_window :: Object
532524#else
533−global :: Object
534−global = Object . JSVal . unsafePerformIO $ newIORef 4
525+global = Object (JSVal 4)
535526#endif
536527
537528-- | Get a list containing the property names present on a given object
@@ -556,7 +547,7 @@ objCallAsFunction :: MakeArgs args
556547objCallAsFunction f this args = do
557548 rargs <- makeArgs args >>= liftIO . Array.fromListIO
558549 liftIO $ js_apply f this rargs
559−foreign import javascript safe "$r = $1.apply($2, $3)"
550+foreign import javascript unsafe "$r = $1.apply($2, $3)"
560551 js_apply :: Object -> Object -> MutableJSArray -> IO JSVal
561552#else
562553objCallAsFunction f this args = do
@@ -576,7 +567,7 @@ objCallAsConstructor :: MakeArgs args
576567objCallAsConstructor f args = do
577568 rargs <- makeArgs args >>= liftIO . Array.fromListIO
578569 liftIO $ js_new f rargs
579−foreign import javascript safe "\
570+foreign import javascript unsafe "\
580571 switch($2.length) {\
581572 case 0 : $r = new $1(); break;\
582573 case 1 : $r = new $1($2[0]); break;\
@@ -612,5 +603,5 @@ nullObject :: Object
612603#ifdef ghcjs_HOST_OS
613604nullObject = Object nullRef
614605#else
615−nullObject = Object . JSVal . unsafePerformIO $ newIORef 0
606+nullObject = Object (JSVal 0)
616607#endif
jsaddle/src/Language/Javascript/JSaddle/Run.hs+74−116
@@ -1,9 +1,6 @@
1−{-# LANGUAGE BangPatterns #-}
21{-# LANGUAGE CPP #-}
32{-# LANGUAGE LambdaCase #-}
43{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE MagicHash #-}
6−{-# LANGUAGE UnboxedTuples #-}
74-----------------------------------------------------------------------------
85--
96-- Module : Language.Javascript.JSaddle.Run
@@ -37,59 +34,43 @@ module Language.Javascript.JSaddle.Run (
3734) where
3835
3936#ifdef ghcjs_HOST_OS
40−import Language.Javascript.JSaddle.Types (JSM, syncPoint, syncAfter)
37+import Language.Javascript.JSaddle.Types (JSM)
4138import qualified JavaScript.Web.AnimationFrame as GHCJS
4239 (waitForAnimationFrame)
4340#else
44−import Control.Exception (throwIO, evaluate)
45−import Control.Monad (void, when, zipWithM_)
41+import Control.Exception (throwIO)
42+import Control.Monad (void, when, forever, zipWithM_)
4643import Control.Monad.IO.Class (MonadIO(..))
4744import Control.Monad.Trans.Reader (ask, runReaderT)
4845import Control.Monad.STM (atomically)
49−import Control.Concurrent (forkIO, myThreadId)
46+import Control.Concurrent (forkIO)
5047import Control.Concurrent.STM.TChan
5148 (tryReadTChan, TChan, readTChan, writeTChan, newTChanIO)
5249import Control.Concurrent.STM.TVar
5350 (writeTVar, readTVar, readTVarIO, modifyTVar', newTVarIO)
5451import Control.Concurrent.MVar
55− (tryTakeMVar, MVar, putMVar, takeMVar, newMVar, newEmptyMVar, readMVar, modifyMVar)
52+ (tryTakeMVar, MVar, putMVar, takeMVar, newEmptyMVar, readMVar)
5653
5754import System.IO.Unsafe (unsafeInterleaveIO)
5855import System.Mem.Weak (addFinalizer)
59−import System.Random
6056
61−import GHC.Base (IO(..), mkWeak#)
62−import GHC.Conc (ThreadId(..))
6357import Data.Monoid ((<>))
64−import qualified Data.Text as T (unpack, pack)
58+import qualified Data.Text as T (unpack)
6559import qualified Data.Map as M (lookup, delete, insert, empty, size)
66−import qualified Data.Set as S (empty, member, insert, delete)
6760import Data.Time.Clock (getCurrentTime,diffUTCTime)
68−import Data.IORef
69− (mkWeakIORef, newIORef, atomicWriteIORef, readIORef)
61+import Data.IORef (newIORef, atomicWriteIORef, readIORef)
7062
7163import Language.Javascript.JSaddle.Types
7264 (Command(..), AsyncCommand(..), Result(..), BatchResults(..), Results(..), JSContextRef(..), JSVal(..),
73− Object(..), JSValueReceived(..), JSM(..), Batch(..), JSValueForSend(..), syncPoint, syncAfter, sendCommand)
65+ Object(..), JSValueReceived(..), JSM(..), Batch(..), JSValueForSend(..))
7466import Language.Javascript.JSaddle.Exception (JSException(..))
75−import Control.DeepSeq (force, deepseq)
76−#if MIN_VERSION_base(4,11,0)
77−import GHC.Stats (getRTSStatsEnabled, getRTSStats, RTSStats(..), gcdetails_live_bytes, gc)
78−#else
67+-- import Language.Javascript.JSaddle.Native.Internal (wrapJSVal)
68+import Control.DeepSeq (deepseq)
7969import GHC.Stats (getGCStatsEnabled, getGCStats, GCStats(..))
80−#endif
70+import Data.Maybe (isJust)
8171import Data.Foldable (forM_)
8272#endif
8373
84−#ifndef ghcjs_HOST_OS
85−#if MIN_VERSION_base(4,11,0)
86−currentBytesUsed = gcdetails_live_bytes . gc
87−#else
88−getRTSStatsEnabled = getGCStatsEnabled
89−getRTSStats = getGCStats
90−#endif
91−#endif
92−
9374-- | Enable (or disable) JSaddle logging
9475enableLogging :: Bool -> JSM ()
9576#ifdef ghcjs_HOST_OS
@@ -100,6 +81,27 @@ enableLogging v = do
10081 liftIO $ f v
10182#endif
10283
84+-- | Forces execution of pending asyncronous code
85+syncPoint :: JSM ()
86+#ifdef ghcjs_HOST_OS
87+syncPoint = return ()
88+#else
89+syncPoint = do
90+ SyncResult <- sendCommand Sync
91+ return ()
92+#endif
93+
94+-- | Forces execution of pending asyncronous code after performing `f`
95+syncAfter :: JSM a -> JSM a
96+#ifdef ghcjs_HOST_OS
97+syncAfter = id
98+#else
99+syncAfter f = do
100+ result <- f
101+ syncPoint
102+ return result
103+#endif
104+
103105-- | On GHCJS this is 'JavaScript.Web.AnimationFrame.waitForAnimationFrame'.
104106-- On GHC it will delay the execution of the current batch of asynchronous
105107-- command when they are sent to JavaScript. It will not delay the Haskell
@@ -125,12 +127,17 @@ nextAnimationFrame f = do
125127 syncAfter (f t)
126128
127129#ifndef ghcjs_HOST_OS
130+sendCommand :: Command -> JSM Result
131+sendCommand cmd = do
132+ s <- doSendCommand <$> JSM ask
133+ liftIO $ s cmd
134+
128135sendLazyCommand :: (JSValueForSend -> AsyncCommand) -> JSM JSVal
129136sendLazyCommand cmd = do
130137 nextRefTVar <- nextRef <$> JSM ask
131138 n <- liftIO . atomically $ do
132139 n <- subtract 1 <$> readTVar nextRefTVar
133− writeTVar nextRefTVar $! n
140+ writeTVar nextRefTVar n
134141 return n
135142 s <- doSendAsyncCommand <$> JSM ask
136143 liftIO $ s (cmd $ JSValueForSend n)
@@ -143,45 +150,34 @@ sendAsyncCommand cmd = do
143150
144151runJavaScript :: (Batch -> IO ()) -> JSM () -> IO (Results -> IO (), Results -> IO Batch, IO ())
145152runJavaScript sendBatch entryPoint = do
146− contextId' <- randomIO
147153 startTime' <- getCurrentTime
148154 recvMVar <- newEmptyMVar
149155 lastAsyncBatch <- newEmptyMVar
150156 commandChan <- newTChanIO
151157 callbacks <- newTVarIO M.empty
152158 nextRef' <- newTVarIO 0
153− finalizerThreads' <- newMVar S.empty
154− animationFrameHandlers' <- newMVar []
155159 loggingEnabled <- newIORef False
156− liveRefs' <- newMVar S.empty
157160 let ctx = JSContextRef {
158− contextId = contextId'
159− , startTime = startTime'
160− , doSendCommand = \cmd -> cmd `deepseq` do
161− result <- newEmptyMVar
162− atomically $ writeTChan commandChan (Right (cmd, result))
163− unsafeInterleaveIO $
164− takeMVar result >>= \case
165− (ThrowJSValue v) -> do
166− jsval <- wrapJSVal' ctx v
167− throwIO $ JSException jsval
168− r -> return r
169− , doSendAsyncCommand = \cmd -> cmd `deepseq` atomically (writeTChan commandChan $ Left cmd)
170− , addCallback = \(Object (JSVal ioref)) cb -> do
171− val <- readIORef ioref
172− atomically $ modifyTVar' callbacks (M.insert val cb)
173− , nextRef = nextRef'
174− , doEnableLogging = atomicWriteIORef loggingEnabled
175− , finalizerThreads = finalizerThreads'
176− , animationFrameHandlers = animationFrameHandlers'
177− , liveRefs = liveRefs'
178− }
179− processResults :: Bool -> Results -> IO ()
161+ startTime = startTime'
162+ , doSendCommand = \cmd -> cmd `deepseq` do
163+ result <- newEmptyMVar
164+ atomically $ writeTChan commandChan (Right (cmd, result))
165+ unsafeInterleaveIO $
166+ takeMVar result >>= \case
167+ (ThrowJSValue (JSValueReceived v)) -> throwIO $ JSException (JSVal v)
168+ r -> return r
169+ , doSendAsyncCommand = \cmd -> cmd `deepseq` atomically (writeTChan commandChan $ Left cmd)
170+ , addCallback = \(Object (JSVal val)) cb -> atomically $ modifyTVar' callbacks (M.insert val cb)
171+ , freeCallback = \(Object (JSVal val)) -> atomically $ modifyTVar' callbacks (M.delete val)
172+ , nextRef = nextRef'
173+ , doEnableLogging = atomicWriteIORef loggingEnabled
174+ }
175+ let processResults :: Bool -> Results -> IO ()
180176 processResults syncCallbacks = \case
181177 (ProtocolError err) -> error $ "Protocol error : " <> T.unpack err
182− (Callback n br (JSValueReceived fNumber) f this a) -> do
178+ (Callback n br f this a) -> do
183179 putMVar recvMVar (n, br)
184− f' <- runReaderT (unJSM $ wrapJSVal f) ctx
180+ f'@(JSVal fNumber) <- runReaderT (unJSM $ wrapJSVal f) ctx
185181 this' <- runReaderT (unJSM $ wrapJSVal this) ctx
186182 args <- runReaderT (unJSM $ mapM wrapJSVal a) ctx
187183 logInfo (("Call " <> show fNumber <> " ") <>)
@@ -206,13 +202,13 @@ runJavaScript sendBatch entryPoint = do
206202 logInfo s =
207203 readIORef loggingEnabled >>= \case
208204 True -> do
209− currentBytesUsedStr <- getRTSStatsEnabled >>= \case
210− True -> show . currentBytesUsed <$> getRTSStats
205+ currentBytesUsedStr <- getGCStatsEnabled >>= \case
206+ True -> show . currentBytesUsed <$> getGCStats
211207 False -> return "??"
212208 cbCount <- M.size <$> readTVarIO callbacks
213− putStrLn . s $ "M " <> currentBytesUsedStr <> " CB " <> show cbCount <> " "
209+ putStrLn . s $ "M " <> currentBytesUsedStr <> "CB " <> show cbCount
214210 False -> return ()
215− _ <- forkIO . numberForeverFromM_ 1 $ \nBatch ->
211+ _ <- forkIO . forM_ [1..] $ \nBatch ->
216212 readBatch nBatch commandChan >>= \case
217213 (batch@(Batch cmds _ _), resultMVars) -> do
218214 logInfo (\x -> "Sync " <> x <> show (length cmds, last cmds))
@@ -220,27 +216,16 @@ runJavaScript sendBatch entryPoint = do
220216 putMVar lastAsyncBatch batch
221217 sendBatch batch
222218 takeResult recvMVar nBatch >>= \case
223− (n, _) | n /= nBatch -> error $ "Unexpected jsaddle results (expected batch " <> show nBatch <> ", got batch " <> show n <> ")"
224− (_, Success callbacksToFree results)
225− | length results /= length resultMVars -> error "Unexpected number of jsaddle results"
226− | otherwise -> do
227− zipWithM_ putMVar resultMVars results
228− forM_ callbacksToFree $ \(JSValueReceived val) ->
229− atomically (modifyTVar' callbacks (M.delete val))
230− (_, Failure callbacksToFree results exception err) -> do
231− -- The exception will only be rethrown in Haskell if/when one of the
232− -- missing results (if any) is evaluated.
233− putStrLn "A JavaScript exception was thrown! (may not reach Haskell code)"
234− putStrLn err
235− zipWithM_ putMVar resultMVars $ results <> repeat (ThrowJSValue exception)
236− forM_ callbacksToFree $ \(JSValueReceived val) ->
237− atomically (modifyTVar' callbacks (M.delete val))
219+ (n, _) | n /= nBatch -> error $ "Unexpected jsaddle results (expected batch " <> show nBatch <> ", got batch " <> show n <> ")"
220+ (_, Success results) | length results /= length resultMVars -> error "Unexpected number of jsaddle results"
221+ | otherwise -> zipWithM_ putMVar resultMVars results
222+ (_, Failure results exception) -> do
223+ -- The exception will only be rethrown in Haskell if/when one of the
224+ -- missing results (if any) is evaluated.
225+ putStrLn "A JavaScript exception was thrown! (may not reach Haskell code)"
226+ zipWithM_ putMVar resultMVars $ results <> repeat (ThrowJSValue exception)
238227 return (asyncResults, syncResults, runReaderT (unJSM entryPoint) ctx)
239228 where
240− numberForeverFromM_ :: (Monad m, Enum n) => n -> (n -> m a) -> m ()
241− numberForeverFromM_ !n f = do
242− _ <- f n
243− numberForeverFromM_ (succ n) f
244229 takeResult recvMVar nBatch =
245230 takeMVar recvMVar >>= \case
246231 (n, _) | n < nBatch -> takeResult recvMVar nBatch
@@ -273,39 +258,12 @@ runJavaScript sendBatch entryPoint = do
273258 loopAnimation (Left asyncCmd) (cmds, resultMVars) =
274259 atomically (readTChan chan) >>= \cmd -> loopAnimation cmd (Left asyncCmd:cmds, resultMVars)
275260
276−addThreadFinalizer :: ThreadId -> IO () -> IO ()
277−addThreadFinalizer t@(ThreadId t#) (IO finalizer) =
278− IO $ \s -> case mkWeak# t# t finalizer s of { (# s1, _ #) -> (# s1, () #) }
279−
280−
281261wrapJSVal :: JSValueReceived -> JSM JSVal
282−wrapJSVal v = do
283− ctx <- JSM ask
284− liftIO $ wrapJSVal' ctx v
285−
286−wrapJSVal' :: JSContextRef -> JSValueReceived -> IO JSVal
287−wrapJSVal' ctx (JSValueReceived n) = do
288− ref <- liftIO $ newIORef n
289− when (n >= 5 || n < 0) $
290−#ifdef JSADDLE_CHECK_WRAPJSVAL
291− do lr <- takeMVar $ liveRefs ctx
292− if n `S.member` lr
293− then do
294− putStrLn $ "JS Value Ref " <> show n <> " already wrapped"
295− putMVar (liveRefs ctx) lr
296− else putMVar (liveRefs ctx) =<< evaluate (S.insert n lr)
297−#endif
298− void . mkWeakIORef ref $ do
299− ft <- takeMVar $ finalizerThreads ctx
300− t <- myThreadId
301− let tname = T.pack $ show t
302− doSendAsyncCommand ctx $ FreeRef tname $ JSValueForSend n
303− if tname `S.member` ft
304− then putMVar (finalizerThreads ctx) ft
305− else do
306− addThreadFinalizer t $ do
307− modifyMVar (finalizerThreads ctx) $ \s -> return (S.delete tname s, ())
308− doSendAsyncCommand ctx $ FreeRefs tname
309− putMVar (finalizerThreads ctx) =<< evaluate (S.insert tname ft)
310− return (JSVal ref)
262+wrapJSVal (JSValueReceived ref) = do
263+ -- TODO make sure this ref has not already been wrapped (perhaps only in debug version)
264+ let result = JSVal ref
265+ when (ref >= 5) $ do
266+ ctx <- JSM ask
267+ liftIO . addFinalizer result $ doSendAsyncCommand ctx $ FreeRef $ JSValueForSend ref
268+ return result
311269#endif
jsaddle/src/Language/Javascript/JSaddle/Run/Files.hs+56−56
@@ -13,6 +13,7 @@
1313
1414module Language.Javascript.JSaddle.Run.Files (
1515 indexHtml
16+ , jsaddleJs
1617 , initState
1718 , runBatch
1819 , ghcjsHelpers
@@ -30,23 +31,21 @@ indexHtml =
3031 \</head>\n\
3132 \<body>\n\
3233 \</body>\n\
33− \<script src=\"/jsaddle.js\"></script>\n\
34+ \<script src=\"jsaddle.js\"></script>\n\
3435 \</html>"
3536
3637initState :: ByteString
3738initState = "\
3839 \ var jsaddle_values = new Map();\n\
39− \ var jsaddle_free = new Map();\n\
4040 \ jsaddle_values.set(0, null);\n\
4141 \ jsaddle_values.set(1, undefined);\n\
4242 \ jsaddle_values.set(2, false);\n\
4343 \ jsaddle_values.set(3, true);\n\
44− \ jsaddle_values.set(4, globalThis);\n\
44+ \ jsaddle_values.set(4, window);\n\
4545 \ var jsaddle_index = 100;\n\
4646 \ var expectedBatch = 1;\n\
47− \ var lastResults = [0, {\"tag\": \"Success\", \"contents\": [[], []]}];\n\
47+ \ var lastResults = [0, {}];\n\
4848 \ var inCallback = 0;\n\
49− \ var asyncBatch = null;\n\
5049 \"
5150
5251runBatch :: (ByteString -> ByteString) -> Maybe (ByteString -> ByteString) -> ByteString
@@ -54,7 +53,6 @@ runBatch send sendSync = "\
5453 \ var runBatch = function(firstBatch, initialSyncDepth) {\n\
5554 \ var processBatch = function(timestamp) {\n\
5655 \ var batch = firstBatch;\n\
57− \ var callbacksToFree = [];\n\
5856 \ var results = [];\n\
5957 \ inCallback++;\n\
6058 \ try {\n\
@@ -69,15 +67,7 @@ runBatch send sendSync = "\
6967 \ var d = cmd.Left;\n\
7068 \ switch (d.tag) {\n\
7169 \ case \"FreeRef\":\n\
72− \ var refsToFree = jsaddle_free.get(d.contents[0]) || [];\n\
73− \ refsToFree.push(d.contents[1]);\n\
74− \ jsaddle_free.set(d.contents[0], refsToFree);\n\
75− \ break;\n\
76− \ case \"FreeRefs\":\n\
77− \ var refsToFree = jsaddle_free.get(d.contents) || [];\n\
78− \ for(var nRef = 0; nRef != refsToFree.length; nRef++)\n\
79− \ jsaddle_values.delete(refsToFree[nRef]);\n\
80− \ jsaddle_free.delete(d.contents);\n\
70+ \ jsaddle_values.delete(d.contents);\n\
8171 \ break;\n\
8272 \ case \"SetPropertyByName\":\n\
8373 \ jsaddle_values.get(d.contents[0])[d.contents[1]]=jsaddle_values.get(d.contents[2]);\n\
@@ -93,10 +83,6 @@ runBatch send sendSync = "\
9383 \ var n = d.contents[1];\n\
9484 \ jsaddle_values.set(n, d.contents[0]);\n\
9585 \ break;\n\
96− \ case \"JSONValueToValue\":\n\
97− \ var n = d.contents[1];\n\
98− \ jsaddle_values.set(n, d.contents[0]);\n\
99− \ break;\n\
10086 \ case \"GetPropertyByName\":\n\
10187 \ var n = d.contents[2];\n\
10288 \ jsaddle_values.set(n, jsaddle_values.get(d.contents[0])[d.contents[1]]);\n\
@@ -116,9 +102,7 @@ runBatch send sendSync = "\
116102 \ case \"NewAsyncCallback\":\n\
117103 \ (function() {\n\
118104 \ var nFunction = d.contents;\n\
119− \ var func = function() {\n\
120− \ var nFunctionInFunc = ++jsaddle_index;\n\
121− \ jsaddle_values.set(nFunctionInFunc, func);\n\
105+ \ jsaddle_values.set(nFunction, function() {\n\
122106 \ var nThis = ++jsaddle_index;\n\
123107 \ jsaddle_values.set(nThis, this);\n\
124108 \ var args = [];\n\
@@ -127,17 +111,13 @@ runBatch send sendSync = "\
127111 \ jsaddle_values.set(nArg, arguments[i]);\n\
128112 \ args[i] = nArg;\n\
129113 \ }\n\
130− \ " <> send "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nFunctionInFunc, nThis, args]}" <> "\n\
131− \ };\n\
132− \ jsaddle_values.set(nFunction, func);\n\
133− \ })();\n\
114+ \ " <> send "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nThis, args]}" <> "\n\
115+ \ })})();\n\
134116 \ break;\n\
135117 \ case \"NewSyncCallback\":\n\
136118 \ (function() {\n\
137119 \ var nFunction = d.contents;\n\
138− \ var func = function() {\n\
139− \ var nFunctionInFunc = ++jsaddle_index;\n\
140− \ jsaddle_values.set(nFunctionInFunc, func);\n\
120+ \ jsaddle_values.set(nFunction, function() {\n\
141121 \ var nThis = ++jsaddle_index;\n\
142122 \ jsaddle_values.set(nThis, this);\n\
143123 \ var args = [];\n\
@@ -149,19 +129,14 @@ runBatch send sendSync = "\
149129 case sendSync of
150130 Just s ->
151131 " if(inCallback > 0) {\n\
152− \ " <> send "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nFunctionInFunc, nThis, args]}" <> "\n\
132+ \ " <> send "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nThis, args]}" <> "\n\
153133 \ } else {\n\
154− \ runBatch(" <> s "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nFunctionInFunc, nThis, args]}" <> ", 1);\n\
134+ \ runBatch(" <> s "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nThis, args]}" <> ", 1);\n\
155135 \ }\n"
156136 Nothing ->
157− " " <> send "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nFunctionInFunc, nThis, args]}" <> "\n"
137+ " " <> send "{\"tag\": \"Callback\", \"contents\": [lastResults[0], lastResults[1], nFunction, nThis, args]}" <> "\n"
158138 ) <>
159− " };\n\
160− \ jsaddle_values.set(nFunction, func);\n\
161− \ })();\n\
162− \ break;\n\
163− \ case \"FreeCallback\":\n\
164− \ callbacksToFree.push(d.contents);\n\
139+ " })})();\n\
165140 \ break;\n\
166141 \ case \"CallAsFunction\":\n\
167142 \ var n = d.contents[3];\n\
@@ -204,7 +179,7 @@ runBatch send sendSync = "\
204179 \ jsaddle_values.set(n, d.contents[0].map(function(v){return jsaddle_values.get(v);}));\n\
205180 \ break;\n\
206181 \ case \"SyncWithAnimationFrame\":\n\
207− \ var n = d.contents;\n\
182+ \ var n = d.contents[0];\n\
208183 \ jsaddle_values.set(n, timestamp);\n\
209184 \ break;\n\
210185 \ case \"StartSyncBlock\":\n\
@@ -247,7 +222,7 @@ runBatch send sendSync = "\
247222 \ (v === true ) ? [3, \"\"] :\n\
248223 \ (typeof v === \"number\") ? [-1, v.toString()] :\n\
249224 \ (typeof v === \"string\") ? [-2, v]\n\
250− \ : [-3, \"\"];\n\
225+ \ : [n, \"\"];\n\
251226 \ results.push({\"tag\": \"DeRefValResult\", \"contents\": c});\n\
252227 \ break;\n\
253228 \ case \"IsNull\":\n\
@@ -276,18 +251,17 @@ runBatch send sendSync = "\
276251 \ }\n\
277252 \ }\n\
278253 \ if(syncDepth <= 0) {\n\
279− \ lastResults = [batch[2], {\"tag\": \"Success\", \"contents\": [callbacksToFree, results]}];\n\
254+ \ lastResults = [batch[2], {\"tag\": \"Success\", \"contents\": results}];\n\
280255 \ " <> send "{\"tag\": \"BatchResults\", \"contents\": [lastResults[0], lastResults[1]]}" <> "\n\
281256 \ break;\n\
282257 \ } else {\n" <> (
283258 case sendSync of
284259 Just s ->
285− " lastResults = [batch[2], {\"tag\": \"Success\", \"contents\": [callbacksToFree, results]}];\n\
260+ " lastResults = [batch[2], {\"tag\": \"Success\", \"contents\": results}];\n\
286261 \ batch = " <> s "{\"tag\": \"BatchResults\", \"contents\": [lastResults[0], lastResults[1]]}" <> ";\n\
287− \ results = [];\n\
288− \ callbacksToFree = [];\n"
262+ \ results = [];\n"
289263 Nothing ->
290− " " <> send "{\"tag\": \"BatchResults\", \"contents\": [batch[2], {\"tag\": \"Success\", \"contents\": [callbacksToFree, results]}]}" <> "\n\
264+ " " <> send "{\"tag\": \"BatchResults\", \"contents\": [batch[2], {\"tag\": \"Success\", \"contents\": results}]}" <> "\n\
291265 \ break;\n"
292266 ) <>
293267 " }\n\
@@ -302,8 +276,7 @@ runBatch send sendSync = "\
302276 \ } else {\n\
303277 \ batch = " <> s "{\"tag\": \"Duplicate\", \"contents\": [batch[2], expectedBatch]}" <> ";\n\
304278 \ }\n\
305− \ results = [];\n\
306− \ callbacksToFree = [];\n"
279+ \ results = [];\n"
307280 Nothing ->
308281 " " <> send "{\"tag\": \"Duplicate\", \"contents\": [batch[2], expectedBatch]}" <> "\n\
309282 \ break;\n"
@@ -315,15 +288,7 @@ runBatch send sendSync = "\
315288 \ catch (err) {\n\
316289 \ var n = ++jsaddle_index;\n\
317290 \ jsaddle_values.set(n, err);\n\
318− \ console.log(err);\n\
319− \ " <> send "{\"tag\": \"BatchResults\", \"contents\": [batch[2], {\"tag\": \"Failure\", \"contents\": [callbacksToFree, results, n, String(err)]}]}" <> "\n\
320− \ }\n\
321− \ if(inCallback == 1) {\n\
322− \ while(asyncBatch !== null) {\n\
323− \ var b = asyncBatch;\n\
324− \ asyncBatch = null;\n\
325− \ if(b[2] == expectedBatch) runBatch(b);\n\
326− \ }\n\
291+ \ " <> send "{\"tag\": \"BatchResults\", \"contents\": [batch[2], {\"tag\": \"Failure\", \"contents\": [results, n]}]}" <> "\n\
327292 \ }\n\
328293 \ inCallback--;\n\
329294 \ };\n\
@@ -337,6 +302,41 @@ runBatch send sendSync = "\
337302 \ runBatch(batch);\n\
338303 \"
339304
305+-- Use this to generate this string for embedding
306+-- sed -e 's|\\|\\\\|g' -e 's|^| \\|' -e 's|$|\\n\\|' -e 's|"|\\"|g' data/jsaddle.js | pbcopy
307+jsaddleJs :: ByteString
308+jsaddleJs = "\
309+ \if(typeof global !== \"undefined\") {\n\
310+ \ global.window = global;\n\
311+ \ global.WebSocket = require('ws');\n\
312+ \}\n\
313+ \\n\
314+ \var connect = function() {\n\
315+ \ var wsaddress =\n\
316+ \ typeof window.location === \"undefined\"\n\
317+ \ ? \"ws://localhost:3709/\"\n\
318+ \ : window.location.protocol.replace('http', 'ws')+\"//\"+window.location.hostname+(window.location.port?(\":\"+window.location.port):\"\");\n\
319+ \\n\
320+ \ var ws = new WebSocket(wsaddress);\n\
321+ \\n\
322+ \ ws.onopen = function(e) {\n\
323+ \ " <> initState <> "\
324+ \\n\
325+ \ ws.onmessage = function(e) {\n\
326+ \ var batch = JSON.parse(e.data);\n\
327+ \\n\
328+ \ " <> runBatch (\a -> "ws.send(JSON.stringify(" <> a <> "));") Nothing <> "\
329+ \ };\n\
330+ \ };\n\
331+ \ ws.onerror = function() {\n\
332+ \ setTimeout(connect, 1000);\n\
333+ \ };\n\
334+ \}\n\
335+ \\n\
336+ \ " <> ghcjsHelpers <> "\
337+ \connect();\n\
338+ \"
339+
340340ghcjsHelpers :: ByteString
341341ghcjsHelpers = "\
342342 \function h$isNumber(o) {\
jsaddle/src/Language/Javascript/JSaddle/Types.hs+29−131
@@ -58,14 +58,8 @@ module Language.Javascript.JSaddle.Types (
5858 -- * Debugging
5959 , JSadddleHasCallStack
6060
61− -- * Sync JSM
62− , syncPoint
63− , syncAfter
64−
65−#ifndef ghcjs_HOST_OS
66− , sendCommand
67−
6861 -- * JavaScript Context Commands
62+#ifndef ghcjs_HOST_OS
6963 , MutabilityType(..)
7064 , Mutable
7165 , Immutable
@@ -95,14 +89,13 @@ import GHCJS.Nullable (Nullable(..))
9589import GHCJS.Prim.Internal (JSVal(..), JSValueRef)
9690import Data.JSString.Internal.Type (JSString(..))
9791import Control.DeepSeq (NFData(..))
98−import Control.Monad.Catch (MonadThrow, MonadCatch(..), MonadMask(..))
9992import Control.Monad.Trans.Cont (ContT(..))
10093import Control.Monad.Trans.Error (Error(..), ErrorT(..))
10194import Control.Monad.Trans.Except (ExceptT(..))
10295import Control.Monad.Trans.Identity (IdentityT(..))
10396import Control.Monad.Trans.List (ListT(..))
10497import Control.Monad.Trans.Maybe (MaybeT(..))
105−import Control.Monad.Trans.Reader (ReaderT(..), ask)
98+import Control.Monad.Trans.Reader (ReaderT(..))
10699import Control.Monad.Trans.RWS.Lazy as Lazy (RWST(..))
107100import Control.Monad.Trans.RWS.Strict as Strict (RWST(..))
108101import Control.Monad.Trans.State.Lazy as Lazy (StateT(..))
@@ -113,9 +106,6 @@ import Control.Monad.Trans.Class (MonadTrans(..))
113106import Control.Monad.Fix (MonadFix)
114107import Control.Monad.Ref (MonadAtomicRef(..), MonadRef(..))
115108import Control.Concurrent.STM.TVar (TVar)
116−import Control.Concurrent.MVar (MVar)
117−import Data.Int (Int64)
118−import Data.Set (Set)
119109import Data.Text (Text)
120110import Data.Time.Clock (UTCTime(..))
121111import Data.Typeable (Typeable)
@@ -123,8 +113,6 @@ import Data.Coerce (coerce, Coercible)
123113import Data.Aeson
124114 (defaultOptions, genericToEncoding, ToJSON(..), FromJSON(..), Value)
125115import GHC.Generics (Generic)
126−import Control.Monad.IO.Unlift (MonadUnliftIO)
127−import qualified Control.Monad.Fail as Fail
128116#endif
129117
130118#if MIN_VERSION_base(4,9,0) && defined(CHECK_UNCHECKED)
@@ -141,16 +129,13 @@ import GHC.Exts (Constraint)
141129type JSContextRef = ()
142130#else
143131data JSContextRef = JSContextRef {
144− contextId :: Int64
145− , startTime :: UTCTime
146− , doSendCommand :: Command -> IO Result
147− , doSendAsyncCommand :: AsyncCommand -> IO ()
148− , addCallback :: Object -> JSCallAsFunction -> IO ()
149− , nextRef :: TVar JSValueRef
150− , doEnableLogging :: Bool -> IO ()
151− , finalizerThreads :: MVar (Set Text)
152− , animationFrameHandlers :: MVar [Double -> JSM ()]
153− , liveRefs :: MVar (Set Int64)
132+ startTime :: UTCTime
133+ , doSendCommand :: Command -> IO Result
134+ , doSendAsyncCommand :: AsyncCommand -> IO ()
135+ , addCallback :: Object -> JSCallAsFunction -> IO ()
136+ , freeCallback :: Object -> IO ()
137+ , nextRef :: TVar JSValueRef
138+ , doEnableLogging :: Bool -> IO ()
154139}
155140#endif
156141
@@ -166,56 +151,9 @@ data JSContextRef = JSContextRef {
166151type JSM = IO
167152#else
168153newtype JSM a = JSM { unJSM :: ReaderT JSContextRef IO a }
169− deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadThrow, MonadUnliftIO, Fail.MonadFail)
170−
171−instance MonadCatch JSM where
172− t `catch` c = JSM (unJSM (syncAfter t) `catch` \e -> unJSM (c e))
173−
174−instance MonadMask JSM where
175− mask a = JSM $ mask $ \unmask -> unJSM (a $ q unmask)
176− where q :: (ReaderT JSContextRef IO a -> ReaderT JSContextRef IO a) -> JSM a -> JSM a
177− q unmask (JSM b) = syncAfter . JSM $ unmask b
178− uninterruptibleMask a =
179− JSM $ uninterruptibleMask $ \unmask -> unJSM (a $ q unmask)
180− where q :: (ReaderT JSContextRef IO a -> ReaderT JSContextRef IO a) -> JSM a -> JSM a
181− q unmask (JSM b) = syncAfter . JSM $ unmask b
182−#if MIN_VERSION_exceptions(0,9,0)
183− generalBracket acquire release use =
184− JSM $ generalBracket
185− (unJSM acquire)
186− (\resource exitCase -> unJSM $ release resource exitCase)
187− (unJSM . syncAfter . use)
154+ deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
188155#endif
189156
190−#endif
191−
192−-- | Forces execution of pending asyncronous code
193−syncPoint :: JSM ()
194−#ifdef ghcjs_HOST_OS
195−syncPoint = return ()
196−#else
197−syncPoint = do
198− SyncResult <- sendCommand Sync
199− return ()
200−#endif
201−
202−-- | Forces execution of pending asyncronous code after performing `f`
203−syncAfter :: JSM a -> JSM a
204−#ifdef ghcjs_HOST_OS
205−syncAfter = id
206−#else
207−syncAfter f = do
208− result <- f
209− syncPoint
210− return result
211−#endif
212−
213−#ifndef ghcjs_HOST_OS
214−sendCommand :: Command -> JSM Result
215−sendCommand cmd = do
216− s <- doSendCommand <$> JSM ask
217− liftIO $ s cmd
218−#endif
219157
220158-- | Type we can give to functions that are pure when using ghcjs, but
221159-- live in JSM when using jsaddle.
@@ -265,7 +203,7 @@ type MonadJSM = MonadIO
265203class (Applicative m, MonadIO m) => MonadJSM m where
266204 liftJSM' :: JSM a -> m a
267205
268− default liftJSM' :: (MonadJSM m', MonadTrans t, m ~ t m') => JSM a -> m a
206+ default liftJSM' :: (MonadJSM m', MonadTrans t) => JSM a' -> t m' a'
269207 liftJSM' = lift . (liftJSM' :: MonadJSM m' => JSM a -> m' a)
270208 {-# INLINE liftJSM' #-}
271209
@@ -273,57 +211,19 @@ instance MonadJSM JSM where
273211 liftJSM' = id
274212 {-# INLINE liftJSM' #-}
275213
276−instance (MonadJSM m) => MonadJSM (ContT r m) where
277− liftJSM' = lift . liftJSM'
278− {-# INLINE liftJSM' #-}
279−
280−instance (Error e, MonadJSM m) => MonadJSM (ErrorT e m) where
281− liftJSM' = lift . liftJSM'
282− {-# INLINE liftJSM' #-}
283−
284−instance (MonadJSM m) => MonadJSM (ExceptT e m) where
285− liftJSM' = lift . liftJSM'
286− {-# INLINE liftJSM' #-}
287−
288−instance (MonadJSM m) => MonadJSM (IdentityT m) where
289− liftJSM' = lift . liftJSM'
290− {-# INLINE liftJSM' #-}
291−
292−instance (MonadJSM m) => MonadJSM (ListT m) where
293− liftJSM' = lift . liftJSM'
294− {-# INLINE liftJSM' #-}
295−
296−instance (MonadJSM m) => MonadJSM (MaybeT m) where
297− liftJSM' = lift . liftJSM'
298− {-# INLINE liftJSM' #-}
299−
300−instance (MonadJSM m) => MonadJSM (ReaderT r m) where
301− liftJSM' = lift . liftJSM'
302− {-# INLINE liftJSM' #-}
303−
304−instance (Monoid w, MonadJSM m) => MonadJSM (Lazy.RWST r w s m) where
305− liftJSM' = lift . liftJSM'
306− {-# INLINE liftJSM' #-}
307−
308−instance (Monoid w, MonadJSM m) => MonadJSM (Strict.RWST r w s m) where
309− liftJSM' = lift . liftJSM'
310− {-# INLINE liftJSM' #-}
311−
312−instance (MonadJSM m) => MonadJSM (Lazy.StateT s m) where
313− liftJSM' = lift . liftJSM'
314− {-# INLINE liftJSM' #-}
315−
316−instance (MonadJSM m) => MonadJSM (Strict.StateT s m) where
317− liftJSM' = lift . liftJSM'
318− {-# INLINE liftJSM' #-}
319−
320−instance (Monoid w, MonadJSM m) => MonadJSM (Lazy.WriterT w m) where
321− liftJSM' = lift . liftJSM'
322− {-# INLINE liftJSM' #-}
323−
324−instance (Monoid w, MonadJSM m) => MonadJSM (Strict.WriterT w m) where
325− liftJSM' = lift . liftJSM'
326− {-# INLINE liftJSM' #-}
214+instance (MonadJSM m) => MonadJSM (ContT r m)
215+instance (Error e, MonadJSM m) => MonadJSM (ErrorT e m)
216+instance (MonadJSM m) => MonadJSM (ExceptT e m)
217+instance (MonadJSM m) => MonadJSM (IdentityT m)
218+instance (MonadJSM m) => MonadJSM (ListT m)
219+instance (MonadJSM m) => MonadJSM (MaybeT m)
220+instance (MonadJSM m) => MonadJSM (ReaderT r m)
221+instance (Monoid w, MonadJSM m) => MonadJSM (Lazy.RWST r w s m)
222+instance (Monoid w, MonadJSM m) => MonadJSM (Strict.RWST r w s m)
223+instance (MonadJSM m) => MonadJSM (Lazy.StateT s m)
224+instance (MonadJSM m) => MonadJSM (Strict.StateT s m)
225+instance (Monoid w, MonadJSM m) => MonadJSM (Lazy.WriterT w m)
226+instance (Monoid w, MonadJSM m) => MonadJSM (Strict.WriterT w m)
327227
328228instance MonadRef JSM where
329229 type Ref JSM = Ref IO
@@ -396,7 +296,7 @@ type MutableJSArray = SomeJSArray Mutable
396296type STJSArray s = SomeJSArray (STMutable s)
397297
398298-- | See 'JavaScript.Object.Internal.Object'
399−newtype Object = Object JSVal
299+newtype Object = Object JSVal deriving(Show, ToJSON, FromJSON)
400300
401301-- | See 'GHCJS.Nullable.Nullable'
402302newtype Nullable a = Nullable a
@@ -420,8 +320,7 @@ newtype JSStringForSend = JSStringForSend Text deriving(Show, ToJSON, FromJSON,
420320instance NFData JSStringForSend
421321
422322-- | Command sent to a JavaScript context for execution asynchronously
423−data AsyncCommand = FreeRef Text JSValueForSend
424− | FreeRefs Text
323+data AsyncCommand = FreeRef JSValueForSend
425324 | SetPropertyByName JSObjectForSend JSStringForSend JSValueForSend
426325 | SetPropertyAtIndex JSObjectForSend Int JSValueForSend
427326 | StringToValue JSStringForSend JSValueForSend
@@ -434,7 +333,6 @@ data AsyncCommand = FreeRef Text JSValueForSend
434333 | NewEmptyObject JSValueForSend
435334 | NewAsyncCallback JSValueForSend
436335 | NewSyncCallback JSValueForSend
437− | FreeCallback JSValueForSend
438336 | NewArray [JSValueForSend] JSValueForSend
439337 | EvaluateScript JSStringForSend JSValueForSend
440338 | SyncWithAnimationFrame JSValueForSend
@@ -503,8 +401,8 @@ instance ToJSON Result where
503401
504402instance FromJSON Result
505403
506−data BatchResults = Success [JSValueReceived] [Result]
507− | Failure [JSValueReceived] [Result] JSValueReceived String
404+data BatchResults = Success [Result]
405+ | Failure [Result] JSValueReceived
508406 deriving (Show, Generic)
509407
510408instance ToJSON BatchResults where
@@ -514,7 +412,7 @@ instance FromJSON BatchResults
514412
515413data Results = BatchResults Int BatchResults
516414 | Duplicate Int Int
517− | Callback Int BatchResults JSValueReceived JSValueReceived JSValueReceived [JSValueReceived]
415+ | Callback Int BatchResults JSValueReceived JSValueReceived [JSValueReceived]
518416 | ProtocolError Text
519417 deriving (Show, Generic)
520418
jsaddle/src/Language/Javascript/JSaddle/Value.hs+3−5
@@ -618,17 +618,15 @@ foreign import javascript unsafe "$r = ($1 === undefined)?0:\
618618 (typeof $1===\"string\")?4:\
619619 (typeof $1===\"object\")?5:-1;" jsrefGetType :: JSVal -> Int
620620#else
621−deRefVal value = do
622− v <- toJSVal value
623− result <- N.deRefVal v
624− return $ case result of
621+deRefVal value = toJSVal value >>= N.deRefVal >>= \result -> return $
622+ case result of
625623 DeRefValResult 0 _ -> ValNull
626624 DeRefValResult 1 _ -> ValUndefined
627625 DeRefValResult 2 _ -> ValBool False
628626 DeRefValResult 3 _ -> ValBool True
629627 DeRefValResult (-1) s -> ValNumber (read (T.unpack s))
630628 DeRefValResult (-2) s -> ValString s
631− DeRefValResult (-3) _ -> ValObject (Object v)
629+ DeRefValResult ref _ -> ValObject (Object (JSVal ref))
632630 _ -> error "Unexpected result dereferencing JSaddle value"
633631#endif
634632
nix/hix.nixdeleted−8
@@ -1,8 +0,0 @@
1−{pkgs, ...}:
2−{ modules = [({pkgs, ...}: {
3− packages.webkit2gtk3-javascriptcore.components.library.doHaddock = false;
4− })];
5− shell.buildInputs = [ pkgs.nodejs ];
6− shell.tools.cabal = {};
7− shell.crossPlatforms = p: [ p.ghcjs ];
8−}
travis/build.sh+12−2
@@ -6,8 +6,18 @@ GHCVER=`ghc --numeric-version`
66
77JSADDLE_WARP_VERSION=`head -n2 jsaddle-warp/jsaddle-warp.cabal | tail -n1 | sed 's/[^0-9.]//g'`
88
9+if [[ -d .cabal && -d .ghc ]]; then
10+ cp -a .cabal .ghc /root
11+fi
12+
913cabal update
10−cabal new-build 'jsaddle-warp:lib:jsaddle-warp' 'jsaddle-warp:test:test-tool'
14+cabal new-build --constraint='Cabal>=1.24.2.0' 'jsaddle-warp:lib:jsaddle-warp' 'jsaddle-warp:test:test-tool'
1115cd jsaddle-warp
12−GHC_PACKAGE_PATH=/opt/ghc/$GHCVER/lib/ghc-$GHCVER/package.conf.d:~/.cabal/store/ghc-$GHCVER/package.db:../dist-newstyle/packagedb/ghc-$GHCVER ../dist-newstyle/build/x86_64-linux/ghc-$GHCVER/jsaddle-warp-$JSADDLE_WARP_VERSION/t/test-tool/build/test-tool/test-tool ../jsaddle
16+GHC_PACKAGE_PATH=/opt/ghc/$GHCVER/lib/ghc-$GHCVER/package.conf.d:~/.cabal/store/ghc-$GHCVER/package.db:./dist-newstyle/packagedb/ghc-$GHCVER jsaddle_datadir=`pwd` ../dist-newstyle/build/jsaddle-warp-$JSADDLE_WARP_VERSION/build/test-tool/test-tool ../jsaddle-warp
17+
18+# update the cache
19+rm -rf .cabal
20+cp -a /root/.cabal ./
21+rm -rf .ghc
22+cp -a /root/.ghc ./
1323