2020-06-29 17:08:40 +02:00
|
|
|
// Copyright 2020 Parity Technologies (UK) Ltd.
|
|
|
|
//
|
|
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
// copy of this software and associated documentation files (the "Software"),
|
|
|
|
// to deal in the Software without restriction, including without limitation
|
|
|
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
// and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
// Software is furnished to do so, subject to the following conditions:
|
|
|
|
//
|
|
|
|
// The above copyright notice and this permission notice shall be included in
|
|
|
|
// all copies or substantial portions of the Software.
|
|
|
|
//
|
|
|
|
// 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 OR COPYRIGHT HOLDERS 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.
|
|
|
|
|
|
|
|
//! The definition of a request/response protocol via inbound
|
|
|
|
//! and outbound substream upgrades. The inbound upgrade
|
|
|
|
//! receives a request and sends a response, whereas the
|
|
|
|
//! outbound upgrade send a request and receives a response.
|
|
|
|
|
|
|
|
use crate::RequestId;
|
|
|
|
use crate::codec::RequestResponseCodec;
|
|
|
|
|
2020-08-12 16:04:54 +02:00
|
|
|
use futures::{channel::oneshot, future::BoxFuture, prelude::*};
|
|
|
|
use libp2p_core::upgrade::{InboundUpgrade, OutboundUpgrade, UpgradeInfo};
|
|
|
|
use libp2p_swarm::NegotiatedSubstream;
|
2020-06-29 17:08:40 +02:00
|
|
|
use smallvec::SmallVec;
|
|
|
|
use std::io;
|
|
|
|
|
|
|
|
/// The level of support for a particular protocol.
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub enum ProtocolSupport {
|
|
|
|
/// The protocol is only supported for inbound requests.
|
|
|
|
Inbound,
|
|
|
|
/// The protocol is only supported for outbound requests.
|
|
|
|
Outbound,
|
|
|
|
/// The protocol is supported for inbound and outbound requests.
|
|
|
|
Full
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ProtocolSupport {
|
|
|
|
/// Whether inbound requests are supported.
|
|
|
|
pub fn inbound(&self) -> bool {
|
|
|
|
match self {
|
|
|
|
ProtocolSupport::Inbound | ProtocolSupport::Full => true,
|
|
|
|
ProtocolSupport::Outbound => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Whether outbound requests are supported.
|
|
|
|
pub fn outbound(&self) -> bool {
|
|
|
|
match self {
|
|
|
|
ProtocolSupport::Outbound | ProtocolSupport::Full => true,
|
|
|
|
ProtocolSupport::Inbound => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Response substream upgrade protocol.
|
|
|
|
///
|
|
|
|
/// Receives a request and sends a response.
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct ResponseProtocol<TCodec>
|
|
|
|
where
|
|
|
|
TCodec: RequestResponseCodec
|
|
|
|
{
|
|
|
|
pub(crate) codec: TCodec,
|
|
|
|
pub(crate) protocols: SmallVec<[TCodec::Protocol; 2]>,
|
2020-09-07 17:22:40 +02:00
|
|
|
pub(crate) request_sender: oneshot::Sender<(RequestId, TCodec::Request)>,
|
|
|
|
pub(crate) response_receiver: oneshot::Receiver<TCodec::Response>,
|
|
|
|
pub(crate) request_id: RequestId
|
|
|
|
|
2020-06-29 17:08:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<TCodec> UpgradeInfo for ResponseProtocol<TCodec>
|
|
|
|
where
|
|
|
|
TCodec: RequestResponseCodec
|
|
|
|
{
|
|
|
|
type Info = TCodec::Protocol;
|
|
|
|
type InfoIter = smallvec::IntoIter<[Self::Info; 2]>;
|
|
|
|
|
|
|
|
fn protocol_info(&self) -> Self::InfoIter {
|
|
|
|
self.protocols.clone().into_iter()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TCodec> InboundUpgrade<NegotiatedSubstream> for ResponseProtocol<TCodec>
|
|
|
|
where
|
|
|
|
TCodec: RequestResponseCodec + Send + 'static,
|
|
|
|
{
|
[request-response] Refine success & error reporting for inbound requests. (#1867)
* Refine error reporting for inbound request handling.
At the moment one can neither get confirmation when a
response has been sent on the underlying transport, nor
is one aware of response omissions. The latter was
originally intended as a feature for support of
one-way protocols, which seems like a bad idea in
hindsight. The lack of notification for sent
responses may prohibit implementation of some
request-response protocols that need to ensure
a happens-before relation between sending a
response and a subsequent request, besides uses
for collecting statistics.
Even with these changes, there is no active notification
for failed inbound requests as a result of connections
unexpectedly closing, as is the case for outbound requests.
Instead, for pending inbound requests this scenario
can be identified if necessary by the absense of both
`InboundFailure` and `ResponseSent` events for a particular
previously received request. Interest in this situation is
not expected to be common and would otherwise require
explicitly tracking all inbound requests in the `RequestResponse`
behaviour, which would be a pity. `RequestResponse::send_response`
now also synchronously returns an error if the inbound upgrade
handling the request has been aborted, due to timeout or
closing of the connection, giving more options for graceful
error handling for inbound requests.
As an aside, the `Throttled` wrapper now no longer emits
inbound or outbound error events occurring in the context
of sending credit requests or responses. This is in addition
to not emitting `ResponseSent` events for ACK responses of
credit grants.
* Update protocols/request-response/src/lib.rs
Co-authored-by: Max Inden <mail@max-inden.de>
* Address some minor clippy warnings. (#1868)
* Track pending credit request IDs.
In order to avoid emitting events relating to credit grants or acks
on the public API. The public API should only emit events relating
to the actual requests and responses sent by client code.
* Small cleanup
* Cleanup
* Update versions and changelogs.
* Unreleased
Co-authored-by: Max Inden <mail@max-inden.de>
2020-12-07 13:07:47 +01:00
|
|
|
type Output = bool;
|
2020-06-29 17:08:40 +02:00
|
|
|
type Error = io::Error;
|
|
|
|
type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
|
|
|
|
|
|
|
|
fn upgrade_inbound(mut self, mut io: NegotiatedSubstream, protocol: Self::Info) -> Self::Future {
|
|
|
|
async move {
|
|
|
|
let read = self.codec.read_request(&protocol, &mut io);
|
|
|
|
let request = read.await?;
|
2020-09-07 17:22:40 +02:00
|
|
|
if let Ok(()) = self.request_sender.send((self.request_id, request)) {
|
2020-06-29 17:08:40 +02:00
|
|
|
if let Ok(response) = self.response_receiver.await {
|
|
|
|
let write = self.codec.write_response(&protocol, &mut io, response);
|
|
|
|
write.await?;
|
[request-response] Refine success & error reporting for inbound requests. (#1867)
* Refine error reporting for inbound request handling.
At the moment one can neither get confirmation when a
response has been sent on the underlying transport, nor
is one aware of response omissions. The latter was
originally intended as a feature for support of
one-way protocols, which seems like a bad idea in
hindsight. The lack of notification for sent
responses may prohibit implementation of some
request-response protocols that need to ensure
a happens-before relation between sending a
response and a subsequent request, besides uses
for collecting statistics.
Even with these changes, there is no active notification
for failed inbound requests as a result of connections
unexpectedly closing, as is the case for outbound requests.
Instead, for pending inbound requests this scenario
can be identified if necessary by the absense of both
`InboundFailure` and `ResponseSent` events for a particular
previously received request. Interest in this situation is
not expected to be common and would otherwise require
explicitly tracking all inbound requests in the `RequestResponse`
behaviour, which would be a pity. `RequestResponse::send_response`
now also synchronously returns an error if the inbound upgrade
handling the request has been aborted, due to timeout or
closing of the connection, giving more options for graceful
error handling for inbound requests.
As an aside, the `Throttled` wrapper now no longer emits
inbound or outbound error events occurring in the context
of sending credit requests or responses. This is in addition
to not emitting `ResponseSent` events for ACK responses of
credit grants.
* Update protocols/request-response/src/lib.rs
Co-authored-by: Max Inden <mail@max-inden.de>
* Address some minor clippy warnings. (#1868)
* Track pending credit request IDs.
In order to avoid emitting events relating to credit grants or acks
on the public API. The public API should only emit events relating
to the actual requests and responses sent by client code.
* Small cleanup
* Cleanup
* Update versions and changelogs.
* Unreleased
Co-authored-by: Max Inden <mail@max-inden.de>
2020-12-07 13:07:47 +01:00
|
|
|
} else {
|
|
|
|
return Ok(false)
|
2020-06-29 17:08:40 +02:00
|
|
|
}
|
|
|
|
}
|
2020-07-13 12:35:32 +02:00
|
|
|
io.close().await?;
|
[request-response] Refine success & error reporting for inbound requests. (#1867)
* Refine error reporting for inbound request handling.
At the moment one can neither get confirmation when a
response has been sent on the underlying transport, nor
is one aware of response omissions. The latter was
originally intended as a feature for support of
one-way protocols, which seems like a bad idea in
hindsight. The lack of notification for sent
responses may prohibit implementation of some
request-response protocols that need to ensure
a happens-before relation between sending a
response and a subsequent request, besides uses
for collecting statistics.
Even with these changes, there is no active notification
for failed inbound requests as a result of connections
unexpectedly closing, as is the case for outbound requests.
Instead, for pending inbound requests this scenario
can be identified if necessary by the absense of both
`InboundFailure` and `ResponseSent` events for a particular
previously received request. Interest in this situation is
not expected to be common and would otherwise require
explicitly tracking all inbound requests in the `RequestResponse`
behaviour, which would be a pity. `RequestResponse::send_response`
now also synchronously returns an error if the inbound upgrade
handling the request has been aborted, due to timeout or
closing of the connection, giving more options for graceful
error handling for inbound requests.
As an aside, the `Throttled` wrapper now no longer emits
inbound or outbound error events occurring in the context
of sending credit requests or responses. This is in addition
to not emitting `ResponseSent` events for ACK responses of
credit grants.
* Update protocols/request-response/src/lib.rs
Co-authored-by: Max Inden <mail@max-inden.de>
* Address some minor clippy warnings. (#1868)
* Track pending credit request IDs.
In order to avoid emitting events relating to credit grants or acks
on the public API. The public API should only emit events relating
to the actual requests and responses sent by client code.
* Small cleanup
* Cleanup
* Update versions and changelogs.
* Unreleased
Co-authored-by: Max Inden <mail@max-inden.de>
2020-12-07 13:07:47 +01:00
|
|
|
Ok(true)
|
2020-06-29 17:08:40 +02:00
|
|
|
}.boxed()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Request substream upgrade protocol.
|
|
|
|
///
|
|
|
|
/// Sends a request and receives a response.
|
2020-12-17 11:01:45 +01:00
|
|
|
#[derive(Debug)]
|
2020-06-29 17:08:40 +02:00
|
|
|
pub struct RequestProtocol<TCodec>
|
|
|
|
where
|
|
|
|
TCodec: RequestResponseCodec
|
|
|
|
{
|
|
|
|
pub(crate) codec: TCodec,
|
|
|
|
pub(crate) protocols: SmallVec<[TCodec::Protocol; 2]>,
|
|
|
|
pub(crate) request_id: RequestId,
|
|
|
|
pub(crate) request: TCodec::Request,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TCodec> UpgradeInfo for RequestProtocol<TCodec>
|
|
|
|
where
|
|
|
|
TCodec: RequestResponseCodec
|
|
|
|
{
|
|
|
|
type Info = TCodec::Protocol;
|
|
|
|
type InfoIter = smallvec::IntoIter<[Self::Info; 2]>;
|
|
|
|
|
|
|
|
fn protocol_info(&self) -> Self::InfoIter {
|
|
|
|
self.protocols.clone().into_iter()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TCodec> OutboundUpgrade<NegotiatedSubstream> for RequestProtocol<TCodec>
|
|
|
|
where
|
|
|
|
TCodec: RequestResponseCodec + Send + 'static,
|
|
|
|
{
|
|
|
|
type Output = TCodec::Response;
|
|
|
|
type Error = io::Error;
|
|
|
|
type Future = BoxFuture<'static, Result<Self::Output, Self::Error>>;
|
|
|
|
|
|
|
|
fn upgrade_outbound(mut self, mut io: NegotiatedSubstream, protocol: Self::Info) -> Self::Future {
|
|
|
|
async move {
|
|
|
|
let write = self.codec.write_request(&protocol, &mut io, self.request);
|
|
|
|
write.await?;
|
2020-07-13 12:35:32 +02:00
|
|
|
io.close().await?;
|
2020-06-29 17:08:40 +02:00
|
|
|
let read = self.codec.read_response(&protocol, &mut io);
|
|
|
|
let response = read.await?;
|
|
|
|
Ok(response)
|
|
|
|
}.boxed()
|
|
|
|
}
|
|
|
|
}
|