feat(websocketaf-eio): track sw for gluten (#52)

* feat(websocketaf-eio): track sw for gluten * update flake * don't require close * fix: gh actions * fix: examples
anmonteiro · Jul 9, 2023 · cf9b528 · cf9b528
1 parent a1c3db2
commit cf9b528
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 36 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ocamlVersion: [4_12, 4_13, 4_14, 5_00]
+        ocamlVersion: [4_14, 5_0, 5_1]
     steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v17
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v22
       with:
         extra_nix_config: |
           extra-substituters = https://anmonteiro.nix-cache.workers.dev

diff --git a/eio/websocketaf_eio.ml b/eio/websocketaf_eio.ml
@@ -9,19 +9,21 @@ module Server = struct
   let create_connection_handler
     ?(config = Httpaf.Config.default)
     ~websocket_handler
-    ~error_handler = fun client_addr socket ->
-    let connection =
-      Websocketaf.Server_connection.create
-        ~sha1
-        ~error_handler:(error_handler client_addr)
-        (websocket_handler client_addr)
-    in
-    Gluten_eio.Server.create_connection_handler
-      ~read_buffer_size:config.read_buffer_size
-      ~protocol:(module Websocketaf.Server_connection)
-      connection
-      client_addr
-      socket
+    ~error_handler ~sw =
+    fun client_addr socket ->
+      let connection =
+        Websocketaf.Server_connection.create
+          ~sha1
+          ~error_handler:(error_handler client_addr)
+          (websocket_handler client_addr)
+      in
+      Gluten_eio.Server.create_connection_handler
+        ~read_buffer_size:config.read_buffer_size
+        ~protocol:(module Websocketaf.Server_connection)
+        ~sw
+        connection
+        client_addr
+        socket
 end
 
 module Client = struct

diff --git a/eio/websocketaf_eio.mli b/eio/websocketaf_eio.mli
@@ -6,7 +6,8 @@ module Server : sig
     :  ?config : Httpaf.Config.t
     -> websocket_handler : (Eio.Net.Sockaddr.stream -> Wsd.t -> Websocket_connection.input_handlers)
     -> error_handler : (Eio.Net.Sockaddr.stream -> Server_connection.error_handler)
-    -> (Eio.Net.Sockaddr.stream -> Eio.Flow.two_way -> unit)
+    -> sw:Eio.Switch.t
+    -> (Eio.Net.Sockaddr.stream -> #Eio.Flow.two_way -> unit)
 end
 
 module Client : sig
@@ -22,7 +23,7 @@ module Client : sig
     -> resource       : string
     -> error_handler : (Client_connection.error -> unit)
     -> websocket_handler : (Wsd.t -> Websocket_connection.input_handlers)
-    -> Eio.Flow.two_way
+    -> #Eio.Flow.two_way
     -> t
 
   val is_closed : t -> bool

diff --git a/examples/eio/echo_server.ml b/examples/eio/echo_server.ml
@@ -1,4 +1,4 @@
-let connection_handler : Eio.Net.Sockaddr.stream -> Eio.Net.stream_socket -> unit =
+let connection_handler ~sw : Eio.Net.Sockaddr.stream -> Eio.Net.stream_socket -> unit =
   let module Body = Httpaf.Body in
   let module Headers = Httpaf.Headers in
   let module Reqd = Httpaf.Reqd in
@@ -42,6 +42,7 @@ let connection_handler : Eio.Net.Sockaddr.stream -> Eio.Net.stream_socket -> uni
     ?config:None
     ~websocket_handler
     ~error_handler
+    ~sw
 
 
 let () =
@@ -69,7 +70,7 @@ let () =
             while true do
               Eio.Net.accept_fork socket ~sw ~on_error:(fun _ -> assert false) (fun client_sock client_addr ->
                   (* let p, u = Eio.Promise.create () in *)
-                  connection_handler client_addr client_sock)
+                  connection_handler ~sw client_addr client_sock)
             done;
           `Stop_daemon)))
     done;

diff --git a/examples/eio/echo_server_upgrade.ml b/examples/eio/echo_server_upgrade.ml
@@ -103,7 +103,7 @@ let () =
             while true do
               Eio.Net.accept_fork socket ~sw ~on_error:(fun _ -> assert false) (fun client_sock client_addr ->
                   (* let p, u = Eio.Promise.create () in *)
-                  connection_handler client_addr client_sock)
+                  connection_handler ~sw client_addr client_sock)
             done;
           `Stop_daemon)))
     done;

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,12 +4,12 @@
   inputs.nix-filter.url = "github:numtide/nix-filter";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.inputs.flake-utils.follows = "flake-utils";
-  inputs.nixpkgs.url = "github:anmonteiro/nix-overlays";
+  inputs.nixpkgs.url = "github:anmonteiro/nix-overlays/anmonteiro/update-gluten-piaf";
 
   outputs = { self, nixpkgs, flake-utils, nix-filter }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
+        pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
           ocamlPackages = super.ocaml-ng.ocamlPackages_5_0;
         });
       in