Removed unused code.

Author: horned-sphere

client/fixture/src/lib.rs

@@ -21,7 +21,7 @@ use swimos_remote::dns::{BoxDnsResolver, DnsResolver};
 use swimos_remote::net::{
     ClientConnections, ConnResult, ConnectionError, IoResult, Listener, ListenerError, Scheme,
 };
-use swimos_remote::ws::{RatchetError, WebsocketClient, WebsocketServer, WsOpenFuture};
+use swimos_remote::websocket::{RatchetError, WebsocketClient, WebsocketServer, WsOpenFuture};
 use swimos_remote::FindNode;
 use tokio::io::{AsyncRead, AsyncWrite, DuplexStream};
 use tokio::sync::mpsc;

client/runtime/src/runtime.rs

@@ -26,7 +26,7 @@ use std::num::NonZeroUsize;
 use std::sync::Arc;
 use swimos_remote::{
     net::{Scheme, SchemeHostPort},
-    ws::WebsocketClient,
+    websocket::WebsocketClient,
 };
 use tokio::sync::{mpsc, oneshot, Notify};
 use tokio::task::{JoinError, JoinHandle};

client/runtime/src/tests.rs

@@ -54,7 +54,7 @@ use swimos_downlink::{
 use swimos_form::Form;
 use swimos_messages::protocol::{RawRequestMessageEncoder, RequestMessage};
 use swimos_model::Text;
-use swimos_remote::ws::RatchetError;
+use swimos_remote::websocket::RatchetError;
 use swimos_remote::AttachClient;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
 use swimos_utilities::byte_channel::{byte_channel, ByteReader, ByteWriter};

client/runtime/src/transport.rs

@@ -25,7 +25,7 @@ use std::net::SocketAddr;
 use std::num::NonZeroUsize;
 use std::time::Duration;
 use swimos_remote::net::{ClientConnections, Scheme, SchemeHostPort};
-use swimos_remote::ws::WebsocketClient;
+use swimos_remote::websocket::WebsocketClient;
 use swimos_remote::{AttachClient, RemoteTask};
 use swimos_utilities::trigger;
 use tokio::select;

client/swimos_client/src/lib.rs

@@ -17,7 +17,7 @@ use ratchet::NoExtProvider;
 use ratchet::WebSocketStream;
 use std::marker::PhantomData;
 use std::num::NonZeroUsize;
-use swimos_remote::ws::RatchetClient;
+use swimos_remote::websocket::RatchetClient;
 
 use futures_util::future::BoxFuture;
 #[cfg(feature = "deflate")]

runtime/swimos_remote/src/dns.rs

@@ -83,12 +83,16 @@ pub struct Resolver {
 impl Resolver {
     #[cfg(feature = "trust-dns")]
     pub async fn new() -> Resolver {
-        Resolver { inner: trust_dns_impl::TrustDnsResolver::new().await }
+        Resolver {
+            inner: trust_dns_impl::TrustDnsResolver::new().await,
+        }
     }
 
     #[cfg(not(feature = "trust-dns"))]
     pub async fn new() -> Resolver {
-        Resolver { inner: GetAddressInfoResolver }
+        Resolver {
+            inner: GetAddressInfoResolver,
+        }
     }
 }
 

runtime/swimos_remote/src/lib.rs

@@ -16,10 +16,19 @@ pub mod dns;
 mod error;
 pub mod net;
 mod task;
-pub mod ws;
+mod ws;
 
 pub use error::{AgentResolutionError, NoSuchAgent};
 pub use task::{AttachClient, FindNode, LinkError, NodeConnectionRequest, RemoteTask};
 
 #[cfg(feature = "tls")]
 pub mod tls;
+
+pub mod websocket {
+
+    pub use super::ws::{
+        RatchetClient, RatchetError, WebsocketClient, WebsocketServer, Websockets, WsOpenFuture,
+    };
+
+    pub const WARP: &str = "warp0";
+}

runtime/swimos_remote/src/ws/mod.rs

@@ -12,29 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::HashSet;
 use std::fmt::Debug;
 use std::net::SocketAddr;
-use std::sync::OnceLock;
 
 use futures::future::BoxFuture;
 use futures::Stream;
 use swimos_utilities::errors::Recoverable;
-use tokio::net::TcpStream;
 
 use ratchet::{ExtensionProvider, ProtocolRegistry, WebSocket, WebSocketConfig, WebSocketStream};
-pub use swimos_ratchet::*;
-pub use switcher::StreamSwitcher;
 use thiserror::Error;
 use tokio::sync::mpsc;
 
 use crate::net::{Listener, ListenerError};
+use crate::websocket::WARP;
 use crate::FindNode;
 
-mod swimos_ratchet;
-
-mod switcher;
-
 #[derive(Debug, Error)]
 #[error("{0}")]
 pub struct RatchetError(#[from] ratchet::Error);
@@ -44,10 +36,6 @@ impl Recoverable for RatchetError {
     }
 }
 
-pub type WebSocketDef<E> = WebSocket<TcpStream, E>;
-
-pub type StreamDef = TcpStream;
-
 pub type WsOpenFuture<'l, Sock, Ext, Error> = BoxFuture<'l, Result<WebSocket<Sock, Ext>, Error>>;
 
 /// Trait for adapters that will negotiate a client websocket connection over an duplex connection.
@@ -109,16 +97,6 @@ impl From<WebSocketConfig> for RatchetClient {
     }
 }
 
-static PROTOCOLS: OnceLock<HashSet<&'static str>> = OnceLock::new();
-
-pub fn protocols() -> &'static HashSet<&'static str> {
-    PROTOCOLS.get_or_init(|| {
-        let mut s = HashSet::new();
-        s.insert("warp0");
-        s
-    })
-}
-
 impl WebsocketClient for RatchetClient {
     fn open_connection<'a, Sock, Provider>(
         &self,
@@ -133,7 +111,7 @@ impl WebsocketClient for RatchetClient {
     {
         let config = self.0;
         Box::pin(async move {
-            let subprotocols = ProtocolRegistry::new(protocols().iter().copied())?;
+            let subprotocols = ProtocolRegistry::new([WARP])?;
             let socket = ratchet::subscribe_with(config, socket, addr, provider, subprotocols)
                 .await?
                 .into_websocket();