Lib: improve EventSource

Author: hhugo

lib/eventSource.ml

@@ -20,13 +20,12 @@
 
 (* https://developer.mozilla.org/en-US/docs/Web/API/EventSource *)
 open Js
-
+open Dom
 type state =
   | CONNECTING
   | OPEN
   | CLOSED
 
-
 class type ['a] messageEvent = object
   inherit ['a] Dom.event
   method data : js_string t readonly_prop
@@ -35,19 +34,15 @@ class type ['a] messageEvent = object
   (* method source : unit *)
 end
 
-
-type ('a,'b) handler = ('a,'b -> unit) meth_callback
-let handler f = Js.wrap_callback f
 class type eventSource = object('self)
   method url : string t readonly_prop
   method withCredentials : bool t readonly_prop
   method readyState : state readonly_prop
   method close : unit meth
 
-  method onopen : ('self t, 'self messageEvent t) handler writeonly_prop
-  method onmessage : ('self t, 'self messageEvent t) handler writeonly_prop
-  method onerror : ('self t, 'self messageEvent t) handler writeonly_prop
-  method addEventListener : js_string t -> ('self t, 'self messageEvent t) handler -> bool t -> unit meth
+  method onopen : ('self t, 'self messageEvent t) event_listener writeonly_prop
+  method onmessage : ('self t, 'self messageEvent t) event_listener writeonly_prop
+  method onerror : ('self t, 'self messageEvent t) event_listener writeonly_prop
 end
 
 class type options = object
@@ -61,3 +56,5 @@ let withCredentials b : options t =
 
 let eventSource         = Js.Unsafe.global##_EventSource
 let eventSource_options = Js.Unsafe.global##_EventSource
+
+let addEventListener = Dom.addEventListener

lib/eventSource.mli

@@ -19,15 +19,12 @@
 
 
 open Js
-
+open Dom
 type state =
   | CONNECTING
   | OPEN
   | CLOSED
 
-
-type ('a,'b) handler
-
 class type ['a] messageEvent = object
   inherit ['a] Dom.event
   method data : js_string t readonly_prop
@@ -42,17 +39,22 @@ class type eventSource = object('self)
   method readyState : state readonly_prop
   method close : unit meth
 
-  method onopen : ('self t, 'self messageEvent t) handler writeonly_prop
-  method onmessage : ('self t, 'self messageEvent t) handler writeonly_prop
-  method onerror : ('self t, 'self messageEvent t) handler writeonly_prop
-  method addEventListener : js_string t -> ('self t, 'self messageEvent t) handler -> bool t -> unit meth
+  method onopen : ('self t, 'self messageEvent t) event_listener writeonly_prop
+  method onmessage : ('self t, 'self messageEvent t) event_listener writeonly_prop
+  method onerror : ('self t, 'self messageEvent t) event_listener writeonly_prop
 end
 
 class type options = object
   method withCredentials : bool t writeonly_prop
 end
 
-val handler : ('this messageEvent t -> unit) -> ('this, 'this messageEvent t) handler
 val withCredentials : bool -> options t
 val eventSource : (js_string t -> eventSource t) constr
 val eventSource_options : (js_string t -> options t -> eventSource t) constr
+
+val addEventListener :
+  (#eventSource t as 'a) -> 'b Event.typ ->
+  ('a, 'b) event_listener -> bool t -> event_listener_id
+  (** Add an event listener.  This function matches the
+      [addEventListener] DOM method, except that it returns
+      an id for removing the listener. *)