feat: Client connections, closing: #39, #40

.gitignore

@@ -5,6 +5,4 @@ target
 Cargo.lock
 
 *.old/
-*.profraw
-
-raknet-test/
+*.profraw

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rakrs"
-version = "0.3.0-rc.4"
+version = "0.3.0-rc.5"
 authors = ["Bavfalcon9 <olybear9@gmail.com>"]
 edition = "2021"
 
@@ -15,8 +15,8 @@ async_tokio = [ "tokio" ]
 [dependencies]
 rand = "0.8.3"
 binary_utils = { git = "https://github.com/NetrexMC/BinaryUtil", tag = "v0.2.2" }
-tokio = { version = "1.15.0", features = ["full"], optional = true }
+tokio = { version = "1.28.2", features = ["full"], optional = true }
 byteorder = "1.4.3"
 futures = "0.3.19"
 futures-executor = "0.3.19"
-async-std = { version = "1.10.0", optional = true, features = [ "unstable" ] }
+async-std = { version = "1.12.0", optional = true, features = [ "unstable" ] }

examples/README.md

@@ -0,0 +1,5 @@
+# Examples
+
+**async-std:**
+- [client](/examples/async-std/client)
+- [server](/examples/async-std/server)

examples/async-std/client/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "client"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-std = { version = "1.12.0", features = [ "unstable", "attributes" ] }
+binary_utils = { git = "https://github.com/NetrexMC/BinaryUtil", tag = "v0.2.2" }
+rakrs = { path = "../../../", features = [ "debug", "debug_all", "async-std" ]}

examples/async-std/client/src/main.rs

@@ -0,0 +1,14 @@
+use rakrs::client::{Client, DEFAULT_MTU};
+use std::net::ToSocketAddrs;
+
+#[async_std::main]
+async fn main() {
+    let mut client = Client::new(10, DEFAULT_MTU);
+    let mut addr = "zeqa.net:19132".to_socket_addrs().unwrap();
+    client.connect(addr.next().unwrap()).await.unwrap();
+
+    loop {
+        let pk = client.recv().await.unwrap();
+        println!("Received packet: {:?}", pk);
+    }
+}

examples/async-std/server/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg", "tokio_unstable"]

examples/async-std/server/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "raknet-server-async-std"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-std = { version = "1.12.0", features = [ "attributes" ] }
+console-subscriber = "0.1.8"
+rakrs = { path = "../../../", features = [ "debug", "debug_all", "mcpe" ] }

examples/async-std/server/src/main.rs

@@ -0,0 +1,31 @@
+use rakrs::connection::Connection;
+use rakrs::mcpe::motd::Gamemode;
+use rakrs::Listener;
+
+#[async_std::main]
+async fn main() {
+    // console_subscriber::init();
+    let mut server = Listener::bind("0.0.0.0:19132").await.unwrap();
+    server.motd.name = "RakNet Rust!".to_string();
+    server.motd.gamemode = Gamemode::Survival;
+
+    server.start().await.unwrap();
+
+    loop {
+        let conn = server.accept().await;
+        async_std::task::spawn(handle(conn.unwrap()));
+    }
+}
+
+async fn handle(mut conn: Connection) {
+    loop {
+        // keeping the connection alive
+        if conn.is_closed() {
+            println!("Connection closed!");
+            break;
+        }
+        if let Ok(pk) = conn.recv().await {
+            println!("(RAKNET RECIEVE SIDE) Got a connection packet {:?} ", pk);
+        }
+    }
+}

examples/tokio/server/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg", "tokio_unstable"]

examples/tokio/server/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "raknet-test"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+async-std = { version = "1.12.0", features = [ "attributes" ] }
+console-subscriber = "0.1.8"
+rakrs = { path = "../", features = [ "debug", "debug_all", "mcpe", "async_tokio" ], default-features = false }
+tokio = "1.23.0"

examples/tokio/server/src/main.rs

@@ -0,0 +1,69 @@
+use rakrs::Listener;
+use rakrs::Motd;
+use rakrs::connection::Connection;
+use rakrs::mcpe;
+use rakrs::mcpe::motd::Gamemode;
+use rakrs::server::event::ServerEvent;
+use rakrs::server::event::ServerEventResponse;
+
+
+#[tokio::main]
+async fn main() {
+    console_subscriber::init();
+    let mut server = Listener::bind("0.0.0.0:19132").await.unwrap();
+    // let inner = server.recv_evnt.clone();
+    server.motd.name = "RakNet Rust!".to_string();
+    server.motd.gamemode = Gamemode::Survival;
+
+    server.start().await.unwrap();
+
+    loop {
+        // let mut recvr = inner.lock().await;
+        // tokio::select! {
+        //     ev = recvr.recv() => {
+        //         match ev {
+        //             Some((event, shoot)) => {
+        //                 match event {
+        //                     ServerEvent::RefreshMotdRequest(_addr, mut motd) => {
+        //                         // force update the motd!!!
+        //                         motd.name = "You are a loser!!!!!!!!!".to_string();
+        //                         motd.player_max = 14_903;
+        //                         motd.player_count = 0;
+        //                         shoot.send(ServerEventResponse::RefreshMotd(motd)).unwrap();
+        //                     },
+        //                     _ => {
+        //                         println!("Got a response!");
+        //                         // YOU NEED TO ALWAYS REPLY TO EVENTS
+        //                         shoot.send(ServerEventResponse::Acknowledged);
+        //                     }
+        //                 }
+        //             },
+        //             None => {
+        //                 println!("Error!");
+        //                 break;
+        //             }
+        //         }
+        //     },
+            // connection = server.accept() => {
+            //     tokio::task::spawn(handle(connection.unwrap()));
+            // }
+
+        let conn = server.accept().await;
+        async_std::task::spawn(handle(conn.unwrap()));
+        // }
+    }
+}
+
+async fn handle(mut conn: Connection) {
+    loop {
+        // keeping the connection alive
+        if conn.is_closed() {
+            println!("Connection closed!");
+            break;
+        }
+        if let Ok(pk) = conn.recv().await {
+            println!("(RAKNET RECIEVE SIDE) Got a connection packet {:?} ", pk);
+        }
+        // conn.tick().await;
+    }
+}