Merge pull request #205 from JuliaGizmos/sd/require_bugs

SimonDanisch · web-flow · commit 1bd23a943013 · 2018-09-26T17:11:27.000+02:00
readguarded not exported via require
diff --git a/assets/providers/websocket_connection.js b/assets/providers/websocket_connection.js
@@ -17,5 +17,6 @@
             }
         }
     }
+
     tryconnect(window.websocket_url)
 })();
diff --git a/src/WebIO.jl b/src/WebIO.jl
@@ -6,6 +6,7 @@ using AssetRegistry
 using Base64: stringmime
 import Widgets
 import Widgets: node, AbstractWidget
+using Logging
 
 abstract type AbstractConnection end
 
@@ -65,10 +66,8 @@ function __init__()
     @require IJulia="7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
         include(joinpath("providers", "ijulia.jl"))
     end
-    @require HTTP="cd3eb016-35fb-5094-929b-558a96fad6f3" begin
-        @require WebSockets="104b5d7c-a370-577a-8038-80a2059c5097" begin
-            include(joinpath("providers", "generic_http.jl"))
-        end
+    @require WebSockets="104b5d7c-a370-577a-8038-80a2059c5097" begin
+        include(joinpath("providers", "generic_http.jl"))
     end
 
 end
diff --git a/src/providers/generic_http.jl b/src/providers/generic_http.jl
@@ -1,6 +1,9 @@
 using Sockets
 import AssetRegistry, JSON
-using WebSockets: is_upgrade, upgrade
+using WebIO
+using .WebSockets: is_upgrade, upgrade
+using .WebSockets: HTTP
+
 
 struct WSConnection{T} <: WebIO.AbstractConnection
     sock::T
@@ -32,9 +35,7 @@ end
 
 wio_asseturl(file) = asseturl(string(normpath(WebIO.assetpath), '/', normpath(file)))
 
-function serve_assets(req, serve_page)
-    response = serve_page(req)
-    response !== missing && return response
+function serve_assets(req)
     if haskey(AssetRegistry.registry, req.target)
         filepath = AssetRegistry.registry[req.target]
         if isfile(filepath)
@@ -51,7 +52,7 @@ end
 function websocket_handler(ws)
     conn = WSConnection(ws)
     while isopen(ws)
-        data, success = readguarded(ws)
+        data, success = WebSockets.readguarded(ws)
         !success && break
         msg = JSON.parse(String(data))
         WebIO.dispatch(conn, msg)
@@ -77,80 +78,47 @@ const routing_callback = Ref{Any}((req)-> missing)
         logging_io = devnull
     )
 
-usage:
-
-```example
-    asset_port = 8081
-    base_url = "127.0.0.1"
-    const app = Ref{Any}()
-    #WebIO.setbaseurl!(baseurl) # plus port!?
-    server = WebIOServer(
-            baseurl = base_url, http_port = asset_port, verbose = true
-        ) do req
-        req.target != "/" && return missing # don't do anything
-        isassigned(app) || return "no app"
-        ws_url = string("ws://", base_url, ':', asset_port, "/webio_websocket/")
-        webio_script = wio_asseturl("/webio/dist/bundle.js")
-        ws_script = wio_asseturl("/providers/websocket_connection.js")
+usage to serve some webio html:
+
+    ```example
+    using WebSockets, WebIO
+    app = Ref{Any}(node(:div, "hi"))
+    function serve_app(req)
+        req.target != "/" && return missing
         return sprint() do io
