rename wit to http-client

crates/kitsune-activitypub/Cargo.toml

@@ -38,7 +38,7 @@ speedy-uuid = { workspace = true }
 tracing = "0.1.40"
 triomphe = { workspace = true }
 typed-builder = "0.20.0"
-url = "2.5.3"
+url = "2.5.4"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 sha2 = { version = "0.10.8", features = ["asm"] }

crates/kitsune-db/Cargo.toml

@@ -22,7 +22,7 @@ kitsune-language = { workspace = true }
 kitsune-type = { workspace = true }
 num-derive = "0.4.2"
 num-traits = "0.2.19"
-rustls = { version = "0.23.17", default-features = false, features = [
+rustls = { version = "0.23.18", default-features = false, features = [
     "logging",
     "ring",
     "std",

crates/kitsune-federation-filter/Cargo.toml

@@ -11,7 +11,7 @@ kitsune-config = { workspace = true }
 kitsune-derive = { workspace = true }
 kitsune-error = { workspace = true }
 kitsune-type = { workspace = true }
-url = "2.5.3"
+url = "2.5.4"
 
 [lints]
 workspace = true

crates/kitsune-http-client/src/lib.rs

@@ -45,8 +45,6 @@ pub use self::body::Body;
 /// Response body type
 pub type ResponseBody = BoxBody;
 
-pub use ::http;
-
 /// Client error type
 pub struct Error {
     inner: BoxError,

crates/kitsune-oidc/Cargo.toml

@@ -25,7 +25,7 @@ serde = { version = "1.0.215", features = ["derive"] }
 sonic-rs = { workspace = true }
 speedy-uuid = { workspace = true }
 thiserror = "2.0.3"
-url = "2.5.3"
+url = "2.5.4"
 
 [dev-dependencies]
 tokio = { version = "1.41.1", features = ["macros", "rt"] }

crates/kitsune-service/Cargo.toml

@@ -52,7 +52,7 @@ tokio = { workspace = true, features = ["macros", "sync"] }
 tracing = "0.1.40"
 triomphe = { workspace = true }
 typed-builder = "0.20.0"
-url = "2.5.3"
+url = "2.5.4"
 zxcvbn = { version = "3.1.0", default-features = false }
 
 [dev-dependencies]

crates/kitsune-test/Cargo.toml

@@ -21,7 +21,7 @@ rand = "0.8.5"
 rusty-s3 = { version = "0.5.0", default-features = false }
 tokio = { workspace = true, features = ["time"] }
 triomphe = { workspace = true }
-url = "2.5.3"
+url = "2.5.4"
 uuid = { version = "1.11.0", features = ["fast-rng", "v4"] }
 
 [lints]

crates/kitsune-wasm-mrf/Cargo.toml

@@ -16,6 +16,7 @@ fred = { workspace = true }
 futures-util = { version = "0.3.31", default-features = false, features = [
     "alloc",
 ] }
+http = "1.1.0"
 http-body-util = "0.1.2"
 kitsune-config = { workspace = true }
 kitsune-derive = { workspace = true }

crates/kitsune-wasm-mrf/src/ctx.rs

@@ -1,6 +1,6 @@
 use crate::{
     kv_storage,
-    mrf_wit::v1::fep::mrf::{http, keyvalue},
+    mrf_wit::v1::fep::mrf::{http_client, keyvalue},
 };
 use slab::Slab;
 use triomphe::Arc;
@@ -28,12 +28,15 @@ impl KvContext {
 
 pub struct HttpContext {
     pub client: kitsune_http_client::Client,
-    pub bodies: Slab<crate::http::Body>,
+    pub bodies: Slab<crate::http_client::Body>,
 }
 
 impl HttpContext {
     #[inline]
-    pub fn get_body(&mut self, rep: &Resource<http::ResponseBody>) -> &mut crate::http::Body {
+    pub fn get_body(
+        &mut self,
+        rep: &Resource<http_client::ResponseBody>,
+    ) -> &mut crate::http_client::Body {
         &mut self.bodies[rep.rep() as usize]
     }
 }
@@ -80,7 +83,7 @@ pub fn construct_store(
             buckets: Slab::new(),
         },
         resource_limiter: StoreLimitsBuilder::new()
-            .memory_size(100 * 1024 * 1024)
+            .memory_size(15 * 1024 * 1024)
             .build(),
         resource_table: ResourceTable::new(),
         wasi_ctx,

crates/kitsune-wasm-mrf/src/http.rs → crates/kitsune-wasm-mrf/src/http_client.rs

@@ -1,6 +1,6 @@
 use crate::{
     ctx::Context,
-    mrf_wit::v1::fep::mrf::http::{self, Error, Request, Response, ResponseBody},
+    mrf_wit::v1::fep::mrf::http_client::{self, Error, Request, Response, ResponseBody},
 };
 use async_trait::async_trait;
 use futures_util::TryStreamExt;
@@ -10,12 +10,12 @@ use wasmtime::component::Resource;
 pub type Body = BodyDataStream<kitsune_http_client::ResponseBody>;
 
 #[async_trait]
-impl http::Host for Context {
+impl http_client::Host for Context {
     async fn do_request(&mut self, request: Request) -> Result<Response, Resource<Error>> {
-        let method = kitsune_http_client::http::Method::from_bytes(request.method.as_bytes())
+        let method = http::Method::from_bytes(request.method.as_bytes())
             .map_err(|_| Resource::new_own(0))?;
 
-        let request = kitsune_http_client::http::Request::builder()
+        let request = http::Request::builder()
             .uri(request.url)
             .method(method)
             .body(request.body.map_or_else(Default::default, Into::into))
@@ -51,7 +51,7 @@ impl http::Host for Context {
 }
 
 #[async_trait]
-impl http::HostResponseBody for Context {
+impl http_client::HostResponseBody for Context {
     async fn next(
         &mut self,
         rep: Resource<ResponseBody>,
@@ -72,7 +72,7 @@ impl http::HostResponseBody for Context {
 }
 
 #[async_trait]
-impl http::HostError for Context {
+impl http_client::HostError for Context {
     async fn drop(&mut self, _rep: Resource<Error>) -> wasmtime::Result<()> {
         Ok(())
     }

crates/kitsune-wasm-mrf/src/lib.rs

@@ -35,7 +35,7 @@ use wasmtime::{
 
 mod cache;
 mod ctx;
-mod http;
+mod http_client;
 mod logging;
 mod mrf_wit;
 

crates/kitsune-wasm-mrf/wit/mrf.wit

@@ -1,7 +1,7 @@
-package fep:mrf@1.0.0;
+package fep:mrf@0.1.0;
 
 /// Home-grown version of an interface for doing HTTP requests
-interface http {
+interface http-client {
     /// Opaque representation of some error
     resource error {}
 
@@ -101,7 +101,7 @@ interface types {
 world mrf {
     use types.{direction, error};
 
-    import http;
+    import http-client;
     import keyvalue;
     import wasi:logging/logging;
 

kitsune/Cargo.toml

@@ -102,7 +102,7 @@ tracing = "0.1.40"
 trials = { workspace = true }
 triomphe = { workspace = true }
 typed-builder = "0.20.0"
-url = "2.5.3"
+url = "2.5.4"
 
 # --- Optional dependencies ---