tsarevvv/rust-ipfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: timeout on dag/resolve

Browse Source
This commit is contained in:
Joonas Koivunen 2020-07-09 16:14:40 +03:00
parent 62e0986c41
commit 603a15a6c4
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
http/src/v0/dag.rs
View File

@ -1,4 +1,7 @@
use crate::v0::support::{try_only_named_multipart, with_ipfs, NotImplemented, StringError};
use crate::v0::support::{
try_only_named_multipart, with_ipfs, MaybeTimeoutExt, NotImplemented, StringError,
StringSerialized,
};
use futures::stream::Stream;
use ipfs::{Ipfs, IpfsTypes};
use libipld::cid::{Cid, Codec};
@ -109,9 +112,7 @@ pub fn resolve<T: IpfsTypes>(
#[derive(Debug, Deserialize)]
struct ResolveOptions {
arg: String,
// with local_resolve, we should not start to fetch the block ever, this is available in
// (js-)ipfs-http-client >= 44.0.0 and the last failing test.
// TODO: #[serde(rename = "localResolve")] local_resolve: bool
timeout: Option<StringSerialized<humantime::Duration>>,
}
async fn inner_resolve<T: IpfsTypes>(
@ -123,7 +124,11 @@ async fn inner_resolve<T: IpfsTypes>(
let path = IpfsPath::try_from(opts.arg.as_str()).map_err(StringError::from)?;
let (current, _, remaining) = walk_path(&ipfs, path).await.map_err(StringError::from)?;
let (current, _, remaining) = walk_path(&ipfs, path)
.maybe_timeout(opts.timeout.map(StringSerialized::into_inner))
.await
.map_err(StringError::from)?
.map_err(StringError::from)?;
let remaining = {
let slashes = remaining.len();