chore: async compat to tokio utils (#725)

* chore: consolidate on tokio-util for stream compat; async-compat@0.2.3 has issues with wasm32

* chore: Use explicit version for `subtext` package

* chore: Update Cargo.lock

---------

Co-authored-by: Christopher Joel <240083+cdata@users.noreply.github.com>
Co-authored-by: Chris Joel <0xcda7a@gmail.com>

Cargo.toml

@@ -53,7 +53,7 @@ serde_urlencoded = { version = "~0.7" }
 serde-wasm-bindgen = { version = "0.4" }
 strum = { version = "0.25" }
 strum_macros = { version = "0.25" }
-subtext = { version = "0.3.4" }
+subtext = { version = "0.3.5" }
 symlink = { version = "0.1" }
 tempfile = { version = "^3" }
 thiserror = { version = "1" }

rust/noosphere-into/Cargo.toml

@@ -19,7 +19,7 @@ readme = "README.md"
 [dependencies]
 noosphere-core = { version = "0.18.0", path = "../noosphere-core" }
 noosphere-storage = { version = "0.10.0", path = "../noosphere-storage" }
-subtext = { version = "0.3.2", features = ["stream"] }
+subtext = { workspace = true, features = ["stream"] }
 async-trait = "~0.1"
 url = { workspace = true }
 tracing = { workspace = true }
@@ -36,7 +36,6 @@ tokio = { workspace = true, features = ["io-util", "macros", "test-util"] }
 
 async-stream = { workspace = true }
 futures = { workspace = true }
-async-compat = { version = "~0.2" }
 async-utf8-decoder = { version = "~0.3" }
 
 ucan = { workspace = true }

rust/noosphere-ipfs/Cargo.toml

@@ -26,7 +26,6 @@ test-kubo = []
 
 [dependencies]
 anyhow = { workspace = true }
-async-compat = { version = "~0.2" }
 async-trait = "~0.1"
 async-stream = { workspace = true }
 libipld-core = { workspace = true }
@@ -37,6 +36,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = ["io-util"] }
 tokio-stream = { workspace = true }
+tokio-util = { workspace = true, features = ["compat"] }
 tracing = { workspace = true }
 url = { workspace = true, features = [ "serde" ] }
 noosphere-storage = { version = "0.10.0", path = "../noosphere-storage" }

rust/noosphere-ipfs/src/client/kubo.rs

@@ -6,12 +6,12 @@ use super::{IpfsClient, IpfsClientAsyncReadSendSync};
 use async_trait::async_trait;
 
 use anyhow::{anyhow, Result};
-use async_compat::CompatExt;
 use cid::Cid;
 use hyper::{
     client::connect::dns::GaiResolver, client::HttpConnector, Body, Client, Request, StatusCode,
 };
 use hyper_multipart_rfc7578::client::multipart::{Body as MultipartBody, Form};
+use tokio_util::compat::TokioAsyncReadCompatExt;
 // TODO(#587): Remove dependency on `ipfs-api` crate
 use ipfs_api_prelude::response::{PinAddResponse, PinLsResponse};
 use libipld_cbor::DagCborCodec;