{"header":{"message":"common: Caching http client wrapper","description":null,"timestamp":"2023-11-15T09:20:19.494711401Z","authors":[{}]},"hash":"WYYH2D5R6HBWJ7M6YYYVFSPWX5PHQ4R5R6HT3UIKIZUTCEOGB6MAC","authors":[{"login":"kim","key":"GatQwNAvmxN5tCNcwspWc3AJdZydkGgDErEEr6JJLffY"}],"deps":{"hashes":[["WYYH2D5R6HBWJ7M6YYYVFSPWX5PHQ4R5R6HT3UIKIZUTCEOGB6MAC","common: Caching http client wrapper"],["AA",null],["3OWFX33CH6MBXWI5QCIOO5AYKTW7Y4S2VAIRTW2W6JEOT66KW63QC","identities: Abstract over HTTP client"],["H3V4EM4IBB7YSJV63CXX33B4FJFXNGH2QYQSBKDC7HLMDPBQ2H5QC","identities: Initial support for DIDs"],["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC","Start dabbling"],["LSM3P7VKAWMCE4VP5F6MU72N6JSSBUX5W5ITE54Z7WSQRUVU2SRQC","automerge: Change iterators"]],"deps":["3OWFX33CH6MBXWI5QCIOO5AYKTW7Y4S2VAIRTW2W6JEOT66KW63QC"],"known":["H3V4EM4IBB7YSJV63CXX33B4FJFXNGH2QYQSBKDC7HLMDPBQ2H5QC"]},"hunks":[{"Edit":{"inode":{"change":5,"pos":7915},"path":"Cargo.lock","line":3289,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6222}],"down_context":[{"change":2,"pos":6222}],"flag":"BLOCK","start":0,"end":11,"inode":{"change":5,"pos":7915}}},"contents":[{"Add":" \"blake3\","}]}},{"Edit":{"inode":{"change":5,"pos":7915},"path":"Cargo.lock","line":3291,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6231}],"down_context":[{"change":2,"pos":6231}],"flag":"BLOCK","start":12,"end":25,"inode":{"change":5,"pos":7915}}},"contents":[{"Add":" \"httparse\","}]}},{"Edit":{"inode":{"change":5,"pos":7915},"path":"Cargo.lock","line":3294,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6253}],"down_context":[{"change":2,"pos":6253}],"flag":"BLOCK","start":26,"end":36,"inode":{"change":5,"pos":7915}}},"contents":[{"Add":" \"tokio\","}]}},{"Edit":{"inode":{"change":5,"pos":7503},"path":"Cargo.toml","line":31,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6137}],"down_context":[{"change":6,"pos":3791}],"flag":"BLOCK","start":37,"end":54,"inode":{"change":5,"pos":7503}}},"contents":[{"Add":"httparse = \"1.8\""}]}},{"Replacement":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":98,"ins":{"up_context":[{"change":2,"pos":4835}],"down_context":[{"change":2,"pos":4868}],"flag":"BLOCK","start":55,"end":118,"inode":{"change":2,"pos":2758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4835},"to":{"change":2,"start":4835,"end":4868},"introduced_by":2}],"inode":{"change":2,"pos":2758}},"ins_contents":[{"Add":"pub fn client() -> impl Client {"}],"del_contents":[{"Del":"pub fn client() -> impl Client {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":105,"ins":{"up_context":[{"change":2,"pos":5061}],"down_context":[{"change":2,"pos":5221}],"flag":"BLOCK","start":119,"end":455,"inode":{"change":2,"pos":2758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5061},"to":{"change":2,"start":5061,"end":5221},"introduced_by":2}],"inode":{"change":2,"pos":2758}},"ins_contents":[{"Add":"pub mod client {"},{"Add":" use std::path::{"},{"Add":" Path,"},{"Add":" PathBuf,"},{"Add":" };"},{"Add":""},{"Add":" use anyhow::Context;"},{"Add":" use http::{"},{"Add":" HeaderName,"},{"Add":" HeaderValue,"},{"Add":" };"},{"Add":" use tokio::io::{"},{"Add":" AsyncRead,"},{"Add":" AsyncReadExt as _,"},{"Add":" AsyncWrite,"},{"Add":" AsyncWriteExt as _,"},{"Add":" };"},{"Add":" use tracing::debug_span;"},{"Add":""},{"Add":" use super::*;"}],"del_contents":[{"Del":"pub fn mock_client(f: F) -> impl Client\nwhere\n F: Fn(Url) -> ::http::Response + Send + Sync,\n{\n struct C {\n respond: F,\n }\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":126,"ins":{"up_context":[{"change":2,"pos":5222}],"down_context":[{"change":2,"pos":5269}],"flag":"BLOCK","start":456,"end":496,"inode":{"change":2,"pos":2758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5222},"to":{"change":2,"start":5222,"end":5269},"introduced_by":2}],"inode":{"change":2,"pos":2758}},"ins_contents":[{"Add":" pub fn mock(f: F) -> impl Client"}],"del_contents":[{"Del":" #[async_trait]\n impl Client for C\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":130,"ins":{"up_context":[{"change":2,"pos":5354}],"down_context":[{"change":2,"pos":5397}],"flag":"BLOCK","start":497,"end":553,"inode":{"change":2,"pos":2758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5354},"to":{"change":2,"start":5354,"end":5397},"introduced_by":2}],"inode":{"change":2,"pos":2758}},"ins_contents":[{"Add":" struct C {"},{"Add":" respond: F,"},{"Add":" }"}],"del_contents":[{"Del":" type Response = reqwest::Response;\n"}]}},{"Replacement":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":134,"ins":{"up_context":[{"change":2,"pos":5398}],"down_context":[{"change":2,"pos":5571}],"flag":"BLOCK","start":554,"end":953,"inode":{"change":2,"pos":2758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5398},"to":{"change":2,"start":5398,"end":5571},"introduced_by":2}],"inode":{"change":2,"pos":2758}},"ins_contents":[{"Add":" #[async_trait]"},{"Add":" impl Client for C"},{"Add":" where"},{"Add":" F: Fn(Url) -> ::http::Response + Send + Sync,"},{"Add":" {"},{"Add":" type Response = reqwest::Response;"},{"Add":""},{"Add":" async fn get(&self, url: U) -> Result {"},{"Add":" let url = url.into_url()?;"},{"Add":" Ok(Self::Response::from((self.respond)(url)))"},{"Add":" }"}],"del_contents":[{"Del":" async fn get(&self, url: U) -> Result {\n let url = url.into_url()?;\n Ok(Self::Response::from((self.respond)(url)))\n"}]}},{"Edit":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":146,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5581}],"down_context":[{"change":2,"pos":5581}],"flag":"BLOCK","start":954,"end":980,"inode":{"change":2,"pos":2758}}},"contents":[{"Add":""},{"Add":" C { respond: f }"}]}},{"Replacement":{"inode":{"change":2,"pos":2758},"path":"lib/common/src/http.rs","line":150,"ins":{"up_context":[{"change":2,"pos":5588}],"down_context":[{"change":2,"pos":5609}],"flag":"BLOCK","start":981,"end":4825,"inode":{"change":2,"pos":2758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5588},"to":{"change":2,"start":5588,"end":5609},"introduced_by":2}],"inode":{"change":2,"pos":2758}},"ins_contents":[{"Add":" pub fn caching(inner: C, path: P) -> impl Client"},{"Add":" where"},{"Add":" C: Client,"},{"Add":" P: Into,"},{"Add":" {"},{"Add":" struct Caching {"},{"Add":" inner: C,"},{"Add":" path: PathBuf,"},{"Add":" }"},{"Add":""},{"Add":" #[async_trait]"},{"Add":" impl Client for Caching"},{"Add":" where"},{"Add":" C: Client,"},{"Add":" {"},{"Add":" type Response = C::Response;"},{"Add":""},{"Add":" async fn get(&self, url: U) -> Result {"},{"Add":" let url = url.into_url()?;"},{"Add":""},{"Add":" let mut cache_path = self.path.clone();"},{"Add":" cache_path.push(blake3::hash(url.as_str().as_bytes()).to_hex().as_str());"},{"Add":" cache_path.set_extension(\"http\");"},{"Add":" let span = debug_span!("},{"Add":" \"cached::get\","},{"Add":" \"url\" = url.as_str(),"},{"Add":" \"cache-path\" = cache_path.display().to_string()"},{"Add":" );"},{"Add":""},{"Add":" fn context<'a>("},{"Add":" what: &'static str,"},{"Add":" cache_path: &'a Path,"},{"Add":" ) -> impl FnOnce() -> String + 'a {"},{"Add":" move || {"},{"Add":" format!("},{"Add":" \"failed to open cache file for {what}: {}\","},{"Add":" cache_path.display()"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if !cache_path.try_exists()? {"},{"Add":" span.in_scope(|| debug!(\"cache miss\"));"},{"Add":" let resp = self.inner.get(url).await?;"},{"Add":" let mut file = tokio::fs::File::create(&cache_path)"},{"Add":" .await"},{"Add":" .with_context(context(\"writing\", &cache_path))?;"},{"Add":" write(resp, &mut file).await?;"},{"Add":" file.sync_all().await?;"},{"Add":" }"},{"Add":" span.in_scope(|| debug!(\"cache load\"));"},{"Add":" let file = tokio::fs::File::open(&cache_path)"},{"Add":" .await"},{"Add":" .with_context(context(\"reading\", &cache_path))?;"},{"Add":" read(tokio::io::BufReader::new(file)).await"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" Caching {"},{"Add":" inner,"},{"Add":" path: path.into(),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" async fn write(resp: reqwest::Response, mut out: W) -> Result<()> {"},{"Add":" out.write_all("},{"Add":" format!("},{"Add":" \"{:?} {} {}\\r\\n\","},{"Add":" resp.version(),"},{"Add":" resp.status().as_u16(),"},{"Add":" resp.status().as_str()"},{"Add":" )"},{"Add":" .as_bytes(),"},{"Add":" )"},{"Add":" .await?;"},{"Add":" for (name, value) in resp.headers() {"},{"Add":" out.write_all(name.as_ref()).await?;"},{"Add":" out.write_all(b\": \").await?;"},{"Add":" out.write_all(value.as_bytes()).await?;"},{"Add":" out.write_all(b\"\\r\\n\").await?;"},{"Add":" }"},{"Add":" out.write_all(b\"\\r\\n\").await?;"},{"Add":" let body = resp.bytes().await?;"},{"Add":" out.write_all(&body).await?;"},{"Add":""},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" async fn read(mut io: R) -> Result {"},{"Add":" let mut buf = Vec::with_capacity(1024);"},{"Add":" io.read_to_end(&mut buf).await?;"},{"Add":""},{"Add":" let mut headers = [httparse::EMPTY_HEADER; 64];"},{"Add":" let mut response = httparse::Response::new(&mut headers);"},{"Add":" let httparse::Status::Complete(len) = response.parse(&buf)? else {"},{"Add":" bail!(\"Incomplete response\")"},{"Add":" };"},{"Add":" let body: &[u8] = &buf[len..];"},{"Add":""},{"Add":" let mut resp = http::Response::builder().status(response.code.unwrap_or(200));"},{"Add":" let headers = resp.headers_mut().unwrap();"},{"Add":" for header in response.headers {"},{"Add":" headers.insert("},{"Add":" HeaderName::from_bytes(header.name.as_bytes())?,"},{"Add":" HeaderValue::from_bytes(header.value)?,"},{"Add":" );"},{"Add":" }"},{"Add":" let resp = resp.body(body.to_vec())?;"},{"Add":""},{"Add":" Ok(resp.into())"},{"Add":" }"}],"del_contents":[{"Del":" C { respond: f }\n"}]}},{"Replacement":{"inode":{"change":2,"pos":5647},"path":"lib/common/Cargo.toml","line":10,"ins":{"up_context":[{"change":2,"pos":5815}],"down_context":[{"change":2,"pos":5828}],"flag":"BLOCK","start":4826,"end":4853,"inode":{"change":2,"pos":5647}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5815},"to":{"change":2,"start":5815,"end":5828},"introduced_by":2}],"inode":{"change":2,"pos":5647}},"ins_contents":[{"Add":"testing = [\"dep:httparse\"]"}],"del_contents":[{"Del":"testing = []\n"}]}},{"Edit":{"inode":{"change":2,"pos":5647},"path":"lib/common/Cargo.toml","line":15,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5897}],"down_context":[{"change":2,"pos":5897}],"flag":"BLOCK","start":4854,"end":4878,"inode":{"change":2,"pos":5647}}},"contents":[{"Add":"blake3.workspace = true"}]}},{"Edit":{"inode":{"change":2,"pos":5647},"path":"lib/common/Cargo.toml","line":17,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5919}],"down_context":[{"change":2,"pos":5919}],"flag":"BLOCK","start":4879,"end":4928,"inode":{"change":2,"pos":5647}}},"contents":[{"Add":"httparse = { workspace = true, optional = true }"}]}},{"Edit":{"inode":{"change":2,"pos":5647},"path":"lib/common/Cargo.toml","line":20,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5967}],"down_context":[{"change":2,"pos":5967}],"flag":"BLOCK","start":4929,"end":4952,"inode":{"change":2,"pos":5647}}},"contents":[{"Add":"tokio.workspace = true"}]}},{"Edit":{"inode":{"change":2,"pos":5647},"path":"lib/common/Cargo.toml","line":23,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6013}],"down_context":[],"flag":"BLOCK","start":4953,"end":4999,"inode":{"change":2,"pos":5647}}},"contents":[{"Add":""},{"Add":"[dev-dependencies]"},{"Add":"httparse.workspace = true"}]}},{"Replacement":{"inode":{"change":3,"pos":8787},"path":"lib/identities/src/did/tests.rs","line":112,"ins":{"up_context":[{"change":2,"pos":1961}],"down_context":[{"change":2,"pos":2004}],"flag":"BLOCK","start":5000,"end":5044,"inode":{"change":3,"pos":8787}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1961},"to":{"change":2,"start":1961,"end":2004},"introduced_by":2}],"inode":{"change":3,"pos":8787}},"ins_contents":[{"Add":" let client = http::client::mock(|url| {"}],"del_contents":[{"Del":" let client = http::mock_client(|url| {\n"}]}}],"owner":"kim","repo":"yapma","token":"aw0mM1FKljnl0awL6ppRCOJ1KfGCS0g/Pjh5/ZAupsY=","login":null}

…

Dependencies

Change contents