Merge pull request #451 from JuliaParallel/jps/webdash-fix-host

jpsamaroo · web-flow · commit 60fbf0f1c5ed · 2023-11-22T11:02:30.000-07:00
DaggerWebDash: Use gethostname and getipaddr
diff --git a/lib/DaggerWebDash/Project.toml b/lib/DaggerWebDash/Project.toml
@@ -1,7 +1,7 @@
 name = "DaggerWebDash"
 uuid = "cfc5aa84-1a2a-41ab-b391-ede92ecae40c"
 authors = ["Julian P Samaroo <jpsamaroo@jpsamaroo.me>"]
-version = "0.1.2"
+version = "0.1.3"
 
 [deps]
 Dagger = "d58978e5-989f-55fb-8d15-ea34adc7bf54"
diff --git a/lib/DaggerWebDash/assets/d3.v7.min.js b/lib/DaggerWebDash/assets/d3.v7.min.js
diff --git a/lib/DaggerWebDash/src/d3.jl b/lib/DaggerWebDash/src/d3.jl
@@ -57,7 +57,7 @@ const D3R_ACTUAL_PORT = Dict{Int,Int}()
 # TODO: Concrete socket types
 const D3R_CLIENT_SOCKETS = Dict{Int,Dict{Int,Vector{Any}}}()
 
-const D3R_WORKER_HOST_MAP = Dict{Int,IPAddr}()
+const D3R_WORKER_HOST_MAP = Dict{Int,Union{IPAddr,String}}()
 const D3R_WORKER_PORT_MAP = Dict{Int,Int}()
 
 struct D3Renderer
@@ -143,6 +143,17 @@ function d3r_init(port::Int, port_range::UnitRange, config_updated::Ref{Bool}, c
                 Dict(:status=>404)
             end
         end),
+        page("/assets/:path", req->begin
+            path = req[:params][:path]
+            occursin("..", path) && return Dict(:status=>404)
+            assets_path = normpath(joinpath(@__DIR__, "..", "assets"))
+            path = normpath(joinpath(assets_path, path))
+            if ispath(path) && normpath(dirname(path)) == assets_path
+                Dict(:body=>String(read(path)))
+            else
+                Dict(:status=>404)
+            end
+        end),
         page("/worker_id", respond("$(myid())")),
         page("/worker/:id/:location", req->begin
             id = parse(Int, req[:params][:id])
@@ -311,7 +322,11 @@ end
 function worker_host_port(id::Int, port::Int, port_range::UnitRange)
     worker_host = get!(D3R_WORKER_HOST_MAP, port) do
         worker_host, worker_port = remotecall_fetch(id, port) do port
-            (MemPool.host, get_actual_port(port, port_range))
+            host = gethostname()
+            if isempty(host)
+                host = getipaddr()
+            end
+            (host, get_actual_port(port, port_range))
         end
         D3R_WORKER_PORT_MAP[port] = worker_port
         worker_host
diff --git a/lib/DaggerWebDash/src/index.html b/lib/DaggerWebDash/src/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8" />
 <title>Dagger Dashboard</title>
-<script type="text/javascript" src="https://d3js.org/d3.v7.min.js"></script>
+<script type="text/javascript" src="/assets/d3.v7.min.js"></script>
 </head>
 <body>
 <div style="border: 2px solid black">
