From a19c22318b3ef4ee0a4c19fc22edb03bd1c0a037 Mon Sep 17 00:00:00 2001 From: core Date: Tue, 9 Jun 2026 23:22:21 -0400 Subject: [PATCH] netcode: remove aeronet --- Cargo.lock | 494 +-------------------------- crates/unified/Cargo.toml | 17 +- crates/unified/src/client/mod.rs | 15 +- crates/unified/src/client/plugins.rs | 4 - crates/unified/src/server/mod.rs | 21 +- crates/unified/src/server/plugins.rs | 5 - crates/unified/src/shared/plugins.rs | 2 - 7 files changed, 15 insertions(+), 543 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62f0960a877546782ab29e9079261040211e5de6..b1dd4b5bc7e18199c509bb495d5533dc0550de57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,98 +85,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "aeronet" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7a1ae9f2a25a6ce704cdcac85aa2d62f12cd34e8c6b5e259a400bfb4bde573" -dependencies = [ - "aeronet_io", - "aeronet_transport", - "bevy_app", -] - -[[package]] -name = "aeronet_io" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bdc30d6e77d611cffd0e6c418299de1eccf21696205de3368f75afc71413a98" -dependencies = [ - "anyhow", - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bevy_reflect", - "bytes", - "derive_more", - "log", -] - -[[package]] -name = "aeronet_replicon" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3660e988e020e887f8e623e99eb8f0945e772ae0e35c4032026b5f73a40f0a3" -dependencies = [ - "aeronet_io", - "aeronet_transport", - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bevy_reflect", - "bevy_replicon", - "bevy_state", - "log", -] - -[[package]] -name = "aeronet_transport" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460e73efd6b13dfd43992aff40d0a7a74202ae90b37dd31f4c0db7e368d10e63" -dependencies = [ - "aeronet_io", - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bevy_reflect", - "bevy_time", - "bit-vec", - "derive_more", - "either", - "log", - "octs", - "ringbuf", - "typesize", -] - -[[package]] -name = "aeronet_websocket" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a721edcf893daea9bf5f565e81b58162c986b0c70d985d7a4ecf3e32e94edd" -dependencies = [ - "aeronet_io", - "bevy_app", - "bevy_ecs", - "bevy_platform", - "bytes", - "cfg-if", - "derive_more", - "futures", - "js-sys", - "rcgen", - "rustls", - "rustls-native-certs", - "tokio", - "tokio-rustls", - "tokio-tungstenite", - "tracing", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "ahash" version = "0.8.12" @@ -480,34 +388,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "aws-lc-rs" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" -dependencies = [ - "cc", - "cmake", - "dunce", - "fs_extra", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - [[package]] name = "bevy" version = "0.18.1" @@ -2071,15 +1951,6 @@ dependencies = [ "web-time 0.2.4", ] -[[package]] -name = "cmake" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" -dependencies = [ - "cc", -] - [[package]] name = "cobs" version = "0.3.0" @@ -2485,15 +2356,6 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" -[[package]] -name = "deranged" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" -dependencies = [ - "powerfmt", -] - [[package]] name = "derive_builder" version = "0.11.2" @@ -2613,7 +2475,7 @@ dependencies = [ "subsecond", "thiserror 2.0.18", "tracing", - "tungstenite 0.28.0", + "tungstenite", ] [[package]] @@ -2703,12 +2565,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - [[package]] name = "dyn-clone" version = "1.0.20" @@ -2985,12 +2841,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "fsevent-sys" version = "4.1.0" @@ -3000,21 +2850,6 @@ dependencies = [ "libc", ] -[[package]] -name = "futures" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.32" @@ -3022,7 +2857,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -3031,17 +2865,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" -[[package]] -name = "futures-executor" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.32" @@ -3072,12 +2895,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "futures-sink" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" - [[package]] name = "futures-task" version = "0.3.32" @@ -3090,13 +2907,9 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "slab", ] @@ -3131,17 +2944,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "getrandom" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - [[package]] name = "getrandom" version = "0.3.4" @@ -4123,12 +3925,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-conv" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" - [[package]] name = "num-derive" version = "0.4.2" @@ -4427,15 +4223,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "octs" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3beef54705459f4a421ff43b6c9b8381f5b84769e4ae69942783dd8918837b7" -dependencies = [ - "bytes", -] - [[package]] name = "offset-allocator" version = "0.2.0" @@ -4458,12 +4245,6 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" -[[package]] -name = "openssl-probe" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" - [[package]] name = "orbclient" version = "0.3.53" @@ -4593,16 +4374,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pem" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" -dependencies = [ - "base64", - "serde_core", -] - [[package]] name = "percent-encoding" version = "2.3.2" @@ -4768,12 +4539,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "pp-rs" version = "0.2.1" @@ -4999,19 +4764,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" -dependencies = [ - "pem", - "ring", - "rustls-pki-types", - "time", - "yasna", -] - [[package]] name = "rdst" version = "0.20.14" @@ -5115,31 +4867,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.17", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "ringbuf" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe47b720588c8702e34b5979cb3271a8b1842c7cb6f57408efa70c779363488c" -dependencies = [ - "crossbeam-utils", - "portable-atomic", - "portable-atomic-util", -] - [[package]] name = "robust" version = "1.2.0" @@ -5213,54 +4940,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "rustls" -version = "0.23.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" -dependencies = [ - "aws-lc-rs", - "log", - "once_cell", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pki-types" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" -dependencies = [ - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" -dependencies = [ - "aws-lc-rs", - "ring", - "rustls-pki-types", - "untrusted", -] - [[package]] name = "rustversion" version = "1.0.22" @@ -5294,15 +4973,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -5328,29 +4998,6 @@ dependencies = [ "tiny-skia", ] -[[package]] -name = "security-framework" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" -dependencies = [ - "bitflags 2.11.1", - "core-foundation 0.10.1", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "self_cell" version = "1.2.2" @@ -5596,16 +5243,6 @@ dependencies = [ "serde", ] -[[package]] -name = "socket2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - [[package]] name = "spade" version = "2.15.1" @@ -5656,10 +5293,6 @@ dependencies = [ name = "starkingdoms" version = "0.1.0" dependencies = [ - "aeronet", - "aeronet_replicon", - "aeronet_transport", - "aeronet_websocket", "avian2d", "bevy", "bevy_common_assets", @@ -5724,12 +5357,6 @@ dependencies = [ "serde", ] -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "svg_fmt" version = "0.4.5" @@ -5880,25 +5507,6 @@ dependencies = [ "tikv-jemalloc-sys", ] -[[package]] -name = "time" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde_core", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" - [[package]] name = "tiny-skia" version = "0.11.4" @@ -5949,46 +5557,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.52.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" -dependencies = [ - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite 0.26.2", -] - [[package]] name = "toml" version = "0.9.12+spec-1.1.0" @@ -6167,25 +5735,6 @@ dependencies = [ "core_maths", ] -[[package]] -name = "tungstenite" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.9.4", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror 2.0.18", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.28.0" @@ -6221,26 +5770,6 @@ version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" -[[package]] -name = "typesize" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da66c62c5b7017a2787e77373c03e6a5aafde77a73bff1ff96e91cd2e128179" -dependencies = [ - "typesize-derive", -] - -[[package]] -name = "typesize-derive" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536b6812192bda8551cfa0e52524e328c6a951b48e66529ee4522d6c721243d6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "typewit" version = "1.15.2" @@ -6289,12 +5818,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - [[package]] name = "utf-8" version = "0.7.6" @@ -7472,15 +6995,6 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3" -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - [[package]] name = "yazi" version = "0.2.1" @@ -7513,12 +7027,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" - [[package]] name = "zmij" version = "1.0.21" diff --git a/crates/unified/Cargo.toml b/crates/unified/Cargo.toml index d6064cdb8438fda637d58bf3e66eaa3fa7f4cd04..ab0c3b1b14eb5408fd0d452bd27c6f28d822fe77 100644 --- a/crates/unified/Cargo.toml +++ b/crates/unified/Cargo.toml @@ -17,35 +17,26 @@ pico-args = { workspace = true } leafwing-input-manager = { workspace = true } good_lp = { workspace = true } web-time = { workspace = true } -aeronet = { workspace = true } -aeronet_transport = { workspace = true } +bevy_replicon = { workspace = true, features = ["client"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -ctrlc = { workspace = true, optional = true } -aeronet_websocket = { workspace = true, features = ["client", "server"] } -aeronet_replicon = { workspace = true, features = ["client", "server"] } -bevy_replicon = { workspace = true, features = ["client", "server"] } +ctrlc = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] wasm-bindgen = { workspace = true } tracing-web = { workspace = true } console_error_panic_hook = { workspace = true } -aeronet_websocket = { workspace = true, features = ["client"] } -aeronet_replicon = { workspace = true, features = ["client"] } -bevy_replicon = { workspace = true, features = ["client"] } [features] native_dev = [ "bevy/file_watcher", "bevy/hotpatching", "bevy/dynamic_linking", - "native", - "aeronet_replicon/server", - "bevy_replicon/server" + "native" ] native = [ "bevy/x11", "bevy/wayland", - "dep:ctrlc" + "bevy_replicon/server" ] wasm = ["getrandom/wasm_js", "bevy/webgl2"] diff --git a/crates/unified/src/client/mod.rs b/crates/unified/src/client/mod.rs index 7ca9848114f16bfc01ad088321aa072992f97818..f81670301683b4c2ff2bf0c1c0e24cae5a7aa626 100644 --- a/crates/unified/src/client/mod.rs +++ b/crates/unified/src/client/mod.rs @@ -1,8 +1,3 @@ -use aeronet::io::{Session, SessionEndpoint}; -use aeronet::io::connection::{DisconnectReason, Disconnected}; -use aeronet_replicon::client::AeronetRepliconClient; -use aeronet_transport::{Transport, TransportConfig}; -use aeronet_websocket::client::{ClientConfig, WebSocketClient}; use crate::client::crafting::ui::crafting_ui_plugin; use crate::client::key_input::key_input_plugin; use crate::client::parts::parts_plugin; @@ -70,23 +65,25 @@ impl Plugin for ClientPlugin { let server = self.server.clone(); app.add_systems(PostStartup, move |mut commands: Commands| { - #[cfg(target_arch = "wasm32")] + /*#[cfg(target_arch = "wasm32")] let config = ClientConfig {}; #[cfg(not(target_arch = "wasm32"))] let config = ClientConfig::builder().with_no_cert_validation(); let Some(server) = server.as_ref() else { return }; commands.spawn((Name::new("default-session"), TransportConfig { max_memory_usage: 536_870_912, ..default() }, AeronetRepliconClient)) .queue( - WebSocketClient::connect(config, server.clone())); + WebSocketClient::connect(config, server.clone()));*/ }); + /* if self.server.is_some() { app.add_observer(on_connecting); app.add_observer(on_connected); app.add_observer(on_disconnected); - } + }*/ } } +/* pub fn on_connecting( trigger: On, names: Query<&Name>, @@ -116,7 +113,7 @@ pub fn on_disconnected(trigger: On, names: Query<&Name>) { warn!(?name, "session disconnected due to error: {err:?}"); } } -} +}*/ pub fn find_me( mut msgs: MessageReader, diff --git a/crates/unified/src/client/plugins.rs b/crates/unified/src/client/plugins.rs index a466a0278528845ce5f156ff3d1c94d31f2bb7a7..3ad04acf4bb16e57e4640ddb0753475b6c95e8ea 100644 --- a/crates/unified/src/client/plugins.rs +++ b/crates/unified/src/client/plugins.rs @@ -1,5 +1,3 @@ -use aeronet_replicon::client::AeronetRepliconClientPlugin; -use aeronet_websocket::client::WebSocketClientPlugin; use bevy::a11y::AccessibilityPlugin; use crate::client::ClientPlugin; use bevy::app::{PanicHandlerPlugin, PluginGroup, PluginGroupBuilder, ScheduleRunnerPlugin}; @@ -33,10 +31,8 @@ impl PluginGroup for ClientPluginGroup { .add(DebugPickingPlugin) .add(InputDispatchPlugin) .add(InputManagerPlugin::::default()) - .add(WebSocketClientPlugin) .add(bevy_replicon::client::ClientPlugin) .add(bevy_replicon::client::message::ClientMessagePlugin) - .add(AeronetRepliconClientPlugin) } } diff --git a/crates/unified/src/server/mod.rs b/crates/unified/src/server/mod.rs index da80e07f33667a67c06abaca7f1e2effc49bd89a..0bbdbe8afe8fa454b8c0f89adbc61ea99b3a56cc 100644 --- a/crates/unified/src/server/mod.rs +++ b/crates/unified/src/server/mod.rs @@ -14,13 +14,6 @@ pub mod components; pub mod visibility; use std::net::SocketAddr; -use aeronet::io::connection::{DisconnectReason, Disconnected, LocalAddr}; -use aeronet::io::server::Server; -use aeronet::io::Session; -use aeronet_replicon::server::AeronetRepliconServer; -use aeronet_transport::lane::LaneKind; -use aeronet_transport::Transport; -use aeronet_websocket::server::{ServerConfig, WebSocketServer}; use bevy_replicon::prelude::Replicated; use bevy_replicon::server::AuthorizedClient; use crate::server::craft::craft_plugin; @@ -58,15 +51,6 @@ impl Plugin for ServerPlugin { .add_plugins(OrbitPlugin) .add_plugins(damping_plugin) .configure_sets(Update, WorldUpdateSet.before(PlayerInputSet)) - .add_observer(on_opened) - .add_observer(on_connected) - .add_observer(on_disconnected) - .add_systems(Startup, move |mut commands: Commands| { - commands.spawn((Name::new("websocket-server"), AeronetRepliconServer)) - .queue(WebSocketServer::open(ServerConfig::builder() - .with_bind_address(bind) - .with_no_encryption())); - }) .add_systems(Update, handle_authorized); } } @@ -80,7 +64,7 @@ pub struct ConnectedNetworkEntity { pub game_entity: Entity, } - +/* fn on_opened(trigger: On, servers: Query<&LocalAddr>) { let server = trigger.event_target(); let local_addr = servers.get(server).unwrap(); @@ -99,6 +83,7 @@ fn on_connected( }; info!(?client, ?server, "client connected"); } +*/ fn handle_authorized( newly_authorized_clients: Query>, @@ -119,6 +104,7 @@ fn handle_authorized( )); } } +/* fn on_disconnected( trigger: On, clients: Query<&ChildOf>, @@ -148,3 +134,4 @@ fn on_disconnected( }; commands.despawn(); } +*/ \ No newline at end of file diff --git a/crates/unified/src/server/plugins.rs b/crates/unified/src/server/plugins.rs index 8b6b1ac2beb9acf4ff2d2d98d332abbb7bb76131..78fa692014b76e48253288f6549f1676e4a8c09e 100644 --- a/crates/unified/src/server/plugins.rs +++ b/crates/unified/src/server/plugins.rs @@ -1,7 +1,4 @@ use std::time::Duration; -use aeronet_replicon::server::AeronetRepliconServerPlugin; -use aeronet_transport::AeronetTransportPlugin; -use aeronet_websocket::server::WebSocketServerPlugin; use bevy::app::{PluginGroup, PluginGroupBuilder, ScheduleRunnerPlugin}; use crate::shared::plugins::TICK_RATE; @@ -11,9 +8,7 @@ impl PluginGroup for ServerPluginGroup { fn build(self) -> PluginGroupBuilder { PluginGroupBuilder::start::() .add(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f64(1.0 / TICK_RATE))) - .add(WebSocketServerPlugin) .add(bevy_replicon::server::ServerPlugin::default()) .add(bevy_replicon::server::message::ServerMessagePlugin) - .add(AeronetRepliconServerPlugin) } } diff --git a/crates/unified/src/shared/plugins.rs b/crates/unified/src/shared/plugins.rs index b86fdd381942e58d6c280e25efa9fa74c99a55a1..ae4e98ffc9111c93de6d59ca5bfa7003af35a6ba 100644 --- a/crates/unified/src/shared/plugins.rs +++ b/crates/unified/src/shared/plugins.rs @@ -1,4 +1,3 @@ -use aeronet_transport::AeronetTransportPlugin; use crate::shared::ecs::{CraftPartRequest, DragRequestEvent, TimeOffset, ToggleDrillEvent}; use crate::shared::thrust::ThrustSolution; use bevy::app::{App, PluginGroup, PluginGroupBuilder}; @@ -27,7 +26,6 @@ impl PluginGroup for SharedPluginGroup { .add(bevy_replicon::shared::RepliconSharedPlugin::default()) .add(TransformPlugin) .add(DiagnosticsPlugin) - .add(AeronetTransportPlugin) .add(|app: &mut App| { app.insert_resource(Time::from_hz(TICK_RATE)); app.insert_resource(TimeOffset::default());