Adapt to Piaf's latest interface (#54)

Author: anmonteiro

lib/client.ml

@@ -135,8 +135,7 @@ let event_response client request_id output =
       request_id
   in
   make_runtime_post_request client path output >>= function
-  | Ok response ->
-    let status = Response.status response in
+  | Ok { Response.status; _ } ->
     if not (Status.is_successful status) then
       let error =
         Errors.make_api_error
@@ -179,8 +178,7 @@ let event_error client request_id err =
       request_id
   in
   make_runtime_error_request client path err >>= function
-  | Ok response ->
-    let status = Response.status response in
+  | Ok { Response.status; _ } ->
     if not (Status.is_successful status) then
       let error =
         Errors.make_api_error
@@ -281,9 +279,7 @@ let next_event client =
   Logs_lwt.info (fun m -> m "Polling for next event. Path: %s\n" path)
   >>= fun () ->
   Client.get client path >>= function
-  | Ok response ->
-    let headers = Response.headers response in
-    let status = Response.status response in
+  | Ok { Response.status; headers; body; _ } ->
     let code = Status.to_code status in
     if Status.is_client_error status then
       Logs_lwt.err (fun m ->
@@ -316,8 +312,19 @@ let next_event client =
             m "Failed to get event context: %s\n" (Errors.message err))
         >>= fun () -> Lwt_result.fail err
       | Ok ctx ->
-        Body.to_string (Response.body response) >>= fun body_str ->
-        Lwt_result.return (body_str, ctx))
+        Body.to_string body >>= ( function
+        | Ok body_str ->
+          Lwt_result.return (body_str, ctx)
+        | Error e ->
+          let err =
+            Errors.make_api_error
+              ~recoverable:false
+              (Format.asprintf
+                 "Server error when polling for new events: %a"
+                 Piaf.Error.pp_hum
+                 e)
+          in
+          Lwt_result.fail err ))
   | Error _ ->
     let err =
       Errors.make_api_error

lib/runtime.ml

@@ -147,8 +147,9 @@ struct
         make ~max_retries:3 ~settings:function_config ~lift ~handler client
       in
       start runtime
-    | Error msg ->
-      failwith (Format.asprintf "Could not start HTTP client: %s" msg)
+    | Error e ->
+      failwith
+        (Format.asprintf "Could not start HTTP client: %a" Piaf.Error.pp_hum e)
 
   let start_lambda ~lift handler =
     match Config.get_runtime_api_endpoint () with

nix/default.nix

@@ -8,6 +8,7 @@ in
   with ocamlPackages;
   let
     build-lambda-runtime = args: buildDunePackage ({
+      useDune2=true;
       version = "0.1.0-dev";
       src = lib.gitignoreSource ./..;
     } // args);

nix/sources.nix

@@ -1,10 +1,9 @@
 { ocamlVersion ? "4_10" }:
 
 let
-  overlays = builtins.fetchTarball {
-    url = https://github.com/anmonteiro/nix-overlays/archive/9ebb27af.tar.gz;
-    sha256 = "0qlq4g96scz1lqsiyprkggjnzhxga07csqjc75ax1j1kk1ich34i";
-  };
+  overlays =
+    builtins.fetchTarball
+      https://github.com/anmonteiro/nix-overlays/archive/3fb1555.tar.gz;
 
 in