Manual changes

Cohttp_eio substitutes Cohttp_lwt_unix.

Uncaught exceptions are now logged with `Cohttp_eio`'s `~on_error`
callback.

The active switch and the environment are passed using Fiber variables.

Ocsigen_stream: Read loop adapted to Eio

Ocsigen_response: Adapted to Eio.File and use unbuffered Eio.Flow read

Ocsigen_response: Cohttp_eio doesn't expose the internal Response module.

Ocsigen_server: Server no longer listen on IPv6 when started with `` ~ports:[ `All ] ``.

Revproxy: Implement `get_inet_addr` with Eio
Revproxy: HTTPS is not supported out of the box in Cohttp_eio

Async exceptions are now handled with a result type:
`Fiber.fork_promise` returns a `('a, exn) result Promise.t` and no
longer use a callback for exceptions.

Add dependency on magic-mime. It was a transitive dependency through cohttp-lwt-unix.

Command pipe: Fork daemon

Use Eio.Exn.pp instead of Printexc.to_string in log messages.
Eio exceptions are printed in a better way with regard to the margin.

Author: Julow

dune-project

@@ -18,12 +18,12 @@
  (depends
   (ocaml (>= 4.08.1))
   (camlzip (>= 1.04))
-  (cohttp-lwt-unix (>= 6.0))
-  conduit-lwt-unix
+  cohttp-eio
   http
   cryptokit
   (ipaddr (>= 2.1))
-  (lwt (>= 3.0))
+  eio
+  eio_main
   lwt_react
   lwt_ssl
   ocamlfind

ocsigenserver.opam

@@ -13,12 +13,12 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.08.1"}
   "camlzip" {>= "1.04"}
-  "cohttp-lwt-unix" {>= "6.0"}
-  "conduit-lwt-unix"
+  "cohttp-eio"
   "http"
   "cryptokit"
   "ipaddr" {>= "2.1"}
-  "lwt" {>= "3.0"}
+  "eio"
+  "eio_main"
   "lwt_react"
   "lwt_ssl"
   "ocamlfind"

src/baselib/dune

@@ -4,7 +4,7 @@
  (flags
   (:standard -no-keep-locs))
  (modules ocsigen_lib_base)
- (libraries lwt))
+ (libraries eio eio.unix))
 
 (library
  (name baselib)
@@ -22,11 +22,12 @@
  (libraries
   str
   findlib
-  lwt.unix
+  eio
   cryptokit
   re
   ocsigen_lib_base
-  cohttp-lwt
+  cohttp
+  cohttp-eio
   logs
   (select
    dynlink_wrapper.ml

src/baselib/ocsigen_cache.ml

@@ -120,7 +120,8 @@ end = struct
     ; mutable finaliser_after : 'a node -> unit
     ; time_bound : time_bound option }
 
-  and time_bound = {timer : float; mutable collector : unit Promise.t option}
+  and time_bound =
+    {timer : float; mutable collector : (unit, exn) result Promise.t option}
 
   (* Checks (by BY):
 
@@ -227,10 +228,13 @@ end = struct
       | Some n ->
           t.collector <-
             Some
-              (sleep_until n.collection;
-               collect r n;
-               t.collector <- None;
-               update_collector r))
+              (Fiber.fork_promise
+                 ~sw:(Option.get (Fiber.get Ocsigen_lib.current_switch))
+                 (fun () ->
+                    sleep_until n.collection;
+                    collect r n;
+                    t.collector <- None;
+                    update_collector r)))
 
   (* Add a node that do not belong to any list to a list.
      The fields [succ] and [prev] are overridden.

src/baselib/ocsigen_lib.ml

@@ -16,9 +16,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *)
 
+open Eio.Std
 include Ocsigen_lib_base
 module String = String_base
 
+let current_switch = Eio.Fiber.create_key ()
+let env = Eio.Fiber.create_key ()
+
 (*****************************************************************************)
 
 module Ip_address = struct
@@ -27,17 +31,15 @@ module Ip_address = struct
   let get_inet_addr ?(v6 = false) host =
     let rec aux = function
       | [] -> raise No_such_host
-      | {Unix.ai_addr = Unix.ADDR_INET (inet_addr, _); _} :: _ -> inet_addr
+      | `Tcp (ipv4v6, _port) :: tl ->
+          Eio.Net.Ipaddr.fold
+            ~v4:(fun ip -> if v6 then aux tl else ip)
+            ~v6:(fun ip -> if v6 then ip else aux tl)
+            ipv4v6
       | _ :: l -> aux l
     in
-    let options =
-      [ (if v6 then Unix.AI_FAMILY Unix.PF_INET6 else Unix.AI_FAMILY Unix.PF_INET)
-      ]
-    in
-    aux
-      (Unix.getaddrinfo
-         (* TODO: lwt-to-direct-style: This call to [Unix.getaddrinfo] was [Lwt_unix.getaddrinfo] before the rewrite. *)
-         host "" options)
+    let env = Stdlib.Option.get (Fiber.get env) in
+    (aux (Eio.Net.getaddrinfo env#net host) : _ Eio.Net.Ipaddr.t :> string)
 end
 
 (*****************************************************************************)

src/baselib/ocsigen_lib.mli

@@ -29,6 +29,9 @@ include
    and type 'a Clist.t = 'a Ocsigen_lib_base.Clist.t
    and type 'a Clist.node = 'a Ocsigen_lib_base.Clist.node
 
+val current_switch : Eio.Switch.t Eio.Fiber.key
+val env : Eio_unix.Stdenv.base Eio.Fiber.key
+
 val make_cryptographic_safe_string : unit -> string
 (** Generate an unique and cryptographically safe random string.
     It is impossible to guess for other people and
@@ -39,7 +42,7 @@ module String : module type of String_base
 module Ip_address : sig
   exception No_such_host
 
-  val get_inet_addr : ?v6:bool -> string -> Unix.inet_addr
+  val get_inet_addr : ?v6:bool -> string -> string
 end
 
 module Filename : sig

src/baselib/ocsigen_stream.ml

@@ -25,7 +25,8 @@ exception Cancelled
 exception Already_read
 exception Finalized
 
-type 'a stream = 'a step Promise.t Lazy.t
+type 'a stream = 'a step Lazy.t
+(** Forcing a [stream] performs effects. *)
 
 and 'a step =
   | Finished of 'a stream option
@@ -215,43 +216,35 @@ let substream delim s =
 let of_file filename =
   let fd = Unix.openfile filename [Unix.O_RDONLY; Unix.O_NONBLOCK] 0o666 in
   let ch =
-    (fun x1 ->
-       Eio.Buf_read.of_flow ~max_size:1_000_000
-         (Eio_unix.Net.import_socket_stream
-            ~sw:(Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch))
-            ~close_unix:true x1
-          : [`R | `Flow | `Close] r))
-      fd
+    (Eio_unix.Net.import_socket_stream
+       ~sw:(Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch))
+       ~close_unix:true fd
+     : [`R | `Flow | `Close] r)
   in
-  let buf = Bytes.create 1024 in
+  let buf = Cstruct.create 1024 in
   let rec aux () =
-    let n =
-      Eio.Flow.single_read
-        (* TODO: lwt-to-direct-style: [buf] should be a [Cstruct.t]. *)
-        (* TODO: lwt-to-direct-style: [Eio.Flow.single_read] operates on a [Flow.source] but [ch] is likely of type [Eio.Buf_read.t]. Rewrite this code to use [Buf_read] (which contains an internal buffer) or change the call to [Eio.Buf_read.of_flow] used to create the buffer. *)
-        (* TODO: lwt-to-direct-style: Dropped expression (buffer offset): [0]. *)
-        (* TODO: lwt-to-direct-style: Dropped expression (buffer length): [1024]. *)
-        ch buf
-    in
+    let n = Eio.Flow.single_read ch buf in
     if n = 0
     then empty None
     else
       (* Streams should be immutable, thus we always make a copy
          of the buffer *)
-      cont (Bytes.sub_string buf 0 n) aux
+      cont (Cstruct.to_string ~len:n buf) aux
   in
   make ~finalize:(fun _ -> Unix.close fd) aux
 
 let of_string s = make (fun () -> cont s (fun () -> empty None))
 
-(** Convert a {!Lwt_stream.t} to an {!Ocsigen_stream.t}. *)
-let of_lwt_stream stream =
+let of_eio_flow body =
+  let buf = Cstruct.create !net_buffer_size in
   let rec aux () =
-    match Lwt_stream.get stream with Some e -> cont e aux | None -> empty None
+    match Eio.Flow.single_read body buf with
+    | exception End_of_file -> empty None
+    | len -> cont (Cstruct.to_string ~len buf) aux
   in
   make aux
 
-let of_cohttp_body body = Cohttp_lwt.Body.to_stream body |> of_lwt_stream
+let of_cohttp_body = of_eio_flow
 
 module StringStream = struct
   type out = string t

src/baselib/ocsigen_stream.mli

@@ -106,8 +106,8 @@ val of_file : string -> string t
 val of_string : string -> string t
 (** returns a stream containing a string. *)
 
-val of_cohttp_body : Cohttp_lwt.Body.t -> string t
-(** Convert a {!Lwt_stream.t} to an {!Ocsigen_stream.t}. *)
+val of_cohttp_body : Cohttp_eio.Body.t -> string t
+(** Convert the body of a request to a {!Ocsigen_stream}. *)
 
 module StringStream : sig
   type out = string t

src/extensions/revproxy.ml

@@ -22,6 +22,7 @@
 
     The reverse proxy is still experimental. *)
 
+open Eio.Std
 module Pcre = Re.Pcre
 
 let section = Logs.Src.create "ocsigen:ext:revproxy"
@@ -128,7 +129,13 @@ let gen dir = function
           Uri.make ~scheme ~host ~port ~path ()
         and body = Ocsigen_request.body request_info
         and meth = Ocsigen_request.meth request_info in
-        Cohttp_lwt_unix.Client.call ~headers ~body meth uri
+        let sw = Stdlib.Option.get (Fiber.get Ocsigen_lib.current_switch) in
+        let env = Stdlib.Option.get (Fiber.get Ocsigen_lib.env) in
+        let client =
+          (* TODO: Https not supported out of the box in [Cohttp_eio]. *)
+          Cohttp_eio.Client.make ~https:None env#net
+        in
+        Cohttp_eio.Client.call client ~sw ~headers ~body meth uri
       in
       Ocsigen_extensions.Ext_found
         (fun () -> Ocsigen_response.of_cohttp (do_request ()))

src/files/ocsigenserver.conf/gen.ml

@@ -84,7 +84,7 @@ let deps () =
     ; "ocsigenserver" ]
   in
   let packages =
-    "lwt_ssl,bytes,lwt.unix,logs,logs-syslog.unix,syslog-message,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-lwt-unix,http"
+    "lwt_ssl,bytes,lwt.unix,logs,logs-syslog.unix,syslog-message,ipaddr,findlib,cryptokit,re,str,xml-light,dynlink,cohttp-eio,http"
   in
   let deps = ref [] in
   let cmd = "ocamlfind query -p-format -recursive " ^ packages in