javascript: switch do_rpc to Rpc.call -> Rpc.response

samoht · Sep 29, 2012 · 2adaa55 · 2adaa55
1 parent bb2adaa
commit 2adaa55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/rpc_client_js.ml b/lib/rpc_client_js.ml
@@ -1,9 +1,10 @@
 open Lwt
 open Js
 
-let do_rpc url contents =
+let do_rpc ~url call =
   let method_ = "POST" in
   let content_type = "text/xml" in
+  let contents = Xmlrpc.string_of_call call in
   let (res, w) = Lwt.task () in
   let req = XmlHttpRequest.create () in
 
@@ -16,7 +17,8 @@ let do_rpc url contents =
     (fun _ ->
        (match req##readyState with
 		   | XmlHttpRequest.DONE ->
-			   Lwt.wakeup w
+			   Lwt.wakeup w (Xmlrpc.response_of_string (Js.to_string req##responseText))
+(*
 				   {XmlHttpRequest.url = url;
 					code = req##status;
 					content = Js.to_string req##responseText;
@@ -30,6 +32,7 @@ let do_rpc url contents =
 									   else Some doc);
 					headers = fun _ -> None;
 				   }
+*)
 		   | _ -> ()));
 
   req##send (Js.some (Js.string contents));

diff --git a/lib/rpc_client_js.mli b/lib/rpc_client_js.mli
@@ -12,4 +12,4 @@
  * GNU Lesser General Public License for more details.
  *)
 
-val do_rpc : string -> string -> XmlHttpRequest.http_frame Lwt.t
+val do_rpc : url:string -> Rpc.call -> Rpc.response Lwt.t