Merge pull request #27 from lykia-rs/feature/net

fix: Simpler comm

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "1"
-members = ["server", "liblykia", "cli"]
+members = ["server", "cli"]
 
 [profile.release]
 opt-level = 3

cli/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 
 [dependencies]
 clap = { version = "4.4.6", features = ["derive"] }
-liblykia = { path = "../liblykia" }
+lykiadb-server = { path = "../server" }
 tokio = { version = "~1.35.1" }

cli/src/main.rs

@@ -1,11 +1,10 @@
 use std::{
     fs::File,
     io::{BufReader, Read},
-    time::Duration,
 };
 
 use clap::Parser;
-use liblykia::protocol::connection::{CommunicationError, Connection, Message, Request};
+use lykiadb_server::net::{CommunicationError, Connection, Message, Request};
 use tokio::net::TcpStream;
 
 #[derive(Parser, Debug)]

server/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-liblykia = { path = "../liblykia" }
+bytes = "1.5.0"
 bson = { version = "2.9.0" }
 bumpalo = "3.12.2"
 phf = { version = "0.11", default-features = false, features = ["macros"] }
@@ -14,7 +14,15 @@ serde = { version = "1.0.188", features=["derive", "rc"] }
 serde_json = "1.0.105"
 ariadne = { features = ["auto-color"] }
 assert-json-diff = "2.0.2"
-tokio = { version = "~1.35.1" }
+tokio = { version = "~1.35.1", features = [
+    "macros",
+    "rt",
+    "rt-multi-thread",
+    "net",
+    "io-util",
+    "time",
+    "sync",
+] }
 tokio-stream = { version = "~0.1.6", features = ["net"] }
 
 [dev-dependencies]

server/src/lib.rs

@@ -1,3 +1,4 @@
 pub mod lang;
 pub mod runtime;
 pub mod util;
+pub mod net;

server/src/main.rs

@@ -1,6 +1,6 @@
 use std::io::Error;
 
-use liblykia::protocol::connection::{CommunicationError, Connection, Message, Request, Response};
+use lykiadb_server::net::{CommunicationError, Connection, Message, Request, Response};
 use lykiadb_server::runtime::types::RV;
 use lykiadb_server::runtime::{Runtime, RuntimeMode};
 use tokio::net::{TcpListener, TcpStream};