client/src/main.rs

@@ -1,3 +1,5 @@
+mod test;
+
 fn main() {
 	println!("Please dont use this");
 }

client/src/test/client_test.rs

@@ -0,0 +1,44 @@
+#[cfg(test)]
+mod test {
+	use foundation::{
+		client::network_connection::NetworkConnection,
+		prelude::Info,
+	};
+	use uuid::Uuid;
+
+	#[tokio::test]
+	async fn get_info() {
+		let client = NetworkConnection::connect(
+			"127.0.0.1:6500"
+				.parse()
+				.expect("failed to parse address string"),
+		)
+		.await
+		.expect("failed to connect to test server");
+
+		let info: Info = client.send_get_info().await.unwrap();
+
+		println!("info: {:?}", info)
+	}
+
+	#[tokio::test]
+	async fn connect_and_disconnect() {
+		let client = NetworkConnection::connect(
+			"127.0.0.1:6500"
+				.parse()
+				.expect("failed to parse address string"),
+		)
+		.await
+		.expect("failed to connect to test server");
+
+		let (w, r) = client
+			.send_connect(Uuid::new_v4(), "test user".into())
+			.await
+			.unwrap();
+
+		drop(w);
+		drop(r);
+
+		println!("finished")
+	}
+}

client/src/test/mod.rs

@@ -0,0 +1 @@
+mod client_test;

foundation/src/client/mod.rs

@@ -1,9 +1,6 @@
 use tokio::task::JoinHandle;
 
-use crate::network::{
-	network_connection::NetworkConnection,
-	server_writer_connection::ServerWriterConnection,
-};
+use crate::client::server_writer_connection::ServerWriterConnection;
 
 pub mod network_connection;
 pub mod server_reader_connection;

foundation/src/client/network_connection.rs

@@ -1,23 +1,24 @@
 use std::{io, net::SocketAddr};
 
-use foundation::{
-	networking::{read_message, write_message},
-	prelude::{
-		network_server_message,
-		Connect,
-		GetInfo,
-		Info,
-		NetworkClientMessage,
-		NetworkServerMessage,
-		Request,
-	},
+use protocol::prelude::{
+	network_client_message,
+	network_server_message,
+	Connect,
+	GetInfo,
+	Info,
+	NetworkClientMessage,
+	NetworkServerMessage,
+	Request,
 };
 use tokio::{io::split, net::TcpStream};
 use uuid::Uuid;
 
-use crate::network::{
-	server_reader_connection::ServerReaderConnection,
-	server_writer_connection::ServerWriterConnection,
+use crate::{
+	client::{
+		server_reader_connection::ServerReaderConnection,
+		server_writer_connection::ServerWriterConnection,
+	},
+	networking::protobuf::{read_message, write_message},
 };
 
 /// # NetworkConnection
@@ -54,11 +55,7 @@ impl NetworkConnection {
 		_ = write_message(
 			&mut self.stream,
 			NetworkClientMessage {
-				message: Some(
-					foundation::prelude::network_client_message::Message::GetInfo(
-						GetInfo {},
-					),
-				),
+				message: Some(network_client_message::Message::GetInfo(GetInfo {})),
 			},
 		)
 		.await;
@@ -88,14 +85,10 @@ impl NetworkConnection {
 		_ = write_message(
 			&mut self.stream,
 			NetworkClientMessage {
-				message: Some(
-					foundation::prelude::network_client_message::Message::Connect(
-						Connect {
-							username,
-							uuid: uuid.to_string(),
-						},
-					),
-				),
+				message: Some(network_client_message::Message::Connect(Connect {
+					username,
+					uuid: uuid.to_string(),
+				})),
 			},
 		)
 		.await;

foundation/src/client/server_reader_connection.rs

@@ -1,8 +1,10 @@
 use std::io;
 
-use foundation::{networking::read_message, prelude::ConnectedServerMessage};
+use protocol::prelude::ConnectedServerMessage;
 use tokio::{io::ReadHalf, net::TcpStream};
 
+use crate::networking::protobuf::read_message;
+
 pub struct ServerReaderConnection {
 	reader: ReadHalf<TcpStream>,
 }

foundation/src/client/server_writer_connection.rs

@@ -1,5 +1,6 @@
 use tokio::{io::WriteHalf, net::TcpStream};
 
+#[allow(dead_code)]
 pub struct ServerWriterConnection {
 	writer: WriteHalf<TcpStream>,
 }

foundation/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod client;
 pub mod messages;
 pub mod models;
 pub mod networking;