Pulled out message types to swimos_messages.

Author: horned-sphere

api/swimos_api/src/error/mod.rs

@@ -83,11 +83,8 @@ pub enum DownlinkFailureReason {
     UnresolvableLocal(RelativeAddress<Text>),
     #[error("Connection to the remote host failed: {0}")]
     ConnectionFailed(Arc<std::io::Error>),
-    #[error("Failed to negotiate a TLS connection: {error}")]
-    TlsConnectionFailed {
-        error: Arc<dyn std::error::Error + Send + Sync>,
-        recoverable: bool,
-    },
+    #[error("Failed to negotiate a TLS connection: {message}")]
+    TlsConnectionFailed { message: String, recoverable: bool },
     #[error("Could not negotiate a websocket connection: {0}")]
     WebsocketNegotiationFailed(String),
     #[error("The remote client stopped while the downlink was starting.")]

client/fixture/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 swimos_runtime = { path = "../../runtime/swimos_runtime" }
 swimos_remote = { path = "../../runtime/swimos_remote" }
+swimos_messages = { path = "../../runtime/swimos_messages" }
 swimos_api = { path = "../../api/swimos_api" }
 ratchet = { features = ["deflate", "split"], workspace = true }
 swimos_recon = { path = "../../api/formats/swimos_recon" }

client/fixture/src/lib.rs

@@ -14,15 +14,15 @@ use std::net::SocketAddr;
 use std::ops::DerefMut;
 use std::sync::Arc;
 use swimos_form::Form;
+use swimos_messages::remote_protocol::FindNode;
 use swimos_model::{Text, Value};
 use swimos_recon::parser::parse_recognize;
 use swimos_recon::print_recon;
 use swimos_remote::dns::{BoxDnsResolver, DnsResolver};
 use swimos_remote::net::{
-    ClientConnections, ConnResult, ConnectionError, IoResult, Listener, ListenerError, Scheme,
+    ClientConnections, ConnResult, ConnectionError, Listener, ListenerError, Scheme,
 };
 use swimos_remote::websocket::{RatchetError, WebsocketClient, WebsocketServer, WsOpenFuture};
-use swimos_remote::FindNode;
 use tokio::io::{AsyncRead, AsyncWrite, DuplexStream};
 use tokio::sync::mpsc;
 use tokio::sync::Mutex;
@@ -87,7 +87,11 @@ impl ClientConnections for MockClientConnections {
         Box::new(self.clone())
     }
 
-    fn lookup(&self, host: String, port: u16) -> BoxFuture<'static, IoResult<Vec<SocketAddr>>> {
+    fn lookup(
+        &self,
+        host: String,
+        port: u16,
+    ) -> BoxFuture<'static, std::io::Result<Vec<SocketAddr>>> {
         self.resolve(host, port).boxed()
     }
 }

client/runtime/src/models.rs

@@ -16,8 +16,8 @@ use fnv::FnvHashMap;
 use std::fmt::{Display, Formatter};
 use std::future::Future;
 use swimos_api::{address::RelativeAddress, agent::DownlinkKind};
+use swimos_messages::remote_protocol::AttachClient;
 use swimos_model::Text;
-use swimos_remote::AttachClient;
 use swimos_runtime::downlink::failure::{
     AlwaysAbortStrategy, AlwaysIgnoreStrategy, ReportStrategy,
 };

client/runtime/src/pending.rs

@@ -24,8 +24,9 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 use swimos_api::address::RelativeAddress;
 use swimos_client_api::DownlinkConfig;
+use swimos_messages::remote_protocol::AttachClient;
 use swimos_model::Text;
-use swimos_remote::{net::Scheme, AttachClient};
+use swimos_remote::net::Scheme;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
 use tokio::sync::mpsc;
 

client/runtime/src/runtime.rs

@@ -24,6 +24,7 @@ use std::fmt::{Debug, Formatter};
 use std::net::SocketAddr;
 use std::num::NonZeroUsize;
 use std::sync::Arc;
+use swimos_messages::remote_protocol::AttachClient;
 use swimos_remote::{
     net::{Scheme, SchemeHostPort},
     websocket::WebsocketClient,
@@ -41,7 +42,6 @@ use swimos_api::{address::Address, agent::DownlinkKind, error::DownlinkFailureRe
 use swimos_client_api::{Downlink, DownlinkConfig};
 use swimos_model::Text;
 use swimos_remote::net::ClientConnections;
-use swimos_remote::AttachClient;
 use swimos_runtime::downlink::{AttachAction, DownlinkOptions, DownlinkRuntimeConfig};
 use swimos_utilities::byte_channel::{byte_channel, ByteReader, ByteWriter};
 use swimos_utilities::trigger;

client/runtime/src/tests.rs

@@ -27,6 +27,7 @@ use ratchet::{
     Message, NegotiatedExtension, NoExt, NoExtProvider, Role, WebSocket, WebSocketConfig,
 };
 use swimos_agent_protocol::MapMessage;
+use swimos_messages::remote_protocol::AttachClient;
 use swimos_remote::net::{Scheme, SchemeHostPort};
 use tokio::io::{duplex, AsyncWriteExt};
 use tokio::spawn;
@@ -55,7 +56,6 @@ use swimos_form::Form;
 use swimos_messages::protocol::{RawRequestMessageEncoder, RequestMessage};
 use swimos_model::Text;
 use swimos_remote::websocket::RatchetError;
-use swimos_remote::AttachClient;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
 use swimos_utilities::byte_channel::{byte_channel, ByteReader, ByteWriter};
 use swimos_utilities::trigger::{promise, trigger};

client/runtime/src/transport.rs

@@ -24,9 +24,10 @@ use std::io;
 use std::net::SocketAddr;
 use std::num::NonZeroUsize;
 use std::time::Duration;
+use swimos_messages::remote_protocol::AttachClient;
 use swimos_remote::net::{ClientConnections, Scheme, SchemeHostPort};
 use swimos_remote::websocket::WebsocketClient;
-use swimos_remote::{AttachClient, RemoteTask};
+use swimos_remote::RemoteTask;
 use swimos_utilities::trigger;
 use tokio::select;
 use tokio::sync::{mpsc, oneshot};

client/swimos_client/src/lib.rs

@@ -38,8 +38,8 @@ use swimos_downlink::{
 };
 use swimos_form::Form;
 use swimos_remote::dns::Resolver;
-use swimos_remote::net::plain::TokioPlainTextNetworking;
 use swimos_remote::net::ClientConnections;
+use swimos_remote::plain::TokioPlainTextNetworking;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
 #[cfg(feature = "tls")]
 use swimos_tls::{ClientConfig as TlsConfig, RustlsClientNetworking, TlsError};

runtime/swimos_messages/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [dependencies]
 bytes = { workspace = true }
 futures = { workspace = true }
-tokio = { workspace = true }
+tokio = { workspace = true, features = ["sync"]}
 tokio-util = { workspace = true, features = ["codec"] }
 swimos_model = { path = "../../api/swimos_model" }
 swimos_api = { path = "../../api/swimos_api" }