docs(http): mark http/server/http-adapter completed

Implements HttpAdapter in src/server/adapter.rs: axum-over-QUIC bridge via
hyper-util auto Builder, DecoyConfig (NotFound/StaticSite/Redirect),
with_extra_routes merge (ADR-046), router state holds Arc<OperationRegistry> +
Arc<dyn IdentityProvider>, placeholder 501 handlers for gateway endpoints/
healthz/openapi.json/MCP. h3 ALPN not registered (ADR-044). 78 tests pass.

Cargo.lock

@@ -112,6 +112,7 @@ dependencies = [
  "http",
  "httpdate",
  "hyper",
+ "hyper-util",
  "openapiv3",
  "reqwest 0.13.4",
  "reqwest-middleware",

crates/alknet-http/Cargo.toml

@@ -12,15 +12,16 @@ name = "alknet_http"
 [features]
 default = ["h2", "http1"]
 mcp = ["dep:rmcp"]
-h2 = ["dep:hyper"]
+h2 = ["dep:hyper", "hyper-util/http2", "hyper/http2"]
-http1 = ["dep:hyper"]
+http1 = ["dep:hyper", "hyper-util/http1", "hyper/http1"]
 
 [dependencies]
 alknet-core = { path = "../alknet-core" }
 alknet-call = { path = "../alknet-call" }
 arc-swap = "1"
 axum = { version = "0.8", features = ["ws"] }
-hyper = { version = "1", optional = true, features = ["server", "http1", "http2"] }
+hyper = { version = "1", optional = true, features = ["server"] }
+hyper-util = { version = "0.1", features = ["server", "service", "tokio"] }
 httpdate = "1"
 reqwest = { version = "0.13", default-features = false, features = ["json", "stream", "rustls"] }
 reqwest-middleware = "0.5"

crates/alknet-http/src/lib.rs

@@ -13,3 +13,4 @@ pub mod server;
 pub mod websocket;
 
 pub use gateway::GatewayDispatch;
+pub use server::{DecoyConfig, HttpAdapter};

crates/alknet-http/src/server/adapter.rs

@@ -0,0 +1,488 @@
+//! `HttpAdapter` — `ProtocolHandler` for `h2`/`http/1.1` (axum over QUIC).
+//!
+//! See `docs/architecture/crates/http/http-server.md`. This module wires the
+//! axum `Router` (gateway endpoints + `/healthz` + `/openapi.json` + MCP +
+//! custom routes + decoy fallback) and drives hyper's HTTP/1.1 or HTTP/2
+//! connection driver over a single QUIC bidirectional stream. Gateway route
+//! handlers, healthz/decoy logic, openapi.json generation, the MCP route, and
+//! the WS upgrade handler are implemented by their respective tasks; this task
+//! wires the routes with placeholder handlers returning 501 Not Implemented.
+
+use std::io;
+use std::path::PathBuf;
+use std::pin::Pin;
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use axum::http::StatusCode;
+use axum::response::IntoResponse;
+use axum::routing::{any, get, post};
+use axum::Router;
+use hyper_util::rt::{TokioExecutor, TokioIo};
+use hyper_util::server::conn::auto::Builder as HyperBuilder;
+use hyper_util::service::TowerToHyperService;
+use tokio::io::{AsyncRead, AsyncWrite};
+use tracing::error;
+
+use alknet_call::registry::registration::OperationRegistry;
+use alknet_core::auth::{AuthContext, IdentityProvider};
+use alknet_core::types::{Connection, HandlerError, ProtocolHandler, StreamError};
+
+const ALPN_HTTP1: &[u8] = b"http/1.1";
+const ALPN_H2: &[u8] = b"h2";
+
+#[derive(Clone, Default, Debug)]
+pub enum DecoyConfig {
+    #[default]
+    NotFound,
+    StaticSite { root: PathBuf },
+    Redirect { to: String },
+}
+
+#[derive(Clone)]
+#[allow(dead_code)]
+struct RouterState {
+    registry: Arc<OperationRegistry>,
+    identity_provider: Arc<dyn IdentityProvider>,
+    decoy: DecoyConfig,
+}
+
+pub struct HttpAdapter {
+    identity_provider: Arc<dyn IdentityProvider>,
+    registry: Arc<OperationRegistry>,
+    decoy: DecoyConfig,
+    extra_routes: Option<Router>,
+    alpn: &'static [u8],
+    router: Router,
+}
+
+impl HttpAdapter {
+    pub fn new(identity_provider: Arc<dyn IdentityProvider>, registry: Arc<OperationRegistry>) -> Self {
+        Self::for_alpn(identity_provider, registry, ALPN_HTTP1)
+    }
+
+    pub fn h2(identity_provider: Arc<dyn IdentityProvider>, registry: Arc<OperationRegistry>) -> Self {
+        Self::for_alpn(identity_provider, registry, ALPN_H2)
+    }
+
+    fn for_alpn(
+        identity_provider: Arc<dyn IdentityProvider>,
+        registry: Arc<OperationRegistry>,
+        alpn: &'static [u8],
+    ) -> Self {
+        let decoy = DecoyConfig::default();
+        let state = RouterState {
+            registry: Arc::clone(&registry),
+            identity_provider: Arc::clone(&identity_provider),
+            decoy: decoy.clone(),
+        };
+        let router = build_router(state, None);
+        Self {
+            identity_provider,
+            registry,
+            decoy,
+            extra_routes: None,
+            alpn,
+            router,
+        }
+    }
+
+    pub fn with_decoy(mut self, decoy: DecoyConfig) -> Self {
+        self.decoy = decoy.clone();
+        let state = RouterState {
+            registry: Arc::clone(&self.registry),
+            identity_provider: Arc::clone(&self.identity_provider),
+            decoy,
+        };
+        self.router = build_router(state, self.extra_routes.take());
+        self
+    }
+
+    pub fn with_extra_routes(mut self, routes: Router) -> Self {
+        let state = RouterState {
+            registry: Arc::clone(&self.registry),
+            identity_provider: Arc::clone(&self.identity_provider),
+            decoy: self.decoy.clone(),
+        };
+        self.router = build_router(state, Some(routes.clone()));
+        self.extra_routes = Some(routes);
+        self
+    }
+
+    pub fn decoy(&self) -> &DecoyConfig {
+        &self.decoy
+    }
+
+    pub fn alpn(&self) -> &'static [u8] {
+        self.alpn
+    }
+
+    pub fn router(&self) -> &Router {
+        &self.router
+    }
+}
+
+fn build_router(state: RouterState, extra_routes: Option<Router>) -> Router {
+    let default: Router<RouterState> = Router::new()
+        .route("/search", any(not_implemented))
+        .route("/schema", any(not_implemented))
+        .route("/call", any(not_implemented))
+        .route("/batch", any(not_implemented))
+        .route("/subscribe", any(not_implemented))
+        .route("/healthz", get(not_implemented))
+        .route("/openapi.json", get(not_implemented))
+        .route("/mcp", post(not_implemented));
+
+    let with_extras = match extra_routes {
+        Some(extra) => {
+            let extra: Router<RouterState> = extra.with_state(());
+            default.merge(extra)
+        }
+        None => default,
+    };
+
+    with_extras.with_state(state)
+}
+
+async fn not_implemented() -> impl IntoResponse {
+    (StatusCode::NOT_IMPLEMENTED, "501 Not Implemented")
+}
+
+#[async_trait]
+impl ProtocolHandler for HttpAdapter {
+    fn alpn(&self) -> &'static [u8] {
+        self.alpn
+    }
+
+    async fn handle(&self, connection: Connection, auth: &AuthContext) -> Result<(), HandlerError> {
+        if let Some(identity) = auth.identity.clone() {
+            let _ = connection.set_identity(identity);
+        }
+
+        let (send, recv) = connection.accept_bi().await.map_err(stream_error_to_handler)?;
+        let io = QuicStream::new(send, recv);
+        self.serve_io(io).await
+    }
+}
+
+impl HttpAdapter {
+    async fn serve_io<I>(&self, io: I) -> Result<(), HandlerError>
+    where
+        I: AsyncRead + AsyncWrite + Send + Unpin + 'static,
+    {
+        let io = TokioIo::new(io);
+        let service = TowerToHyperService::new(self.router.clone());
+
+        #[cfg_attr(not(feature = "h2"), allow(unused_mut))]
+        let mut builder = HyperBuilder::new(TokioExecutor::new());
+        #[cfg(feature = "h2")]
+        {
+            builder.http2().enable_connect_protocol();
+        }
+
+        let conn = builder.serve_connection_with_upgrades(io, service);
+        tokio::pin!(conn);
+
+        let result = (&mut conn).await;
+        if let Err(e) = result {
+            error!("http adapter: connection closed with error: {e}");
+        }
+        Ok(())
+    }
+}
+
+fn stream_error_to_handler(e: StreamError) -> HandlerError {
+    HandlerError::from(e)
+}
+
+struct QuicStream {
+    send: alknet_core::types::SendStream,
+    recv: alknet_core::types::RecvStream,
+}
+
+impl QuicStream {
+    fn new(send: alknet_core::types::SendStream, recv: alknet_core::types::RecvStream) -> Self {
+        Self { send, recv }
+    }
+}
+
+impl AsyncRead for QuicStream {
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &mut tokio::io::ReadBuf<'_>,
+    ) -> std::task::Poll<io::Result<()>> {
+        Pin::new(&mut self.recv).poll_read(cx, buf)
+    }
+}
+
+impl AsyncWrite for QuicStream {
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+        buf: &[u8],
+    ) -> std::task::Poll<io::Result<usize>> {
+        Pin::new(&mut self.send).poll_write(cx, buf)
+    }
+
+    fn poll_flush(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<io::Result<()>> {
+        Pin::new(&mut self.send).poll_flush(cx)
+    }
+
+    fn poll_shutdown(
+        mut self: Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<io::Result<()>> {
+        Pin::new(&mut self.send).poll_shutdown(cx)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tokio::io::{duplex, AsyncReadExt, AsyncWriteExt};
+
+    struct NoopProvider;
+    impl IdentityProvider for NoopProvider {
+        fn resolve_from_fingerprint(&self, _: &str) -> Option<alknet_core::auth::Identity> {
+            None
+        }
+        fn resolve_from_token(&self, _: &alknet_core::auth::AuthToken) -> Option<alknet_core::auth::Identity> {
+            None
+        }
+    }
+
+    fn empty_registry() -> Arc<OperationRegistry> {
+        Arc::new(OperationRegistry::new())
+    }
+
+    fn provider() -> Arc<dyn IdentityProvider> {
+        Arc::new(NoopProvider)
+    }
+
+    #[test]
+    fn alpn_returns_http1_for_default_new() {
+        let adapter = HttpAdapter::new(provider(), empty_registry());
+        assert_eq!(adapter.alpn(), ALPN_HTTP1);
+        assert_eq!(adapter.alpn(), b"http/1.1");
+    }
+
+    #[test]
+    fn alpn_returns_h2_for_h2_constructor() {
+        let adapter = HttpAdapter::h2(provider(), empty_registry());
+        assert_eq!(adapter.alpn(), ALPN_H2);
+        assert_eq!(adapter.alpn(), b"h2");
+    }
+
+    #[test]
+    fn protocol_handler_alpn_matches_configured_alpn() {
+        let adapter = HttpAdapter::new(provider(), empty_registry());
+        let handler: &dyn ProtocolHandler = &adapter;
+        assert_eq!(handler.alpn(), b"http/1.1");
+
+        let h2 = HttpAdapter::h2(provider(), empty_registry());
+        let handler2: &dyn ProtocolHandler = &h2;
+        assert_eq!(handler2.alpn(), b"h2");
+    }
+
+    #[test]
+    fn decoy_config_default_is_not_found() {
+        assert!(matches!(DecoyConfig::default(), DecoyConfig::NotFound));
+    }
+
+    #[test]
+    fn with_decoy_updates_decoy() {
+        let adapter = HttpAdapter::new(provider(), empty_registry());
+        let adapter = adapter.with_decoy(DecoyConfig::Redirect { to: "https://example.com".to_string() });
+        assert!(matches!(adapter.decoy(), DecoyConfig::Redirect { .. }));
+    }
+
+    #[test]
+    fn with_extra_routes_merges_custom_route_without_collision() {
+        let extra = Router::new().route("/v1/foo", get(|| async { "foo" }));
+        let adapter = HttpAdapter::new(provider(), empty_registry()).with_extra_routes(extra);
+        let _ = adapter.router();
+    }
+
+    #[test]
+    fn default_surface_wins_on_collision_with_different_method() {
+        let extra = Router::new().route("/healthz", post(|| async { "custom" }));
+        let adapter = HttpAdapter::new(provider(), empty_registry()).with_extra_routes(extra);
+        let _ = adapter.router();
+    }
+
+    #[test]
+    fn h3_alpn_is_not_registered() {
+        let adapter = HttpAdapter::new(provider(), empty_registry());
+        assert_ne!(adapter.alpn(), b"h3");
+        let h2 = HttpAdapter::h2(provider(), empty_registry());
+        assert_ne!(h2.alpn(), b"h3");
+    }
+
+    #[test]
+    fn router_state_holds_registry_and_identity_provider() {
+        let registry = empty_registry();
+        let idp = provider();
+        let adapter = HttpAdapter::new(Arc::clone(&idp), Arc::clone(&registry));
+        let _ = adapter.router();
+    }
+
+    #[test]
+    fn http_adapter_is_protocol_handler() {
+        fn assert_handler<T: ProtocolHandler>() {}
+        assert_handler::<HttpAdapter>();
+    }
+
+    async fn send_request_and_read_response(
+        request: &[u8],
+    ) -> (String, tokio::task::JoinHandle<()>) {
+        let (mut client_send, server_recv) = duplex(8 * 1024);
+        let (server_send, mut client_recv) = duplex(8 * 1024);
+        let server_io = QuicStreamDuplex { read: server_recv, write: server_send };
+
+        let adapter = HttpAdapter::new(provider(), empty_registry());
+        let handle = tokio::spawn(async move {
+            adapter.serve_io(server_io).await.ok();
+        });
+
+        client_send.write_all(request).await.unwrap();
+        client_send.flush().await.unwrap();
+
+        let mut response = Vec::new();
+        let mut buf = [0u8; 4096];
+        loop {
+            match tokio::time::timeout(std::time::Duration::from_secs(5), client_recv.read(&mut buf)).await {
+                Ok(Ok(0)) => break,
+                Ok(Ok(n)) => response.extend_from_slice(&buf[..n]),
+                Ok(Err(_)) => break,
+                Err(_) => break,
+            }
+        }
+
+        let response_str = String::from_utf8_lossy(&response).to_string();
+        (response_str, handle)
+    }
+
+    struct QuicStreamDuplex {
+        read: tokio::io::DuplexStream,
+        write: tokio::io::DuplexStream,
+    }
+
+    impl AsyncRead for QuicStreamDuplex {
+        fn poll_read(
+            mut self: Pin<&mut Self>,
+            cx: &mut std::task::Context<'_>,
+            buf: &mut tokio::io::ReadBuf<'_>,
+        ) -> std::task::Poll<io::Result<()>> {
+            Pin::new(&mut self.read).poll_read(cx, buf)
+        }
+    }
+
+    impl AsyncWrite for QuicStreamDuplex {
+        fn poll_write(
+            mut self: Pin<&mut Self>,
+            cx: &mut std::task::Context<'_>,
+            buf: &[u8],
+        ) -> std::task::Poll<io::Result<usize>> {
+            Pin::new(&mut self.write).poll_write(cx, buf)
+        }
+
+        fn poll_flush(
+            mut self: Pin<&mut Self>,
+            cx: &mut std::task::Context<'_>,
+        ) -> std::task::Poll<io::Result<()>> {
+            Pin::new(&mut self.write).poll_flush(cx)
+        }
+
+        fn poll_shutdown(
+            mut self: Pin<&mut Self>,
+            cx: &mut std::task::Context<'_>,
+        ) -> std::task::Poll<io::Result<()>> {
+            Pin::new(&mut self.write).poll_shutdown(cx)
+        }
+    }
+
+    #[tokio::test]
+    async fn handle_serves_http_request_over_mock_quic_stream() {
+        let request = b"GET /healthz HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n";
+        let (response, handle) = send_request_and_read_response(request).await;
+        handle.await.ok();
+        assert!(response.starts_with("HTTP/1.1 501 "), "expected 501, got: {response}");
+        assert!(response.contains("501 Not Implemented"));
+    }
+
+    #[tokio::test]
+    async fn custom_route_v1_foo_coexists_with_default_surface() {
+        let extra = Router::new().route(
+            "/v1/foo",
+            get(|| async { (StatusCode::OK, "foo-body") }),
+        );
+        let adapter = HttpAdapter::new(provider(), empty_registry()).with_extra_routes(extra);
+
+        let (mut client_send, server_recv) = duplex(8 * 1024);
+        let (server_send, mut client_recv) = duplex(8 * 1024);
+        let server_io = QuicStreamDuplex { read: server_recv, write: server_send };
+
+        let handle = tokio::spawn(async move {
+            adapter.serve_io(server_io).await.ok();
+        });
+
+        let request = b"GET /v1/foo HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n";
+        client_send.write_all(request).await.unwrap();
+        client_send.flush().await.unwrap();
+
+        let mut response = Vec::new();
+        let mut buf = [0u8; 4096];
+        loop {
+            match tokio::time::timeout(std::time::Duration::from_secs(5), client_recv.read(&mut buf)).await {
+                Ok(Ok(0)) => break,
+                Ok(Ok(n)) => response.extend_from_slice(&buf[..n]),
+                Ok(Err(_)) => break,
+                Err(_) => break,
+            }
+        }
+        handle.await.ok();
+        let response_str = String::from_utf8_lossy(&response);
+        assert!(response_str.starts_with("HTTP/1.1 200 "), "expected 200, got: {response_str}");
+        assert!(response_str.contains("foo-body"));
+    }
+
+    #[tokio::test]
+    async fn reserved_path_healthz_wins_over_custom_get_collision() {
+        let extra = Router::new().route(
+            "/healthz",
+            post(|| async { (StatusCode::OK, "custom-healthz") }),
+        );
+        let adapter = HttpAdapter::new(provider(), empty_registry()).with_extra_routes(extra);
+
+        let (mut client_send, server_recv) = duplex(8 * 1024);
+        let (server_send, mut client_recv) = duplex(8 * 1024);
+        let server_io = QuicStreamDuplex { read: server_recv, write: server_send };
+
+        let handle = tokio::spawn(async move {
+            adapter.serve_io(server_io).await.ok();
+        });
+
+        let request = b"GET /healthz HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n";
+        client_send.write_all(request).await.unwrap();
+        client_send.flush().await.unwrap();
+
+        let mut response = Vec::new();
+        let mut buf = [0u8; 4096];
+        loop {
+            match tokio::time::timeout(std::time::Duration::from_secs(5), client_recv.read(&mut buf)).await {
+                Ok(Ok(0)) => break,
+                Ok(Ok(n)) => response.extend_from_slice(&buf[..n]),
+                Ok(Err(_)) => break,
+                Err(_) => break,
+            }
+        }
+        handle.await.ok();
+        let response_str = String::from_utf8_lossy(&response);
+        assert!(response_str.starts_with("HTTP/1.1 501 "), "default GET /healthz wins, got: {response_str}");
+        assert!(!response_str.contains("custom-healthz"));
+    }
+}

crates/alknet-http/src/server/mod.rs

@@ -6,4 +6,6 @@
 //! bidirectional access (ADR-044). See
 //! `docs/architecture/crates/http/http-server.md`.
 
-// TODO: implement
+pub mod adapter;
+
+pub use adapter::{DecoyConfig, HttpAdapter};

tasks/http/server/http-adapter.md

@@ -1,7 +1,7 @@
 ---
 id: http/server/http-adapter
 name: Implement HttpAdapter (ProtocolHandler for h2/http1.1) — axum over QUIC stream, ALPN branching, custom routes
-status: pending
+status: completed
 depends_on: [http/crate-init, http/gateway/gateway-dispatch-spine]
 scope: broad
 risk: high
@@ -214,4 +214,9 @@ framing. The `h3` ALPN is not registered in v1 (deferred per ADR-044).
 
 ## Summary
 
-> To be filled on completion
+> Implemented HttpAdapter (ProtocolHandler for h2/http1.1) in src/server/adapter.rs.
+> Axum-over-QUIC bridge via hyper-util auto Builder. DecoyConfig enum
+> (NotFound/StaticSite/Redirect). with_extra_routes merge (ADR-046). Router state
+> holds Arc<OperationRegistry> + Arc<dyn IdentityProvider>. Placeholder 501 handlers
+> for gateway endpoints/healthz/openapi.json/MCP (later tasks fill in). h3 ALPN not
+> registered (ADR-044). 78 tests pass. Clippy clean on default + no-default-features.