Merge pull request #355 from TimLariviere/fix-liveupdate

LiveUpdate - Fix types sent over network
fabulous-dev · Mar 6, 2019 · 08d4f77 · 08d4f77
2 parents 6a4efaa + f99fe36
commit 08d4f77
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Fabulous.LiveUpdate/LiveUpdate.fs b/src/Fabulous.LiveUpdate/LiveUpdate.fs
@@ -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
@@ -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 ()
@@ -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