port to eio (#65)

* port to eio

* fix gh actions

* fix examples, pass sw/env to context, remove unneeded deps from dune
files

Author: anmonteiro

.github/workflows/test.yml

@@ -9,15 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ocamlVersion: [4_12, 4_13, 4_14, 5_00]
+        ocamlVersion: [5_00]
     steps:
     - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v16
+    - uses: cachix/install-nix-action@v18
       with:
-        skip_adding_nixpkgs_channel: true
-    - uses: cachix/cachix-action@v10
-      with:
-        name: anmonteiro
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+        extra_nix_config: |
+          extra-substituters = https://anmonteiro.nix-cache.workers.dev
+          extra-trusted-public-keys = ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY=
     - name: "Run nix-build"
       run: nix-build ./nix/ci/test.nix --argstr ocamlVersion ${{ matrix.ocamlVersion }}

.ocamlformat

@@ -1,18 +1,27 @@
-profile = sparse
-break-cases = nested
-break-fun-decl = smart
-cases-exp-indent = 2
-if-then-else = fit-or-vertical
-parens-tuple = multi-line-only
-parens-tuple-patterns = multi-line-only
-parens-ite = false
-infix-precedence = parens
+break-infix = fit-or-vertical
 break-infix-before-func = false
-sequence-style = terminator
-sequence-blank-line = compact
+break-fun-decl = fit-or-vertical
+break-separators = before
+break-sequences = true
+cases-exp-indent = 2
+dock-collection-brackets = false
+field-space = loose
+if-then-else = keyword-first
 indicate-multiline-delimiters = no
+infix-precedence = parens
+leading-nested-match-parens = true
+let-and = sparse
+let-module = sparse
 ocp-indent-compat = true
-wrap-comments = true
+parens-tuple = multi-line-only
 parse-docstrings = true
-let-binding-spacing = compact
+sequence-blank-line = preserve-one
+sequence-style = terminator
+single-case = sparse
+space-around-arrays= true
+space-around-lists= true
+space-around-records= true
+space-around-variants= true
 type-decl = sparse
+wrap-comments = true
+wrap-fun-args = false

examples/asynchronous-handler/basic.ml

@@ -1,8 +1,6 @@
-open Lwt.Infix
-
 let my_handler evt _context =
-  Logs_lwt.app (fun m -> m "Hello from the async handler") >>= fun () ->
-  Lwt_result.return evt
+  Logs.app (fun m -> m "Hello from the async handler");
+  Ok evt
 
 let setup_log ?style_renderer level =
   Fmt_tty.setup_std_outputs ?style_renderer ();
@@ -12,4 +10,4 @@ let setup_log ?style_renderer level =
 
 let () =
   setup_log (Some Logs.Debug);
-  Lambda_runtime.Json.io_lambda my_handler
+  Lambda_runtime.Json.lambda my_handler

examples/asynchronous-handler/dune

@@ -1,6 +1,6 @@
 (executable
  (name basic)
- (libraries lambda-runtime logs.lwt logs.fmt fmt.tty lwt lwt.unix result))
+ (libraries lambda-runtime logs.fmt fmt.tty result))
 
 (env
  (static

examples/now-custom-runtime/basic.ml

@@ -7,8 +7,7 @@ let my_handler evt _context =
         ; "body", `String (Yojson.Safe.prettify body)
         ; "headers", `Assoc []
         ])
-  | _ ->
-    Error "Body wasn't string"
+  | _ -> Error "Body wasn't string"
 
 let setup_log ?style_renderer level =
   Fmt_tty.setup_std_outputs ?style_renderer ();

examples/vercel-lambda-reason/basic.re

@@ -1,43 +1,35 @@
-open Lwt.Infix;
 module Client = Piaf.Client.Oneshot;
 
