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

Author: SirCipher

Cargo.toml

@@ -39,6 +39,7 @@ members = [
     "example_apps/join_map",
     "example_apps/join_value",
     "example_apps/aggregations",
+    "example_apps/time_series",
 ]
 
 exclude = [
@@ -93,7 +94,7 @@ ratchet_fixture = "0.4"
 flate2 = "1.0.22"
 bitflags = "2.5"
 rocksdb = "0.22"
-integer-encoding = "3.0.4"
+integer-encoding = "4.0.0"
 rustls = "0.20"
 webpki = "0.22"
 webpki-roots = "0.22"
@@ -124,7 +125,7 @@ serde-xml-rs = "0.6"
 axum = "0.6.20"
 hyper-staticfile = "0.9"
 httparse = "1.8"
-sha1 = "0.10"
+sha-1 = "0.10.1"
 waker-fn = "1.1.0"
 num = "0.4"
 smol_str = "0.2.0"

docs/event_handler.md

@@ -90,7 +90,7 @@ The `HandlerContext`.
 The aid in the construction of event handlers, a factor type is provided in the form of:
 
 ```rust
-swimos::agent::agent_lifecycle::utility::HandlerContext<AgentType>
+swimos::agent::agent_lifecycle::HandlerContext<AgentType>
 ```
 
 This allows for the easier construction of event handlers that will run in the context of the `AgentType`. Typically, in

example_apps/aggregations/src/area.rs

@@ -20,7 +20,7 @@ use rand::seq::SliceRandom;
 
 use swimos::agent::event_handler::HandlerActionExt;
 use swimos::{
-    agent::agent_lifecycle::utility::HandlerContext,
+    agent::agent_lifecycle::HandlerContext,
     agent::event_handler::EventHandler,
     agent::lanes::{CommandLane, JoinValueLane, ValueLane},
     agent::lifecycle,
@@ -140,8 +140,10 @@ impl AreaLifecycle {
                     format!("/cars/{car_id}").as_str(),
                     "speed",
                 )
-                .boxed(),
-            Action::Deregister(car_id) => context.remove_downlink(AreaAgent::CARS, *car_id).boxed(),
+                .boxed_local(),
+            Action::Deregister(car_id) => context
+                .remove_downlink(AreaAgent::CARS, *car_id)
+                .boxed_local(),
         }
     }
     #[on_update(cars)]

example_apps/aggregations/src/car.rs

@@ -19,7 +19,7 @@ use rand::Rng;
 
 use swimos::agent::stores::ValueStore;
 use swimos::{
-    agent::agent_lifecycle::utility::HandlerContext,
+    agent::agent_lifecycle::HandlerContext,
     agent::event_handler::{EventHandler, HandlerActionExt},
     agent::lanes::ValueLane,
     agent::{lifecycle, projections, AgentLaneModel},

example_apps/aggregations/src/city.rs

@@ -14,7 +14,7 @@
 
 use std::collections::HashMap;
 use swimos::{
-    agent::agent_lifecycle::utility::HandlerContext,
+    agent::agent_lifecycle::HandlerContext,
     agent::event_handler::EventHandler,
     agent::lanes::ValueLane,
     agent::lanes::{CommandLane, JoinValueLane},

example_apps/command_lane/src/agent.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerActionExt},
     lanes::{CommandLane, ValueLane},
     lifecycle, projections, AgentLaneModel,
@@ -76,12 +76,12 @@ impl ExampleLifecycle {
         cmd: &Instruction,
     ) -> impl EventHandler<ExampleAgent> {
         match *cmd {
-            Instruction::Zero => context.set_value(ExampleAgent::LANE, 0).boxed(),
+            Instruction::Zero => context.set_value(ExampleAgent::LANE, 0).boxed_local(),
             Instruction::Add(n) => context
                 .get_value(ExampleAgent::LANE)
                 .and_then(move |v| context.set_value(ExampleAgent::LANE, v + n))
-                .boxed(),
-            Instruction::Stop => context.stop().boxed(),
+                .boxed_local(),
+            Instruction::Stop => context.stop().boxed_local(),
         }
     }
 }

example_apps/demand_lane/src/agent.rs

@@ -15,7 +15,7 @@
 use std::time::Duration;
 
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerAction, HandlerActionExt},
     lanes::{DemandLane, ValueLane},
     lifecycle, projections, AgentLaneModel,

example_apps/demand_map_lane/src/agent.rs

@@ -15,7 +15,7 @@
 use std::collections::HashMap;
 
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerAction, HandlerActionExt},
     lanes::{CommandLane, DemandMapLane},
     lifecycle, projections, AgentLaneModel,

example_apps/event_downlink/src/consumer/agent.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     agent_model::downlink::hosted::EventDownlinkHandle,
     event_handler::{EventHandler, HandlerAction, HandlerActionExt},
     lanes::{CommandLane, ValueLane},
@@ -101,15 +101,15 @@ impl ConsumerLifecycle {
                     ),
                 })
                 .discard()
-                .boxed(),
+                .boxed_local(),
             Instruction::CloseLink => handle
                 .with_mut(|h| {
                     if let Some(h) = h.as_mut() {
                         h.stop();
                     }
                 })
-                .boxed(),
-            Instruction::Stop => context.stop().boxed(),
+                .boxed_local(),
+            Instruction::Stop => context.stop().boxed_local(),
         };
         context
             .effect(move || println!("{}", msg))

example_apps/event_downlink/src/producer/agent.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use swimos::agent::{
-    agent_lifecycle::utility::HandlerContext,
+    agent_lifecycle::HandlerContext,
     event_handler::{EventHandler, HandlerActionExt},
     lanes::ValueLane,
     lifecycle, projections, AgentLaneModel,