Webapp: separate ui and logic, fixes by moving to Hooked from React

.github/workflows/ci.yml

@@ -95,7 +95,7 @@ jobs:
       - name: Make Javascript app
         run: |
           opam exec -- make Kappapp.tar.gz build/site/index.html
-          cp -r gui/viz .
+          cp -r gui/js_lib/viz .
           mv build/Kappapp.tar.gz .
           mv build/site .
       - name: Archive Javascript app

.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.26.1
+version = 0.26.2
 profile=conventional
 margin=80
 if-then-else=k-r

Makefile

@@ -178,7 +178,7 @@ Kappapp:
 
 build/Kappapp.tar.gz: build/Kappapp
 	tar -C build -czf $@ Kappapp
-	rm -r build/Kappapp
+	rm -rf build/Kappapp
 
 Kappapp.tar.gz: build/Kappapp.tar.gz
 
@@ -208,7 +208,7 @@ KappaBin:
 
 build/KappaBin.zip: build/KappaBin
 	zip -y -r $@ build/KappaBin
-	rm -r build/KappaBin
+	rm -rf build/KappaBin
 
 KappaBin.zip: build/KappaBin.zip
 

dune-project

@@ -93,6 +93,7 @@
    (js_of_ocaml-lwt ( = 5.7.0 ))
    (js_of_ocaml-ppx ( = 5.7.0 ))
    (js_of_ocaml-tyxml ( = 5.7.0 ))
+   (ppx_inline_test ( = v0.15.1 ))
    kappa-binaries
    kappa-agents
    )

gui/dune

@@ -1,11 +1,3 @@
-(library
- (name kappa_js_lib)
- (modules Common Hooked)
- (libraries js_of_ocaml-lwt lwt_react)
- (preprocess
-  (pps js_of_ocaml-ppx tyxml-ppx))
- (flags :standard -w +a -open Js_of_ocaml))
-
 (rule
  (with-stdout-to
   js_of_ocaml_flags
@@ -18,7 +10,7 @@
   (flags
    (:include js_of_ocaml_flags)))
  (modules KaSimWorker)
- (libraries kappa_js_lib kappa_json_api)
+ (libraries kappa_webapp_lib kappa_json_api)
  (preprocess
   (pps js_of_ocaml-ppx tyxml-ppx))
  (flags
@@ -28,7 +20,7 @@
   -open
   Js_of_ocaml
   -open
-  Kappa_js_lib
+  Kappa_webapp_lib
   -open
   Kappa_json_api))
 
@@ -39,7 +31,7 @@
   (flags
    (:include js_of_ocaml_flags)))
  (modules KaSaWorker)
- (libraries kappa_js_lib kappa_kasa_export)
+ (libraries kappa_webapp_lib kappa_kasa_export)
  (preprocess
   (pps js_of_ocaml-ppx tyxml-ppx))
  (flags
@@ -49,7 +41,7 @@
   -open
   Js_of_ocaml
   -open
-  Kappa_js_lib
+  Kappa_webapp_lib
   -open
   Kappa_kasa_export))
 
@@ -60,7 +52,7 @@
   (flags
    (:include js_of_ocaml_flags)))
  (modules KaStorWorker)
- (libraries kappa_js_lib kappa_cflow)
+ (libraries kappa_webapp_lib kappa_cflow)
  (preprocess
   (pps js_of_ocaml-ppx tyxml-ppx))
  (flags
@@ -70,7 +62,7 @@
   -open
   Js_of_ocaml
   -open
-  Kappa_js_lib
+  Kappa_webapp_lib
   -open
   Kappa_cflow))
 
@@ -81,7 +73,7 @@
   (flags
    (:include js_of_ocaml_flags)))
  (modules KaMoHaWorker)
- (libraries kappa_js_lib kappa_grammar)
+ (libraries kappa_webapp_lib kappa_grammar)
  (preprocess
   (pps js_of_ocaml-ppx tyxml-ppx))
  (flags :standard -w +a))