-let my_handler = (_request, _context) => {
+let my_handler = (_request, {Lambda_runtime.Context.sw, env, _}) => {
   let uri =
     Uri.of_string(
       "http://api.giphy.com/v1/gifs/random?tag=cat&api_key=hamBGlVDz0XI5tYtxTuPgudCVhHSNX8q&limit=1",
     );
-  Client.get(uri)
-  >>= (
-    fun
-    | Ok(response) => {
-        Piaf.Body.to_string(response.body)
-        >>= (
-          fun
-          | Ok(body_str) => {
-              open Yojson.Safe;
-              let body_json = Yojson.Safe.from_string(body_str);
-              let img_url =
-                body_json
-                |> Util.member("data")
-                |> Util.member("images")
-                |> Util.member("original")
-                |> Util.member("url")
-                |> Util.to_string;
-              let body = Printf.sprintf("<img src=\"%s\">", img_url);
-              let response =
-                Piaf.Response.of_string(
-                  ~body,
-                  ~headers=
-                    Piaf.Headers.of_list([("content-type", "text/html")]),
-                  `OK,
-                );
-              Lwt.return_ok(response);
-            }
-          | Error(_) => Lwt.return(Error("Failed for some reason"))
+  switch (Client.get(~sw, env, uri)) {
+  | Ok(response) =>
+    switch (Piaf.Body.to_string(response.body)) {
+    | Ok(body_str) =>
+      open Yojson.Safe;
+      let body_json = Yojson.Safe.from_string(body_str);
+      let img_url =
+        body_json
+        |> Util.member("data")
+        |> Util.member("images")
+        |> Util.member("original")
+        |> Util.member("url")
+        |> Util.to_string;
+      let body = Printf.sprintf("<img src=\"%s\">", img_url);
+      let response =
+        Piaf.Response.of_string(
+          ~body,
+          ~headers=Piaf.Headers.of_list([("content-type", "text/html")]),
+          `OK,
         );
-      }
-    | Error(_) => Lwt.return(Error("Failed for some reason"))
-  );
+      Ok(response);
+    | Error(_) => Error("Failed for some reason")
+    }
+  | Error(_) => Error("Failed for some reason")
+  };
 };
 
 let setup_log = (~style_renderer=?, level) => {
@@ -49,5 +41,5 @@ let setup_log = (~style_renderer=?, level) => {
 
 let () = {
   setup_log(Some(Logs.Debug));
-  Vercel.io_lambda(my_handler);
+  Vercel.lambda(my_handler);
 };

examples/vercel-lambda-reason/dune

@@ -1,7 +1,6 @@
 (executable
  (name basic)
- (libraries vercel logs.fmt fmt.tty piaf lwt lwt.unix uri bigstringaf
-   bigarray-compat result yojson))
+ (libraries vercel logs.fmt fmt.tty piaf uri bigstringaf yojson))
 
 (env
  (static

examples/vercel-lambda/basic.ml

@@ -1,16 +1,13 @@
-open Lwt.Syntax
 open Vercel
 
 let my_handler request _context =
   let { Request.headers; body; _ } = request in
   let host = Headers.get_exn headers "host" in
-  let+ body = Piaf.Body.to_string body in
-  let body = Result.get_ok body in
+  let body = Result.get_ok (Piaf.Body.to_string body) in
   let body =
-    if String.length body > 0 then
-      body
-    else
-      Format.asprintf "Didn't get an HTTP body from %s" host
+    if String.length body > 0
+    then body
+    else Format.asprintf "Didn't get an HTTP body from %s" host
   in
   let response =
     Response.of_string
@@ -28,4 +25,4 @@ let setup_log ?style_renderer level =
 
 let () =
   setup_log (Some Logs.Debug);
-  Vercel.io_lambda my_handler
+  Vercel.lambda my_handler

examples/vercel-lambda/dune

@@ -1,6 +1,6 @@
 (executable
  (name basic)
- (libraries vercel logs.fmt fmt.tty piaf lwt result))
+ (libraries vercel logs.fmt fmt.tty piaf result))
 
 (env
  (static

flake.lock

@@ -1,20 +1,21 @@
 {
   description = "Lambda Runtime Nix Flake";
 
+  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";
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, nix-filter }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
-          ocamlPackages = super.ocaml-ng.ocamlPackages_4_14;
+          ocamlPackages = super.ocaml-ng.ocamlPackages_5_0;
         });
       in
       rec {
-        packages = (pkgs.callPackage ./nix { });
+        packages = (pkgs.callPackage ./nix { nix-filter = nix-filter.lib; });
         defaultPackage = packages.lambda-runtime;
-        devShell = pkgs.callPackage ./shell.nix { };
+        devShell = pkgs.callPackage ./shell.nix { inherit packages; };
       });
 }

flake.nix

@@ -15,9 +15,9 @@ depends: [
   "yojson" {>= "1.6.0" & < "2.0.0"}
   "ppx_deriving_yojson"
   "piaf"
+  "eio_main"
   "uri"
   "logs"
-  "lwt"
   "alcotest" {with-test}
 ]
 synopsis: