Port improvements from #127 (#129)

mxgrey · web-flow · commit 717d2cc0730c · 2025-10-12T15:38:37.000+08:00
Signed-off-by: Michael X. Grey &lt;greyxmike@gmail.com&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,17 +16,42 @@ categories = [
 ]
 
 [workspace.dependencies]
-schemars = { version = "0.9.0" }
-serde = { version = "1.0.210", features = ["derive", "rc"] }
-serde_json = { version = "1.0.128" }
+axum = "0.8.4"
+bevy_app = "0.12.1"
+bevy_core = "0.12.1"
+bevy_derive = "0.12.1"
+bevy_ecs = "0.12.1"
+bevy_hierarchy = "0.12.1"
+bevy_time = "0.12.1"
+bevy_utils = "0.12.1"
+clap = { version = "4.5.23", features = ["derive"] }
+mime_guess = "2.0.5"
+schemars = "0.9.0"
+serde = "1.0.219"
+serde_json = "1.0.140"
+tokio = "1.47.1"
+tonic = "0.14"
+prost = "0.14"
+tonic-prost = "0.14"
+tonic-prost-build = "0.14"
+prost-build = "0.14"
+prost-reflect = "0.16"
+tracing = "0.1.41"
+tracing-subscriber = "0.3.19"
+futures = "0.3.31"
+futures-util = "0.3.31"
+uuid = "1.13.1"
+wasm-bindgen = "0.2.100"
+zenoh = "1.3.2"
+zenoh-ext = "1.4.0"
 
 [dependencies]
 bevy_impulse_derive = { path = "macros", version = "0.0.2" }
-bevy_ecs = "0.12"
-bevy_utils = "0.12"
-bevy_hierarchy = "0.12"
-bevy_derive = "0.12"
-bevy_app = "0.12"
+bevy_ecs = { workspace = true }
+bevy_utils = { workspace = true }
+bevy_hierarchy = { workspace = true }
+bevy_derive = { workspace = true }
+bevy_app = { workspace = true }
 
 async-task = { version = "4.7.1", optional = true }
 
@@ -37,8 +62,8 @@ bevy_tasks = { version = "0.12", features = ["multi-threaded"] }
 
 itertools = "0.13"
 smallvec = { version = "1.13", features = ["serde"] }
-tokio = { version = "1.39", features = ["sync"] }
-futures = "0.3"
+tokio = { workspace = true, features = ["sync"] }
+futures = { workspace = true }
 backtrace = "0.3"
 anyhow = "1.0"
 thiserror = "1.0"
@@ -48,35 +73,35 @@ thiserror = "1.0"
 # the testing module for doctests, and doctests can only
 # make use of default features, so we're a bit stuck with
 # these for now.
-bevy_core = "0.12"
-bevy_time = "0.12"
+bevy_core = { workspace = true }
+bevy_time = { workspace = true }
 
 schemars = { workspace = true, optional = true }
-serde = { workspace = true, optional = true }
+serde = { workspace = true, optional = true, features = ["derive", "rc"] }
 serde_json = { workspace = true, optional = true }
 cel-interpreter = { version = "0.9.0", features = ["json"], optional = true }
 
 # --- Dependencies for grpc feature
-tonic = { version = "0.14", optional = true }
-prost = { version = "0.14", optional = true }
-tonic-prost = { version = "0.14", optional = true }
-prost-reflect = { version = "0.16", features = ["serde"], optional = true }
+tonic = { workspace = true, optional = true }
+prost = { workspace = true, optional = true }
+tonic-prost = { workspace = true, optional = true }
+prost-reflect = { workspace = true, features = ["serde"], optional = true }
 http = { version = "1.3", optional = true }
 futures-lite = { version = "2.6", features = ["std", "race"], optional = true }
 async-std = { version = "1.12", optional = true}
 # --- end grpc
 
 # --- Dependencies for zenoh feature
-zenoh = { version = "1.3.2", features = ["unstable"], optional = true }
-zenoh-ext = { version = "*", features = ["unstable"], optional = true }
+zenoh = { workspace = true, features = ["unstable"], optional = true }
+zenoh-ext = { workspace = true, features = ["unstable"], optional = true }
 # --- end zenoh
 
-tracing = "0.1.41"
+tracing = { workspace = true }
 strum = { version = "0.26.3", optional = true, features = ["derive"] }
 semver = { version = "1.0.24", optional = true }
 
 [target.wasm32-unknown-unknown.dependencies]
-uuid = { version = "1.13.1", default-features = false, features = ["js"] }
+uuid = { workspace = true, default-features = false, features = ["js"] }
 getrandom = { version = "0.3.3", features = ["wasm_js"] }
 
 [features]
@@ -143,4 +168,4 @@ required-features = ["diagram"]
 doc = false
 
 [build-dependencies]
-tonic-prost-build = { version = "0.14", optional = true }
+tonic-prost-build = { workspace = true, optional = true }
diff --git a/diagram-editor/Cargo.toml b/diagram-editor/Cargo.toml
@@ -28,26 +28,26 @@ exclude = ["/build.rs"]
 path = "server/lib.rs"
 
 [dependencies]
-axum = { version = "0.8.4", features = ["json"], default-features = false }
-bevy_app = "0.12.1"
-bevy_ecs = "0.12.1"
+axum = { workspace = true, features = ["json"], default-features = false }
+bevy_app = { workspace = true }
+bevy_ecs = { workspace = true }
 bevy_impulse = { version = "0.0.2", path = "..", features = [
   "diagram",
   "trace",
 ] }
-clap = { version = "4.5.23", features = ["derive"], optional = true }
+clap = { workspace = true, features = ["derive"], optional = true }
 flate2 = { version = "1.1.1", optional = true }
-futures-util = "0.3.31"
+futures-util = { workspace = true }
 indexmap = { version = "2.10.0", optional = true, features = ["serde"] }
-mime_guess = "2.0.5"
-schemars = { version = "0.9", optional = true }
-serde = "1.0.219"
-serde_json = "1.0.140"
+mime_guess = { workspace = true }
+schemars = { workspace = true, optional = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 tar = { version = "0.4.44", optional = true }
 thiserror = "2.0.16"
-tokio = { version = "1.45.1", features = ["macros"] }
-tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", optional = true }
+tokio = { workspace = true, features = ["macros"] }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true, optional = true }
 
 [build-dependencies]
 flate2 = { version = "1.1.1", optional = true }
@@ -56,7 +56,7 @@ tar = { version = "0.4.44", optional = true }
 [dev-dependencies]
 futures-channel = "0.3.31"
 test-log = "0.2.18"
-tokio = { version = "1.45.1", features = ["macros", "rt-multi-thread"] }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tower = "0.5.2"
 
 [features]
diff --git a/diagram-editor/wasm/Cargo.toml b/diagram-editor/wasm/Cargo.toml
@@ -25,20 +25,20 @@ categories = [
 ]
 
 [dependencies]
-axum = { version = "0.8.4", features = ["json"], default-features = false }
-bevy_app = "0.12.1"
+axum = { workspace = true, features = ["json"], default-features = false }
+bevy_app = { workspace = true }
 bevy_impulse = { version = "0.0.2", path = "../..", features = [
   "diagram",
   "single_threaded_async",
 ] }
 bevy_impulse_diagram_editor = { version = "0.0.1", path = "..", default-features = false }
-mime_guess = { version = "2.0.5" }
-serde_json = "1.0.140"
+mime_guess = { workspace = true }
+serde_json = { workspace = true }
 serde-wasm-bindgen = "0.6.5"
-wasm-bindgen = "0.2.100"
+wasm-bindgen = { workspace = true }
 wasm-bindgen-futures = "0.4.50"
-tokio = { version = "1.47.1", default-features = false, features = ["rt"] }
-futures = "0.3.31"
+tokio = { workspace = true, default-features = false, features = ["rt"] }
+futures = { workspace = true }
 serde.workspace = true
 
 [build-dependencies]
diff --git a/diagram-editor/wasm/src/executor.rs b/diagram-editor/wasm/src/executor.rs
@@ -58,6 +58,7 @@ pub async fn post_run(request: PostRunRequestWasm) -> Result<JsValue, JsValue> {
 }
 
 #[cfg(test)]
