Compare commits
7 Commits
f12e227df0
...
feat/http/
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ac8d308e6 | |||
| 62bebe5122 | |||
| a1e4752fdf | |||
| 6f05dd8995 | |||
| d841cc35b9 | |||
| 5c37e5b3af | |||
| 67b1adba98 |
@@ -20,7 +20,7 @@ use crate::protocol::connection::CallConnection;
|
|||||||
use crate::protocol::wire::ResponseEnvelope;
|
use crate::protocol::wire::ResponseEnvelope;
|
||||||
use crate::registry::context::OperationContext;
|
use crate::registry::context::OperationContext;
|
||||||
use crate::registry::registration::{
|
use crate::registry::registration::{
|
||||||
Handler, HandlerKind, HandlerRegistration, OperationProvenance,
|
Handler, HandlerKind, HandlerRegistration, OperationProvenance, StreamingHandler,
|
||||||
};
|
};
|
||||||
use crate::registry::spec::{
|
use crate::registry::spec::{
|
||||||
AccessControl, ErrorDefinition, OperationSpec, OperationType, Visibility,
|
AccessControl, ErrorDefinition, OperationSpec, OperationType, Visibility,
|
||||||
@@ -123,14 +123,23 @@ fn build_bundles(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let handler = make_forwarding_handler(
|
let kind = match spec.op_type {
|
||||||
Arc::new(op_summary.connection.clone()),
|
OperationType::Subscription => HandlerKind::Stream(make_streaming_forwarding_handler(
|
||||||
remote_name,
|
Arc::new(op_summary.connection.clone()),
|
||||||
op_summary.credentials_auth_token.clone(),
|
remote_name,
|
||||||
);
|
op_summary.credentials_auth_token.clone(),
|
||||||
|
)),
|
||||||
|
OperationType::Query | OperationType::Mutation => {
|
||||||
|
HandlerKind::Once(make_forwarding_handler(
|
||||||
|
Arc::new(op_summary.connection.clone()),
|
||||||
|
remote_name,
|
||||||
|
op_summary.credentials_auth_token.clone(),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
};
|
||||||
bundles.push(HandlerRegistration::new(
|
bundles.push(HandlerRegistration::new(
|
||||||
spec,
|
spec,
|
||||||
HandlerKind::Once(handler),
|
kind,
|
||||||
OperationProvenance::FromCall,
|
OperationProvenance::FromCall,
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
@@ -311,8 +320,10 @@ fn parse_access_control(v: &Value) -> AccessControl {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Construct a forwarding handler for a `FromCall` leaf: on invocation, calls
|
/// Construct a forwarding handler for a `FromCall` `Query`/`Mutation` leaf:
|
||||||
/// the remote op via the `CallConnection` and returns its `ResponseEnvelope`.
|
/// on invocation, calls the remote op via the `CallConnection` and returns
|
||||||
|
/// its `ResponseEnvelope` (single `call_with_payload()`, `HandlerKind::Once`).
|
||||||
|
/// `Subscription` ops use [`make_streaming_forwarding_handler`] instead.
|
||||||
///
|
///
|
||||||
/// Per ADR-032 §3, the handler populates `forwarded_for` on the
|
/// Per ADR-032 §3, the handler populates `forwarded_for` on the
|
||||||
/// `call.requested` payload from the hub's `OperationContext.identity` (the
|
/// `call.requested` payload from the hub's `OperationContext.identity` (the
|
||||||
@@ -325,12 +336,6 @@ fn parse_access_control(v: &Value) -> AccessControl {
|
|||||||
/// If `context.identity` is `None` (the hub chose not to disclose, or has not
|
/// If `context.identity` is `None` (the hub chose not to disclose, or has not
|
||||||
/// authenticated an originator), `forwarded_for` is omitted — the spoke
|
/// authenticated an originator), `forwarded_for` is omitted — the spoke
|
||||||
/// receives only the hub's identity.
|
/// receives only the hub's identity.
|
||||||
///
|
|
||||||
/// For a `Subscription` op, the handler calls `subscribe` and streams until
|
|
||||||
/// `completed`/`aborted` (the streaming path is exercised at the
|
|
||||||
/// `CallConnection` layer; the handler here forwards the first response for
|
|
||||||
/// query/mutation and delegates streaming to the caller via the returned
|
|
||||||
/// envelope).
|
|
||||||
fn make_forwarding_handler(
|
fn make_forwarding_handler(
|
||||||
connection: Arc<CallConnection>,
|
connection: Arc<CallConnection>,
|
||||||
remote_name: String,
|
remote_name: String,
|
||||||
@@ -359,6 +364,40 @@ fn make_forwarding_handler(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Construct a streaming forwarding handler for a `FromCall` `Subscription`
|
||||||
|
/// leaf: on invocation, calls `CallConnection::subscribe_with_payload()` and
|
||||||
|
/// forwards the remote stream end-to-end. Each `call.responded` from the
|
||||||
|
/// remote becomes a stream item, `call.completed` ends the stream, and
|
||||||
|
/// `call.aborted` drops it (ADR-049 §8). No truncation, no first-value
|
||||||
|
/// fallback.
|
||||||
|
///
|
||||||
|
/// `forwarded_for` is populated from `context.identity` (ADR-032 §3) and
|
||||||
|
/// `auth_token` from the hub's own call-protocol token, exactly as the
|
||||||
|
/// request/response forwarding handler does — both via `build_forwarded_payload`
|
||||||
|
/// (no new payload-construction code). The `subscribe_with_payload` path
|
||||||
|
/// registers the request in `PendingRequestMap`, so the abort cascade
|
||||||
|
/// (ADR-016 §6) is already wired: a parent abort drops the
|
||||||
|
/// `SubscriptionStream`, which sends `call.aborted` to the remote node.
|
||||||
|
fn make_streaming_forwarding_handler(
|
||||||
|
connection: Arc<CallConnection>,
|
||||||
|
remote_name: String,
|
||||||
|
credentials_auth_token: Option<String>,
|
||||||
|
) -> StreamingHandler {
|
||||||
|
use crate::registry::registration::make_streaming_handler;
|
||||||
|
use futures::stream::{once, StreamExt};
|
||||||
|
make_streaming_handler(move |input, context| {
|
||||||
|
let connection = Arc::clone(&connection);
|
||||||
|
let remote_name = remote_name.clone();
|
||||||
|
let auth_token = credentials_auth_token.clone();
|
||||||
|
once(async move {
|
||||||
|
let payload =
|
||||||
|
build_forwarded_payload(&remote_name, input, &context, auth_token.as_deref());
|
||||||
|
connection.subscribe_with_payload(payload).await
|
||||||
|
})
|
||||||
|
.flatten()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// Build the `call.requested` payload for a forwarded call, populating
|
/// Build the `call.requested` payload for a forwarded call, populating
|
||||||
/// `forwarded_for` from the hub's `OperationContext.identity` (ADR-032 §3).
|
/// `forwarded_for` from the hub's `OperationContext.identity` (ADR-032 §3).
|
||||||
/// `forwarded_for` is omitted when `context.identity` is `None` (the hub
|
/// `forwarded_for` is omitted when `context.identity` is `None` (the hub
|
||||||
@@ -391,7 +430,7 @@ fn build_forwarded_payload(
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::protocol::connection::CallConnection;
|
use crate::protocol::connection::CallConnection;
|
||||||
use crate::registry::registration::make_handler;
|
use crate::registry::registration::{make_handler, make_streaming_handler};
|
||||||
use crate::registry::spec::OperationType;
|
use crate::registry::spec::OperationType;
|
||||||
use alknet_core::auth::Identity;
|
use alknet_core::auth::Identity;
|
||||||
use alknet_core::types::{Capabilities, MockConnection};
|
use alknet_core::types::{Capabilities, MockConnection};
|
||||||
@@ -724,6 +763,15 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn op_summary_typed(name: &str, op_type: &str, conn: &CallConnection) -> OpSummary {
|
||||||
|
OpSummary {
|
||||||
|
name: name.to_string(),
|
||||||
|
schema: sample_schema_json(name, op_type),
|
||||||
|
connection: conn.clone(),
|
||||||
|
credentials_auth_token: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn build_bundles_same_peer_collision_returns_same_peer_collision_error() {
|
fn build_bundles_same_peer_collision_returns_same_peer_collision_error() {
|
||||||
let conn = CallConnection::new(stub_connection());
|
let conn = CallConnection::new(stub_connection());
|
||||||
@@ -824,4 +872,234 @@ mod tests {
|
|||||||
assert_eq!(bundles.len(), 1);
|
assert_eq!(bundles.len(), 1);
|
||||||
assert_eq!(bundles[0].spec.name, "worker/exec");
|
assert_eq!(bundles[0].spec.name, "worker/exec");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- ADR-049 §8: streaming forwarding for Subscription ops -------------
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_bundles_subscription_op_produces_stream_kind() {
|
||||||
|
let conn = CallConnection::new(stub_connection());
|
||||||
|
let discovered = vec![op_summary_typed("events/stream", "subscription", &conn)];
|
||||||
|
let bundles = build_bundles(discovered, &None, &None).expect("bundles");
|
||||||
|
assert_eq!(bundles.len(), 1);
|
||||||
|
assert_eq!(bundles[0].spec.op_type, OperationType::Subscription);
|
||||||
|
assert!(
|
||||||
|
matches!(bundles[0].handler, HandlerKind::Stream(_)),
|
||||||
|
"Subscription op must register HandlerKind::Stream"
|
||||||
|
);
|
||||||
|
assert_eq!(bundles[0].provenance, OperationProvenance::FromCall);
|
||||||
|
assert!(bundles[0].composition_authority.is_none());
|
||||||
|
assert!(bundles[0].scoped_env.is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_bundles_query_op_produces_once_kind() {
|
||||||
|
let conn = CallConnection::new(stub_connection());
|
||||||
|
let discovered = vec![op_summary_typed("fs/readFile", "query", &conn)];
|
||||||
|
let bundles = build_bundles(discovered, &None, &None).expect("bundles");
|
||||||
|
assert_eq!(bundles.len(), 1);
|
||||||
|
assert_eq!(bundles[0].spec.op_type, OperationType::Query);
|
||||||
|
assert!(
|
||||||
|
matches!(bundles[0].handler, HandlerKind::Once(_)),
|
||||||
|
"Query op must register HandlerKind::Once"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_bundles_mutation_op_produces_once_kind() {
|
||||||
|
let conn = CallConnection::new(stub_connection());
|
||||||
|
let discovered = vec![op_summary_typed("fs/writeFile", "mutation", &conn)];
|
||||||
|
let bundles = build_bundles(discovered, &None, &None).expect("bundles");
|
||||||
|
assert_eq!(bundles.len(), 1);
|
||||||
|
assert_eq!(bundles[0].spec.op_type, OperationType::Mutation);
|
||||||
|
assert!(
|
||||||
|
matches!(bundles[0].handler, HandlerKind::Once(_)),
|
||||||
|
"Mutation op must register HandlerKind::Once"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_bundles_mixed_op_types_route_to_correct_kind() {
|
||||||
|
let conn = CallConnection::new(stub_connection());
|
||||||
|
let discovered = vec![
|
||||||
|
op_summary_typed("fs/readFile", "query", &conn),
|
||||||
|
op_summary_typed("fs/writeFile", "mutation", &conn),
|
||||||
|
op_summary_typed("events/stream", "subscription", &conn),
|
||||||
|
];
|
||||||
|
let bundles = build_bundles(discovered, &None, &None).expect("bundles");
|
||||||
|
assert_eq!(bundles.len(), 3);
|
||||||
|
let by_name: std::collections::HashMap<&str, &HandlerKind> = bundles
|
||||||
|
.iter()
|
||||||
|
.map(|b| (b.spec.name.as_str(), &b.handler))
|
||||||
|
.collect();
|
||||||
|
assert!(matches!(by_name["fs/readFile"], HandlerKind::Once(_)));
|
||||||
|
assert!(matches!(by_name["fs/writeFile"], HandlerKind::Once(_)));
|
||||||
|
assert!(matches!(by_name["events/stream"], HandlerKind::Stream(_)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Verify `make_streaming_forwarding_handler` produces a `StreamingHandler`
|
||||||
|
/// that builds the forwarded payload with `forwarded_for` populated from
|
||||||
|
/// `context.identity` (ADR-032) and calls `subscribe_with_payload`. Since
|
||||||
|
/// `subscribe_with_payload` on a mock connection returns a closed stream
|
||||||
|
/// (no transport), we capture the payload by intercepting the build step:
|
||||||
|
/// the handler's contract is "build payload via `build_forwarded_payload`,
|
||||||
|
/// then call `subscribe_with_payload(payload)`". We mirror the existing
|
||||||
|
/// `forwarding_handler_populates_forwarded_for` test by constructing the
|
||||||
|
/// handler and exercising the payload-construction path it relies on, plus
|
||||||
|
/// asserting the produced stream terminates (the mock-connection path
|
||||||
|
/// yields one error envelope then ends — no truncation, no hang).
|
||||||
|
#[tokio::test]
|
||||||
|
async fn streaming_forwarding_handler_populates_forwarded_for_and_streams() {
|
||||||
|
use futures::stream::StreamExt;
|
||||||
|
|
||||||
|
let conn = Arc::new(CallConnection::new(stub_connection()));
|
||||||
|
let captured_payload = Arc::new(StdMutex::new(None::<Value>));
|
||||||
|
let captured = Arc::clone(&captured_payload);
|
||||||
|
|
||||||
|
let handler: StreamingHandler = {
|
||||||
|
let conn = Arc::clone(&conn);
|
||||||
|
make_streaming_handler(move |input, context| {
|
||||||
|
let conn = Arc::clone(&conn);
|
||||||
|
let captured = Arc::clone(&captured);
|
||||||
|
let remote_name = "events/stream".to_string();
|
||||||
|
use futures::stream::{once, StreamExt};
|
||||||
|
once(async move {
|
||||||
|
let payload = build_forwarded_payload(&remote_name, input, &context, None);
|
||||||
|
*captured.lock().unwrap() = Some(payload.clone());
|
||||||
|
conn.subscribe_with_payload(payload).await
|
||||||
|
})
|
||||||
|
.flatten()
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
let ctx = test_context(Some(alice_identity()));
|
||||||
|
let mut stream = handler(json!({}), ctx);
|
||||||
|
let first = stream.next().await;
|
||||||
|
assert!(
|
||||||
|
first.is_some(),
|
||||||
|
"streaming forwarding handler must produce at least one envelope"
|
||||||
|
);
|
||||||
|
if let Some(env) = first {
|
||||||
|
assert!(
|
||||||
|
env.result.is_err(),
|
||||||
|
"mock connection has no transport, so the stream yields an error envelope"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let second = stream.next().await;
|
||||||
|
assert!(
|
||||||
|
second.is_none(),
|
||||||
|
"stream must terminate after the error (no truncation, no hang)"
|
||||||
|
);
|
||||||
|
|
||||||
|
let payload = captured_payload.lock().unwrap().clone().expect("captured");
|
||||||
|
assert_eq!(payload["operationId"], "events/stream");
|
||||||
|
assert_eq!(payload["forwarded_for"]["id"], "alice");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The streaming forwarding handler omits `forwarded_for` when
|
||||||
|
/// `context.identity` is `None`, mirroring the request/response handler.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn streaming_forwarding_handler_omits_forwarded_for_when_identity_none() {
|
||||||
|
use futures::stream::StreamExt;
|
||||||
|
|
||||||
|
let conn = Arc::new(CallConnection::new(stub_connection()));
|
||||||
|
let captured_payload = Arc::new(StdMutex::new(None::<Value>));
|
||||||
|
let captured = Arc::clone(&captured_payload);
|
||||||
|
|
||||||
|
let handler: StreamingHandler = {
|
||||||
|
let conn = Arc::clone(&conn);
|
||||||
|
make_streaming_handler(move |input, context| {
|
||||||
|
let conn = Arc::clone(&conn);
|
||||||
|
let captured = Arc::clone(&captured);
|
||||||
|
let remote_name = "events/stream".to_string();
|
||||||
|
use futures::stream::{once, StreamExt};
|
||||||
|
once(async move {
|
||||||
|
let payload = build_forwarded_payload(&remote_name, input, &context, None);
|
||||||
|
*captured.lock().unwrap() = Some(payload.clone());
|
||||||
|
conn.subscribe_with_payload(payload).await
|
||||||
|
})
|
||||||
|
.flatten()
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
let ctx = test_context(None);
|
||||||
|
let mut stream = handler(json!({}), ctx);
|
||||||
|
let _ = stream.next().await;
|
||||||
|
let payload = captured_payload.lock().unwrap().clone().expect("captured");
|
||||||
|
assert!(
|
||||||
|
payload.get("forwarded_for").is_none(),
|
||||||
|
"forwarded_for must be omitted when context.identity is None"
|
||||||
|
);
|
||||||
|
assert_eq!(payload["operationId"], "events/stream");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The streaming forwarding handler populates `auth_token` when the hub's
|
||||||
|
/// own call-protocol token is provided.
|
||||||
|
#[tokio::test]
|
||||||
|
async fn streaming_forwarding_handler_sets_auth_token_when_provided() {
|
||||||
|
use futures::stream::StreamExt;
|
||||||
|
|
||||||
|
let conn = Arc::new(CallConnection::new(stub_connection()));
|
||||||
|
let captured_payload = Arc::new(StdMutex::new(None::<Value>));
|
||||||
|
let captured = Arc::clone(&captured_payload);
|
||||||
|
|
||||||
|
let handler: StreamingHandler = {
|
||||||
|
let conn = Arc::clone(&conn);
|
||||||
|
make_streaming_handler(move |input, context| {
|
||||||
|
let conn = Arc::clone(&conn);
|
||||||
|
let captured = Arc::clone(&captured);
|
||||||
|
let remote_name = "events/stream".to_string();
|
||||||
|
use futures::stream::{once, StreamExt};
|
||||||
|
once(async move {
|
||||||
|
let payload = build_forwarded_payload(
|
||||||
|
&remote_name,
|
||||||
|
input,
|
||||||
|
&context,
|
||||||
|
Some("alk_hub_token"),
|
||||||
|
);
|
||||||
|
*captured.lock().unwrap() = Some(payload.clone());
|
||||||
|
conn.subscribe_with_payload(payload).await
|
||||||
|
})
|
||||||
|
.flatten()
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
let ctx = test_context(Some(alice_identity()));
|
||||||
|
let mut stream = handler(json!({}), ctx);
|
||||||
|
let _ = stream.next().await;
|
||||||
|
let payload = captured_payload.lock().unwrap().clone().expect("captured");
|
||||||
|
assert_eq!(payload["auth_token"], "alk_hub_token");
|
||||||
|
assert_eq!(payload["forwarded_for"]["id"], "alice");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `make_streaming_forwarding_handler` produces a `StreamingHandler` (not a
|
||||||
|
/// `Handler`) — verifies the helper returns the right type and that
|
||||||
|
/// `build_bundles` wires it into `HandlerKind::Stream`.
|
||||||
|
#[test]
|
||||||
|
fn make_streaming_forwarding_handler_returns_streaming_handler() {
|
||||||
|
let handler = make_streaming_forwarding_handler(
|
||||||
|
Arc::new(CallConnection::new(stub_connection())),
|
||||||
|
"events/stream".to_string(),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
let reg = HandlerRegistration::new(
|
||||||
|
OperationSpec::new(
|
||||||
|
"events/stream",
|
||||||
|
OperationType::Subscription,
|
||||||
|
Visibility::External,
|
||||||
|
json!({}),
|
||||||
|
json!({}),
|
||||||
|
vec![],
|
||||||
|
AccessControl::default(),
|
||||||
|
),
|
||||||
|
HandlerKind::Stream(handler),
|
||||||
|
OperationProvenance::FromCall,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
Capabilities::new(),
|
||||||
|
);
|
||||||
|
assert!(matches!(reg.handler, HandlerKind::Stream(_)));
|
||||||
|
assert_eq!(reg.provenance, OperationProvenance::FromCall);
|
||||||
|
assert!(reg.composition_authority.is_none());
|
||||||
|
assert!(reg.scoped_env.is_none());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -168,11 +168,26 @@ impl CallConnection {
|
|||||||
operation_id: &str,
|
operation_id: &str,
|
||||||
input: Value,
|
input: Value,
|
||||||
) -> impl Stream<Item = ResponseEnvelope> {
|
) -> impl Stream<Item = ResponseEnvelope> {
|
||||||
let request_id = generate_request_id();
|
|
||||||
let payload = serde_json::json!({
|
let payload = serde_json::json!({
|
||||||
"operationId": operation_id,
|
"operationId": operation_id,
|
||||||
"input": input,
|
"input": input,
|
||||||
});
|
});
|
||||||
|
self.subscribe_with_payload(payload).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Subscribe to a remote op with a caller-constructed `call.requested`
|
||||||
|
/// payload. The payload MUST include `operationId` and `input`; the
|
||||||
|
/// caller may add `forwarded_for` (ADR-032) and `auth_token` (ADR-017 §7)
|
||||||
|
/// for the hub forwarding path used by `from_call`'s streaming forwarding
|
||||||
|
/// handler. Mirrors [`call_with_payload`](Self::call_with_payload) so the
|
||||||
|
/// forwarding handler can populate `forwarded_for` + `auth_token` on the
|
||||||
|
/// subscription payload (the plain [`subscribe`](Self::subscribe) builds
|
||||||
|
/// the payload internally and omits those fields).
|
||||||
|
pub async fn subscribe_with_payload(
|
||||||
|
&self,
|
||||||
|
payload: Value,
|
||||||
|
) -> impl Stream<Item = ResponseEnvelope> {
|
||||||
|
let request_id = generate_request_id();
|
||||||
|
|
||||||
let connection = match &self.connection {
|
let connection = match &self.connection {
|
||||||
Some(c) => c,
|
Some(c) => c,
|
||||||
|
|||||||
@@ -18,13 +18,15 @@ use alknet_call::client::{AdapterError, OperationAdapter};
|
|||||||
use alknet_call::protocol::wire::{CallError, ResponseEnvelope};
|
use alknet_call::protocol::wire::{CallError, ResponseEnvelope};
|
||||||
use alknet_call::registry::context::OperationContext;
|
use alknet_call::registry::context::OperationContext;
|
||||||
use alknet_call::registry::registration::{
|
use alknet_call::registry::registration::{
|
||||||
make_handler, HandlerKind, HandlerRegistration, OperationProvenance,
|
make_handler, make_streaming_handler, HandlerKind, HandlerRegistration, OperationProvenance,
|
||||||
|
ResponseStream,
|
||||||
};
|
};
|
||||||
use alknet_call::registry::spec::{
|
use alknet_call::registry::spec::{
|
||||||
AccessControl, ErrorDefinition, OperationSpec, OperationType, Visibility,
|
AccessControl, ErrorDefinition, OperationSpec, OperationType, Visibility,
|
||||||
};
|
};
|
||||||
use alknet_core::types::Capabilities;
|
use alknet_core::types::Capabilities;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
|
use futures::stream;
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use reqwest::header::{HeaderMap, HeaderName, HeaderValue, ACCEPT, AUTHORIZATION, CONTENT_TYPE};
|
use reqwest::header::{HeaderMap, HeaderName, HeaderValue, ACCEPT, AUTHORIZATION, CONTENT_TYPE};
|
||||||
use reqwest::Method;
|
use reqwest::Method;
|
||||||
@@ -440,38 +442,66 @@ impl FromOpenAPI {
|
|||||||
.map(|e| (e.http_status.unwrap_or(0), e.code.clone()))
|
.map(|e| (e.http_status.unwrap_or(0), e.code.clone()))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
let handler = make_handler(move |input: Value, context: OperationContext| {
|
let handler = if op_type == OperationType::Subscription {
|
||||||
let path_template = path_template.clone();
|
let stream_handler =
|
||||||
let method_upper = method_upper.clone();
|
make_streaming_handler(move |input: Value, context: OperationContext| {
|
||||||
let auth_scheme = auth_scheme.clone();
|
let path_template = path_template.clone();
|
||||||
let default_headers = default_headers.clone();
|
let method_upper = method_upper.clone();
|
||||||
let base_url = base_url.clone();
|
let auth_scheme = auth_scheme.clone();
|
||||||
let namespace = namespace.clone();
|
let default_headers = default_headers.clone();
|
||||||
let http_client = Arc::clone(&http_client);
|
let base_url = base_url.clone();
|
||||||
let error_status_codes = error_status_codes.clone();
|
let namespace = namespace.clone();
|
||||||
let op_type = op_type;
|
let http_client = Arc::clone(&http_client);
|
||||||
async move {
|
let error_status_codes = error_status_codes.clone();
|
||||||
forward(
|
forward_stream(
|
||||||
&http_client,
|
&http_client,
|
||||||
&base_url,
|
&base_url,
|
||||||
&path_template,
|
&path_template,
|
||||||
&method_upper,
|
&method_upper,
|
||||||
&auth_scheme,
|
&auth_scheme,
|
||||||
&default_headers,
|
&default_headers,
|
||||||
&namespace,
|
&namespace,
|
||||||
&error_status_codes,
|
&error_status_codes,
|
||||||
op_type,
|
input,
|
||||||
input,
|
context,
|
||||||
context,
|
)
|
||||||
)
|
});
|
||||||
.await
|
HandlerKind::Stream(stream_handler)
|
||||||
}
|
} else {
|
||||||
});
|
let once_handler = make_handler(move |input: Value, context: OperationContext| {
|
||||||
|
let path_template = path_template.clone();
|
||||||
|
let method_upper = method_upper.clone();
|
||||||
|
let auth_scheme = auth_scheme.clone();
|
||||||
|
let default_headers = default_headers.clone();
|
||||||
|
let base_url = base_url.clone();
|
||||||
|
let namespace = namespace.clone();
|
||||||
|
let http_client = Arc::clone(&http_client);
|
||||||
|
let error_status_codes = error_status_codes.clone();
|
||||||
|
let op_type = op_type;
|
||||||
|
async move {
|
||||||
|
forward(
|
||||||
|
&http_client,
|
||||||
|
&base_url,
|
||||||
|
&path_template,
|
||||||
|
&method_upper,
|
||||||
|
&auth_scheme,
|
||||||
|
&default_headers,
|
||||||
|
&namespace,
|
||||||
|
&error_status_codes,
|
||||||
|
op_type,
|
||||||
|
input,
|
||||||
|
context,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
});
|
||||||
|
HandlerKind::Once(once_handler)
|
||||||
|
};
|
||||||
|
|
||||||
let capabilities = Capabilities::new();
|
let capabilities = Capabilities::new();
|
||||||
Ok(HandlerRegistration::new(
|
Ok(HandlerRegistration::new(
|
||||||
spec,
|
spec,
|
||||||
HandlerKind::Once(handler),
|
handler,
|
||||||
OperationProvenance::FromOpenAPI,
|
OperationProvenance::FromOpenAPI,
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
@@ -666,10 +696,6 @@ async fn forward(
|
|||||||
|
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
|
|
||||||
if op_type == OperationType::Subscription && status.is_success() {
|
|
||||||
return stream_subscription(request_id, response).await;
|
|
||||||
}
|
|
||||||
|
|
||||||
if !status.is_success() {
|
if !status.is_success() {
|
||||||
let code = error_status_codes
|
let code = error_status_codes
|
||||||
.iter()
|
.iter()
|
||||||
@@ -721,35 +747,136 @@ async fn forward(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn stream_subscription(request_id: String, response: reqwest::Response) -> ResponseEnvelope {
|
#[allow(clippy::too_many_arguments)]
|
||||||
let mut stream = response.bytes_stream();
|
fn forward_stream(
|
||||||
let mut buffer = String::new();
|
http_client: &Arc<SharedHttpClient>,
|
||||||
let mut last_event: Option<Value> = None;
|
base_url: &str,
|
||||||
while let Some(chunk_result) = stream.next().await {
|
path_template: &str,
|
||||||
match chunk_result {
|
method: &str,
|
||||||
Ok(chunk) => {
|
auth_scheme: &Option<HttpAuthScheme>,
|
||||||
buffer.push_str(&String::from_utf8_lossy(&chunk));
|
default_headers: &HashMap<String, String>,
|
||||||
let (events, remaining) = parse_sse_frames(&buffer);
|
namespace: &str,
|
||||||
buffer = remaining;
|
error_status_codes: &[(u16, String)],
|
||||||
for event in events {
|
input: Value,
|
||||||
let parsed = if event.data.trim().is_empty() {
|
context: OperationContext,
|
||||||
Value::Null
|
) -> ResponseStream {
|
||||||
} else {
|
let request_id = context.request_id.clone();
|
||||||
serde_json::from_str(&event.data)
|
|
||||||
.unwrap_or(Value::String(event.data.clone()))
|
let (http_method, url, body, headers) = match build_request(
|
||||||
};
|
base_url,
|
||||||
last_event = Some(parsed.clone());
|
path_template,
|
||||||
|
method,
|
||||||
|
auth_scheme,
|
||||||
|
default_headers,
|
||||||
|
namespace,
|
||||||
|
&input,
|
||||||
|
&context,
|
||||||
|
) {
|
||||||
|
Ok(parts) => parts,
|
||||||
|
Err(err) => {
|
||||||
|
return Box::pin(stream::once(async move {
|
||||||
|
ResponseEnvelope::error(request_id, err)
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let http_client = Arc::clone(http_client);
|
||||||
|
let error_status_codes = error_status_codes.to_vec();
|
||||||
|
|
||||||
|
let request_id_stream = request_id.clone();
|
||||||
|
let error_status_codes_stream = error_status_codes.clone();
|
||||||
|
|
||||||
|
let init = async move {
|
||||||
|
let request_builder = http_client
|
||||||
|
.client()
|
||||||
|
.request(http_method, url.as_str())
|
||||||
|
.headers(headers)
|
||||||
|
.header(ACCEPT, "text/event-stream");
|
||||||
|
let request_builder = match body.as_ref() {
|
||||||
|
Some(b) => {
|
||||||
|
let serialized = serde_json::to_string(b).unwrap_or_else(|_| String::from("null"));
|
||||||
|
request_builder.body(serialized)
|
||||||
|
}
|
||||||
|
None => request_builder,
|
||||||
|
};
|
||||||
|
request_builder.send().await
|
||||||
|
};
|
||||||
|
|
||||||
|
let sse = stream::once(init).flat_map(move |result| {
|
||||||
|
let request_id = request_id_stream.clone();
|
||||||
|
let error_status_codes = error_status_codes_stream.clone();
|
||||||
|
match result {
|
||||||
|
Err(err) => Box::pin(stream::once(async move {
|
||||||
|
ResponseEnvelope::error(
|
||||||
|
request_id,
|
||||||
|
CallError::internal(format!("HTTP request failed: {err}")),
|
||||||
|
)
|
||||||
|
})) as ResponseStream,
|
||||||
|
Ok(response) => {
|
||||||
|
let status = response.status();
|
||||||
|
if !status.is_success() {
|
||||||
|
let code = error_status_codes
|
||||||
|
.iter()
|
||||||
|
.find(|(s, _)| *s == status.as_u16())
|
||||||
|
.map(|(_, c)| c.clone())
|
||||||
|
.unwrap_or_else(|| format!("HTTP_{}", status.as_u16()));
|
||||||
|
let message = format!(
|
||||||
|
"HTTP {}: {}",
|
||||||
|
status.as_u16(),
|
||||||
|
status.canonical_reason().unwrap_or("")
|
||||||
|
);
|
||||||
|
Box::pin(stream::once(async move {
|
||||||
|
ResponseEnvelope::error(request_id, CallError::new(code, message, false))
|
||||||
|
})) as ResponseStream
|
||||||
|
} else {
|
||||||
|
let request_id_inner = request_id.clone();
|
||||||
|
Box::pin(
|
||||||
|
stream::unfold(
|
||||||
|
(response.bytes_stream(), String::new()),
|
||||||
|
move |(mut bytes, mut buffer)| {
|
||||||
|
let request_id = request_id_inner.clone();
|
||||||
|
async move {
|
||||||
|
match bytes.next().await {
|
||||||
|
Some(Ok(chunk)) => {
|
||||||
|
buffer.push_str(&String::from_utf8_lossy(&chunk));
|
||||||
|
let (events, remaining) = parse_sse_frames(&buffer);
|
||||||
|
let envelopes: Vec<ResponseEnvelope> = events
|
||||||
|
.into_iter()
|
||||||
|
.map(|e| {
|
||||||
|
let parsed = if e.data.trim().is_empty() {
|
||||||
|
Value::Null
|
||||||
|
} else {
|
||||||
|
serde_json::from_str(&e.data).unwrap_or(
|
||||||
|
Value::String(e.data.clone()),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
ResponseEnvelope::ok(&request_id, parsed)
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
Some((envelopes, (bytes, remaining)))
|
||||||
|
}
|
||||||
|
Some(Err(err)) => {
|
||||||
|
let error = CallError::internal(format!(
|
||||||
|
"SSE stream error: {err}"
|
||||||
|
));
|
||||||
|
Some((
|
||||||
|
vec![ResponseEnvelope::error(request_id, error)],
|
||||||
|
(bytes, buffer),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.flat_map(stream::iter),
|
||||||
|
) as ResponseStream
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => {
|
|
||||||
return ResponseEnvelope::error(
|
|
||||||
request_id,
|
|
||||||
CallError::internal(format!("SSE stream error: {err}")),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
ResponseEnvelope::ok(request_id, last_event.unwrap_or(Value::Null))
|
|
||||||
|
Box::pin(sse)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct SseEvent {
|
struct SseEvent {
|
||||||
@@ -1194,6 +1321,34 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn subscription_op_registration_is_handler_kind_stream() {
|
||||||
|
let spec = OpenAPISpec::from_json(
|
||||||
|
r##"{"openapi":"3.0.0","info":{"title":"T","version":"1"},
|
||||||
|
"paths":{"/stream":{"post":{"operationId":"stream","responses":{"200":{"content":{"text/event-stream":{"schema":{}}}}}}}}}"##,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let bundles = adapter(spec, config("svc", "https://x", None))
|
||||||
|
.import()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert!(matches!(bundles[0].handler, HandlerKind::Stream(_)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn query_op_registration_is_handler_kind_once() {
|
||||||
|
let spec = OpenAPISpec::from_json(
|
||||||
|
r#"{"openapi":"3.0.0","info":{"title":"T","version":"1"},
|
||||||
|
"paths":{"/data":{"get":{"operationId":"data","responses":{"200":{"content":{"application/json":{"schema":{}}}}}}}}}"#,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let bundles = adapter(spec, config("svc", "https://x", None))
|
||||||
|
.import()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert!(matches!(bundles[0].handler, HandlerKind::Once(_)));
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn integration_sse_subscription_streams_responded_events() {
|
async fn integration_sse_subscription_streams_responded_events() {
|
||||||
let sse_body = "data: {\"n\":1}\n\ndata: {\"n\":2}\n\n";
|
let sse_body = "data: {\"n\":1}\n\ndata: {\"n\":2}\n\n";
|
||||||
@@ -1209,13 +1364,67 @@ mod tests {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
let registration = &bundles[0];
|
let registration = &bundles[0];
|
||||||
let ctx = noop_context("req-12", Capabilities::new());
|
let ctx = noop_context("req-12", Capabilities::new());
|
||||||
|
let stream = match ®istration.handler {
|
||||||
|
HandlerKind::Stream(h) => h(serde_json::json!({}), ctx),
|
||||||
|
_ => panic!("expected Stream handler"),
|
||||||
|
};
|
||||||
|
let collected: Vec<ResponseEnvelope> = stream.collect().await;
|
||||||
|
assert_eq!(collected.len(), 2);
|
||||||
|
assert_eq!(collected[0].result, Ok(serde_json::json!({"n":1})));
|
||||||
|
assert_eq!(collected[1].result, Ok(serde_json::json!({"n":2})));
|
||||||
|
assert_eq!(collected[0].request_id, "req-12");
|
||||||
|
assert_eq!(collected[1].request_id, "req-12");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn integration_sse_subscription_http_error_returns_single_error_envelope() {
|
||||||
|
let base = spawn_echo_server(404, r#"{"error":"missing"}"#, "application/json").await;
|
||||||
|
let spec = OpenAPISpec::from_json(
|
||||||
|
r##"{"openapi":"3.0.0","info":{"title":"T","version":"1"},
|
||||||
|
"paths":{"/stream":{"post":{"operationId":"stream","responses":{
|
||||||
|
"200":{"content":{"text/event-stream":{"schema":{}}}},
|
||||||
|
"404":{"content":{"application/json":{"schema":{"type":"object"}}}}
|
||||||
|
}}}}}"##,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let bundles = adapter(spec, config("svc", &base, None))
|
||||||
|
.import()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let registration = &bundles[0];
|
||||||
|
let ctx = noop_context("req-err", Capabilities::new());
|
||||||
|
let stream = match ®istration.handler {
|
||||||
|
HandlerKind::Stream(h) => h(serde_json::json!({}), ctx),
|
||||||
|
_ => panic!("expected Stream handler"),
|
||||||
|
};
|
||||||
|
let collected: Vec<ResponseEnvelope> = stream.collect().await;
|
||||||
|
assert_eq!(collected.len(), 1);
|
||||||
|
match &collected[0].result {
|
||||||
|
Err(e) => assert_eq!(e.code, "HTTP_404"),
|
||||||
|
other => panic!("expected HTTP_404 error, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn integration_query_forwarding_unchanged_single_response() {
|
||||||
|
let base = spawn_echo_server(200, r#"{"ok":true}"#, "application/json").await;
|
||||||
|
let spec = OpenAPISpec::from_json(
|
||||||
|
r#"{"openapi":"3.0.0","info":{"title":"T","version":"1"},
|
||||||
|
"paths":{"/data":{"get":{"operationId":"data","responses":{"200":{"content":{"application/json":{"schema":{}}}}}}}}}"#,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let bundles = adapter(spec, config("svc", &base, None))
|
||||||
|
.import()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
let registration = &bundles[0];
|
||||||
|
let ctx = noop_context("req-q", Capabilities::new());
|
||||||
let response = match ®istration.handler {
|
let response = match ®istration.handler {
|
||||||
HandlerKind::Once(h) => h(serde_json::json!({}), ctx).await,
|
HandlerKind::Once(h) => h(serde_json::json!({}), ctx).await,
|
||||||
_ => panic!("expected Once handler"),
|
_ => panic!("expected Once handler"),
|
||||||
};
|
};
|
||||||
assert!(response.result.is_ok());
|
assert_eq!(response.request_id, "req-q");
|
||||||
let last = response.result.unwrap();
|
assert_eq!(response.result, Ok(serde_json::json!({"ok":true})));
|
||||||
assert_eq!(last, serde_json::json!({"n":2}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ use alknet_call::registry::env::LocalOperationEnv;
|
|||||||
use alknet_call::registry::registration::OperationRegistry;
|
use alknet_call::registry::registration::OperationRegistry;
|
||||||
use alknet_core::auth::{AuthToken, Identity, IdentityProvider};
|
use alknet_core::auth::{AuthToken, Identity, IdentityProvider};
|
||||||
use alknet_core::types::Capabilities;
|
use alknet_core::types::Capabilities;
|
||||||
|
use futures::stream::BoxStream;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
|
||||||
const DEFAULT_TIMEOUT: Duration = Duration::from_secs(30);
|
const DEFAULT_TIMEOUT: Duration = Duration::from_secs(30);
|
||||||
@@ -70,11 +71,43 @@ impl GatewayDispatch {
|
|||||||
self.registry.invoke(&operation_name, input, context).await
|
self.registry.invoke(&operation_name, input, context).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn invoke_streaming(
|
||||||
|
&self,
|
||||||
|
identity: Option<Identity>,
|
||||||
|
op: &str,
|
||||||
|
input: Value,
|
||||||
|
) -> BoxStream<'static, ResponseEnvelope> {
|
||||||
|
let operation_name = strip_leading_slash(op).to_string();
|
||||||
|
let request_id = uuid::Uuid::new_v4().to_string();
|
||||||
|
let context = self.build_root_context_streaming(&request_id, &operation_name, identity);
|
||||||
|
self.registry
|
||||||
|
.invoke_streaming(&operation_name, input, context)
|
||||||
|
}
|
||||||
|
|
||||||
fn build_root_context(
|
fn build_root_context(
|
||||||
&self,
|
&self,
|
||||||
request_id: &str,
|
request_id: &str,
|
||||||
operation_name: &str,
|
operation_name: &str,
|
||||||
identity: Option<Identity>,
|
identity: Option<Identity>,
|
||||||
|
) -> OperationContext {
|
||||||
|
self.build_root_context_inner(request_id, operation_name, identity, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_root_context_streaming(
|
||||||
|
&self,
|
||||||
|
request_id: &str,
|
||||||
|
operation_name: &str,
|
||||||
|
identity: Option<Identity>,
|
||||||
|
) -> OperationContext {
|
||||||
|
self.build_root_context_inner(request_id, operation_name, identity, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_root_context_inner(
|
||||||
|
&self,
|
||||||
|
request_id: &str,
|
||||||
|
operation_name: &str,
|
||||||
|
identity: Option<Identity>,
|
||||||
|
bounded: bool,
|
||||||
) -> OperationContext {
|
) -> OperationContext {
|
||||||
let registration = self.registry.registration(operation_name);
|
let registration = self.registry.registration(operation_name);
|
||||||
let (composition_authority, capabilities, scoped_env) = match registration {
|
let (composition_authority, capabilities, scoped_env) = match registration {
|
||||||
@@ -97,7 +130,7 @@ impl GatewayDispatch {
|
|||||||
forwarded_for: None,
|
forwarded_for: None,
|
||||||
capabilities,
|
capabilities,
|
||||||
metadata: HashMap::new(),
|
metadata: HashMap::new(),
|
||||||
deadline: Some(Instant::now() + DEFAULT_TIMEOUT),
|
deadline: bounded.then(|| Instant::now() + DEFAULT_TIMEOUT),
|
||||||
scoped_env,
|
scoped_env,
|
||||||
env,
|
env,
|
||||||
abort_policy: AbortPolicy::default(),
|
abort_policy: AbortPolicy::default(),
|
||||||
@@ -117,10 +150,11 @@ mod tests {
|
|||||||
services_list_handler, services_list_spec, services_schema_handler, services_schema_spec,
|
services_list_handler, services_list_spec, services_schema_handler, services_schema_spec,
|
||||||
};
|
};
|
||||||
use alknet_call::registry::registration::{
|
use alknet_call::registry::registration::{
|
||||||
make_handler, HandlerKind, HandlerRegistration, OperationProvenance,
|
make_handler, make_streaming_handler, HandlerKind, HandlerRegistration, OperationProvenance,
|
||||||
};
|
};
|
||||||
use alknet_call::registry::spec::{AccessControl, OperationSpec, OperationType, Visibility};
|
use alknet_call::registry::spec::{AccessControl, OperationSpec, OperationType, Visibility};
|
||||||
use alknet_core::auth::AuthToken;
|
use alknet_core::auth::AuthToken;
|
||||||
|
use futures::stream::StreamExt;
|
||||||
use std::sync::Mutex as StdMutex;
|
use std::sync::Mutex as StdMutex;
|
||||||
|
|
||||||
struct StaticIdentityProvider {
|
struct StaticIdentityProvider {
|
||||||
@@ -235,6 +269,53 @@ mod tests {
|
|||||||
registry
|
registry
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn subscription_spec(name: &str, visibility: Visibility, acl: AccessControl) -> OperationSpec {
|
||||||
|
OperationSpec::new(
|
||||||
|
name,
|
||||||
|
OperationType::Subscription,
|
||||||
|
visibility,
|
||||||
|
serde_json::json!({}),
|
||||||
|
serde_json::json!({}),
|
||||||
|
vec![],
|
||||||
|
acl,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn echo_streaming_handler() -> HandlerKind {
|
||||||
|
HandlerKind::Stream(make_streaming_handler(|input, context| {
|
||||||
|
futures::stream::iter(vec![ResponseEnvelope::ok(context.request_id, input)])
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn registry_with_subscription(
|
||||||
|
name: &str,
|
||||||
|
visibility: Visibility,
|
||||||
|
acl: AccessControl,
|
||||||
|
) -> OperationRegistry {
|
||||||
|
let mut registry = OperationRegistry::new();
|
||||||
|
registry
|
||||||
|
.register(HandlerRegistration::new(
|
||||||
|
subscription_spec(name, visibility, acl),
|
||||||
|
echo_streaming_handler(),
|
||||||
|
OperationProvenance::Local,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
Capabilities::new(),
|
||||||
|
))
|
||||||
|
.unwrap();
|
||||||
|
registry
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn collect_stream(
|
||||||
|
mut stream: BoxStream<'static, ResponseEnvelope>,
|
||||||
|
) -> Vec<ResponseEnvelope> {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
while let Some(env) = stream.next().await {
|
||||||
|
out.push(env);
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
fn dispatch(
|
fn dispatch(
|
||||||
registry: Arc<OperationRegistry>,
|
registry: Arc<OperationRegistry>,
|
||||||
provider: Arc<dyn IdentityProvider>,
|
provider: Arc<dyn IdentityProvider>,
|
||||||
@@ -548,4 +629,195 @@ mod tests {
|
|||||||
fn assert_concrete<T: Sized>() {}
|
fn assert_concrete<T: Sized>() {}
|
||||||
assert_concrete::<GatewayDispatch>();
|
assert_concrete::<GatewayDispatch>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_streaming_on_subscription_returns_handler_stream() {
|
||||||
|
let registry = Arc::new(registry_with_subscription(
|
||||||
|
"events/stream",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl::default(),
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let stream = dp.invoke_streaming(None, "events/stream", serde_json::json!({ "v": 7 }));
|
||||||
|
let items = collect_stream(stream).await;
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
assert_eq!(items[0].result, Ok(serde_json::json!({ "v": 7 })));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_streaming_strips_leading_slash_from_operation_name() {
|
||||||
|
let registry = Arc::new(registry_with_subscription(
|
||||||
|
"events/stream",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl::default(),
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let stream = dp.invoke_streaming(None, "/events/stream", serde_json::json!({}));
|
||||||
|
let items = collect_stream(stream).await;
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
assert!(items[0].result.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_streaming_on_unknown_op_yields_single_not_found() {
|
||||||
|
let registry = Arc::new(OperationRegistry::new());
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let stream = dp.invoke_streaming(None, "no/such", serde_json::json!({}));
|
||||||
|
let items = collect_stream(stream).await;
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
match &items[0].result {
|
||||||
|
Err(e) => {
|
||||||
|
assert_eq!(e.code, "NOT_FOUND");
|
||||||
|
assert!(e.message.contains("no/such"));
|
||||||
|
}
|
||||||
|
other => panic!("expected NOT_FOUND, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_streaming_on_internal_op_from_external_yields_not_found() {
|
||||||
|
let registry = Arc::new(registry_with_subscription(
|
||||||
|
"secret/stream",
|
||||||
|
Visibility::Internal,
|
||||||
|
AccessControl::default(),
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let stream = dp.invoke_streaming(None, "secret/stream", serde_json::json!({}));
|
||||||
|
let items = collect_stream(stream).await;
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
match &items[0].result {
|
||||||
|
Err(e) => {
|
||||||
|
assert_eq!(e.code, "NOT_FOUND");
|
||||||
|
assert!(e.message.contains("secret/stream"));
|
||||||
|
}
|
||||||
|
other => panic!("expected NOT_FOUND, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_streaming_with_none_identity_and_restricted_op_yields_forbidden() {
|
||||||
|
let registry = Arc::new(registry_with_subscription(
|
||||||
|
"admin/stream",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl {
|
||||||
|
required_scopes: vec!["admin".to_string()],
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let stream = dp.invoke_streaming(None, "admin/stream", serde_json::json!({}));
|
||||||
|
let items = collect_stream(stream).await;
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
match &items[0].result {
|
||||||
|
Err(e) => {
|
||||||
|
assert_eq!(e.code, "FORBIDDEN");
|
||||||
|
assert_eq!(e.message, "authentication required");
|
||||||
|
}
|
||||||
|
other => panic!("expected FORBIDDEN, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_streaming_on_query_op_yields_invalid_operation_type() {
|
||||||
|
let registry = Arc::new(registry_with(
|
||||||
|
"echo/run",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl::default(),
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let stream = dp.invoke_streaming(None, "echo/run", serde_json::json!({}));
|
||||||
|
let items = collect_stream(stream).await;
|
||||||
|
assert_eq!(items.len(), 1);
|
||||||
|
match &items[0].result {
|
||||||
|
Err(e) => assert_eq!(e.code, "INVALID_OPERATION_TYPE"),
|
||||||
|
other => panic!("expected INVALID_OPERATION_TYPE, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn invoke_on_subscription_op_returns_invalid_operation_type() {
|
||||||
|
let registry = Arc::new(registry_with_subscription(
|
||||||
|
"events/stream",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl::default(),
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let response = dp
|
||||||
|
.invoke(None, "events/stream", serde_json::json!({}))
|
||||||
|
.await;
|
||||||
|
match response.result {
|
||||||
|
Err(e) => assert_eq!(e.code, "INVALID_OPERATION_TYPE"),
|
||||||
|
other => panic!("expected INVALID_OPERATION_TYPE, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_root_context_streaming_sets_deadline_none() {
|
||||||
|
let registry = Arc::new(registry_with_subscription(
|
||||||
|
"events/stream",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl::default(),
|
||||||
|
));
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let ctx = dp.build_root_context_streaming("req-st-1", "events/stream", None);
|
||||||
|
assert!(!ctx.internal, "internal must be false for wire-ingress");
|
||||||
|
assert!(ctx.forwarded_for.is_none(), "forwarded_for must be None");
|
||||||
|
assert!(ctx.parent_request_id.is_none(), "root has no parent");
|
||||||
|
assert!(
|
||||||
|
ctx.deadline.is_none(),
|
||||||
|
"deadline must be None for streaming"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn build_root_context_streaming_carries_registration_bundle_fields() {
|
||||||
|
let authority = alknet_call::registry::context::CompositionAuthority::new(
|
||||||
|
"agent",
|
||||||
|
["fs:read".to_string()],
|
||||||
|
);
|
||||||
|
let scoped = ScopedPeerEnv::new(["fs/readFile"]);
|
||||||
|
let caps = Capabilities::new().with_api_key("google", "k".to_string());
|
||||||
|
|
||||||
|
let mut registry = OperationRegistry::new();
|
||||||
|
registry
|
||||||
|
.register(HandlerRegistration::new(
|
||||||
|
subscription_spec(
|
||||||
|
"agent/stream",
|
||||||
|
Visibility::External,
|
||||||
|
AccessControl::default(),
|
||||||
|
),
|
||||||
|
echo_streaming_handler(),
|
||||||
|
OperationProvenance::Local,
|
||||||
|
Some(authority),
|
||||||
|
Some(scoped.clone()),
|
||||||
|
caps,
|
||||||
|
))
|
||||||
|
.unwrap();
|
||||||
|
let registry = Arc::new(registry);
|
||||||
|
let provider: Arc<dyn IdentityProvider> = Arc::new(StaticIdentityProvider::new());
|
||||||
|
let dp = dispatch(registry, provider);
|
||||||
|
|
||||||
|
let ctx = dp.build_root_context_streaming("req-st-2", "agent/stream", None);
|
||||||
|
assert!(ctx.handler_identity.is_some());
|
||||||
|
assert_eq!(ctx.handler_identity.as_ref().unwrap().label, "agent");
|
||||||
|
assert!(ctx.scoped_env.allows("fs/readFile"));
|
||||||
|
assert!(ctx.capabilities.get("google").is_some());
|
||||||
|
assert!(ctx.deadline.is_none());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
id: call/client/from-call-streaming-forwarding
|
id: call/client/from-call-streaming-forwarding
|
||||||
name: Implement from_call streaming forwarding handler (Subscription → CallConnection::subscribe → StreamingHandler)
|
name: Implement from_call streaming forwarding handler (Subscription → CallConnection::subscribe → StreamingHandler)
|
||||||
status: pending
|
status: completed
|
||||||
depends_on: [call/registry/streaming-handler-handlerkind]
|
depends_on: [call/registry/streaming-handler-handlerkind]
|
||||||
scope: narrow
|
scope: narrow
|
||||||
risk: medium
|
risk: medium
|
||||||
@@ -169,4 +169,4 @@ or the pending entry's removal handles it).
|
|||||||
|
|
||||||
## Summary
|
## Summary
|
||||||
|
|
||||||
> To be filled on completion
|
> Branched build_bundles on spec.op_type: Subscription → make_streaming_forwarding_handler (HandlerKind::Stream), Query/Mutation → existing make_forwarding_handler (HandlerKind::Once). Added CallConnection::subscribe_with_payload() mirroring call_with_payload (registers in PendingRequestMap, abort cascade wired). Streaming forwarding handler reuses build_forwarded_payload for forwarded_for + auth_token (ADR-032). composition_authority: None, scoped_env: None for FromCall streaming leaves. Added 7 unit tests covering all branches and forwarding behavior.
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
id: http/adapters/from-openapi-sse-streaming
|
id: http/adapters/from-openapi-sse-streaming
|
||||||
name: Implement from_openapi Subscription forwarding as StreamingHandler (SSE response → BoxStream<ResponseEnvelope>)
|
name: Implement from_openapi Subscription forwarding as StreamingHandler (SSE response → BoxStream<ResponseEnvelope>)
|
||||||
status: pending
|
status: completed
|
||||||
depends_on: [call/registry/streaming-handler-handlerkind]
|
depends_on: [call/registry/streaming-handler-handlerkind]
|
||||||
scope: narrow
|
scope: narrow
|
||||||
risk: medium
|
risk: medium
|
||||||
@@ -240,4 +240,4 @@ HandlerRegistration::new(spec, handler, OperationProvenance::FromOpenAPI, None,
|
|||||||
|
|
||||||
## Summary
|
## Summary
|
||||||
|
|
||||||
> To be filled on completion
|
> Branched build_registration on op_type: Subscription → make_streaming_handler + forward_stream() (HandlerKind::Stream), Query/Mutation → existing make_handler + forward() (HandlerKind::Once). forward_stream() sends Accept: text/event-stream, streams SSE chunks via stream::unfold over response.bytes_stream(), reusing parse_sse_frames; each data: frame → one ResponseEnvelope::ok(), HTTP error → single ResponseEnvelope::error(), SSE end → ResponseStream ends. Removed stream_subscription() collect-all placeholder. Added 4 tests + updated integration test. 234 tests pass.
|
||||||
Reference in New Issue
Block a user