Merge pull request #6 from rsocket/improve/pick_transport

Improve/pick transport

Author: jjeffcaii

.travis.yml

@@ -0,0 +1,6 @@
+language: rust
+rust:
+  - stable
+script:
+  - cargo build --verbose --all
+  - cargo test -- --nocapture

Cargo.toml

@@ -1,42 +1,12 @@
-[package]
-name = "rsocket_rust"
-version = "0.4.0"
-authors = ["Jeffsky <[email protected]>"]
-edition = "2018"
-license = "Apache-2.0"
-readme = "README.md"
-repository = "https://github.com/rsocket/rsocket-rust"
-homepage = "https://github.com/rsocket/rsocket-rust"
-description = "rsocket-rust is an implementation of the RSocket protocol in Rust."
-
-[dependencies]
-matches = "0.1.8"
-log = "0.4.8"
-bytes = "0.5.3"
-futures = "0.3.1"
-lazy_static = "1.4.0"
-url = "2.1.0"
-# reactor_rs = {git = "https://github.com/jjeffcaii/reactor-rust", branch = "develop"}
-
-[dependencies.tokio]
-version = "0.2.6"
-default-features = false
-features = ["full"]
-
-[dependencies.tokio-util]
-version = "0.2.0"
-default-features = false
-features = ["codec"]
-
-[dev-dependencies]
-env_logger = "0.7.1"
-hex = "0.4.0"
-rand = "0.7.2"
-
-[[example]]
-name = "echo"
-path = "examples/echo/main.rs"
-
-[[example]]
-name = "proxy"
-path = "examples/proxy/main.rs"
+[workspace]
+
+members = [
+"rsocket",
+"rsocket-transport-tcp",
+"rsocket-transport-websocket",
+"rsocket-transport-wasm",
+
+# Internal
+"examples",
+"rsocket-test",
+]

README.md

@@ -13,30 +13,45 @@ It's an **alpha** version and still under active development.
 
 > Here are some example codes which show how RSocket works in Rust.
 
+### Dependencies
+
+Add dependencies in your `Cargo.toml`.
+
+```toml
+[dependencies]
+tokio = "0.2"
+rsocket_rust = "*"
+
+# choose transport:
+# rsocket_rust_transport_tcp = "*"
+# rsocket_rust_transport_websocket = "*"
+```
+
 ### Server
 
 ```rust
-extern crate rsocket_rust;
-extern crate tokio;
 #[macro_use]
 extern crate log;
+
 use rsocket_rust::prelude::*;
+use rsocket_rust_transport_tcp::TcpServerTransport;
 use std::env;
 use std::error::Error;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
-    env_logger::builder().init();
-    let addr = env::args().nth(1).unwrap_or("tcp://127.0.0.1:7878".to_string());
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
+    env_logger::builder().format_timestamp_millis().init();
+    let addr = env::args().nth(1).unwrap_or("127.0.0.1:7878".to_string());
 
     RSocketFactory::receive()
-        .transport(&addr)
+        .transport(TcpServerTransport::from(addr))
         .acceptor(|setup, _socket| {
             info!("accept setup: {:?}", setup);
             Ok(Box::new(EchoRSocket))
             // Or you can reject setup
             // Err(From::from("SETUP_NOT_ALLOW"))
         })
+        .on_start(|| info!("+++++++ echo server started! +++++++"))
         .serve()
         .await
 }
@@ -45,16 +60,15 @@ async fn main() -> Result<(), Box<dyn Error>> {
 ### Client
 
 ```rust
-extern crate rsocket_rust;
-
 use rsocket_rust::prelude::*;
