chore: Update for tungstenite/jsonschema changes

Author: qdot

buttplug/src/core/connector/transport/websocket/websocket_client.rs

@@ -189,8 +189,8 @@ impl ButtplugConnectorTransport for ButtplugWebsocketClientTransport {
                   msg = outgoing_receiver.recv().fuse() => {
                     if let Some(msg) = msg {
                       let out_msg = match msg {
-                        ButtplugSerializedMessage::Text(text) => Message::Text(text),
-                        ButtplugSerializedMessage::Binary(bin) => Message::Binary(bin),
+                        ButtplugSerializedMessage::Text(text) => Message::Text(text.into()),
+                        ButtplugSerializedMessage::Binary(bin) => Message::Binary(bin.into()),
                       };
                       // TODO see what happens when we try to send to a remote that's closed connection.
                       writer.send(out_msg).await.expect("This should never fail?");
@@ -231,7 +231,7 @@ impl ButtplugConnectorTransport for ButtplugWebsocketClientTransport {
                         Message::Binary(v) => {
                           if incoming_sender
                             .send(ButtplugTransportIncomingMessage::Message(
-                              ButtplugSerializedMessage::Binary(v),
+                              ButtplugSerializedMessage::Binary(v.into()),
                             ))
                             .await
                             .is_err()

buttplug/src/core/connector/transport/websocket/websocket_server.rs

@@ -96,7 +96,7 @@ async fn run_connection_loop(
         }
         pong_count = 0;
         if websocket_server_sender
-          .send(tokio_tungstenite::tungstenite::Message::Ping(vec!(0)))
+          .send(tokio_tungstenite::tungstenite::Message::Ping(vec!(0).into()))
           .await
           .is_err() {
           warn!("Cannot send ping to client, considering connection closed.");
@@ -109,7 +109,7 @@ async fn run_connection_loop(
             ButtplugSerializedMessage::Text(text_msg) => {
               trace!("Sending text message: {}", text_msg);
               if websocket_server_sender
-                .send(tokio_tungstenite::tungstenite::Message::Text(text_msg))
+                .send(tokio_tungstenite::tungstenite::Message::Text(text_msg.into()))
                 .await
                 .is_err() {
                 warn!("Cannot send text value to server, considering connection closed.");
@@ -118,7 +118,7 @@ async fn run_connection_loop(
             }
             ButtplugSerializedMessage::Binary(binary_msg) => {
               if websocket_server_sender
-                .send(tokio_tungstenite::tungstenite::Message::Binary(binary_msg))
+                .send(tokio_tungstenite::tungstenite::Message::Binary(binary_msg.into()))
                 .await
                 .is_err() {
                 warn!("Cannot send binary value to server, considering connection closed.");
@@ -141,7 +141,7 @@ async fn run_connection_loop(
               match msg {
                 tokio_tungstenite::tungstenite::Message::Text(text_msg) => {
                   trace!("Got text: {}", text_msg);
-                  if response_sender.send(ButtplugTransportIncomingMessage::Message(ButtplugSerializedMessage::Text(text_msg))).await.is_err() {
+                  if response_sender.send(ButtplugTransportIncomingMessage::Message(ButtplugSerializedMessage::Text(text_msg.as_str().to_owned()))).await.is_err() {
                     warn!("Connector that owns transport no longer available, exiting.");
                     break;
                   }

buttplug/src/core/message/serializer/json_serializer.rs

@@ -119,10 +119,9 @@ where
           let e = validator
             .validate(&json_msg)
             .expect_err("We can't get here without validity checks failing.");
-          let err_vec: Vec<jsonschema::ValidationError> = e.collect();
           return Err(ButtplugSerializerError::JsonSerializerError(format!(
             "Error during JSON Schema Validation - Message: {} - Error: {:?}",
-            json_msg, err_vec
+            json_msg, e
           )));
         }
       }

buttplug/src/server/device/hardware/communication/websocket_server/websocket_server_hardware.rs

@@ -75,7 +75,7 @@ async fn run_connection_loop(
         }
         pong_count = 0;
         if websocket_server_sender
-          .send(tokio_tungstenite::tungstenite::Message::Ping(vec!(0)))
+          .send(tokio_tungstenite::tungstenite::Message::Ping(vec!(0).into()))
           .await
           .is_err() {
           error!("Cannot send ping to client, considering connection closed.");
@@ -85,7 +85,7 @@ async fn run_connection_loop(
       ws_msg = request_receiver.recv().fuse() => {
         if let Some(binary_msg) = ws_msg {
           if websocket_server_sender
-            .send(tokio_tungstenite::tungstenite::Message::Binary(binary_msg))
+            .send(tokio_tungstenite::tungstenite::Message::Binary(binary_msg.into()))
             .await
             .is_err() {
             error!("Cannot send binary value to client, considering connection closed.");
@@ -107,7 +107,7 @@ async fn run_connection_loop(
                 }
                 tokio_tungstenite::tungstenite::Message::Binary(binary_msg) => {
                   // If no one is listening, ignore output.
-                  let _ = response_sender.send(binary_msg);
+                  let _ = response_sender.send(binary_msg.to_vec());
                 }
                 tokio_tungstenite::tungstenite::Message::Close(_) => {
                   // Drop the error if no one receives the message, we're breaking anyways.

buttplug/src/util/json.rs

@@ -44,10 +44,9 @@ impl JSONValidator {
       ))
     })?;
     self.schema.validate(&check_value).map_err(|err| {
-      let err_vec: Vec<jsonschema::ValidationError> = err.collect();
       ButtplugSerializerError::JsonSerializerError(format!(
         "Error during JSON Schema Validation: {:?}",
-        err_vec
+        err
       ))
     })
   }