diff --git a/client/wasm/src/lib.rs b/client/wasm/src/lib.rs index 8e1551c..2bc5038 100644 --- a/client/wasm/src/lib.rs +++ b/client/wasm/src/lib.rs @@ -1,16 +1,13 @@ mod utils; -use pong::collision::collision::{Collision, CollisionDetector}; use pong::game_field::{Field, Input, InputType}; -use pong::game_object::game_object::{DefaultGameObject, GameObject}; +use pong::game_object::game_object::{GameObject}; use pong::geom::shape::ShapeType; -use pong::geom::vector::Vector; use pong::pong::pong_events::DefaultPongEventWriter; use pong::utils::utils::{DefaultLoggerFactory, Logger}; use serde::{Deserialize, Serialize}; use serde_json::json; use std::cell::RefCell; -use std::cmp::{max, min}; use std::rc::Rc; use wasm_bindgen::prelude::*; @@ -20,7 +17,7 @@ extern crate web_sys; // A macro to provide `println!(..)`-style syntax for `console.log` logging. macro_rules! log { ( $( $t:tt )* ) => { - web_sys::console::log_1(&format!( $( $t )* ).into()); + web_sys::console::log_1(&format!( $( $t )* ).into()) } } diff --git a/client/wasm/src/utils.rs b/client/wasm/src/utils.rs index b1d7929..c4be847 100644 --- a/client/wasm/src/utils.rs +++ b/client/wasm/src/utils.rs @@ -1,3 +1,4 @@ +#[allow(dead_code)] pub fn set_panic_hook() { // When the `console_error_panic_hook` feature is enabled, we can call the // `set_panic_hook` function at least once during initialization, and then diff --git a/init-kafka.sh b/init-kafka.sh new file mode 100755 index 0000000..98af4a4 --- /dev/null +++ b/init-kafka.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -e + +docker exec pong_server_kafka /opt/bitnami/kafka/bin/kafka-topics.sh --create --topic session --bootstrap-server "$KAFKA_HOST:$KAFKA_PORT" +docker exec pong_server_kafka /opt/bitnami/kafka/bin/kafka-topics.sh --create --topic move --bootstrap-server "$KAFKA_HOST:$KAFKA_PORT" +docker exec pong_server_kafka /opt/bitnami/kafka/bin/kafka-topics.sh --create --topic status --bootstrap-server "$KAFKA_HOST:$KAFKA_PORT" +docker exec pong_server_kafka /opt/bitnami/kafka/bin/kafka-topics.sh --create --topic input --bootstrap-server "$KAFKA_HOST:$KAFKA_PORT" diff --git a/run-server.dev.sh b/run-server.dev.sh new file mode 100755 index 0000000..cdeefb7 --- /dev/null +++ b/run-server.dev.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -e + +cd server || exit + +source .env + +docker-compose down +docker-compose up -d --build --force-recreate kafka zookeeper nginx + +./init-kafka.sh diff --git a/server/src/http.rs b/server/src/http.rs index f5af61e..1312328 100644 --- a/server/src/http.rs +++ b/server/src/http.rs @@ -252,9 +252,6 @@ async fn serve_websocket( break; } } - // Avoid starvation of read thread (?) - // TODO: How to avoid this? This is very bad for performance. - sleep(Duration::from_millis(1)).await; } }); Ok(())