remove deprecated ez_curl.multi

src/request/unix/curl/dune

@@ -25,7 +25,7 @@
  (public_name ez_api.curl_lwt)
  (optional)
  (modules ezCurl_lwt)
- (libraries ezCurl_multi))
+ (libraries verbose curl.lwt ezCurl_common ezRequest_lwt))
 
 (library
  (name ezCurl_lwt_i)

src/request/unix/curl/ezCurl_lwt.ml

@@ -8,4 +8,31 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include EzCurl_multi
+let make ?msg ?meth ?headers ~url l =
+  EzCurl_common.log ?meth url msg;
+  if !Verbose.v land 2 <> 0 then Format.printf "[ez_api] sent:\n%s@." (EzCurl_common.payload_to_string l);
+  let r () =
+    let r, c = EzCurl_common.init ?meth ?headers ~url l in
+    Lwt.map (fun _code ->
+        let rc = Curl.get_responsecode c in
+        Curl.cleanup c;
+        let data = Buffer.contents r in
+        EzCurl_common.log ~meth:("RECV " ^ string_of_int rc) url msg;
+        if !Verbose.v land 1 <> 0 then Format.printf "[ez_api] received:\n%s@." data;
+        if rc >= 200 && rc < 300 then Ok data
+        else Error (rc, Some data))
+      (Curl_lwt.perform c) in
+  Lwt.catch r (function
+      | Curl.CurlException (_, i, s) -> Lwt.return (Error (i, Some s))
+      | exn -> Lwt.return (Error (-1, Some (Printexc.to_string exn))))
+
+module Interface = struct
+  let get ?(meth="GET") ?headers ?msg url =
+    make ?msg ~meth ?headers ~url []
+
+  let post ?(meth="POST") ?(content_type="application/json") ?(content="{}") ?headers
+      ?msg url =
+    make ?msg ~meth ?headers ~url [ "", `content content, Some content_type ]
+end
+
+include EzRequest_lwt.Make(Interface)