Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LiveUpdate - Fix types sent over network #355

Merged
merged 2 commits into from
Mar 6, 2019
Merged

LiveUpdate - Fix types sent over network #355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
710937b
Fix types
TimLariviere Mar 6, 2019
f99fe36
Ignore unused member
TimLariviere Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Fabulous.LiveUpdate/LiveUpdate.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ type HttpServer(?port) =
if (path = "/update") then
let reader = new StreamReader (c.Request.InputStream, Encoding.UTF8)
let! requestText = reader.ReadToEndAsync () |> Async.AwaitTask
let req = Newtonsoft.Json.JsonConvert.DeserializeObject<DFile[]>(requestText)
let req = Newtonsoft.Json.JsonConvert.DeserializeObject<(string * DFile)[]>(requestText)
//let req = serializer.UnPickleOfString<DFile>(requestText)
let resp = switchD req
return Newtonsoft.Json.JsonConvert.SerializeObject resp
Expand Down Expand Up @@ -211,15 +211,15 @@ module Extensions =

let interp = EvalContext(System.Reflection.Assembly.Load)

let switchD (files: DFile[]) =
let switchD (files: (string * DFile)[]) =
lock interp (fun () ->
let res =
try
for file in files do
for (_, file) in files do
printfn "LiveUpdate: adding declarations...."
interp.AddDecls file.Code

for file in files do
for (_, file) in files do
printfn "LiveUpdate: evaluating decls in code package for side effects...."
interp.EvalDecls (envEmpty, file.Code)
Result.Ok ()
Expand All @@ -239,7 +239,7 @@ module Extensions =
| 0 -> { Quacked = "couldn't quack! Files were empty!" }
| _ ->
let result =
files |> Array.tryPick (fun file ->
files |> Array.tryPick (fun (_, file) ->

let programOptD =
match tryFindMemberByName "programLiveUpdate" file.Code with
Expand Down