extract async client abstraction.

Cargo.toml

@@ -2,15 +2,16 @@
 members = [
 	"examples",
 	"benches",
-	"http-client",
 	"http-server",
 	"test-utils",
 	"jsonrpsee",
 	"tests",
 	"types",
 	"core",
-	"ws-client",
 	"ws-server",
+	"client/ws-client",
+	"client/http-client",
+	"client/transport",
 	"proc-macros",
 ]
 resolver = "2"

benches/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonrpsee-benchmarks"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Benchmarks for jsonrpsee"
 edition = "2018"

benches/bench.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use criterion::*;
 use futures_util::future::join_all;
 use helpers::{SUB_METHOD_NAME, UNSUB_METHOD_NAME};
-use jsonrpsee::core::client::{Client, SubscriptionClient};
+use jsonrpsee::core::client::{ClientT, SubscriptionClientT};
 use jsonrpsee::http_client::HttpClientBuilder;
 use jsonrpsee::types::{Id, ParamsSer, RequestSer};
 use jsonrpsee::ws_client::WsClientBuilder;
@@ -132,15 +132,21 @@ impl RequestBencher for AsyncBencher {
 	const REQUEST_TYPE: RequestType = RequestType::Async;
 }
 
-fn run_round_trip(rt: &TokioRuntime, crit: &mut Criterion, client: Arc<impl Client>, name: &str, request: RequestType) {
+fn run_round_trip(
+	rt: &TokioRuntime,
+	crit: &mut Criterion,
+	client: Arc<impl ClientT>,
+	name: &str,
+	request: RequestType,
+) {
 	crit.bench_function(&request.group_name(name), |b| {
 		b.to_async(rt).iter(|| async {
 			black_box(client.request::<String>(request.method_name(), None).await.unwrap());
 		})
 	});
 }
 
-fn run_sub_round_trip(rt: &TokioRuntime, crit: &mut Criterion, client: Arc<impl SubscriptionClient>, name: &str) {
+fn run_sub_round_trip(rt: &TokioRuntime, crit: &mut Criterion, client: Arc<impl SubscriptionClientT>, name: &str) {
 	let mut group = crit.benchmark_group(name);
 	group.bench_function("subscribe", |b| {
 		b.to_async(rt).iter_with_large_drop(|| async {
@@ -188,7 +194,7 @@ fn run_sub_round_trip(rt: &TokioRuntime, crit: &mut Criterion, client: Arc<impl
 fn run_round_trip_with_batch(
 	rt: &TokioRuntime,
 	crit: &mut Criterion,
-	client: Arc<impl Client>,
+	client: Arc<impl ClientT>,
 	name: &str,
 	request: RequestType,
 ) {
@@ -203,7 +209,7 @@ fn run_round_trip_with_batch(
 	group.finish();
 }
 
-fn run_concurrent_round_trip<C: 'static + Client + Send + Sync>(
+fn run_concurrent_round_trip<C: 'static + ClientT + Send + Sync>(
 	rt: &TokioRuntime,
 	crit: &mut Criterion,
 	client: Arc<C>,

http-client/Cargo.toml → client/http-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonrpsee-http-client"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "HTTP client for JSON-RPC"
 edition = "2018"
@@ -14,16 +14,16 @@ async-trait = "0.1"
 rustc-hash = "1"
 hyper = { version = "0.14.10", features = ["client", "http1", "http2", "tcp"] }
 hyper-rustls = { version = "0.23", optional = true }
-jsonrpsee-types = { path = "../types", version = "0.6.0" }
-jsonrpsee-core = { path = "../core", version = "0.6.0", features = ["client", "http-helpers"] }
+jsonrpsee-types = { path = "../../types", version = "0.6.1" }
+jsonrpsee-core = { path = "../../core", version = "0.6.1", features = ["client", "http-helpers"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.8", features = ["time"] }
 tracing = "0.1"
 
 [dev-dependencies]
-jsonrpsee-test-utils = { path = "../test-utils" }
+jsonrpsee-test-utils = { path = "../../test-utils" }
 tokio = { version = "1.8", features = ["net", "rt-multi-thread", "macros"] }
 
 [features]

http-client/src/client.rs → client/http-client/src/client.rs

@@ -28,10 +28,10 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use crate::transport::HttpTransportClient;
-use crate::types::{ErrorResponse, Id, NotificationSer, ParamsSer, RequestSer, Response, TEN_MB_SIZE_BYTES};
+use crate::types::{ErrorResponse, Id, NotificationSer, ParamsSer, RequestSer, Response};
 use async_trait::async_trait;
-use jsonrpsee_core::client::{CertificateStore, Client, RequestIdManager, Subscription, SubscriptionClient};
-use jsonrpsee_core::Error;
+use jsonrpsee_core::client::{CertificateStore, ClientT, RequestIdManager, Subscription, SubscriptionClientT};
+use jsonrpsee_core::{Error, TEN_MB_SIZE_BYTES};
 use rustc_hash::FxHashMap;
 use serde::de::DeserializeOwned;
 
@@ -104,7 +104,7 @@ pub struct HttpClient {
 }
 
 #[async_trait]
-impl Client for HttpClient {
+impl ClientT for HttpClient {
 	async fn notification<'a>(&self, method: &'a str, params: Option<ParamsSer<'a>>) -> Result<(), Error> {
 		let notif = NotificationSer::new(method, params);
 		let fut = self.transport.send(serde_json::to_string(&notif).map_err(Error::ParseError)?);
@@ -196,7 +196,7 @@ impl Client for HttpClient {
 }
 
 #[async_trait]
-impl SubscriptionClient for HttpClient {
+impl SubscriptionClientT for HttpClient {
 	/// Send a subscription request to the server. Not implemented for HTTP; will always return [`Error::HttpNotImplemented`].
 	async fn subscribe<'a, N>(
 		&self,

http-client/src/tests.rs → client/http-client/src/tests.rs

@@ -27,7 +27,7 @@
 use crate::types::error::{ErrorCode, ErrorObject, ErrorResponse};
 use crate::types::ParamsSer;
 use crate::HttpClientBuilder;
-use jsonrpsee_core::client::Client;
+use jsonrpsee_core::client::ClientT;
 use jsonrpsee_core::rpc_params;
 use jsonrpsee_core::Error;
 use jsonrpsee_test_utils::helpers::*;

client/transport/Cargo.toml

@@ -0,0 +1,41 @@
+[package]
+name = "jsonrpsee-client-transport"
+version = "0.6.1"
+authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
+description = "WebSocket client for JSON-RPC"
+edition = "2018"
+license = "MIT"
+repository = "https://github.com/paritytech/jsonrpsee"
+homepage = "https://github.com/paritytech/jsonrpsee"
+documentation = "https://docs.rs/jsonrpsee-ws-client"
+
+[dependencies]
+jsonrpsee-types = { path = "../../types", version = "0.6.1", optional = true }
+jsonrpsee-core = { path = "../../core", version = "0.6.1", features = ["client"] }
+tracing = { version = "0.1", optional = true }
+thiserror = { version = "1", optional = true }
+futures = { version = "0.3.14", default-features = false, features = ["std"], optional = true }
+http = { version = "0.2", optional = true }
+tokio-util = { version = "0.6", features = ["compat"], optional = true }
+tokio = { version = "1", features = ["net", "time", "macros"], optional = true }
+pin-project = { version = "1", optional = true }
+rustls-native-certs = { version = "0.6", optional = true }
+webpki-roots = { version = "0.22", optional = true }
+tokio-rustls = { version = "0.23", optional = true }
+
+# ws
+soketto = { version = "0.7.1", optional = true }
+
+[features]
+tls = ["tokio-rustls", "webpki-roots", "rustls-native-certs"]
+ws = [
+    "futures", 
+    "http", 
+    "tokio", 
+    "tokio-util", 
+    "soketto", 
+    "pin-project",
+    "jsonrpsee-types",
+    "thiserror",
+    "tracing"
+]

ws-client/src/lib.rs → client/transport/src/lib.rs

@@ -26,27 +26,9 @@
 
 #![warn(missing_debug_implementations, missing_docs, unreachable_pub)]
 
-//! # jsonrpsee-ws-client
+//! # jsonrpsee-client-transports
 //!
-//! `jsonrpsee-ws-client` is a [JSON RPC](https://www.jsonrpc.org/specification) WebSocket client library that's is built for `async/await`.
-//!
-//! ## Runtime support
-//!
-//! This library uses `tokio` as the runtime and does not support other kinds of runtimes.
-
-/// WebSocket Client.
-pub mod client;
-/// Helpers.
-pub mod helpers;
-/// Request manager.
-pub mod manager;
-/// Stream.
-pub mod stream;
-/// WebSocket transport.
-pub mod transport;
-
-#[cfg(test)]
-mod tests;
 
-pub use client::{WsClient, WsClientBuilder};
-pub use jsonrpsee_types as types;
+/// Websocket transport
+#[cfg(feature = "ws")]
+pub mod ws;