+#[cfg(target_arch = "wasm32")]
 mod tests {
     use std::{collections::HashMap, sync::Arc};
 
diff --git a/diagram-editor/wasm/src/globals.rs b/diagram-editor/wasm/src/globals.rs
@@ -26,12 +26,6 @@ pub fn setup_wasm(
     BEVY_APP.lock().unwrap().replace(app);
 }
 
-pub(super) fn with_bevy_app<R>(f: impl FnOnce(&mut bevy_app::App) -> R) -> R {
-    let mut mg = BEVY_APP.lock().unwrap();
-    let app = mg.as_mut().expect("`init_wasm` not called");
-    f(app)
-}
-
 pub(super) async fn with_bevy_app_async<R>(f: impl AsyncFnOnce(&mut bevy_app::App) -> R) -> R {
     let mut mg = BEVY_APP.lock().unwrap();
     let app = mg.as_mut().expect("`init_wasm` not called");
diff --git a/diagram-editor/wasm/src/registry.rs b/diagram-editor/wasm/src/registry.rs
@@ -12,6 +12,7 @@ pub fn get_registry() -> JsValue {
         .expect("failed to serialize registry")
 }
 
+#[cfg(target_arch = "wasm32")]
 #[cfg(test)]
 mod tests {
     use wasm_bindgen_test::wasm_bindgen_test;
diff --git a/diagram-editor/wasm/src/test_utils.rs b/diagram-editor/wasm/src/test_utils.rs
@@ -17,6 +17,7 @@ init_wasm! {
     InitOptions{app, registry, executor_options}
 }
 
+#[cfg(target_arch = "wasm32")]
 pub(crate) fn setup_test() {
     init_wasm();
 }
diff --git a/examples/diagram/calculator_ops_catalog/Cargo.toml b/examples/diagram/calculator_ops_catalog/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 description = "catalog of reusable calculator operations"
 
 [dependencies]
-bevy_app = "0.12"
-bevy_core = "0.12"
+bevy_app = { workspace = true }
+bevy_core = { workspace = true }
 bevy_impulse = { version = "0.0.2", path = "../../..", features = ["diagram"] }
-bevy_time = "0.12"
+bevy_time = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 schemars = { workspace = true }
-tracing-subscriber = "0.3.19"
+tracing-subscriber = { workspace = true }
diff --git a/examples/diagram/calculator_wasm/Cargo.toml b/examples/diagram/calculator_wasm/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-bevy_app = "0.12"
+bevy_app = { workspace = true }
 bevy_impulse = { version = "0.0.2", path = "../../.." }
 bevy_impulse_diagram_editor_wasm = { version = "0.0.1", path = "../../../diagram-editor/wasm" }
 calculator_ops_catalog = { version = "0.1.0", path = "../calculator_ops_catalog" }
-wasm-bindgen = "0.2.100"
+wasm-bindgen = { workspace = true }
diff --git a/examples/zenoh-examples/Cargo.toml b/examples/zenoh-examples/Cargo.toml
@@ -12,21 +12,21 @@ name = "use-door"
 path = "src/use_door.rs"
 
 [dependencies]
-bevy_app = "0.12"
-bevy_core = "0.12"
-bevy_ecs = "0.12"
-bevy_time = "0.12"
 bevy_impulse = { version = "0.0.2", path = "../..", features = ["diagram"] }
-futures = "0.3"
-schemars = { version = "0.9.0" }
-serde = { version = "1.0.210", features = ["derive", "rc"] }
-serde_json = "1.0.128"
-prost = "0.13.5"
-tracing = "0.1.41"
-clap = { version = "4.5.23", features = ["derive"] }
-uuid = { version = "*", features = ["v4"] }
-zenoh = { version = "1.3.2", features = ["unstable"] }
-zenoh-ext = { version = "*", features = ["unstable"] }
+bevy_app = { workspace = true }
+bevy_core = { workspace = true }
+bevy_ecs = { workspace = true }
+bevy_time = { workspace = true }
+futures = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, features = ["derive", "rc"] }
+serde_json = { workspace = true }
+prost = { workspace = true }
+tracing = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+uuid = { workspace = true, features = ["v4"] }
+zenoh = { workspace = true, features = ["unstable"] }
+zenoh-ext = { workspace = true, features = ["unstable"] }
 
 [build-dependencies]
-prost-build = "0.13.5"
+prost-build = { workspace = true }
diff --git a/examples/zenoh-examples/src/lib.rs b/examples/zenoh-examples/src/lib.rs
@@ -109,7 +109,7 @@ pub fn zenoh_subscription_node<T: 'static + Send + Sync + Message + Default>(
     builder.create_node(callback.as_callback())
 }
 
-pub fn zenoh_publisher_node<T: 'static + Send + Sync + Message>(
+pub fn zenoh_publisher_node<T: 'static + Send + Sync + Message + std::fmt::Debug>(
     topic_name: Arc<str>,
     builder: &mut Builder,
 ) -> Node<T, Result<(), ArcError>> {
diff --git a/src/buffer/json_buffer.rs b/src/buffer/json_buffer.rs
@@ -217,6 +217,11 @@ impl From<JsonBufferKey> for AnyBufferKey {
 /// Similar to [`BufferView`][crate::BufferView], but this can be unlocked with
 /// a [`JsonBufferKey`], so it can work for any buffer whose message types
 /// support serialization and deserialization.
+///
+/// Obtain this from a [`World`] using the [`JsonBufferWorldAccess`] trait. Full
+/// world access is needed to get this, because the underlaying buffer may be any
+/// serializable data type, and only the [`JsonBufferKey`] will know the actual
+/// data type.
 pub struct JsonBufferView<'a> {
     storage: Box<dyn JsonBufferViewing + 'a>,
     gate: &'a GateState,
@@ -249,6 +254,14 @@ impl<'a> JsonBufferView<'a> {
         self.len() == 0
     }
 
+    /// Iterate through the current elements of the buffer.
+    pub fn iter(&self) -> IterJsonBufferView<'a, '_> {
+        IterJsonBufferView {
+            index: 0,
+            view: self,
+        }
+    }
+
     /// Check whether the gate of this buffer is open or closed.
     pub fn gate(&self) -> Gate {
         self.gate
@@ -259,9 +272,28 @@ impl<'a> JsonBufferView<'a> {
     }
 }
 
+pub struct IterJsonBufferView<'a, 'b> {
+    index: usize,
+    view: &'b JsonBufferView<'a>,
+}
+
+impl<'a, 'b> Iterator for IterJsonBufferView<'a, 'b> {
+    type Item = Result<JsonMessage, serde_json::Error>;
+    fn next(&mut self) -> Option<Self::Item> {
+        let next = self.index;
+        self.index += 1;
+        self.view.get(next).transpose()
+    }
+}
+
 /// Similar to [`BufferMut`][crate::BufferMut], but this can be unlocked with a
 /// [`JsonBufferKey`], so it can work for any buffer whose message types support
 /// serialization and deserialization.
+///
+/// Obtain this from a [`World`] using the [`JsonBufferWorldAccess`] trait. Full
+/// world access is needed to get this, because the underlaying buffer may be any
+/// serializable data type, and only the [`JsonBufferKey`] will know the actual
+/// data type.
 pub struct JsonBufferMut<'w, 's, 'a> {
     storage: Box<dyn JsonBufferManagement + 'a>,
     buffer: Entity,
diff --git a/src/diagram.rs b/src/diagram.rs
diff --git a/src/diagram/grpc.rs b/src/diagram/grpc.rs
diff --git a/src/diagram/zenoh.rs b/src/diagram/zenoh.rs
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/service.rs b/src/service.rs
diff --git a/src/utils.rs b/src/utils.rs

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ pub async fn post_run(request: PostRunRequestWasm) -> Result<JsValue, JsValue> {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`#[cfg(test)]`
	`61`	`+#[cfg(target_arch = "wasm32")]`
`61`	`62`	`mod tests {`
`62`	`63`	`use std::{collections::HashMap, sync::Arc};`
`63`	`64`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ pub fn get_registry() -> JsValue {`
`12`	`12`	`.expect("failed to serialize registry")`
`13`	`13`	`}`
`14`	`14`
	`15`	`+#[cfg(target_arch = "wasm32")]`
`15`	`16`	`#[cfg(test)]`
`16`	`17`	`mod tests {`
`17`	`18`	`use wasm_bindgen_test::wasm_bindgen_test;`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ init_wasm! {`
`17`	`17`	`InitOptions{app, registry, executor_options}`
`18`	`18`	`}`
`19`	`19`
	`20`	`+#[cfg(target_arch = "wasm32")]`
`20`	`21`	`pub(crate) fn setup_test() {`
`21`	`22`	`init_wasm();`
`22`	`23`	`}`