Moved UriForest into swimos_introspection.

Author: horned-sphere

server/swimos_introspection/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 futures = { workspace = true }
-swimos_utilities = { path = "../../swimos_utilities", features = ["io", "trigger", "text", "uri_forest", "encoding"] }
+swimos_utilities = { path = "../../swimos_utilities", features = ["io", "trigger", "text", "encoding"] }
 swimos_runtime = { path = "../../runtime/swimos_runtime" }
 bytes = { workspace = true }
 tokio = { workspace = true, features = ["sync", "time"] }
@@ -23,6 +23,8 @@ uuid = { workspace = true }
 thiserror = { workspace = true }
 parking_lot = { workspace = true, features = ["send_guard"] }
 once_cell = "1.17.1"
+static_assertions = { workspace = true }
+smol_str = "0.2.0"
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["rt", "macros", "time", "test-util"] }

swimos_utilities/swimos_uri_forest/src/forest/iter.rs renamed to server/swimos_introspection/src/forest/iter.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub mod iter;
+mod iter;
 #[cfg(test)]
 mod tests;
 
@@ -21,7 +21,7 @@ use std::collections::HashMap;
 use std::fmt::Debug;
 use std::iter::Peekable;
 
-use self::iter::{PathSegmentIterator, UriForestIterator, UriPartIterator};
+pub use self::iter::{PathSegmentIterator, UriForestIterator, UriPart, UriPartIterator};
 
 static_assertions::assert_impl_all!(UriForest<()>: Send, Sync);
 

swimos_utilities/swimos_uri_forest/src/forest/mod.rs renamed to server/swimos_introspection/src/forest/mod.rs

@@ -14,12 +14,9 @@
 
 use std::collections::{HashMap, HashSet};
 
