diff --git a/Cargo.lock b/Cargo.lock index cc77f6966..b57f88ba1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2254,9 +2254,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -3069,8 +3069,8 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "dwn" -version = "0.0.10" -source = "git+https://github.com/unavi-xyz/dwn#88318731bbb605ebbc9364c981145fde31773034" +version = "0.1.0" +source = "git+https://github.com/unavi-xyz/dwn#73ee7f9963e9986f2a01a9e865d785c9469603f1" dependencies = [ "base64 0.22.1", "dwn-core", @@ -3080,15 +3080,15 @@ dependencies = [ "reqwest", "ring", "serde_json", - "thiserror 2.0.4", + "thiserror 2.0.6", "tracing", "xdid", ] [[package]] name = "dwn-core" -version = "0.0.10" -source = "git+https://github.com/unavi-xyz/dwn#88318731bbb605ebbc9364c981145fde31773034" +version = "0.1.0" +source = "git+https://github.com/unavi-xyz/dwn#73ee7f9963e9986f2a01a9e865d785c9469603f1" dependencies = [ "base64 0.22.1", "ipld-core", @@ -3101,15 +3101,15 @@ dependencies = [ "serde_json", "serde_with", "sha3", - "thiserror 2.0.4", + "thiserror 2.0.6", "time", "xdid", ] [[package]] name = "dwn-native-db" -version = "0.0.10" -source = "git+https://github.com/unavi-xyz/dwn#88318731bbb605ebbc9364c981145fde31773034" +version = "0.1.0" +source = "git+https://github.com/unavi-xyz/dwn#73ee7f9963e9986f2a01a9e865d785c9469603f1" dependencies = [ "dwn-core", "native_db", @@ -3121,8 +3121,8 @@ dependencies = [ [[package]] name = "dwn-server" -version = "0.0.10" -source = "git+https://github.com/unavi-xyz/dwn#88318731bbb605ebbc9364c981145fde31773034" +version = "0.1.0" +source = "git+https://github.com/unavi-xyz/dwn#73ee7f9963e9986f2a01a9e865d785c9469603f1" dependencies = [ "axum", "axum-macros", @@ -3477,9 +3477,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fd-lock" @@ -5035,9 +5035,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libfuzzer-sys" @@ -5476,7 +5476,7 @@ dependencies = [ [[package]] name = "native_db" version = "0.8.1" -source = "git+https://github.com/vincent-herlemont/native_db?branch=main#ecc25ff8cb96c989801ad144fe7a1ef05cd6785e" +source = "git+https://github.com/vincent-herlemont/native_db#ecc25ff8cb96c989801ad144fe7a1ef05cd6785e" dependencies = [ "native_db_macro", "native_model", @@ -5484,13 +5484,13 @@ dependencies = [ "semver", "serde", "skeptic", - "thiserror 2.0.4", + "thiserror 2.0.6", ] [[package]] name = "native_db_macro" version = "0.8.1" -source = "git+https://github.com/vincent-herlemont/native_db?branch=main#ecc25ff8cb96c989801ad144fe7a1ef05cd6785e" +source = "git+https://github.com/vincent-herlemont/native_db#ecc25ff8cb96c989801ad144fe7a1ef05cd6785e" dependencies = [ "proc-macro2", "quote", @@ -5509,7 +5509,7 @@ dependencies = [ "native_model_macro", "rmp-serde", "serde", - "thiserror 2.0.4", + "thiserror 2.0.6", "zerocopy 0.8.13", ] @@ -6631,7 +6631,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls", "socket2", - "thiserror 2.0.4", + "thiserror 2.0.6", "tokio", "tracing", ] @@ -6650,7 +6650,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.4", + "thiserror 2.0.6", "tinyvec", "tracing", "web-time", @@ -6658,9 +6658,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" +checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" dependencies = [ "cfg_aliases 0.2.1", "libc", @@ -7177,9 +7177,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.41" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags 2.6.0", "errno", @@ -7187,7 +7187,7 @@ dependencies = [ "libc", "linux-raw-sys", "once_cell", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8034,11 +8034,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.4" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" dependencies = [ - "thiserror-impl 2.0.4", + "thiserror-impl 2.0.6", ] [[package]] @@ -8054,9 +8054,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.4" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" dependencies = [ "proc-macro2", "quote", @@ -10645,7 +10645,7 @@ dependencies = [ "flate2", "indexmap 2.7.0", "memchr", - "thiserror 2.0.4", + "thiserror 2.0.6", "zopfli", ] diff --git a/Cargo.toml b/Cargo.toml index 78d088f23..274984d66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,36 +14,36 @@ too_many_arguments = "allow" type_complexity = "allow" [workspace.dependencies] -anyhow = "1.0.82" -avian3d = { version = "0.1.0", features = ["simd"] } -axum = "0.7.5" +anyhow = "1.0.94" +avian3d = { version = "0.1.2", features = ["simd"] } +axum = "0.7.9" axum-server = "0.7.1" -base64 = "0.22.0" -bevy = "0.14.0" -bevy-inspector-egui = "0.25.1" +base64 = "0.22.1" +bevy = "0.14.2" +bevy-inspector-egui = "0.25.2" bevy_async_task = "0.2.0" -bevy_panorbit_camera = "0.19.0" +bevy_panorbit_camera = "0.19.5" bevy_vr_controller = "0.1.1" bevy_vrm = "0.0.12" -capnp = "0.19.4" -capnp-rpc = "0.19.1" -clap = { version = "4.5.4", features = ["derive"] } +capnp = "0.19.8" +capnp-rpc = "0.19.5" +clap = { version = "4.5.23", features = ["derive"] } directories = "5.0.1" dwn = { git = "https://github.com/unavi-xyz/dwn" } glam = "0.28.0" -reqwest = "0.12.5" -semver = "1.0.22" -serde = { version = "1.0.197", features = ["derive"] } -serde_json = "1.0.115" -thiserror = "1.0.61" -tokio = { version = "1.40.0", features = ["macros", "rt", "time"] } -tracing = "0.1.40" -tracing-test = "0.2.4" -wasm-bindgen = "0.2.92" -wasm-bindgen-futures = "0.4.41" -web-sys = "0.3.70" +reqwest = "0.12.9" +semver = "1.0.23" +serde = { version = "1.0.215", features = ["derive"] } +serde_json = "1.0.133" +thiserror = "1.0.69" +tokio = { version = "1.42.0", features = ["macros", "rt", "time"] } +tracing = "0.1.41" +tracing-test = "0.2.5" +wasm-bindgen = "0.2.99" +wasm-bindgen-futures = "0.4.49" +web-sys = "0.3.76" wit-bindgen-rt = { version = "0.23.0", features = ["bitflags"] } -wtransport = "0.3.0" +wtransport = "0.3.1" xdid = "0.2.0" xwt-core = { git = "https://github.com/kayhhh/xwt" } xwt-wtransport = { git = "https://github.com/kayhhh/xwt" } diff --git a/crates/unavi-app/Cargo.toml b/crates/unavi-app/Cargo.toml index 9c8b8e149..330d993a3 100644 --- a/crates/unavi-app/Cargo.toml +++ b/crates/unavi-app/Cargo.toml @@ -39,13 +39,13 @@ web-sys = { workspace = true, features = [ [target.'cfg(not(target_family = "wasm"))'.dependencies] bevy_oxr = "0.3.0" -image = { version = "0.25.2", default-features = false, features = ["png"] } +image = { version = "0.25.5", default-features = false, features = ["png"] } reqwest.workspace = true self_update = "0.41.0" -tempfile = "3.12.0" +tempfile = "3.14.0" tokio.workspace = true winit = { version = "0.30.5", default-features = false } -zip = { version = "2.2.0", default-features = false, features = ["deflate"] } +zip = { version = "2.2.1", default-features = false, features = ["deflate"] } [build-dependencies] unavi-constants = { path = "../unavi-constants" } diff --git a/crates/unavi-app/src/lib.rs b/crates/unavi-app/src/lib.rs index c9612b750..6cc923d98 100644 --- a/crates/unavi-app/src/lib.rs +++ b/crates/unavi-app/src/lib.rs @@ -27,8 +27,6 @@ //! git submodule foreach git pull //! ``` -use std::sync::Arc; - use bevy::{ asset::AssetMetaCheck, log::{Level, LogPlugin}, @@ -37,11 +35,7 @@ use bevy::{ }; use avian3d::prelude::*; -use dwn::{ - core::store::{DataStore, RecordStore}, - stores::NativeDbStore, - Dwn, -}; +use dwn::Dwn; #[cfg(not(target_family = "wasm"))] pub mod native; diff --git a/crates/unavi-scripting/src/env.rs b/crates/unavi-scripting/src/env.rs index d729d737f..1b34bde93 100644 --- a/crates/unavi-scripting/src/env.rs +++ b/crates/unavi-scripting/src/env.rs @@ -71,7 +71,7 @@ impl ScriptEnvBuilder { config.async_support(true); config.wasm_component_model(true); - let engine = Engine::new(&config).expect("Failed to create wasm engine"); + let engine = Engine::new(&config)?; let mut store = Store::new(&engine, self.data); let mut linker = Linker::new(store.engine()); diff --git a/crates/unavi-server/Cargo.toml b/crates/unavi-server/Cargo.toml index a5c168186..d47f2c916 100644 --- a/crates/unavi-server/Cargo.toml +++ b/crates/unavi-server/Cargo.toml @@ -17,7 +17,7 @@ clap.workspace = true directories.workspace = true dwn.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "signal"] } -tracing-subscriber = "0.3.18" +tracing-subscriber = "0.3.19" tracing.workspace = true unavi-social-server = { path = "../unavi-social-server" } unavi-world-host = { path = "../unavi-world-host" } diff --git a/crates/unavi-server/src/lib.rs b/crates/unavi-server/src/lib.rs index 1549b6b4d..a4aa7a47c 100644 --- a/crates/unavi-server/src/lib.rs +++ b/crates/unavi-server/src/lib.rs @@ -1,7 +1,4 @@ -use std::{ - path::PathBuf, - sync::LazyLock, -}; +use std::{path::PathBuf, sync::LazyLock}; use anyhow::Result; use clap::{Parser, Subcommand, ValueEnum}; diff --git a/crates/unavi-social-server/Cargo.toml b/crates/unavi-social-server/Cargo.toml index 45d64a2b1..aea440b8f 100644 --- a/crates/unavi-social-server/Cargo.toml +++ b/crates/unavi-social-server/Cargo.toml @@ -8,6 +8,6 @@ edition.workspace = true [dependencies] axum-server.workspace = true -dwn-server = { version = "0.0.10", git = "https://github.com/unavi-xyz/dwn" } +dwn-server = { git = "https://github.com/unavi-xyz/dwn" } dwn.workspace = true tracing.workspace = true diff --git a/crates/unavi-world-host/src/lib.rs b/crates/unavi-world-host/src/lib.rs index c5da6b40e..f64ec8694 100644 --- a/crates/unavi-world-host/src/lib.rs +++ b/crates/unavi-world-host/src/lib.rs @@ -8,7 +8,6 @@ use std::{ time::Duration, }; - use dwn::Dwn; use tracing::info; diff --git a/crates/unavi-world/src/lib.rs b/crates/unavi-world/src/lib.rs index 343062026..15bd26e7f 100644 --- a/crates/unavi-world/src/lib.rs +++ b/crates/unavi-world/src/lib.rs @@ -1,4 +1,3 @@ - use bevy::prelude::*; use wired_social::schemas::common::RecordLink; @@ -17,10 +16,7 @@ impl Plugin for WorldPlugin { app // .add_event::() .init_state::() - .add_systems( - Startup, - scene::setup_lights, - ) + .add_systems(Startup, scene::setup_lights) .add_systems( Update, ( diff --git a/crates/xwt-futures-io/Cargo.toml b/crates/xwt-futures-io/Cargo.toml index c3bcca703..af1d58f6b 100644 --- a/crates/xwt-futures-io/Cargo.toml +++ b/crates/xwt-futures-io/Cargo.toml @@ -8,6 +8,6 @@ edition.workspace = true [dependencies] anyhow.workspace = true -futures-io = "0.3.30" +futures-io = "0.3.31" tracing.workspace = true xwt-core.workspace = true diff --git a/flake.nix b/flake.nix index aafb40c3b..decc92acd 100644 --- a/flake.nix +++ b/flake.nix @@ -158,6 +158,7 @@ (with pkgs; [ cargo-component cargo-deny + cargo-edit cargo-machete cargo-rdme cargo-release diff --git a/wasm/unavi-shapes/Cargo.toml b/wasm/unavi-shapes/Cargo.toml index bf1088ea1..66b678360 100644 --- a/wasm/unavi-shapes/Cargo.toml +++ b/wasm/unavi-shapes/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib"] [dependencies] glam.workspace = true hexasphere = "14.1.0" -parry3d = "0.17.0" +parry3d = "0.17.4" wit-bindgen-rt.workspace = true [package.metadata.component] diff --git a/wasm/unavi-ui/Cargo.toml b/wasm/unavi-ui/Cargo.toml index 3a73423b9..1bbccc53c 100644 --- a/wasm/unavi-ui/Cargo.toml +++ b/wasm/unavi-ui/Cargo.toml @@ -10,7 +10,7 @@ license.workspace = true crate-type = ["cdylib"] [dependencies] -meshtext = { version = "0.3.0", features = ["owned"] } +meshtext = { version = "0.3.1", features = ["owned"] } wit-bindgen-rt.workspace = true [package.metadata.component] diff --git a/wasm/unavi-ui/src/lib.rs b/wasm/unavi-ui/src/lib.rs index 0843ed469..b66647453 100644 --- a/wasm/unavi-ui/src/lib.rs +++ b/wasm/unavi-ui/src/lib.rs @@ -25,6 +25,7 @@ static ELEMENT_ID: AtomicUsize = AtomicUsize::new(0); /// You will likely want to add this call to [Drop]. static mut ELEMENTS: LazyCell>>> = LazyCell::new(RefCell::default); +#[allow(static_mut_refs)] trait Updatable { fn id(&self) -> usize; fn update(&self, delta: f32); @@ -51,6 +52,7 @@ trait Updatable { struct GuestImpl; +#[allow(static_mut_refs)] impl Guest for GuestImpl { fn update_ui(delta: f32) { // WASM is single-threaded, mutable statics are fine.