@@ -95,18 +87,17 @@
  (modules
   :standard
   \
-  Common
-  Hooked
   KaSimWorker
   KaSaWorker
   KaStorWorker
   KaMoHaWorker)
  (libraries
   js_of_ocaml-tyxml
   lwt_react
-  kappa_js_lib
+  kappa_webapp_lib
   kappa_json_api
-  kappa_parameters)
+  kappa_parameters
+  kappa_webapp_ui)
  (preprocess
   (pps js_of_ocaml-ppx tyxml-ppx))
  (flags
@@ -118,7 +109,7 @@
   -open
   Js_of_ocaml_tyxml
   -open
-  Kappa_js_lib
+  Kappa_webapp_lib
   -open
   Kappa_json_api
   -open
@@ -140,4 +131,11 @@
   -open
   Kappa_logging
   -open
-  Kappa_cflow))
+  Kappa_cflow
+  -open 
+  Kappa_webapp_ui
+  -open
+  Kappa_webapp_ui
+  -open
+  Kappa_webapp_state
+  ))

gui/dune_js_of_ocaml_flags.inc

@@ -0,0 +1,12 @@
+; Windows build only has access to 4.0.0, where --disable flags don't exist yet in jsoo
+; TODO: better distinguish this, as this should depend on jsoo version and not OS
+
+(rule
+ (with-stdout-to
+  js_of_ocaml_flags.Unix
+  (echo "(:standard --disable globaldeadcode --disable deadcode)")))
+
+(rule
+ (with-stdout-to
+  js_of_ocaml_flags.Win32
+  (echo ":standard")))

gui/common.ml → gui/lib/common.ml

@@ -139,9 +139,22 @@ let async loc (task : unit -> 'a Lwt.t) : unit =
   Js_of_ocaml_lwt.Lwt_js_events.async (fun () ->
       Lwt.catch task (fun exn ->
           let () =
-            info ~loc:__LOC__ (Js.string (loc ^ Printexc.to_string exn))
+            warn ~loc:__LOC__
+              (Js.string
+                 ("Async error at " ^ loc ^ ":\n" ^ Printexc.to_string exn))
           in
-          let () = debug ~loc:__LOC__ (Js.string (Printexc.get_backtrace ())) in
+          let log_trace =
+            if Printexc.backtrace_status () then (
+              let trace = Printexc.get_backtrace () in
+              if String.length trace > 0 then
+                "Backtrace: " ^ trace
+              else
+                "Couldn't get backtrace while backtrace record is enabled, \
+                 might be because of jsoo or react :/"
+            ) else
+              "Enable backtrace recording to (hopefully?) get backtrace"
+          in
+          let () = warn ~loc:__LOC__ (Js.string log_trace) in
           Lwt.return_unit))
 
 let guid () : string =

gui/lib/dune

@@ -0,0 +1,28 @@
+(library
+ (name kappa_webapp_lib)
+ (preprocess
+  (pps 
+    js_of_ocaml-ppx 
+    tyxml-ppx 
+    ppx_inline_test
+  ))
+ (libraries 
+  js_of_ocaml-lwt 
+  lwt_react
+  js_of_ocaml-tyxml 
+  ppx_inline_test
+  kappa_webapp_lib_no_js
+  kappa_parameters
+  kappa_kasa_type_interface)
+ (flags :standard -w +a 
+  -open 
+  Js_of_ocaml
+  -open
+  Js_of_ocaml_tyxml
+  -open
+  Kappa_kasa_type_interface
+  -open
+  Kappa_parameters
+ ))
+
+

gui/lib/hooked.ml

@@ -0,0 +1,11 @@
+module DebugPrint : Kappa_webapp_lib_no_js.Hooked.DebugPrint = struct
+  let debug_print s =
+    let () = Common.debug ~loc:__LOC__ s in
+    ()
+end
+
+module S = Kappa_webapp_lib_no_js.Hooked.MakeS (DebugPrint)
+module E = Kappa_webapp_lib_no_js.Hooked.MakeE (DebugPrint)
+
+type 'a signal = 'a S.t
+type 'a event = 'a E.t

gui/lib/hooked.mli

@@ -0,0 +1,6 @@
+module DebugPrint : Kappa_webapp_lib_no_js.Hooked.DebugPrint
+module S : Kappa_webapp_lib_no_js.Hooked.S
+module E : Kappa_webapp_lib_no_js.Hooked.E
+
+type 'a signal = 'a S.t
+type 'a event = 'a E.t