use eio with lwt_eio

bin/main.ml

@@ -14,6 +14,9 @@ let server () =
     req |> render ~default [ (text_html, main) ]
   in
 
+  Eio_main.run @@ fun env ->
+  Lwt_eio.with_event_loop ~clock:env#clock @@ fun _ ->
+  Lwt_eio.run_lwt @@ fun () ->
   Httpq.Server.start_server ~port ~error_handler Router.handler @@ fun () ->
   Migration.verify_migration_status ();%lwt
   Logq.info (fun m -> m "Listening on 127.0.0.1:%d" port);

lib/dune

@@ -30,12 +30,15 @@
   camlimages.xpm
   cstruct
   curl.lwt
+  eio
+  eio_main
   fpath
   httpq
   jingoo
   lambdasoup
   logq
   lwt
+  lwt_eio
   lwt.unix
   mirage-crypto-rng
   mirage-crypto-rng.lwt

lib_httpq/bare_server.ml

@@ -58,7 +58,7 @@ let start_server port k callback =
     Cohttp_lwt_unix.Server.make_response_action ~callback ()
     |> Cohttp_lwt_unix.Server.create ~mode:(`TCP (`Port port))
   in
-  Lwt.pick [ server; (k >>= fun () -> Lwt.task () |> fst) ] |> Lwt_main.run
+  Lwt.pick [ server; (k >>= fun () -> Lwt.task () |> fst) ]
 
 type ws_conn = {
   mutable frames_out_fn : (Websocket.Frame.t option -> unit) option;

lib_httpq/server.ml

@@ -185,7 +185,7 @@ let default_handler : handler = function
       in
       respond ~status ""
 
-let start_server ?(port = 8080) ?error_handler (handler : handler) k : unit =
+let start_server ?(port = 8080) ?error_handler (handler : handler) k : unit Lwt.t =
   Bare_server.start_server port (k ())
   @@ fun (req : Bare_server.Request.t) (body : Bare_server.Body.t) :
     Bare_server.Response.t Lwt.t ->

waq.opam

@@ -22,11 +22,14 @@ depends: [
   "cohttp-lwt-unix"
   "cppo"
   "cstruct"
+  "eio"
+  "eio_main"
   "dune" {>= "3.7"}
   "fpath"
   "jingoo"
   "lambdasoup"
   "lwt"
+  "lwt_eio"
   "lwt_ppx"
   "lwt_ssl"
   "mirage-crypto-rng" {<= "0.10.7"}