Backporting recent fixes for Parity (#111)

* Improving the external API. (#108)

* Improving the external API.

* Fix output format for subscriptions.

* Additional improvements to integrate pubsub with Parity (#110)

* Cloneable types

* Adding Origin to RequestContext

* Sink implementations.

* Add comment regarding Task wakeup.

Author: tomusdrw

core/src/io.rs

@@ -192,7 +192,8 @@ impl<T: Metadata, S: Middleware<T>> MetaIoHandler<T, S> {
 		}).boxed()
 	}
 
-	fn handle_call(&self, call: Call, meta: T) -> BoxFuture<Option<Output>, ()> {
+	/// Handle single call asynchronously.
+	pub fn handle_call(&self, call: Call, meta: T) -> BoxFuture<Option<Output>, ()> {
 		match call {
 			Call::MethodCall(method) => {
 				let params = method.params.unwrap_or(Params::None);

core/src/types/params.rs

@@ -10,7 +10,7 @@ use serde_json::value::from_value;
 use super::{Value, Error};
 
 /// Request parameters
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum Params {
 	/// Array of values
 	Array(Vec<Value>),

core/src/types/request.rs

@@ -47,6 +47,18 @@ pub enum Call {
 
 }
 
+impl From<MethodCall> for Call {
+	fn from(mc: MethodCall) -> Self {
+		Call::MethodCall(mc)
+	}
+}
+
+impl From<Notification> for Call {
+	fn from(n: Notification) -> Self {
+		Call::Notification(n)
+	}
+}
+
 impl Serialize for Call {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
 	where S: Serializer {

core/src/types/response.rs

@@ -5,7 +5,7 @@ use serde_json::value::from_value;
 use super::{Id, Value, Error, ErrorCode, Version};
 
 /// Successful response
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct Success {
 	/// Protocol version
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -17,7 +17,7 @@ pub struct Success {
 }
 
 /// Unsuccessful response
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct Failure {
 	/// Protocol Version
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -29,7 +29,7 @@ pub struct Failure {
 }
 
 /// Represents output - failure or success
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub enum Output {
 	/// Success
 	Success(Success),

macros/examples/pubsub-macros.rs

@@ -99,7 +99,7 @@ fn main() {
 			{
 				let subscribers = active_subscriptions.read().unwrap();
 				for sink in subscribers.values() {
-					let _ = sink.send("Hello World!".into()).wait();
+					let _ = sink.notify("Hello World!".into()).wait();
 				}
 			}
 			thread::sleep(::std::time::Duration::from_secs(1));

macros/src/auto_args.rs

@@ -233,6 +233,7 @@ macro_rules! build_rpc_trait {
 				)
 			}),
 			($unsubscribe, move |base, id| {
+				use $crate::jsonrpc_core::futures::Future;
 				Self::$unsub_method(base, id).map($crate::to_value).boxed()
 			}),
 		);

macros/src/lib.rs

@@ -1,4 +1,4 @@
-extern crate jsonrpc_core;
+pub extern crate jsonrpc_core;
 extern crate jsonrpc_pubsub;
 extern crate serde;
 

macros/src/pubsub.rs

@@ -5,6 +5,8 @@ use jsonrpc_pubsub as pubsub;
 use serde;
 use util::to_value;
 
+use self::core::futures::{self, Sink as FuturesSink};
+
 pub use self::pubsub::SubscriptionId;
 
 pub struct Subscriber<T> {
@@ -25,22 +27,80 @@ impl<T> Subscriber<T> {
 	}
 
 	pub fn assign_id(self, id: SubscriptionId) -> Result<Sink<T>, ()> {
-		let sink = self.subscriber.assign_id(id)?;
+		let sink = self.subscriber.assign_id(id.clone())?;
 		Ok(Sink {
+			id: id,
 			sink: sink,
+			buffered: None,
 			_data: PhantomData,
 		})
 	}
 }
 
 pub struct Sink<T> {
 	sink: pubsub::Sink,
+	id: SubscriptionId,
+	buffered: Option<core::Params>,
 	_data: PhantomData<T>,
 }
 
 impl<T: serde::Serialize> Sink<T> {
-	pub fn send(&self, val: T) -> pubsub::SinkResult {
+	pub fn notify(&self, val: T) -> pubsub::SinkResult {
+		self.sink.notify(self.val_to_params(val))
+	}
+
+	fn val_to_params(&self, val: T) -> core::Params {
+		let id = self.id.clone().into();
 		let val = to_value(val);
-		self.sink.send(core::Params::Array(vec![val]))
+
+		core::Params::Map(vec![
+			("subscription".to_owned(), id),
+			("result".to_owned(), val),
+		].into_iter().collect())
+	}
+
+	fn poll(&mut self) -> futures::Poll<(), pubsub::TransportError> {
+		if let Some(item) = self.buffered.take() {
+			let result = self.sink.start_send(item)?;
+			if let futures::AsyncSink::NotReady(item) = result {
+				self.buffered = Some(item);
+			}
+		}
+
+		if self.buffered.is_some() {
+			Ok(futures::Async::NotReady)
+		} else {
+			Ok(futures::Async::Ready(()))
+		}
+	}
+}
+
+impl<T: serde::Serialize> futures::sink::Sink for Sink<T> {
+	type SinkItem = T;
+	type SinkError = pubsub::TransportError;
+
+	fn start_send(&mut self, item: Self::SinkItem) -> futures::StartSend<Self::SinkItem, Self::SinkError> {
+		// Make sure to always try to process the buffered entry.
+		// Since we're just a proxy to real `Sink` we don't need
+		// to schedule a `Task` wakeup. It will be done downstream.
+		if self.poll()?.is_not_ready() {
+			return Ok(futures::AsyncSink::NotReady(item));
+		}
+
+		let val = self.val_to_params(item);
+		self.buffered = Some(val);
+		self.poll()?;
+
+		Ok(futures::AsyncSink::Ready)
+	}
+
+	fn poll_complete(&mut self) -> futures::Poll<(), Self::SinkError> {
+		self.poll()?;
+		self.sink.poll_complete()
+	}
+
+	fn close(&mut self) -> futures::Poll<(), Self::SinkError> {
+		self.poll()?;
+		self.sink.close()
 	}
 }

pubsub/examples/pubsub.rs

@@ -55,7 +55,7 @@ fn main() {
 			thread::spawn(move || {
 				loop {
 					thread::sleep(time::Duration::from_millis(100));
-					match sink.send(Params::Array(vec![Value::Number(10.into())])).wait() {
+					match sink.notify(Params::Array(vec![Value::Number(10.into())])).wait() {
 						Ok(_) => {},
 						Err(_) => {
 							println!("Subscription has ended, finishing.");

pubsub/src/lib.rs

@@ -15,7 +15,4 @@ mod types;
 
 pub use self::handler::{PubSubHandler, SubscribeRpcMethod, UnsubscribeRpcMethod};
 pub use self::subscription::{Session, Sink, Subscriber, new_subscription};
-pub use self::types::{PubSubMetadata, SubscriptionId};
-
-/// Subscription send result.
-pub type SinkResult = core::futures::sink::Send<types::TransportSender>;
+pub use self::types::{PubSubMetadata, SubscriptionId, TransportError, SinkResult};

pubsub/src/subscription.rs

@@ -1,15 +1,16 @@
 //! Subscription primitives.
 
+use std::fmt;
 use std::collections::HashMap;
 use std::sync::Arc;
 use parking_lot::Mutex;
 
 use core;
-use core::futures::{self, sink, future, Sink as FuturesSink, Future, BoxFuture};
+use core::futures::{self, future, Sink as FuturesSink, Future, BoxFuture};
 use core::futures::sync::oneshot;
 
 use handler::{SubscribeRpcMethod, UnsubscribeRpcMethod};
-use types::{PubSubMetadata, SubscriptionId, TransportSender};
+use types::{PubSubMetadata, SubscriptionId, TransportSender, TransportError, SinkResult};
 
 /// RPC client session
 /// Keeps track of active subscriptions and unsubscribes from them upon dropping.
@@ -19,6 +20,15 @@ pub struct Session {
 	on_drop: Mutex<Vec<Box<Fn() + Send>>>,
 }
 
+impl fmt::Debug for Session {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		fmt.debug_struct("pubsub::Session")
+			.field("active_subscriptions", &self.active_subscriptions.lock().len())
+			.field("transport", &self.transport)
+			.finish()
+	}
+}
+
 impl Session {
 	/// Creates new session given transport raw send capabilities.
 	/// Session should be created as part of metadata, `sender` should be returned by transport.
@@ -70,21 +80,50 @@ impl Drop for Session {
 }
 
 /// A handle to send notifications directly to subscribed client.
+#[derive(Debug, Clone)]
 pub struct Sink {
 	notification: String,
 	transport: TransportSender
 }
 
 impl Sink {
 	/// Sends a notification to a client.
-	pub fn send(&self, val: core::Params) -> sink::Send<TransportSender> {
+	pub fn notify(&self, val: core::Params) -> SinkResult {
+		let val = self.params_to_string(val);
+		self.transport.clone().send(val.0)
+	}
+
+	fn params_to_string(&self, val: core::Params) -> (String, core::Params) {
 		let notification = core::Notification {
 			jsonrpc: Some(core::Version::V2),
 			method: self.notification.clone(),
 			params: Some(val),
 		};
+		(
+			core::to_string(&notification).expect("Notification serialization never fails."),
+			notification.params.expect("Always Some"),
+		)
+	}
+}
+
+impl FuturesSink for Sink {
+	type SinkItem = core::Params;
+	type SinkError = TransportError;
+
+	fn start_send(&mut self, item: Self::SinkItem) -> futures::StartSend<Self::SinkItem, Self::SinkError> {
+		let (val, params) = self.params_to_string(item);
+		self.transport.start_send(val).map(|result| match result {
+			futures::AsyncSink::Ready => futures::AsyncSink::Ready,
+			futures::AsyncSink::NotReady(_) => futures::AsyncSink::NotReady(params),
+		})
+	}
+
+	fn poll_complete(&mut self) -> futures::Poll<(), Self::SinkError> {
+		self.transport.poll_complete()
+	}
 
-		self.transport.clone().send(core::to_string(&notification).expect("Notification serialization never fails."))
+	fn close(&mut self) -> futures::Poll<(), Self::SinkError> {
+		self.transport.close()
 	}
 }
 
@@ -314,7 +353,7 @@ mod tests {
 		};
 
 		// when
-		sink.send(core::Params::Array(vec![core::Value::Number(10.into())])).wait().unwrap();
+		sink.notify(core::Params::Array(vec![core::Value::Number(10.into())])).wait().unwrap();
 
 		// then
 		assert_eq!(

pubsub/src/types.rs

@@ -6,6 +6,10 @@ use subscription::Session;
 
 /// Raw transport sink for specific client.
 pub type TransportSender = mpsc::Sender<String>;
+/// Raw transport error.
+pub type TransportError = mpsc::SendError<String>;
+/// Subscription send result.
+pub type SinkResult = core::futures::sink::Send<TransportSender>;
 
 /// Metadata extension for pub-sub method handling.
 pub trait PubSubMetadata: core::Metadata {

ws/src/metadata.rs

@@ -2,11 +2,14 @@ use core;
 use ws;
 
 use session;
+use Origin;
 
 /// Request context
 pub struct RequestContext {
 	/// Session id
 	pub session_id: session::SessionId,
+	/// Request Origin
+	pub origin: Option<Origin>,
 	/// Direct channel to send messages to a client.
 	pub out: ws::Sender,
 }

ws/src/session.rs

@@ -95,8 +95,11 @@ impl<M: core::Metadata, S: core::Middleware<M>> Drop for Session<M, S> {
 }
 
 impl<M: core::Metadata, S: core::Middleware<M>> Session<M, S> {
-	fn verify_origin(&self, req: &ws::Request) -> Option<ws::Response> {
-		let origin = req.header("origin").map(|x| &x[..]);
+	fn read_origin<'a>(&self, req: &'a ws::Request) -> Option<&'a [u8]> {
+		req.header("origin").map(|x| &x[..])
+	}
+
+	fn verify_origin(&self, origin: Option<&[u8]>) -> Option<ws::Response> {
 		if !header_is_allowed(&self.allowed_origins, origin) {
 			warn!(target: "signer", "Blocked connection to Signer API from untrusted origin: {:?}", origin);
 			Some(forbidden(
@@ -131,9 +134,10 @@ impl<M: core::Metadata, S: core::Middleware<M>> ws::Handler for Session<M, S> {
 			MiddlewareAction::Proceed
 		};
 
+		let origin = self.read_origin(req);
 		if action.should_verify_origin() {
 			// Verify request origin.
-			if let Some(response) = self.verify_origin(req) {
+			if let Some(response) = self.verify_origin(origin) {
 				return Ok(response);
 			}
 		}
@@ -145,6 +149,7 @@ impl<M: core::Metadata, S: core::Middleware<M>> ws::Handler for Session<M, S> {
 			}
 		}
 
+		self.context.origin = origin.and_then(|origin| ::std::str::from_utf8(origin).ok()).map(Into::into);
 		self.metadata = self.meta_extractor.extract(&self.context);
 
 		match action {
@@ -217,6 +222,7 @@ impl<M: core::Metadata, S: core::Middleware<M>> ws::Factory for Factory<M, S> {
 		Session {
 			context: metadata::RequestContext {
 				session_id: self.session_id,
+				origin: None,
 				out: sender,
 			},
 			handler: self.handler.clone(),