Merge pull request #150 from plotly/dev

Release 1.1.1

Author: waralex

Project.toml

@@ -1,7 +1,7 @@
 name = "Dash"
 uuid = "1b08a953-4be3-4667-9a23-3db579824955"
 authors = ["Chris Parmer <chris@plotly.com>", "Alexandr Romanenko <waralex@gmail.com>"]
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/handler/make_handler.jl

@@ -14,7 +14,8 @@ function start_reload_poll(state::HandlerState)
     for pkg in values(state.registry.components)
         push!(folders, pkg.path)
     end
-    state.reload.task = @async poll_folders(folders; interval = get_devsetting(state.app, :hot_reload_watch_interval)) do file, ts, deleted
+    initial_watched = init_watched(folders)
+    state.reload.task = @async poll_folders(folders, initial_watched; interval = get_devsetting(state.app, :hot_reload_watch_interval)) do file, ts, deleted
         state.reload.hard = true
         state.reload.hash = generate_hash()
         assets_path = get_assets_path(state.app)

src/handler/state.jl

@@ -3,6 +3,8 @@ struct ChangedAsset
     modified ::Int
     is_css ::Bool
 end
+JSON3.StructTypes.StructType(::Type{ChangedAsset}) = JSON3.StructTypes.Struct()
+
 mutable struct StateReload
     hash::Union{String, Nothing}
     hard::Bool

src/utils/poll.jl

@@ -12,7 +12,7 @@ function poll_until_changed(files::Set{String}; interval = 1.)
     active = true
     while active
         for w in watched
-            if !isfile(w.filename) 
+            if !isfile(w.filename)
                 active = false
                 break;
             end
@@ -25,17 +25,32 @@ function poll_until_changed(files::Set{String}; interval = 1.)
     end
 end
 
-function poll_folders(on_change, folders; interval = 1.)
+function init_watched(folders)
     watched = Dict{String, Float64}()
+    for folder in folders
+        !isdir(folder) && continue
+        for (base, _, files) in walkdir(folder)
+            for f in files
+                path = joinpath(base, f)
+                new_time = mtime(path)
+                watched[path] = new_time
+            end
+        end
+    end
+    return watched
+end
+
+function poll_folders(on_change, folders, initial_watched; interval = 1.)
+    watched = initial_watched
     while true
         walked = Set{String}()
         for folder in folders
             !isdir(folder) && continue
             for (base, _, files) in walkdir(folder)
                 for f in files
-                    path = joinpath(base, f)   
+                    path = joinpath(base, f)
                     new_time = mtime(path)
-                    if new_time > get(watched, path, -1.) 
+                    if new_time > get(watched, path, -1.)
                         on_change(path, new_time, false)
                     end
                     watched[path] = new_time

test/config_functional.jl

@@ -72,6 +72,7 @@ end
     app = dash()
     @test app.config.routes_pathname_prefix == "/"
     @test app.config.requests_pathname_prefix == "/test-app/"
+    delete!(ENV, "DASH_APP_NAME")
 
 end
 

test/reload_hash.jl

@@ -0,0 +1,39 @@
+using Test
+using Dash
+using Dash: HandlerState, main_registry, start_reload_poll, enable_dev_tools!
+import HTTP
+import JSON3
+@testset "reload state" begin
+    rm("assets/test2.png", force = true)
+    app = dash()
+    enable_dev_tools!(app, dev_tools_hot_reload_watch_interval = 1.)
+    app.layout = html_div()
+    state = HandlerState(app, main_registry())
+    start_reload_poll(state)
+    initial_hash = state.reload.hash
+    sleep(1)
+    @test length(state.reload.changed_assets) == 0
+    write("assets/test2.png", "")
+    sleep(2)
+    @test state.reload.hash != initial_hash
+    @test length(state.reload.changed_assets) == 1
+    @test length(state.reload.changed_assets) == 1
+    @test state.reload.changed_assets[1].url == "/assets/test2.png"
+    rm("assets/test2.png", force = true)
+
+end
+@testset "reload handler" begin
+    rm("assets/test2.css", force = true)
+    app = dash()
+    enable_dev_tools!(app, dev_tools_hot_reload = true, dev_tools_hot_reload_watch_interval = 1.)
+    app.layout = html_div()
+    handler = make_handler(app)
+    write("assets/test2.css", "")
+    sleep(2)
+    response = HTTP.handle(handler, HTTP.Request("GET", "/_reload-hash"))
+    data = JSON3.read(response.body)
+    @test length(data.files) == 1
+    @test data.files[1].url == "/assets/test2.css"
+    @test data.files[1].is_css == true
+    rm("assets/test2.css", force = true)
+end

test/runtests.jl

@@ -11,4 +11,5 @@ include("misc.jl")
 include("callbacks.jl")
 include("components_utils.jl")
 include("table_format.jl")
+include("reload_hash.jl")
 #include("dev.jl")