Manual changes

Author: Julow

src/lib/client/dune

@@ -28,7 +28,8 @@
   logs.browser
   cohttp
   tyxml
-  reactiveData)
+  reactiveData
+  eio)
  (foreign_stubs
   (language c)
   (names eliom_stubs))

src/lib/eliom_comet.client.ml

@@ -170,10 +170,7 @@ module Configuration = struct
       let () =
         Fiber.any
           [ (fun () -> Js_of_ocaml_lwt.Lwt_js.sleep t)
-          ; (fun () ->
-              !
-                (* TODO: lwt-to-direct-style: This computation might not be suspended correctly. *)
-                update_configuration_waiter)
+          ; (fun () -> Promise.await !update_configuration_waiter)
           ; active_waiter ]
       in
       let remaining_time = sleep_duration () -. (Sys.time () -. time) in

src/lib/eliom_common.server.ml

@@ -242,7 +242,6 @@ type 'a cookie_info1 =
   (* None = new cookie
       (not sent by the browser) *)
   * one_persistent_cookie_info session_cookie ref)
-    Promise.t
     (* SCNo_data = the session has been closed
       SCData_session_expired = the cookie has not been found in the table.
       For both of them, ask the browser to remove the cookie.
@@ -300,7 +299,8 @@ let network_of_ip k mask4 mask6 =
 
 let network_of_request r ~mask4 ~mask6 =
   match Ocsigen_request.client_conn r with
-  | `Inet (ip, _) -> network_of_ip ip mask4 mask6
+  | `Inet (ip, _) ->
+      network_of_ip (Ipaddr.of_string_exn (ip :> string)) mask4 mask6
   | _ -> Ipaddr.(V6 V6.localhost)
 
 module Net_addr_Hashtbl : sig
@@ -831,7 +831,7 @@ let empty_tables max forsession =
                      Ocsigen_request.client_conn
                        sp.sp_request.Ocsigen_extensions.request_info
                    with
-                   | `Inet (ip, _) -> ip
+                   | `Inet (ip, _) -> Ipaddr.of_string_exn (ip :> string)
                    | _ -> default_ip_table_key
                  in
                  ( ip

src/lib/eliom_common.server.mli

@@ -360,7 +360,6 @@ type 'a cookie_info1 =
       ref
   * ((string * timeout * float option * perssessgrp option) option
     * one_persistent_cookie_info session_cookie ref)
-      Promise.t
       Lazy.t
       Full_state_name_table.t
       ref

src/lib/eliom_cscache.eliom

@@ -1,10 +1,10 @@
-open Eio.Std
+open%server Eio.Std
 
 (* Copyright Vincent Balat *)
 
 [%%shared.start]
 
-type ('a, 'b) t = (unit -> ('a, 'b Promise.t) Hashtbl.t) Eliom_shared.Value.t
+type ('a, 'b) t = (unit -> ('a, 'b Promise.or_exn) Hashtbl.t) Eliom_shared.Value.t
 
 let%client create_ () =
   let c = Hashtbl.create 100 in
@@ -37,26 +37,27 @@ let%server do_cache cache id v =
   ignore [%client.unsafe (do_cache ~%cache ~%id ~%v : unit)]
 
 let%server find cache get_data id =
-  try Hashtbl.find ((Eliom_shared.Value.local cache) ()) id
+  try Promise.await_exn (Hashtbl.find ((Eliom_shared.Value.local cache) ()) id)
   with Not_found ->
     let th =
-      let v = get_data id in
-      ignore [%client.unsafe (do_cache ~%cache ~%id ~%v : unit)];
-      v
+      Fiber.fork_promise
+        ~sw:(Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch))
+        (fun () ->
+           let v = get_data id in
+           ignore [%client.unsafe (do_cache ~%cache ~%id ~%v : unit)];
+           v)
     in
-    (* On server side, we put immediately in table the thread that is
-       fetching the data.  in order to avoid fetching it several
-       times. *)
-    do_cache_raw cache id th;
-    th
+    (* On server side, we put immediately in table the thread that is fetching
+       the data. in order to avoid fetching it several times. *)
+    do_cache_raw cache id th; Promise.await_exn th
 
 let%client load cache get_data id =
   let th = get_data id in
   (* On client side, we put immediately in table the thread that is
      fetching the data.  Thus, [get_data_from_cache] returns
      immediately (in order to display a spinner). *)
   do_cache_raw cache id th;
-  th
+  Promise.await_exn th
 
 let%client find cache get_data id =
   try Hashtbl.find ((Eliom_shared.Value.local cache) ()) id
@@ -68,4 +69,7 @@ let local_find cache id = Hashtbl.find ((Eliom_shared.Value.local cache) ()) id
 
 let find_if_ready cache id =
   let v = local_find cache id in
-  match Promise.peek v with Some v -> v | _ -> raise Not_ready
+  match Promise.peek v with
+  | Some (Ok v) -> v
+  | Some (Error e) -> raise e
+  | _ -> raise Not_ready

src/lib/eliom_cscache.eliomi

@@ -40,14 +40,14 @@ val find : ('a, 'b) t -> ('a -> 'b) -> 'a -> 'b
     result in a single call to [get_from_db]. Exceptions are not
     cached.  *)
 
