Switch to Cohttp

.jenkins.sh

@@ -1,3 +1,11 @@
+opam pin add js_of_ocaml --dev-repo --no-action
+
+for pkg in camlp4 compiler lwt ocamlbuild ppx tyxml; do
+    opam pin add js_of_ocaml-$pkg \
+         https://github.com/ocsigen/js_of_ocaml.git \
+         --no-action
+done
+
 opam pin add --no-action eliom .
 opam install --deps-only eliom
 opam install --verbose eliom

VERSION

@@ -1 +1 @@
-6.3.0
+8.0.0

opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "eliom"
-version: "7.0.0"
+version: "8.0.0"
 maintainer: "dev@ocsigen.org"
 authors: "dev@ocsigen.org"
 synopsis: "Client/server Web framework"
@@ -25,7 +25,7 @@ depends: [
   "lwt_log"
   "lwt_ppx"
   "tyxml" {>= "4.4.0" & < "5.0.0"}
-  "ocsigenserver" {>= "2.18.0"}
+  "ocsigenserver" {>= "3.0.0"}
   "ipaddr" {>= "2.1"}
   "reactiveData" {>= "0.2.1"}
   "dbm" | "sqlite3"

pkg/filelist.ml

@@ -22,7 +22,6 @@ let server = {
     "eliom_common";
     "eliom_config";
     "eliom_content";
-    "eliom_cookie";
     "eliom_extension";
     "eliom_lib";
     "eliom_mkreg";

src/lib/client/eliommod_cookies.ml

@@ -19,28 +19,31 @@
 
 open Js_of_ocaml
 open Eliom_lib
-open Ocsigen_cookies
 
 include Eliom_cookies_base
 
 (* CCC The tables are indexed by the hostname, not the port appear.
    there are no particular reason. If needed it is possible to add it *)
-let cookie_tables = Jstable.create ()
+let cookie_tables
+  : (float option * string * bool) Ocsigen_cookie_map.Map_inner.t
+      Ocsigen_cookie_map.Map_path.t Jstable.t
+  = Jstable.create ()
 
 (** [in_local_storage] implements cookie substitutes for iOS WKWebView *)
 let get_table ?(in_local_storage=false) = function
-  | None -> Cookies.empty
+  | None -> Ocsigen_cookie_map.Map_path.empty
   | Some host ->
     if in_local_storage then
       let host = Js.string (host ^ "/substitutes") in
-      Js.Optdef.case (Dom_html.window##.localStorage) (fun () -> Cookies.empty)
+      Js.Optdef.case (Dom_html.window##.localStorage)
+        (fun () -> Ocsigen_cookie_map.Map_path.empty)
         (fun st ->
            Js.Opt.case (st##(getItem host))
-             (fun () -> Cookies.empty)
+             (fun () -> Ocsigen_cookie_map.Map_path.empty)
              (fun v -> Json.unsafe_input v))
     else
       Js.Optdef.get (Jstable.find cookie_tables (Js.string host))
-        (fun () -> Cookies.empty)
+        (fun () -> Ocsigen_cookie_map.Map_path.empty)
 
 (** [in_local_storage] implements cookie substitutes for iOS WKWebView *)
 let set_table ?(in_local_storage=false) host t =
@@ -60,53 +63,56 @@ let now () =
   Js.to_float (date##getTime) /. 1000.
 
 (** [in_local_storage] implements cookie substitutes for iOS WKWebView *)
-let update_cookie_table ?(in_local_storage=false) host cookieset =
+let update_cookie_table ?(in_local_storage=false) host cookies =
   let now = now () in
-  Cookies.iter
+  Ocsigen_cookie_map.Map_path.iter
     (fun path table ->
-      CookiesTable.iter
-        (fun name -> function
-          | OSet (Some exp, _, _) when exp <= now ->
-            set_table ~in_local_storage
-              host (remove_cookie path name (get_table ~in_local_storage host))
-          | OUnset ->
-            set_table ~in_local_storage
-              host (remove_cookie path name (get_table ~in_local_storage host))
-          | OSet (exp, value, secure) ->
-            set_table ~in_local_storage
-              host (add_cookie path name (exp, value, secure)
-                      (get_table ~in_local_storage host)))
-        table
-    )
-    cookieset
+       Ocsigen_cookie_map.Map_inner.iter
+         (fun name -> function
+            | OSet (Some exp, _, _) when exp <= now ->
+              set_table ~in_local_storage host
+                (Ocsigen_cookie_map.Poly.remove ~path name
+                   (get_table ~in_local_storage host))
+            | OUnset ->
+              set_table ~in_local_storage host
+                (Ocsigen_cookie_map.Poly.remove ~path name
+                   (get_table ~in_local_storage host))
+            | OSet (exp, value, secure) ->
+              set_table ~in_local_storage host
+                (Ocsigen_cookie_map.Poly.add ~path name
+                   (exp, value, secure)
+                   (get_table ~in_local_storage host)))
+         table)
+    cookies
 
 (** [in_local_storage] implements cookie substitutes for iOS WKWebView *)
 let get_cookies_to_send ?(in_local_storage=false) host https path =
   let now = now () in
-  Cookies.fold
+  Ocsigen_cookie_map.Map_path.fold
     (fun cpath t cookies_to_send ->
       if Url.is_prefix_skip_end_slash
           (Url.remove_slash_at_beginning cpath)
           (Url.remove_slash_at_beginning path)
-      then CookiesTable.fold
-        (fun name (exp, value, secure) cookies_to_send ->
-          match exp with
-            | Some exp when exp <= now ->
-              set_table ~in_local_storage host
-                (remove_cookie cpath name (get_table ~in_local_storage host));
-              cookies_to_send
-            | _ ->
-              if (not secure) || https
-              then (name,value)::cookies_to_send
-              else cookies_to_send
-        )
-        t
-        cookies_to_send
-      else cookies_to_send
-    )
+      then
+        Ocsigen_cookie_map.Map_inner.fold
+          (fun name (exp, value, secure) cookies_to_send ->
+             match exp with
+             | Some exp when exp <= now ->
+               set_table ~in_local_storage host
+                 (Ocsigen_cookie_map.Poly.remove cpath
+                    name (get_table ~in_local_storage host));
+               cookies_to_send
+             | _ ->
+               if (not secure) || https
+               then (name,value)::cookies_to_send
+               else cookies_to_send)
+          t cookies_to_send
+      else
+        cookies_to_send)
     (get_table ~in_local_storage host)
     []
 
 
 let make_new_session_id () =
-  failwith "Cannot define anonymous coservices on client side. Ask their values to the server."
+  failwith "Cannot define anonymous coservices on client side. \
+            Ask their values to the server."

src/lib/eliom_client.client.ml

@@ -97,13 +97,10 @@ let init_client_app
   Eliom_process.set_request_template None;
   (* We set the tab cookie table, with the app name inside: *)
   Eliom_process.set_request_cookies
-    (Ocsigen_cookies.Cookies.add
-       []
-       (Ocsigen_cookies.CookiesTable.add
-          Eliom_common.appl_name_cookie_name
-          (Eliommod_cookies.OSet (None, app_name, false))
-          Ocsigen_cookies.CookiesTable.empty)
-       Ocsigen_cookies.Cookies.empty);
+    (Ocsigen_cookie_map.add ~path:[]
+       Eliom_common.appl_name_cookie_name
+       (Ocsigen_cookie_map.OSet (None, app_name, false))
+       Ocsigen_cookie_map.empty);
   ignore (get_global_data ())
 
 let is_client_app () = !Eliom_common.is_client_app

src/lib/eliom_client.server.mli

@@ -38,7 +38,7 @@ val server_function :
   ?charset:string ->
   ?code:int ->
   ?content_type:string ->
-  ?headers:Http_headers.t ->
+  ?headers:Ocsigen_header.t ->
   ?secure_session:bool ->
   ?name:string ->
   ?csrf_safe:bool ->

src/lib/eliom_comet.server.ml

@@ -516,8 +516,10 @@ end = struct
     handler.hd_registered_chan_id <- List.filter ((<>) chan_id) handler.hd_registered_chan_id
 
   let wait_closed_connection () =
-    let ri = Eliom_request_info.get_ri () in
-    let%lwt () = Ocsigen_extensions.Ocsigen_request_info.connection_closed ri in
+    let%lwt () =
+      Ocsigen_request.connection_closed
+        (Eliom_request_info.get_ri ())
+    in
     Lwt.fail Connection_closed
 
   (* register the service handler.hd_service *)