Add :async option to make Window() synchronous!

`Window()` now blocks until the window is loaded and the socket is open: ```julia julia> @time Window(Blink.@d(:async=>false)); 0.229105 seconds (4.10 k allocations: 365.495 KiB) julia> @time Window(Blink.@d(:async=>true)); 0.018366 seconds (1.14 k allocations: 39.156 KiB) ``` Also removed all the now-unneccessary `sleep()`s from all tests.
JuliaGizmos · Aug 15, 2018 · 3b29fa2 · 3b29fa2
1 parent 3eff499
commit 3b29fa2
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 11 deletions.
diff --git a/res/blink.js b/res/blink.js
@@ -147,4 +147,9 @@
 
   Blink.click = click;
 
+
+  // Window creation callback
+  if (typeof callback_id !== 'undefined') {
+    Blink.sock.onopen = ()=>{ cb(callback_id, true); }
+  }
 })();
diff --git a/src/AtomShell/window.jl b/src/AtomShell/window.jl
@@ -31,8 +31,23 @@ function Window(a::Shell, opts::Associative = Dict())
 end
 
 function Window(a::Shell, content::Page, opts::Associative = Dict())
-  opts = merge(opts, Dict(:url => Blink.localurl(content)))
-  return Window(raw_window(a, opts), a, content)
+  url = Blink.localurl(content)
+  is_async(opts) = get(opts, :async, false)
+  callback = !is_async(opts)
+  if callback
+      id, cond = Blink.callback!()
+      url *= "?callback=$id"
+  end
+  opts = merge(opts, Dict(:url => url))
+  w = Window(raw_window(a, opts), a, content)
+  if callback
+      val = wait(cond)
+      if isa(val, Associative) && get(val, "type", "") == "error"
+          err = JSError(get(val, "name", "unknown"), get(val, "message", "blank"))
+          throw(err)
+      end
+  end
+  return w
 end
 
 Window(args...) = Window(shell(), args...)

diff --git a/src/content/main.html b/src/content/main.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <script>var id = {{id}}</script>
+    <script>{{optional_create_window_callback}}</script>
     <script src="blink.js"></script>
     <link rel="stylesheet" href="reset.css">
     <link rel="stylesheet" href="blink.css">

diff --git a/src/content/server.jl b/src/content/server.jl
@@ -13,14 +13,19 @@ const resroute =
 
 const maintp = Mustache.template_from_file(joinpath(dirname(@__FILE__), "main.html"))
 
-app(f) = req -> render(maintp, d("id"=>Page(f).id))
+function app(f)
+    req -> render(maintp, d("id"=>Page(f).id))
+end
 
 function page_handler(req)
   id = try parse(req[:params][:id]) catch e @goto fail end
   haskey(pool, id) || @goto fail
   active(pool[id].value) && @goto fail
 
-  return render(maintp, d("id"=>id))
+  callback_id = try split(req[:query], "=")[2] catch e nothing end
+  callback_script = callback_id != nothing ? """var callback_id = $callback_id""" : ""
+  return render(maintp, d("id"=>id,
+                          "optional_create_window_callback"=>callback_script))
 
   @label fail
   return d(:body => "Not found",

diff --git a/src/rpc/rpc.jl b/src/rpc/rpc.jl
@@ -51,4 +51,3 @@ end
 macro js_(o, ex)
     :(js($(esc(o)), $(Expr(:quote, ex)), callback=false))
 end
-
diff --git a/test/AtomShell/window.jl b/test/AtomShell/window.jl
@@ -2,7 +2,7 @@ using Blink
 using Base.Test
 
 @testset "size Tests" begin
-    w = Window(Blink.@d(:show => false, :width=>150, :height=>100)) ; sleep(5.0);
+    w = Window(Blink.@d(:show => false, :width=>150, :height=>100, :async=>false));
     @test size(w) == [150,100]
 
     size(w, 200,200)

diff --git a/test/content/api.jl b/test/content/api.jl
@@ -2,7 +2,7 @@ using Blink
 using Base.Test
 
 @testset "content! Tests" begin
-    w = Window(Blink.@d(:show => false)); sleep(5.0)
+    w = Window(Blink.@d(:show => false, :async=>false));
     body!(w, "", async=false);
     @test (@js w document.querySelector("body").innerHTML) == ""
 
@@ -20,22 +20,22 @@ using Base.Test
     fadeTestHtml = """<script>var testJS = "test";</script><div id="d">hi world</div>"""
     @testset "Fade True" begin
         # Must create a new window to ensure javascript is reset.
-        w = Window(Blink.@d(:show => false)); sleep(5.0)
+        w = Window(Blink.@d(:show => false));
 
         body!(w, fadeTestHtml; fade=true, async=false);
         @test (@js w testJS) == "test"
     end
     @testset "Fade False" begin
         # Must create a new window to ensure javascript is reset.
-        w = Window(Blink.@d(:show => false)); sleep(5.0)
+        w = Window(Blink.@d(:show => false, :async=>false));
 
         body!(w, fadeTestHtml; fade=false, async=false);
         @test (@js w testJS) == "test"
     end
 end
 
 @testset "Sync/Async content reload tests" begin
-    w = Window(Blink.@d(:show => false)); sleep(5.0)
+    w = Window(Blink.@d(:show => false, :async=>false));
     sleep_content(seconds) = """
         <script>
             function spinsleep(ms) {

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -6,7 +6,7 @@ cleanup = !AtomShell.isinstalled()
 cleanup && AtomShell.install()
 
 # open window and wait for it to initialize
-w = Window(Blink.@d(:show => false)); sleep(5.0)
+w = Window(Blink.@d(:show => false, :async=>false));
 
 # make sure the window is really active
 @test @js(w, Math.log(10)) ≈ log(10)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,4 +51,3 @@ end
		macro js_(o, ex)
		:(js($(esc(o)), $(Expr(:quote, ex)), callback=false))
		end