+use rsocket_rust_transport_tcp::TcpClientTransport;
 
 #[tokio::main]
 #[test]
 async fn test() {
     let cli = RSocketFactory::connect()
         .acceptor(|| Box::new(EchoRSocket))
-        .transport("tcp://127.0.0.1:7878")
+        .transport(TcpClientTransport::from("127.0.0.1:7878"))
         .setup(Payload::from("READY!"))
         .mime_type("text/plain", "text/plain")
         .start()
@@ -71,11 +85,6 @@ async fn test() {
 
 ```
 
-## Dependencies
-
-- [tokio](https://tokio.rs/)
-- [futures-rs](http://rust-lang-nursery.github.io/futures-rs/)
-
 ## TODO
 
 - Operations
@@ -85,7 +94,7 @@ async fn test() {
   - [x] REQUEST_STREAM
   - [x] REQUEST_CHANNEL
 - More Operations
-  - [ ] Error
+  - [x] Error
   - [ ] Cancel
   - [ ] Fragmentation
   - [ ] Resume
@@ -94,7 +103,8 @@ async fn test() {
   - [ ] Lease
 - Transport
   - [x] TCP
-  - [ ] Websocket
+  - [x] Websocket
+  - [x] WASM: (see example: [https://github.com/jjeffcaii/rsocket-rust-wasm-example](https://github.com/jjeffcaii/rsocket-rust-wasm-example))
 - Reactor
   - [ ] ...
 - High Level APIs

examples/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "examples"
+version = "0.0.0"
+authors = ["Jeffsky <[email protected]>"]
+edition = "2018"
+
+[dev-dependencies]
+rsocket_rust = { path = "../rsocket" }
+rsocket_rust_transport_tcp = { path = "../rsocket-transport-tcp" }
+rsocket_rust_transport_websocket = { path = "../rsocket-transport-websocket" }
+log = "0.4.8"
+env_logger = "0.7.1"
+futures = "0.3.4"
+
+[dev-dependencies.tokio]
+version = "0.2.11"
+default-features = false
+features = ["full"]
+
+[[example]]
+name = "echo"
+path = "echo.rs"
+
+[[example]]
+name = "proxy"
+path = "proxy.rs"

examples/echo/main.rs renamed to examples/echo.rs

@@ -1,19 +1,18 @@
-extern crate rsocket_rust;
-extern crate tokio;
 #[macro_use]
 extern crate log;
+
 use rsocket_rust::prelude::*;
+use rsocket_rust_transport_tcp::TcpServerTransport;
 use std::env;
 use std::error::Error;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     env_logger::builder().format_timestamp_millis().init();
-    let addr = env::args()
-        .nth(1)
-        .unwrap_or("tcp://127.0.0.1:7878".to_string());
+    let addr = env::args().nth(1).unwrap_or("127.0.0.1:7878".to_string());
+
     RSocketFactory::receive()
-        .transport(&addr)
+        .transport(TcpServerTransport::from(addr))
         .acceptor(|setup, _socket| {
             info!("accept setup: {:?}", setup);
             Ok(Box::new(EchoRSocket))

examples/proxy/main.rs renamed to examples/proxy.rs

@@ -1,32 +1,29 @@
 #[macro_use]
 extern crate log;
-extern crate env_logger;
-extern crate futures;
-extern crate rsocket_rust;
-extern crate tokio;
 
 use futures::executor::block_on;
 use rsocket_rust::prelude::*;
+use rsocket_rust_transport_tcp::*;
 use std::error::Error;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     env_logger::builder().format_timestamp_millis().init();
 
     RSocketFactory::receive()
+        .transport(TcpServerTransport::from("127.0.0.1:7979"))
         .acceptor(|setup, _sending_socket| {
             info!("incoming socket: setup={:?}", setup);
             Ok(Box::new(block_on(async move {
                 RSocketFactory::connect()
+                    .transport(TcpClientTransport::from("127.0.0.1:7878"))
                     .acceptor(|| Box::new(EchoRSocket))
                     .setup(Payload::from("I'm Rust!"))
-                    .transport("tcp://127.0.0.1:7878")
                     .start()
                     .await
                     .unwrap()
             })))
         })
-        .transport("tcp://127.0.0.1:7979")
         .serve()
         .await
 }

rsocket-test/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "rsocket_rust_test"
+version = "0.0.0"
+authors = ["Jeffsky <[email protected]>"]
+edition = "2018"
+
+[dev-dependencies]
+log = "0.4"
+futures = "0.3.4"
+env_logger = "0.7.1"
+rsocket_rust = { path = "../rsocket", features = ["frame"] }
+rsocket_rust_transport_tcp = { path = "../rsocket-transport-tcp" }
+rsocket_rust_transport_websocket = { path = "../rsocket-transport-websocket" }
+bytes = "0.5.4"
+hex = "0.4.2"
+rand = "0.7.3"
+
+[dev-dependencies.tokio]
+version = "0.2.11"
+default-features = false
+features = ["full"]