fix: use monotonically incrementing id per domain / compile tests

lib/server.ml

@@ -184,7 +184,7 @@ module Command = struct
     ; shutdown_resolvers : (unit -> unit) list
     ; client_sockets :
         (* TODO: pool of ids as old ones free up *)
-        (string, Eio.Net.stream_socket) Hashtbl.t list
+        (int, Eio.Net.stream_socket) Hashtbl.t list
     ; clock : Eio.Time.clock
     ; shutdown_timeout : float
     }
@@ -224,9 +224,9 @@ module Command = struct
 
   let accept_loop ~sw ~socket ~client_sockets connection_handler =
     let released_p, released_u = Promise.create () in
-    (* TODO: this can probably be a condition variable instead. *)
     let await_release () = Promise.await released_p in
     Fiber.fork ~sw (fun () ->
+        let id = ref 0 in
         while not (Promise.is_resolved released_p) do
           Fiber.first await_release (fun () ->
               Eio.Net.accept_fork
@@ -239,10 +239,14 @@ module Command = struct
                         (Printexc.to_string exn)))
                 (fun socket addr ->
                   Switch.run (fun sw ->
-                      let id = Openssl.random_string 20 in
-                      Hashtbl.replace client_sockets id socket;
+                      let connection_id =
+                        let cid = !id in
+                        incr id;
+                        cid
+                      in
+                      Hashtbl.replace client_sockets connection_id socket;
                       connection_handler ~sw socket addr;
-                      Hashtbl.remove client_sockets id)))
+                      Hashtbl.remove client_sockets connection_id)))
         done);
     fun () -> Promise.resolve released_u ()
 
@@ -266,18 +270,21 @@ module Command = struct
         network
         address
     in
-    let client_sockets = Hashtbl.create 256 in
     let resolvers = ref [] in
+    let resolver_mutex = Eio.Mutex.create () in
     let all_started, resolve_all_started = Promise.create () in
     for idx = 0 to domains - 1 do
       Eio.Fiber.fork ~sw (fun () ->
           let is_last_domain = idx = domains - 1 in
           let run_accept_loop () =
             Switch.run (fun sw ->
+                let client_sockets = Hashtbl.create 256 in
                 let resolver =
                   accept_loop ~sw ~client_sockets ~socket connection_handler
                 in
-                resolvers := resolver :: !resolvers;
+                Eio.Mutex.lock resolver_mutex;
+                resolvers := (resolver, client_sockets) :: !resolvers;
+                Eio.Mutex.unlock resolver_mutex;
                 if is_last_domain then Promise.resolve resolve_all_started ())
           in
           (* Last domain starts on the main thread. *)
@@ -288,8 +295,8 @@ module Command = struct
     Promise.await all_started;
     Log.info (fun m -> m "Server listening on %a" Eio.Net.Sockaddr.pp address);
     { sockets = [ socket ]
-    ; shutdown_resolvers = !resolvers
-    ; client_sockets = [ client_sockets ]
+    ; shutdown_resolvers = List.map fst !resolvers
+    ; client_sockets = List.map snd !resolvers
     ; clock = Eio.Stdenv.clock env
     ; shutdown_timeout
     }

lib_test/helper_server.ml

@@ -40,6 +40,7 @@ module HTTP = struct
       ~backlog
       ~domains
       ~address
+      ~shutdown_timeout:0.
       env
       (Server.http_connection_handler
          (Server.create ~config:(Server.Config.create address) request_handler))
@@ -131,6 +132,7 @@ module ALPN = struct
       ~address
       ~backlog
       ~domains
+      ~shutdown_timeout:0.
       env
       (fun ~sw:_ fd client_addr ->
         let server_ctx = Ssl.create_context Ssl.TLSv1_3 Ssl.Server_context in
@@ -241,6 +243,7 @@ module H2c = struct
       ~backlog
       ~domains
       ~address
+      ~shutdown_timeout:0.
       env
       (Server.http_connection_handler
          (Server.create