From fd7920d551b07dd68679a4a5e19de43062a991e3 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Sun, 17 Jul 2022 02:34:54 -0400
Subject: [PATCH] More refactoring

---
 src/in_out.rs        | 16 +++-------------
 src/lib.rs           |  4 ----
 src/tls/incoming.rs  |  6 +++---
 src/websocket/mod.rs |  7 +++++--
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/in_out.rs b/src/in_out.rs
index 0d464c4..3988c0a 100644
--- a/src/in_out.rs
+++ b/src/in_out.rs
@@ -1,7 +1,5 @@
-// Box<dyn AsyncWrite + Unpin + Send>, Box<dyn AsyncRead + Unpin + Send>
-
 #[cfg(feature = "websocket")]
-use crate::websocket::{from_ws, to_ws_new, AsyncReadAndWrite};
+use crate::websocket::{from_ws, to_ws_new, WsRd, WsWr};
 use crate::{
     common::IN_BUFFER_SIZE,
     in_out::{StanzaRead::*, StanzaWrite::*},
@@ -10,19 +8,11 @@ use crate::{
 };
 use anyhow::{bail, Result};
 #[cfg(feature = "websocket")]
-use futures_util::{
-    stream::{SplitSink, SplitStream},
-    SinkExt, TryStreamExt,
-};
+use futures_util::{SinkExt, TryStreamExt};
 use log::trace;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt, BufReader};
 #[cfg(feature = "websocket")]
-use tokio_tungstenite::{tungstenite::Message::*, WebSocketStream};
-
-#[cfg(feature = "websocket")]
-type WsWr = SplitSink<WebSocketStream<Box<dyn AsyncReadAndWrite + Unpin + Send>>, tokio_tungstenite::tungstenite::Message>;
-#[cfg(feature = "websocket")]
-type WsRd = SplitStream<WebSocketStream<Box<dyn AsyncReadAndWrite + Unpin + Send>>>;
+use tokio_tungstenite::tungstenite::Message::{Close, Ping, Pong, Text};
 
 pub enum StanzaWrite {
     AsyncWrite(Box<dyn AsyncWrite + Unpin + Send>),
diff --git a/src/lib.rs b/src/lib.rs
index b488780..cb0f98e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,3 @@
-use anyhow::bail;
-use log::info;
-use std::net::SocketAddr;
-
 pub mod common;
 pub mod slicesubsequence;
 pub mod stanzafilter;
diff --git a/src/tls/incoming.rs b/src/tls/incoming.rs
index 86db9f4..dca3fcb 100644
--- a/src/tls/incoming.rs
+++ b/src/tls/incoming.rs
@@ -1,4 +1,5 @@
 use crate::common::incoming::{shuffle_rd_wr_filter, CloneableConfig, ServerCerts};
+use std::net::SocketAddr;
 
 use crate::{
     common::{first_bytes_match, to_str, IN_BUFFER_SIZE},
@@ -6,11 +7,10 @@ use crate::{
     in_out::{StanzaRead, StanzaWrite},
     slicesubsequence::SliceSubsequence,
     stanzafilter::{StanzaFilter, StanzaReader},
-    *,
 };
-use anyhow::Result;
+use anyhow::{bail, Result};
 use die::Die;
-use log::{error, trace};
+use log::{error, info, trace};
 use rustls::{ServerConfig, ServerConnection};
 
 use std::sync::Arc;
diff --git a/src/websocket/mod.rs b/src/websocket/mod.rs
index 89e372a..d5e2c9e 100644
--- a/src/websocket/mod.rs
+++ b/src/websocket/mod.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use futures::StreamExt;
-
-use tokio_tungstenite::tungstenite::protocol::WebSocketConfig;
+use futures_util::stream::{SplitSink, SplitStream};
+use tokio_tungstenite::{tungstenite::protocol::WebSocketConfig, WebSocketStream};
 
 #[cfg(feature = "incoming")]
 pub mod incoming;
@@ -9,6 +9,9 @@ pub mod incoming;
 #[cfg(feature = "outgoing")]
 pub mod outgoing;
 
+pub type WsWr = SplitSink<WebSocketStream<Box<dyn AsyncReadAndWrite + Unpin + Send>>, tokio_tungstenite::tungstenite::Message>;
+pub type WsRd = SplitStream<WebSocketStream<Box<dyn AsyncReadAndWrite + Unpin + Send>>>;
+
 // https://datatracker.ietf.org/doc/html/rfc7395
 
 fn ws_cfg(max_stanza_size_bytes: usize) -> Option<WebSocketConfig> {