Merge branch 'main' of https://github.com/swimos/swim-rust into unused-deps

SirCipher · SirCipher · commit a62004abc7a2 · 2024-06-07T09:35:46.000+01:00
# Conflicts:
#	example_apps/transit/Cargo.toml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    open-pull-requests-limit: 10
+    directory: "/"
+    schedule:
+      interval: "daily"
+#    ignore:
+#      - dependency-name: ""
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,6 +37,7 @@ members = [
     "example_apps/tutorial_app",
     "example_apps/tutorial_app/model",
     "example_apps/tutorial_app/generator",
+    "example_apps/join_map",
     "example_apps/join_value",
 ]
 
@@ -64,7 +65,7 @@ futures-util = "0.3.25"
 parking_lot = "0.12"
 pin-project = "1.0.12"
 rand = "0.8"
-criterion = "0.4"
+criterion = "0.5.1"
 either = "1.8"
 tempdir = "0.3.7"
 slab = "0.4"
@@ -90,15 +91,15 @@ num-bigint = "0.4"
 ratchet = { package = "ratchet_rs", version = "0.4" }
 ratchet_fixture = "0.4"
 flate2 = "1.0.22"
-bitflags = "1.3"
+bitflags = "2.5"
 rocksdb = "0.22"
 integer-encoding = "3.0.4"
 rustls = "0.20"
 webpki = "0.22"
 webpki-roots = "0.22"
 tokio-rustls = "0.23"
 rustls-pemfile = "1.0.0"
-trust-dns-resolver = "0.22.0"
+trust-dns-resolver = "0.23.2"
 clap = "4.1"
 crossbeam-queue = { version = "0.3" }
 crossbeam-channel = { version = "0.5" }
@@ -108,6 +109,23 @@ percent-encoding = "2.1.0"
 mime = "0.3"
 serde_json = "1.0"
 serde = "1.0"
-reqwest = "0.11"
+reqwest = "0.12.4"
 convert_case = "0.6"
 frunk = "0.4"
+byteorder = "1.4"
+rmp = "0.8"
+ryu = "1.0"
+regex = "1.3.6"
+fnv = "1.0.7"
+cursive = { default-features = false, version = "0.20" }
+duration-str = "0.11.2"
+quick-xml = "0.31.0"
+csv = "1.2"
+serde-xml-rs = "0.6"
+axum = "0.6.20"
+hyper-staticfile = "0.9"
+httparse = "1.8"
+sha1 = "0.10"
+waker-fn = "1.1.0"
+num = "0.4"
+smol_str = "0.2.0"
diff --git a/api/formats/swimos_msgpack/Cargo.toml b/api/formats/swimos_msgpack/Cargo.toml
@@ -10,8 +10,8 @@ either = { workspace = true }
 swimos_form = { path = "../../swimos_form" }
 swimos_model = { path = "../../swimos_model" }
 bytes = { workspace = true }
-byteorder = "1.4"
-rmp = "0.8"
+byteorder = { workspace = true }
+rmp = { workspace = true }
 
 [dev-dependencies]
 
