Revert update to tunstenite 0.23

Cargo.toml

@@ -20,8 +20,8 @@ futures-util = { version = "0.3", default-features = false }
 js-sys = "0.3"
 log = "0.4"
 tokio = "1.16"
-tokio-tungstenite = "0.23"
-tungstenite = "0.23"
+tokio-tungstenite = ">=0.17, <=0.21"
+tungstenite = { version = ">=0.17, <=0.21" }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 web-sys = "0.3"

echo_server/src/main.rs

@@ -1,3 +1,4 @@
+#![allow(deprecated)] // TODO(emilk): Remove when we update tungstenite
 #![allow(clippy::unwrap_used, clippy::disallowed_methods)] // We are just testing here.
 
 use std::{net::TcpListener, thread::spawn};
@@ -10,10 +11,10 @@ fn main() {
         spawn(move || {
             let mut websocket = tungstenite::accept(stream.unwrap()).unwrap();
             eprintln!("New client connected");
-            while let Ok(msg) = websocket.read() {
+            while let Ok(msg) = websocket.read_message() {
                 // We do not want to send back ping/pong messages.
                 if msg.is_binary() || msg.is_text() {
-                    if let Err(err) = websocket.send(msg) {
+                    if let Err(err) = websocket.write_message(msg) {
                         eprintln!("Error sending message: {err}");
                         break;
                     } else {

ewebsock/src/lib.rs

@@ -133,16 +133,12 @@ pub struct Options {
     ///
     /// Ignored on Web.
     pub max_incoming_frame_size: usize,
-
-    /// Delay blocking in ms - default 10ms
-    pub delay_blocking: std::time::Duration,
 }
 
 impl Default for Options {
     fn default() -> Self {
         Self {
             max_incoming_frame_size: 64 * 1024 * 1024,
-            delay_blocking: std::time::Duration::from_millis(10),
         }
     }
 }

ewebsock/src/native_tungstenite.rs

@@ -1,4 +1,4 @@
-//! Native implementation of the WebSocket client using the `tungstenite` crate.
+#![allow(deprecated)] // TODO(emilk): Remove when we update tungstenite
 
 use std::{
     ops::ControlFlow,
@@ -95,7 +95,7 @@ pub fn ws_receiver_blocking(url: &str, options: Options, on_event: &EventHandler
     }
 
     loop {
-        let control = match socket.read() {
+        let control = match socket.read_message() {
             Ok(incoming_msg) => match incoming_msg {
                 tungstenite::protocol::Message::Text(text) => {
                     on_event(WsEvent::Message(WsMessage::Text(text)))
@@ -155,7 +155,7 @@ pub(crate) fn ws_connect_impl(
 
 /// Connect and call the given event handler on each received event.
 ///
-/// This is a blocking variant of [`crate::ws_connect`], only available on native.
+/// This is a blocking variant of [`ws_connect`], only available on native.
 ///
 /// # Errors
 /// All errors are returned to the caller, and NOT reported via `on_event`.
@@ -165,7 +165,6 @@ pub fn ws_connect_blocking(
     on_event: &EventHandler,
     rx: &Receiver<WsMessage>,
 ) -> Result<()> {
-    let delay = options.delay_blocking;
     let config = tungstenite::protocol::WebSocketConfig::from(options);
     let max_redirects = 3; // tungstenite default
     let (mut socket, response) =
@@ -217,22 +216,22 @@ pub fn ws_connect_blocking(
                     WsMessage::Pong(data) => tungstenite::protocol::Message::Pong(data),
                     WsMessage::Unknown(_) => panic!("You cannot send WsMessage::Unknown"),
                 };
-                if let Err(err) = socket.write(outgoing_message) {
+                if let Err(err) = socket.write_message(outgoing_message) {
                     socket.close(None).ok();
-                    socket.flush().ok();
+                    socket.write_pending().ok();
                     return Err(format!("send: {err}"));
                 }
             }
             Err(TryRecvError::Disconnected) => {
                 log::debug!("WsSender dropped - closing connection.");
                 socket.close(None).ok();
-                socket.flush().ok();
+                socket.write_pending().ok();
                 return Ok(());
             }
             Err(TryRecvError::Empty) => {}
         };
 
-        let control = match socket.read() {
+        let control = match socket.read_message() {
             Ok(incoming_msg) => {
                 did_work = true;
                 match incoming_msg {
@@ -274,7 +273,7 @@ pub fn ws_connect_blocking(
         }
 
         if !did_work {
-            std::thread::sleep(delay);
+            std::thread::sleep(std::time::Duration::from_millis(10)); // TODO(emilk): make configurable
         }
     }
 }

ewebsock/src/tungstenite_common.rs

@@ -2,7 +2,6 @@ impl From<crate::Options> for tungstenite::protocol::WebSocketConfig {
     fn from(options: crate::Options) -> Self {
         let crate::Options {
             max_incoming_frame_size,
-            ..
         } = options;
 
         Self {