-            print(io, "
-                <!doctype html>
-                <html>
-                <head>
-                <meta charset="UTF-8">
-                <script> var websocket_url = \$(repr(ws_url)) </script>
-                <script src="\$webio_script"></script>
-                <script src="\$ws_script"></script>
-                </head>
-                <body>
-            ")
-            tohtml(io, app[])
-            print(io, "
-                </body>
-                </html>
-            ")
+            print(io, \"\"\"
+                <!doctype html><html><head>
+                <meta charset="UTF-8"></head><body>
+            \"\"\")
+            show(io, MIME"application/webio"(), app[])
+            print(io, "</body></html>")
         end
     end
-
-    w = Scope()
-
-    obs = Observable(w, "rand-value", 0.0)
-
-    on(obs) do x
-        println("JS sent \$x")
-    end
-
-    using JSExpr
-    app[] = w(
-      dom"button"(
-        "generate random",
-        events=Dict("click"=>@js () -> \$obs[] = Math.random()),
-      ),
-    );
-```
+    server = WebIO.WebIOServer(serve_app, logger = stdout, verbose = true)
+    ```
 """
 function WebIOServer(
         default_response::Function = (req)-> missing;
         baseurl::String = "127.0.0.1", http_port::Int = 8081,
         verbose = false, singleton = true,
         websocket_route = "/webio_websocket/",
-        logging_io = devnull,
+        logger = devnull,
         server_kw_args...
     )
     # TODO test if actually still running, otherwise restart even if singleton
     if !singleton || !isassigned(singleton_instance)
         handler = HTTP.HandlerFunction() do req
-            serve_assets(req, default_response)
+            response = default_response(req)
+            response !== missing && return response
+            return serve_assets(req)
         end
         wshandler = WebSockets.WebsocketHandler() do req, sock
-            try
-                req.target == websocket_route && websocket_handler(sock)
-            catch e
-                @warn(e)
-            end
+            req.target == websocket_route && websocket_handler(sock)
+        end
+        server = WebSockets.ServerWS(handler, wshandler, logger; server_kw_args...)
+        server_task = with_logger(NullLogger()) do
+            @async WebSockets.serve(server, baseurl, http_port, verbose)
         end
-        server = WebSockets.ServerWS(handler, wshandler; server_kw_args...)
-        server_task = @async (ret = WebSockets.serve(server, baseurl, http_port, verbose))
         singleton_instance[] = WebIOServer(server, server_task)
     end
     return singleton_instance[]
@@ -170,7 +138,7 @@ function global_server_config()
 
         url = get(ENV, "WEBIO_SERVER_HOST_URL", "127.0.0.1")
         http_port = parse(Int, get(ENV, "WEBIO_HTTP_PORT", "8081"))
-        ws_default = string(url, ":", http_port, "/webio_websocket/")
+        ws_default = string("ws://", url, ":", http_port, "/webio_websocket/")
         ws_url = get(ENV, "WEBIO_WEBSOCKT_URL", ws_default)
         webio_server_config[] = (url = url, http_port = http_port, ws_url = ws_url)
 
@@ -191,15 +159,26 @@ can be used in the following way to create a generic display method for webio:
     ```
 The above example enables display code & webio code that doesn't rely on any
 provider dependencies.
+If you want to host the bundle + websocket script somewhere else, you can also call:
+    ```example
+    function Base.display(d::MyWebDisplay, m::MIME"application/webio", app)
+        println(d.io, "outer html")
+        show(io, m, app, bundle_url, websocket_url)
+        println(d.io, "close outer html")
+    end
+    ```
 """
-function Base.show(io::IO, ::MIME"application/webio", app::Union{Scope, Node})
-    # Make sure we run a server
-    c = global_server_config()
-    WebIOServer(routing_callback[], baseurl = c.url, http_port = c.http_port)
-
+function Base.show(io::IO, m::MIME"application/webio", app::Union{Scope, Node})
     webio_script = wio_asseturl("/webio/dist/bundle.js")
     ws_script = wio_asseturl("/providers/websocket_connection.js")
+    show(io, m, app, webio_script, ws_script)
+    return
+end
 
+function Base.show(io::IO, ::MIME"application/webio", app::Union{Scope, Node}, webio_script, ws_script)
+    # Make sure we run a server
+    c = global_server_config()
+    WebIOServer(routing_callback[], baseurl = c.url, http_port = c.http_port)
     println(io, "<script> var websocket_url = $(repr(c.ws_url)) </script>")
     println(io, "<script src=$(repr(webio_script))></script>")
     println(io, "<script src=$(repr(ws_script))   ></script>")
diff --git a/test/REQUIRE b/test/REQUIRE
@@ -4,5 +4,4 @@ JSExpr
 IJulia
 NBInclude 2.0.0
 NodeJS
-HTTP
 WebSockets
diff --git a/test/http-tests.jl b/test/http-tests.jl
@@ -1,12 +1,57 @@
 using WebIO
-using HTTP, WebSockets
+using WebSockets
 using JSExpr
 using Test
 
 @testset "HTTP provider" begin
     output = sprint(io-> show(io, MIME"application/webio"(), node(:div, "hi")))
-    @test occursin("<script> var websocket_url = \"127.0.0.1:8081/webio_websocket/\" </script>", output)
+    @test occursin("<script> var websocket_url = \"ws://127.0.0.1:8081/webio_websocket/\" </script>", output)
     @test occursin("""{"props":{},"nodeType":"DOM","type":"node","instanceArgs":{"namespace":"html","tag":"div"},"children":["hi"]}""", output)
-    @test WebIO.webio_server_config[] == (url = "127.0.0.1", http_port = 8081, ws_url = "127.0.0.1:8081/webio_websocket/")
+    @test WebIO.webio_server_config[] == (url = "127.0.0.1", http_port = 8081, ws_url = "ws://127.0.0.1:8081/webio_websocket/")
     @test isassigned(WebIO.singleton_instance)
 end
+
+
+using WebSockets, WebIO
+
+app = Ref{Any}(node(:div, "hi"))
+function serve_app(req)
+    if req.target == "/"
+        return sprint() do io
+            print(io, """
+                <!doctype html>
+                <html>
+                <head>
+                <meta charset="UTF-8">
+                </head>
+                <body>
+            """)
+            show(io, MIME"application/webio"(), app[])
+            print(io, "
+                </body>
+                </html>
+            ")
+        end
+    else
+        return missing
+    end
+end
+server = WebIO.WebIOServer(serve_app, logger = stdout, verbose = true)
+using JSExpr
+WebIO.wio_asseturl("/webio/dist/bundle.js")
+server.serve_task
+
+w = Scope()
+
+obs = Observable(w, "rand-value", 0.0)
+
+on(obs) do x
+   println("JS sent $x")
+end
+
+app[] = w(
+ dom"button"(
+   "generate random",
+   events=Dict("click"=>@js () -> $obs[] = Math.random()),
+ ),
+);

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+`
`20`	`21`	`tryconnect(window.websocket_url)`
`21`	`22`	`})();`