Merge pull request #32 from lykia-rs/fix/structure

fix/structure

.gitignore

@@ -1,7 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
-
+node_modules/
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
-resolver = "1"
-members = ["server", "cli"]
+resolver= "2"
+members = ["lykiadb-server", "lykiadb-shell", "lykiadb-connect", "lykiadb-playground"]
+edition = "2021"
 
 [profile.release]
 opt-level = 3

README.md

@@ -47,12 +47,12 @@ To use Lykia, you can download the latest release from the GitHub releases page.
 Run the server:
 
 ```shell
-$ cargo run --release --bin lykiadb-server
+$ cargo run --release --bin lykiadb-lykiadb-server
 ```
 Run the client:
 
 ```shell 
-$ cargo run --release --bin lykiadb-shell cli/examples/fib.ly
+$ cargo run --release --bin lykiadb-shell lykiadb-shell/examples/fib.ly
 ```
 
 Client transmits the fib.ly in an infinite loop.

lykiadb-connect/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+authors = ["Vedat Can Keklik <vcankeklik@gmail.com>"]
+name = "lykiadb-connect"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bson = { version = "2.9.0" }
+clap = { version = "4.4.6", features = ["derive"] }
+lykiadb-server = { path = "../lykiadb-server" }
+serde_json = "1.0.105"
+tokio = { version = "~1.35.1" }
+bytes = "1.5.0"
+serde = { version = "1.0.188", features=["derive", "rc"] }

lykiadb-connect/src/lib.rs

@@ -0,0 +1,29 @@
+use tokio::net::TcpStream;
+use crate::session::ClientSession;
+use crate::tcp::TcpClientSession;
+
+pub mod session;
+mod tcp;
+
+pub use lykiadb_server::net::{Message, Request, Response};
+pub use lykiadb_server::runtime::error::{report_error};
+
+pub enum Protocol {
+    Tcp,
+    Http
+}
+
+pub async fn get_session(addr: &str, protocol: Protocol) -> impl ClientSession {
+    match protocol {
+        Protocol::Tcp => {
+            let socket = TcpStream::connect(addr).await.unwrap();
+            TcpClientSession::new(socket)
+        }
+        Protocol::Http => {
+            panic!("Http not implemented!")
+        }
+    }
+}
+pub async fn connect(addr: &str) -> impl ClientSession {
+    get_session(addr, Protocol::Tcp).await
+}

lykiadb-connect/src/session.rs

@@ -0,0 +1,6 @@
+use lykiadb_server::net::Message;
+
+pub trait ClientSession {
+    async fn send_receive(&mut self, msg: Message) -> Result<Message, ()>;
+    async fn execute(&mut self, query: &str) -> Result<Message, ()>;
+}

lykiadb-connect/src/tcp.rs

@@ -0,0 +1,38 @@
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::TcpStream;
+use lykiadb_server::net::{CommunicationError, Message, Request};
+use lykiadb_server::net::tcp::TcpConnection;
+use crate::session::ClientSession;
+
+pub(crate) struct TcpClientSession {
+    conn: TcpConnection,
+}
+
+impl TcpClientSession {
+    pub fn new(stream: TcpStream) -> Self {
+        TcpClientSession {
+            conn: TcpConnection::new(stream),
+        }
+    }
+
+    async fn handle(&mut self) -> Result<Message, ()> {
+        match self.conn.read().await.unwrap() {
+            Some(message) => Ok(message),
+            None => Err(()),
+        }
+    }
+
+    async fn send(&mut self, msg: Message) -> Result<(), CommunicationError> {
+        self.conn.write(msg).await
+    }
+}
+impl ClientSession for TcpClientSession {
+    async fn send_receive(&mut self, msg: Message) -> Result<Message, ()> {
+        self.send(msg).await.unwrap();
+        self.handle().await
+    }
+
+    async fn execute(&mut self, query: &str) -> Result<Message, ()> {
+        self.send_receive(Message::Request(Request::Run(query.to_string()))).await
+    }
+}

lykiadb-playground/Cargo.toml

@@ -0,0 +1,96 @@
+[package]
+name = "lykiadb-playground"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["macros"] }
+console_error_panic_hook = "0.1"
+http = { version = "1.0.0", optional = true }
+leptos = { version = "0.6" }
+leptos_meta = { version = "0.6" }
+leptos_actix = { version = "0.6", optional = true }
+leptos_router = { version = "0.6" }
+wasm-bindgen = "=0.2.92"
+lykiadb-connect = { path = "../lykiadb-connect", optional = true }
+
+[features]
+csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
+ssr = [
+  "dep:actix-files",
+  "dep:actix-web",
+  "dep:leptos_actix",
+  "dep:lykiadb-connect",
+  "leptos/ssr",
+  "leptos_meta/ssr",
+  "leptos_router/ssr",
+]
+
+# Defines a size-optimized profile for the WASM bundle in release mode
+[profile.wasm-release]
+inherits = "release"
+opt-level = 'z'
+lto = true
+codegen-units = 1
+panic = "abort"
+
+[package.metadata.leptos]
+# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
+output-name = "lykiadb-playground"
+# The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
+site-root = "target/site"
+# The site-root relative folder where all compiled output (JS, WASM and CSS) is written
+# Defaults to pkg
+site-pkg-dir = "pkg"
+# [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
+# style-file = "style/main.scss"
+tailwind-input-file = "style/tailwind.css"
+tailwind-config-file = "tailwind.config.js"
+
+# Assets source dir. All files found here will be copied and synchronized to site-root.
+# The assets-dir cannot have a sub directory with the same name/path as site-pkg-dir.
+#
+# Optional. Env: LEPTOS_ASSETS_DIR.
+assets-dir = "assets"
+# The IP and port (ex: 127.0.0.1:8888) where the server serves the content. Use it in your server setup.
+site-addr = "127.0.0.1:8888"
+# The port to use for automatic reload monitoring
+reload-port = 8889
+# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
+#   [Windows] for non-WSL use "npx.cmd playwright test"
+#   This binary name can be checked in Powershell with Get-Command npx
+end2end-cmd = "npx playwright test"
+end2end-dir = "end2end"
+#  The browserlist query used for optimizing the CSS.
+browserquery = "defaults"
+# The environment Leptos will run in, usually either "DEV" or "PROD"
+env = "DEV"
+# The features to use when compiling the bin target
+#
+# Optional. Can be over-ridden with the command line parameter --bin-features
+bin-features = ["ssr"]
+
+# If the --no-default-features flag should be used when compiling the bin target
+#
+# Optional. Defaults to false.
+bin-default-features = false
+
+# The features to use when compiling the lib target
+#
+# Optional. Can be over-ridden with the command line parameter --lib-features
+lib-features = ["hydrate"]
+
+# If the --no-default-features flag should be used when compiling the lib target
+#
+# Optional. Defaults to false.
+lib-default-features = false
+
+# The profile to use for the lib target when compiling for release
+#
+# Optional. Defaults to "release".
+lib-profile-release = "wasm-release"

lykiadb-playground/LICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>