From 7553d031e6398a880b7a84bdea8cbb17580393b6 Mon Sep 17 00:00:00 2001 From: aratama <16192627+aratama@users.noreply.github.com> Date: Mon, 21 Oct 2024 04:05:34 +0900 Subject: [PATCH] remove websocket for now --- Cargo.lock | 134 +++++++++++++++++- Cargo.toml | 11 +- Trunk.toml | 3 +- docs/index.html | 6 +- docs/my_bevy_game-7d1d0a04ba0fe6f6.js | 1 + ... => my_bevy_game-7d1d0a04ba0fe6f6_bg.wasm} | Bin 11052166 -> 11052158 bytes docs/my_bevy_game-a8b691d97a29bb5e.js | 1 - server/index.js | 6 +- server/package.json | 2 +- server/public/main.js | 6 +- src/game.rs | 1 - src/game/game.rs | 21 --- src/game/websocket.rs | 44 ------ 13 files changed, 146 insertions(+), 90 deletions(-) create mode 100644 docs/my_bevy_game-7d1d0a04ba0fe6f6.js rename docs/{my_bevy_game-a8b691d97a29bb5e_bg.wasm => my_bevy_game-7d1d0a04ba0fe6f6_bg.wasm} (61%) delete mode 100644 docs/my_bevy_game-a8b691d97a29bb5e.js delete mode 100644 src/game/websocket.rs diff --git a/Cargo.lock b/Cargo.lock index a6f6a9df..d12d2886 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -378,6 +378,17 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + [[package]] name = "async-channel" version = "2.3.1" @@ -390,6 +401,19 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-compat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bab94bde396a3f7b4962e396fdad640e241ed797d4d8d77fc8c237d14c58fc0" +dependencies = [ + "futures-core", + "futures-io", + "once_cell", + "pin-project-lite", + "tokio", +] + [[package]] name = "async-executor" version = "1.13.1" @@ -414,6 +438,40 @@ dependencies = [ "futures-lite", ] +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.3.1", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "async-lock" version = "3.4.0" @@ -436,6 +494,32 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "async-std" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + [[package]] name = "async-task" version = "4.7.1" @@ -780,6 +864,18 @@ dependencies = [ "syn 2.0.79", ] +[[package]] +name = "bevy_async_task" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3570cf1389d868d4c0f154fd161d9f338f1bc837f2add3d458552cf895171256" +dependencies = [ + "async-compat", + "async-std", + "bevy", + "tokio", +] + [[package]] name = "bevy_audio" version = "0.14.2" @@ -1270,7 +1366,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836cf8a513db013cbe7d55a331060088efd407e49fd5b05c8404700cd82e7619" dependencies = [ - "async-channel", + "async-channel 2.3.1", "bevy_app", "bevy_asset", "bevy_color", @@ -1400,7 +1496,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77865f310b1fc48fb05b7c4adbe76607ec01d0c14f8ab4caba4d714c86439946" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-executor", "concurrent-queue", "futures-lite", @@ -1661,7 +1757,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite", @@ -3103,6 +3199,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "glow" version = "0.13.1" @@ -3756,6 +3864,15 @@ dependencies = [ "libc", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -3944,6 +4061,9 @@ name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +dependencies = [ + "value-bag", +] [[package]] name = "lol_html" @@ -4144,10 +4264,12 @@ dependencies = [ name = "my_bevy_game" version = "0.1.0" dependencies = [ + "async-std", "bevy", "bevy-inspector-egui", "bevy_aseprite_ultra", "bevy_asset_loader", + "bevy_async_task", "bevy_ecs_tilemap", "bevy_light_2d", "bevy_particle_systems", @@ -7112,6 +7234,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" + [[package]] name = "vec_map" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 66d53fec..bf971f47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,9 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] +async-std = "1.13.0" bevy-inspector-egui = "0.27.0" bevy_aseprite_ultra = "0.2.4" bevy_asset_loader = "0.21.0" +bevy_async_task = "0.2.0" bevy_ecs_tilemap = "0.14.0" bevy_light_2d = "0.4.0" bevy_particle_systems = "0.13.0" @@ -60,14 +62,7 @@ features = [ [dependencies.web-sys] version = "0.3.70" -features = [ - "console", - "Window", - "Storage", - "WebSocket", - "MessageEvent", - "ErrorEvent", -] +features = ["console", "Window", "Storage"] [dependencies.bevy_rapier2d] version = "0.27.0" diff --git a/Trunk.toml b/Trunk.toml index b783ac7c..e019049a 100644 --- a/Trunk.toml +++ b/Trunk.toml @@ -1,6 +1,7 @@ # https://trunkrs.dev/configuration/ [build] release = true +minify = "always" public_url = "./" dist = "docs" -minify = "always" +wasm_opt = 0 diff --git a/docs/index.html b/docs/index.html index ed24a89b..c08b188f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,8 +1,8 @@ -