diff --git a/Cargo.toml b/Cargo.toml index 56d4f44..f9fa742 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-sockets" -version = "1.0.0" +version = "1.0.1" authors = ["scratchyone "] edition = "2018" license = "MIT" @@ -34,7 +34,7 @@ web-sys = { version = "0.3.22", features = [ "BinaryType", "Blob", "CloseEvent", - "ErrorEvent", + "Event", "FileReader", "MessageEvent", "ProgressEvent", diff --git a/src/lib.rs b/src/lib.rs index bec84bc..ae499a7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -94,7 +94,7 @@ use thiserror::Error; use wasm_bindgen::prelude::*; #[cfg(target_arch = "wasm32")] use wasm_bindgen::JsCast; -use web_sys::{CloseEvent, ErrorEvent, MessageEvent, WebSocket}; +use web_sys::{CloseEvent, Event, MessageEvent, WebSocket}; #[cfg(not(target_arch = "wasm32"))] compile_error!("wasm-sockets can only compile to WASM targets"); @@ -239,7 +239,7 @@ pub struct EventClient { /// The current connection status pub status: Rc>, /// The function bound to the on_error event - pub on_error: Rc>>>, + pub on_error: Rc>>>, /// The function bound to the on_connection event pub on_connection: Rc>>>, /// The function bound to the on_message event @@ -270,15 +270,15 @@ impl EventClient { let status = Rc::new(RefCell::new(ConnectionStatus::Connecting)); let ref_status = status.clone(); - let on_error: Rc>>> = Rc::new(RefCell::new(None)); + let on_error: Rc>>> = Rc::new(RefCell::new(None)); let on_error_ref = on_error.clone(); - let onerror_callback = Closure::wrap(Box::new(move |e: ErrorEvent| { + let onerror_callback = Closure::wrap(Box::new(move |e: Event| { *ref_status.borrow_mut() = ConnectionStatus::Error; if let Some(f) = &*on_error_ref.borrow() { f.as_ref()(e); } - }) as Box); + }) as Box); ws.set_onerror(Some(onerror_callback.as_ref().unchecked_ref())); onerror_callback.forget(); @@ -394,7 +394,7 @@ impl EventClient { /// panic!("Error: {:#?}", error); /// }))); /// ``` - pub fn set_on_error(&mut self, f: Option>) { + pub fn set_on_error(&mut self, f: Option>) { *self.on_error.borrow_mut() = f; } /// Set an on_connection event handler.