-use crate::{
-    forest::{
-        iter::{PathSegmentIterator, UriPart},
-        TreeNode,
-    },
-    UriForest,
+use crate::forest::{
+    iter::{PathSegmentIterator, UriPart},
+    TreeNode, UriForest,
 };
 
 #[test]

swimos_utilities/swimos_uri_forest/src/forest/tests.rs renamed to server/swimos_introspection/src/forest/tests.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 mod config;
+mod forest;
 mod meta_agent;
 mod meta_mesh;
 mod model;

server/swimos_introspection/src/lib.rs

@@ -15,7 +15,10 @@
 #[cfg(test)]
 mod tests;
 
-use crate::task::AgentMeta;
+use crate::{
+    forest::{UriForest, UriPart},
+    task::AgentMeta,
+};
 use futures::future::{BoxFuture, Either};
 use futures::stream::select;
 use futures::{FutureExt, SinkExt, StreamExt, TryFutureExt};
@@ -33,7 +36,6 @@ use swimos_model::Text;
 use swimos_runtime::downlink::Io;
 use swimos_utilities::routing::RouteUri;
 use swimos_utilities::trigger;
-use swimos_utilities::uri_forest::{UriForest, UriPart};
 use tokio_util::codec::{FramedRead, FramedWrite};
 
 pub struct MetaMeshAgent {

server/swimos_introspection/src/meta_mesh/mod.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::forest::UriForest;
 use crate::meta_mesh::{run_task, NodeInfo, NodeInfoCount, NodeInfoList};
 use crate::model::AgentIntrospectionUpdater;
 use crate::task::AgentMeta;
@@ -33,7 +34,6 @@ use swimos_form::read::RecognizerReadable;
 use swimos_model::{Text, Timestamp};
 use swimos_runtime::agent::reporting::UplinkReporter;
 use swimos_utilities::io::byte_channel::{byte_channel, ByteReader, ByteWriter};
-use swimos_utilities::uri_forest::UriForest;
 use swimos_utilities::{non_zero_usize, trigger};
 use tokio_util::codec::{FramedRead, FramedWrite};
 use uuid::Uuid;

server/swimos_introspection/src/meta_mesh/tests.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::forest::UriForest;
 use std::sync::Arc;
 use std::{collections::HashMap, num::NonZeroUsize};
 
@@ -25,14 +26,14 @@ use swimos_runtime::agent::{
     reporting::{UplinkReportReader, UplinkReporter},
     NodeReporting, UplinkReporterRegistration,
 };
-use swimos_utilities::uri_forest::UriForest;
 use swimos_utilities::{routing::RouteUri, trigger};
 use tokio::sync::{mpsc, oneshot};
 use tokio_stream::wrappers::{ReceiverStream, UnboundedReceiverStream};
 use tracing::info;
 use uuid::Uuid;
 
 use crate::model::{AgentIntrospectionHandle, AgentIntrospectionUpdater, LaneView};
+use crate::MetaMeshAgent;
 
 /// Requests that can be made by to the introspection task.
 pub enum IntrospectionMessage {
@@ -96,16 +97,18 @@ impl From<UplinkReporterRegistration> for IntrospectionMessage {
 pub fn init_introspection(
     stopping: trigger::Receiver,
     channel_size: NonZeroUsize,
-    agents: Arc<RwLock<UriForest<AgentMeta>>>,
 ) -> (
     IntrospectionResolver,
+    MetaMeshAgent,
     impl Future<Output = ()> + Send + 'static,
 ) {
+    let agents = Arc::new(RwLock::new(UriForest::new()));
     let (msg_tx, msg_rx) = mpsc::unbounded_channel();
     let (reg_tx, reg_rx) = mpsc::channel(channel_size.get());
-    let task = introspection_task(stopping, msg_rx, reg_rx, agents);
+    let task = introspection_task(stopping, msg_rx, reg_rx, agents.clone());
+    let meta_agent = MetaMeshAgent::new(agents);
     let resolver = IntrospectionResolver::new(msg_tx, reg_tx);
-    (resolver, task)
+    (resolver, meta_agent, task)
 }
 
 #[derive(Debug)]

server/swimos_introspection/src/task/mod.rs

@@ -15,7 +15,6 @@
 use futures::future::{join, Either};
 use futures::stream::{unfold, FuturesUnordered};
 use futures::{FutureExt, Stream, StreamExt};
-use parking_lot::RwLock;
 use ratchet::{ExtensionProvider, SplittableExtension, WebSocket, WebSocketStream};
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
@@ -32,7 +31,7 @@ use swimos_api::error::{
 };
 use swimos_api::{address::RelativeAddress, persistence::PlanePersistence};
 use swimos_introspection::route::{lane_pattern, mesh_pattern, node_pattern};
-use swimos_introspection::{init_introspection, IntrospectionResolver, MetaMeshAgent};
+use swimos_introspection::{init_introspection, IntrospectionResolver};
 use swimos_introspection::{IntrospectionConfig, LaneMetaAgent, NodeMetaAgent};
 use swimos_model::Text;
 use swimos_net::{BadUrl, Scheme};
@@ -52,7 +51,6 @@ use swimos_remote::ws::{RatchetError, Websockets};
 use swimos_utilities::io::byte_channel::{byte_channel, BudgetedFutureExt, ByteReader, ByteWriter};
 use swimos_utilities::routing::RoutePattern;
 use swimos_utilities::trigger::{self, promise};
-use swimos_utilities::uri_forest::UriForest;
 use thiserror::Error;
 use tokio::sync::{mpsc, oneshot};
 use tokio::task::JoinError;
@@ -1241,10 +1239,8 @@ fn start_introspection(
     stopping: trigger::Receiver,
     routes: &mut Routes,
 ) -> IntrospectionResolver {
-    let agents = Arc::new(RwLock::new(UriForest::new()));
-    let (resolver, task) =
-        init_introspection(stopping, config.registration_channel_size, agents.clone());
-    let mesh_meta = MetaMeshAgent::new(agents);
+    let (resolver, mesh_meta, task) =
+        init_introspection(stopping, config.registration_channel_size);
     let node_meta = NodeMetaAgent::new(config, resolver.clone());
     let lane_meta = LaneMetaAgent::new(config, resolver.clone());
 

server/swimos_server_app/src/server/runtime/mod.rs

@@ -6,7 +6,7 @@ edition = "2021"
 
 [features]
 default = []
-all = ["future", "errors", "sync", "collections", "time", "text", "rtree", "buf_channel", "algebra", "multi_reader", "uri_forest", "encoding"]
+all = ["future", "errors", "sync", "collections", "time", "text", "rtree", "buf_channel", "algebra", "multi_reader", "encoding"]
 algebra = ["swimos_algebra"]
 buf_channel = ["swimos_byte_channel"]
 multi_reader = ["swimos_multi_reader"]
@@ -19,7 +19,6 @@ sync = ["future", "trigger", "swimos_sync"]
 text = ["swimos_route", "swimos_format"]
 time = ["swimos_time"]
 trigger = ["swimos_trigger"]
-uri_forest = ["swimos_uri_forest"]
 encoding = ["swimos_encoding"]
 
 [dependencies]
@@ -37,5 +36,4 @@ swimos_rtree = { path = "./swimos_rtree", optional = true }
 swimos_sync = { path = "./swimos_sync", optional = true }
 swimos_time = { path = "./swimos_time", optional = true }
 swimos_encoding = { path = "./swimos_encoding", optional = true }
-swimos_uri_forest = { path = "./swimos_uri_forest", optional = true }