-val do_cache : ('a, 'b) t -> 'a -> 'b -> unit
+val do_cache : ('a, 'b) t -> 'a -> 'b Eio.Promise.or_exn -> unit
 (** [do_cache cache key value] adds the association from [key] to
     [value] in [cache], or replaces it if not already present.  Called
     from client side, it affects only client side cache.  Called from
     server side, it will have effect both on the server cache (scope:
     request) and the client side cache.  *)
 
-val local_find : ('a, 'b) t -> 'a -> 'b
+val local_find : ('a, 'b) t -> 'a -> 'b Eio.Promise.or_exn
 (** Find a piece of data in local cache, without trying to fetch it
     from server. Raises [Not_found] instead.  If the value is currently
     being retrieved, it waits for it to be ready before returning.  *)

src/lib/eliom_form.eliom

@@ -1,5 +1,3 @@
-open Eio.Std
-
 (* Ocsigen
  * http://www.ocsigen.org
  * Module Eliom_form
@@ -124,6 +122,7 @@ module Make_links (Html : Html) = struct
         let f =
           [%client.unsafe
             fun ev ->
+              let open Eio.Std in
               if not (Eliom_client.middleClick ev) then (
                 Dom.preventDefault ev;
                 Dom_html.stopPropagation ev;

src/lib/eliom_parameter.server.mli

@@ -20,7 +20,7 @@
 include
   Eliom_parameter_sigs.S
   with type raw_post_data =
-    ((string * string) * (string * string) list) option * Cohttp_lwt.Body.t
+    ((string * string) * (string * string) list) option * Cohttp_eio.Body.t
 
 val user_type :
    ?client_to_and_of:'a to_and_of Eliom_client_value.t

src/lib/eliom_parameter_sigs.shared.mli

@@ -1,5 +1,3 @@
-open Eio.Std
-
 (* Ocsigen
  * http://www.ocsigen.org
  * Copyright (C) 2007-2016 Vincent Balat
@@ -379,8 +377,8 @@ module type S = sig
   val reconstruct_params :
      sp:Eliom_common.server_params
     -> ('a, [< `WithSuffix | `WithoutSuffix], 'c) params_type
-    -> (string * string) list Promise.t option
-    -> (string * Eliom_lib.file_info) list Promise.t option
+    -> (string * string) list option
+    -> (string * Eliom_lib.file_info) list option
     -> bool
     -> Eliom_lib.Url.path option
     -> 'a

src/lib/eliom_reference.server.ml

@@ -1,5 +1,3 @@
-open Eio.Std
-
 (* Ocsigen
  * http://www.ocsigen.org
  * Copyright (C) 2010 Vincent Balat
@@ -29,16 +27,16 @@ module Ocsipersist = struct
   include Eliom_common.Ocsipersist.Polymorphic
 end
 
-let pers_ref_store = Ocsipersist.open_store "eliom__persistent_refs"
+let pers_ref_store = lazy (Ocsipersist.open_store "eliom__persistent_refs")
 
 type 'a eref_kind =
   | Req of 'a Polytables.key
   | Sit of 'a Polytables.key
   | Ref of 'a lazy_t ref (* Ocaml reference *)
   | Vol of 'a volatile_table Lazy.t (* Vol. table (group, session, process) *)
-  | Ocsiper of 'a option Ocsipersist.t Promise.t (* Global persist. table *)
-  | Ocsiper_sit of 'a Ocsipersist.table Promise.t (* Persist. table for site *)
-  | Per of 'a persistent_table Promise.t
+  | Ocsiper of 'a option Ocsipersist.t Lazy.t (* Global persist. table *)
+  | Ocsiper_sit of 'a Ocsipersist.table Lazy.t (* Persist. table for site *)
+  | Per of 'a persistent_table Lazy.t
 (* Persist. table for group session or process *)
 
 type volatile = [`Volatile]
@@ -175,18 +173,20 @@ let eref_from_fun_ ~ext ~scope ?secure ?persistent f : 'a eref =
         ( f
         , ext
         , Ocsiper
-            (let store = pers_ref_store in
-             Ocsipersist.make_persistent ~store ~name ~default:None) ))
+            (lazy
+              (let (lazy store) = pers_ref_store in
+               Ocsipersist.make_persistent ~store ~name ~default:None)) ))
   | `Site -> (
     match persistent with
     | None -> (Volatile.eref_from_fun_ ~ext ~scope ?secure f :> _ eref)
     | Some name ->
         (*VVV!!! ??? CHECK! *)
-        f, ext, Ocsiper_sit (Ocsipersist.open_table name))
+        f, ext, Ocsiper_sit (lazy (Ocsipersist.open_table name)))
   | #Eliom_common.user_scope as scope -> (
     match persistent with
     | None -> (Volatile.eref_from_fun_ ~ext ~scope ?secure f :> _ eref)
-    | Some name -> f, ext, Per (create_persistent_table ~scope ?secure name))
+    | Some name ->
+        f, ext, Per (lazy (create_persistent_table ~scope ?secure name)))
 
 let eref_from_fun ~scope ?secure ?persistent f : 'a eref =
   eref_from_fun_ ~ext:false ~scope ?secure ?persistent f
@@ -202,23 +202,23 @@ let get_site_id () =
 let get ((f, _, table) as eref) =
   match table with
   | Per t -> (
-      let t = t in
+      let (lazy t) = t in
       match get_persistent_data ~table:t () with
       | Data d -> d
       | _ ->
           let value = f () in
           set_persistent_data ~table:t value;
           value)
   | Ocsiper r -> (
-      let r = r in
+      let (lazy r) = r in
       match Ocsipersist.get r with
       | Some v -> v
       | None ->
           let value = f () in
           Ocsipersist.set r (Some value);
           value)
   | Ocsiper_sit t -> (
-      let t = t in
+      let (lazy t) = t in
       let site_id = get_site_id () in
       try Ocsipersist.find t site_id
       with Not_found ->
@@ -230,13 +230,13 @@ let get ((f, _, table) as eref) =
 let set ((_, _, table) as eref) value =
   match table with
   | Per t ->
-      let t = t in
+      let (lazy t) = t in
       set_persistent_data ~table:t value
   | Ocsiper r ->
-      let r = r in
+      let (lazy r) = r in
       Ocsipersist.set r (Some value)
   | Ocsiper_sit t ->
-      let t = t in
+      let (lazy t) = t in
       Ocsipersist.add t (get_site_id ()) value
   | _ -> Volatile.set eref value
 
@@ -247,13 +247,13 @@ let modify eref f =
 let unset ((_, _, table) as eref) =
   match table with
   | Per t ->
-      let t = t in
+      let (lazy t) = t in
       remove_persistent_data ~table:t ()
   | Ocsiper r ->
-      let r = r in
+      let (lazy r) = r in
       Ocsipersist.set r None
   | Ocsiper_sit t ->
-      let t = t in
+      let (lazy t) = t in
       Ocsipersist.remove t (get_site_id ())
   | _ -> Volatile.unset eref
 
@@ -263,7 +263,7 @@ module Ext = struct
     match table with
     | Vol _ -> Volatile.Ext.get state r
     | Per t -> (
-        let t = t in
+        let (lazy t) = t in
         try Eliom_state.Ext.Low_level.get_persistent_data ~state ~table:t with
         | Not_found ->
             if ext (* We can run the function from another state *)
@@ -281,7 +281,7 @@ module Ext = struct
     match table with
     | Vol _ -> Volatile.Ext.set state r value
     | Per t ->
-        let t = t in
+        let (lazy t) = t in
         Eliom_state.Ext.Low_level.set_persistent_data ~state ~table:t value
     | _ -> raise (Failure "wrong eref for this function")
 
@@ -294,7 +294,7 @@ module Ext = struct
     match table with
     | Vol _ -> Volatile.Ext.unset state r
     | Per t ->
-        let t = t in
+        let (lazy t) = t in
         Eliom_state.Ext.Low_level.remove_persistent_data ~state ~table:t
     | _ -> failwith "wrong eref for this function"
 end