diff --git a/api/formats/swimos_recon/Cargo.toml b/api/formats/swimos_recon/Cargo.toml
@@ -16,7 +16,7 @@ swimos_utilities = { path = "../../../swimos_utilities", features = ["encoding"]
 nom = { workspace = true }
 nom_locate = { workspace = true }
 num-traits = { workspace = true }
-ryu = "1.0"
+ryu = { workspace = true }
 futures = { workspace = true }
 tokio = { workspace = true, features = ["io-util"] }
 tokio-util = { workspace = true, features = ["codec"] }
diff --git a/api/swimos_schema/Cargo.toml b/api/swimos_schema/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 swimos_model = { path = "../swimos_model" }
 swimos_schema_derive = { path = "../swimos_schema_derive" }
 num-traits = { workspace = true }
-regex = "1.3.6"
+regex = { workspace = true }
 
 [dev-dependencies]
 swimos_form = { path = "../swimos_form" }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,5 +1,5 @@
-trigger: ["main", "byte-routing"]
-pr: ["main", "byte-routing"]
+trigger: [ "main" ]
+pr: [ "main" ]
 
 variables:
   RUSTFLAGS: -Dwarnings
diff --git a/ci/azure-code-coverage.yml b/ci/azure-code-coverage.yml
@@ -1,17 +1,8 @@
-trigger: ["main", "byte-routing"]
-pr: ["main", "byte-routing"]
-
-schedules:
-  - cron: "0 0 * * *"
-    displayName: Nightly code coverage run
-    branches:
-      include:
-        - main
-        - byte-routing
-
+trigger: [ "main" ]
+pr: [ "main" ]
 
 variables:
-    RUSTFLAGS: -Dwarnings
+  RUSTFLAGS: -Dwarnings
 
 jobs:
   - job: Code_coverage
diff --git a/ci/azure-test-stable.yml b/ci/azure-test-stable.yml
@@ -19,7 +19,7 @@ jobs:
         parameters:
           rust_version: ${{ parameters.rust }}
       - template: azure-install-sccache.yml
-      - script: cargo test --verbose --all-features --workspace --lib --tests --profile "ci"
+      - script: cargo test --all-features --workspace --lib --tests --profile "ci"
         env:
           RUST_BACKTRACE: 1
         displayName: cargo test --lib --tests
diff --git a/client/fixture/Cargo.toml b/client/fixture/Cargo.toml
@@ -11,7 +11,7 @@ ratchet = { features = ["deflate", "split"], workspace = true }
 swimos_recon = { path = "../../api/formats/swimos_recon" }
 swimos_model = { path = "../../api/swimos_model" }
 swimos_form = { path = "../../api/swimos_form" }
-tokio-util = { version = "0.6.8", features = ["codec"] }
+tokio-util = { workspace = true, features = ["codec"] }
 futures = { workspace = true }
 futures-util = { workspace = true }
 bytes = { workspace = true }
diff --git a/client/runtime/Cargo.toml b/client/runtime/Cargo.toml
@@ -27,7 +27,7 @@ bytes = { workspace = true }
 tokio = { workspace = true, features = ["io-util", "sync"] }
 tokio-util = { workspace = true, features = ["codec"] }
 url = { workspace = true }
-fnv = "1.0.7"
+fnv = { workspace = true }
 thiserror = { workspace = true }
 uuid = { workspace = true }
 tracing = { workspace = true }
diff --git a/example_apps/console/Cargo.toml b/example_apps/console/Cargo.toml
@@ -20,11 +20,11 @@ bytes = { workspace = true }
 console-views = { path = "console_views" }
 http = { workspace = true }
 rand = { workspace = true }
-duration-str = "0.5"
-thiserror = { workspace = true} 
+duration-str = { workspace = true }
+thiserror = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
-cursive = { version = "0.20", default-features = false, features = ["crossterm-backend"] }
+cursive = { workspace = true, features = ["crossterm-backend"] }
 
 [target.'cfg(unix)'.dependencies]
-cursive = { version = "0.20", default-features = false, features = ["termion-backend"] }
+cursive = { workspace = true, features = ["termion-backend"] }
diff --git a/example_apps/console/console_views/Cargo.toml b/example_apps/console/console_views/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
 
 [dependencies]
-cursive = { version = "0.20", default-features = false }
+cursive = { workspace = true }
 
diff --git a/example_apps/join_map/Cargo.toml b/example_apps/join_map/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "join_map"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+swimos = { path = "../../swimos", features = ["server", "agent"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+example-util = { path = "../example_util" }
diff --git a/example_apps/join_map/src/agents.rs b/example_apps/join_map/src/agents.rs
@@ -0,0 +1,76 @@
+use swimos::{
+    agent::agent_lifecycle::utility::HandlerContext,
+    agent::event_handler::{EventHandler, HandlerActionExt},
+    agent::lanes::{JoinMapLane, MapLane},
+    agent::projections,
+    agent::{lifecycle, AgentLaneModel},
+};
+
+#[derive(AgentLaneModel)]
+#[projections]
+pub struct StreetStatisticsAgent {
+    state: MapLane<String, u64>,
+}
+
+#[derive(Clone)]
+pub struct StreetStatisticsLifecycle;
+
+#[lifecycle(StreetStatisticsAgent)]
+impl StreetStatisticsLifecycle {}
+
+#[derive(AgentLaneModel)]
+#[projections]
+pub struct AggregatedStatisticsAgent {
+    streets: JoinMapLane<String, String, u64>,
+}
+
+#[derive(Clone)]
+pub struct AggregatedLifecycle;
+
+#[lifecycle(AggregatedStatisticsAgent)]
+impl AggregatedLifecycle {
+    #[on_start]
+    pub fn on_start(
+        &self,
+        context: HandlerContext<AggregatedStatisticsAgent>,
+    ) -> impl EventHandler<AggregatedStatisticsAgent> {
+        let california_downlink = context.add_map_downlink(
+            AggregatedStatisticsAgent::STREETS,
+            "california".to_string(),
+            None,
+            "/state/california",
+            "state",
+        );
+        let texas_downlink = context.add_map_downlink(
+            AggregatedStatisticsAgent::STREETS,
+            "texas".to_string(),
+            None,
+            "/state/texas",
+            "state",
+        );
+        let florida_downlink = context.add_map_downlink(
+            AggregatedStatisticsAgent::STREETS,
+            "florida".to_string(),
+            None,
+            "/state/florida",
+            "state",
+        );
+
+        context
+            .get_agent_uri()
+            .and_then(move |uri| context.effect(move || println!("Starting agent at: {}", uri)))
+            .followed_by(california_downlink)
+            .followed_by(texas_downlink)
+            .followed_by(florida_downlink)
+    }
+
+    #[on_stop]
+    pub fn on_stop(
+        &self,
+        context: HandlerContext<AggregatedStatisticsAgent>,
+    ) -> impl EventHandler<AggregatedStatisticsAgent> {
+        context
+            .get_agent_uri()
+            .and_then(move |uri| context.effect(move || println!("Stopping agent at: {}", uri)))
+    }
+}
diff --git a/example_apps/join_map/src/main.rs b/example_apps/join_map/src/main.rs
@@ -0,0 +1,59 @@
+// Copyright 2015-2023 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod agents;
+
+use crate::agents::{
+    AggregatedLifecycle, AggregatedStatisticsAgent, StreetStatisticsAgent,
+    StreetStatisticsLifecycle,
+};
+use example_util::{example_logging, manage_handle};
+use std::{error::Error, time::Duration};
+use swimos::{
+    agent::agent_model::AgentModel, route::RoutePattern, server::Server, server::ServerBuilder,
+};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
+    example_logging()?;
+
+    let street_route = RoutePattern::parse_str("/state/:name")?;
+    let street_agent = AgentModel::new(
+        StreetStatisticsAgent::default,
+        StreetStatisticsLifecycle.into_lifecycle(),
+    );
+
+    let aggregated_route = RoutePattern::parse_str("/join/state/:name")?;
+    let aggregated_agent = AgentModel::new(
+        AggregatedStatisticsAgent::default,
+        AggregatedLifecycle.into_lifecycle(),
+    );
+
+    let server = ServerBuilder::with_plane_name("Statistics Plane")
+        .add_route(street_route, street_agent)
+        .add_route(aggregated_route, aggregated_agent)
+        .update_config(|config| {
+            config.agent_runtime.inactive_timeout = Duration::from_secs(5 * 60);
+        })
+        .build()
+        .await?;
+
+    let (task, handle) = server.run();
+    let shutdown = manage_handle(handle);
+    let (_, result) = tokio::join!(shutdown, task);
+
+    result?;
+    println!("Server stopped successfully.");
+    Ok(())
+}
diff --git a/example_apps/transit/Cargo.toml b/example_apps/transit/Cargo.toml
@@ -11,7 +11,7 @@ tokio-stream = { workspace = true, features = ["io-util"] }
 tokio-util = { workspace = true, features = ["io"] }
 example-util = { path = "../example_util" }
 serde = { workspace = true, features = ["derive"] }
-csv = "1.2"
+csv = { workspace = true }
 thiserror = { workspace = true }
 percent-encoding = { workspace = true }
 reqwest = { workspace = true, features = ["rustls-tls", "gzip"] }
@@ -21,4 +21,4 @@ transit-model = { path = "transit-model" }
 futures = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-axum = { version = "0.6.20", features = ["tokio", "http1"] }
+axum = { workspace = true, features = ["tokio", "http1"] }
diff --git a/example_apps/transit/transit-model/Cargo.toml b/example_apps/transit/transit-model/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 swimos = { path = "../../../swimos" }
 swimos_form = { path = "../../../api/swimos_form" }
 serde = { workspace = true, features = ["derive"] }
-quick-xml = { version = "0.30", features = ["serialize", "serde-types"] }
+quick-xml = { workspace = true, features = ["serialize", "serde-types"] }
 percent-encoding = { workspace = true }
 thiserror = { workspace = true }
diff --git a/example_apps/tutorial_app/Cargo.toml b/example_apps/tutorial_app/Cargo.toml
@@ -10,6 +10,6 @@ example-util = { path = "../example_util" }
 rand = { workspace = true }
 tutorial-app-model = { path = "./model" }
 hyper = { workspace = true, features = ["server", "tcp", "http1"] }
-hyper-staticfile = "0.9"
+hyper-staticfile = { workspace = true }
 http = { workspace = true }
 futures = { workspace = true }
diff --git a/runtime/swimos_http/Cargo.toml b/runtime/swimos_http/Cargo.toml
@@ -9,9 +9,9 @@ futures = { workspace = true }
 ratchet = { workspace = true }
 hyper = { workspace = true }
 http = { workspace = true }
-httparse = "1.8"
+httparse = { workspace = true }
 bytes = { workspace = true }
-sha1 = "0.10"
+sha1 = { workspace = true }
 base64 = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
diff --git a/runtime/swimos_runtime/src/downlink/mod.rs b/runtime/swimos_runtime/src/downlink/mod.rs
@@ -54,13 +54,14 @@ mod tests;
 bitflags! {
     /// Flags that a downlink consumer can set to instruct the downlink runtime how it wishes
     /// to be driven.
+    #[derive(Debug, Copy, Clone)]
     pub struct DownlinkOptions: u8 {
         /// The consumer needs to be synchronized with the remote lane.
         const SYNC = 0b01;
         /// If the connection fails, it should be restarted and the consumer passed to the new
         /// connection.
         const KEEP_LINKED = 0b10;
-        const DEFAULT = Self::SYNC.bits | Self::KEEP_LINKED.bits;
+        const DEFAULT = Self::SYNC.bits() | Self::KEEP_LINKED.bits();
     }
 }
 
@@ -72,7 +73,7 @@ bitflags! {
         /// A new consumer that needs to be synced has joined why a write was pending.
         const NEEDS_SYNC = 0b10;
         /// When the task starts it does not need to be flushed.
-        const INIT = Self::FLUSHED.bits;
+        const INIT = Self::FLUSHED.bits();
     }
 }
 
diff --git a/server/swimos_agent/src/agent_model/mod.rs b/server/swimos_agent/src/agent_model/mod.rs
diff --git a/server/swimos_agent/src/event_handler/mod.rs b/server/swimos_agent/src/event_handler/mod.rs
diff --git a/server/swimos_agent_derive/src/lane_model_derive/model.rs b/server/swimos_agent_derive/src/lane_model_derive/model.rs
diff --git a/server/swimos_introspection/Cargo.toml b/server/swimos_introspection/Cargo.toml
diff --git a/server/swimos_introspection/src/meta_mesh/tests.rs b/server/swimos_introspection/src/meta_mesh/tests.rs
diff --git a/swimos_utilities/swimos_multi_reader/Cargo.toml b/swimos_utilities/swimos_multi_reader/Cargo.toml
diff --git a/swimos_utilities/swimos_rtree/Cargo.toml b/swimos_utilities/swimos_rtree/Cargo.toml
diff --git a/swimos_utilities/swimos_uri_forest/Cargo.toml b/swimos_utilities/swimos_uri_forest/Cargo.toml
