Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(channels): drop relay startup module and its tests

Steven Enamakel47596b8280af
diff --git a/crates/openhuman-core/src/channels/routes_tests.rs b/crates/openhuman-core/src/channels/routes_tests.rs
index 45102700fc..949a279542 100644
--- a/crates/openhuman-core/src/channels/routes_tests.rs
+++ b/crates/openhuman-core/src/channels/routes_tests.rs
@@ -11,7 +11,6 @@ use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex};
use std::task::{Context, Poll, Waker};
use tinybus::EventHandler;
-use tinychannels::routes::resolve_provider_alias;
use tinychannels_bus::ChannelMessage;
use tinytools::{Tool, ToolResult};
@@ -138,17 +137,7 @@ async fn module_route_help_response(
}
#[test]
-fn provider_alias_and_route_selection_round_trip() {
- let first_provider = provider::list_providers()
- .into_iter()
- .next()
- .expect("provider registry should not be empty");
- assert_eq!(
- resolve_provider_alias(first_provider.name, &provider_descriptors()).as_deref(),
- Some(first_provider.name)
- );
- assert!(resolve_provider_alias(" ", &provider_descriptors()).is_none());
-
+fn route_selection_round_trip() {
let ctx = runtime_context(PathBuf::from("/tmp"));
let sender_key = "telegram_alice_reply";
assert_eq!(
diff --git a/crates/openhuman-core/src/channels/runtime/startup.rs b/crates/openhuman-core/src/channels/runtime/startup.rs
index 2fcefd20a9..cfd4a1c9df 100644
--- a/crates/openhuman-core/src/channels/runtime/startup.rs
+++ b/crates/openhuman-core/src/channels/runtime/startup.rs
@@ -7,8 +7,6 @@ mod delivery_import;
mod module_providers;
mod progressive_transport;
mod prompt;
-#[cfg(test)]
-mod relay;
mod start_channels;
mod turn_parts;
diff --git a/crates/openhuman-core/src/channels/runtime/startup/relay.rs b/crates/openhuman-core/src/channels/runtime/startup/relay.rs
deleted file mode 100644
index 4f66daa065..0000000000
--- a/crates/openhuman-core/src/channels/runtime/startup/relay.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-//! The TinyChannels relay runtime: inbound handler wiring and connect/handshake.
-
-use super::super::dispatch::RuntimeChannelMessage;
-use anyhow::Result;
-use async_trait::async_trait;
-use std::sync::Arc;
-use tinychannels_runtime::config::RelayRuntimeConfigExt as _;
-use tokio::sync::mpsc;
-
-pub(super) struct RelayInboundMessageHandler {
- tx: mpsc::Sender<RuntimeChannelMessage>,
-}
-
-impl RelayInboundMessageHandler {
- pub(super) fn new(tx: mpsc::Sender<RuntimeChannelMessage>) -> Self {
- Self { tx }
- }
-}
-
-#[async_trait]
-impl tinychannels::relay::RelayInboundHandler for RelayInboundMessageHandler {
- async fn handle(
- &self,
- event: tinychannels::relay::AuthenticatedRelayInboundEvent,
- ) -> Result<(), tinychannels::relay::RelayTransportError> {
- let envelope: tinychannels::ChannelInboundEnvelope = serde_json::from_value(event.event)
- .map_err(|error| {
- tinychannels::relay::RelayTransportError::Handler(format!(
- "invalid inbound envelope: {error}"
- ))
- })?;
- // Non-text content (voice notes, media) has no legacy projection; the
- // processor prepares it from the envelope instead.
- let msg =
- tinychannels::legacy_message_from_inbound_envelope(&envelope, 0).unwrap_or_default();
- self.tx
- .send(RuntimeChannelMessage::with_inbound_envelope(msg, envelope))
- .await
- .map_err(|_| tinychannels::relay::RelayTransportError::Closed)
- }
-}
-
-pub(super) struct RelayRuntimeHandle {
- pub(super) _transport: Arc<tinychannels::relay::RelayTransport>,
- pub(super) _reconnect: tinychannels::relay::RelayReconnectHandle,
-}
-
-impl Drop for RelayRuntimeHandle {
- fn drop(&mut self) {
- tinychannels::relay::unregister_relay_transport(&self._transport);
- self._reconnect.abort();
- }
-}
-
-pub(super) async fn start_relay_runtime(
- relay: &tinychannels::config::RelayRuntimeConfig,
- tx: mpsc::Sender<RuntimeChannelMessage>,
-) -> Result<RelayRuntimeHandle> {
- anyhow::ensure!(
- relay.is_listener_configured(),
- "relay runtime requires non-empty url and at least one identity"
- );
-
- let websocket_config = tinychannels::relay::WebSocketRelayConfig::from(relay);
- let io = tinychannels::relay::connect_websocket_relay_io(&websocket_config).await?;
- let transport = Arc::new(tinychannels::relay::RelayTransport::new(
- relay.relay_identities(),
- Arc::new(io),
- relay.timeouts,
- ));
- transport
- .set_inbound_handler(Arc::new(RelayInboundMessageHandler::new(tx)))
- .await;
- transport.connect().await?;
- let descriptor = transport.handshake().await?;
- tracing::info!(
- label = %descriptor.label,
- max_message_length = descriptor.max_message_length,
- "[channels][relay] connected relay runtime"
- );
- tinychannels::relay::register_relay_transport(transport.clone());
-
- let dialer = Arc::new(tinychannels::relay::WebSocketRelayDialer::new(
- websocket_config,
- ));
- let reconnect = transport.spawn_reconnect_supervisor(dialer, relay.reconnect);
- Ok(RelayRuntimeHandle {
- _transport: transport,
- _reconnect: reconnect,
- })
-}
diff --git a/crates/openhuman-core/src/channels/runtime/startup_email_secret_tests_tests.rs b/crates/openhuman-core/src/channels/runtime/startup_email_secret_tests_tests.rs
index a0d6379cd5..e73739fa3b 100644
--- a/crates/openhuman-core/src/channels/runtime/startup_email_secret_tests_tests.rs
+++ b/crates/openhuman-core/src/channels/runtime/startup_email_secret_tests_tests.rs
@@ -2,7 +2,7 @@ use super::*;
use crate::security::credentials::AuthService;
use std::collections::HashMap;
use tempfile::tempdir;
-use tinychannels::providers::email_channel::EmailConfig;
+use tinychannels_bus::config::EmailConfig;
use crate::channels::credentials::resolve_email_password;
fn isolated_config() -> (tempfile::TempDir, Config) {
diff --git a/crates/openhuman-core/src/channels/runtime/startup_tests.rs b/crates/openhuman-core/src/channels/runtime/startup_tests.rs
index e8af9daf17..980a71ceaa 100644
--- a/crates/openhuman-core/src/channels/runtime/startup_tests.rs
+++ b/crates/openhuman-core/src/channels/runtime/startup_tests.rs
@@ -7,9 +7,8 @@
//! (cloud) path is preserved for users who haven't picked a local /
//! BYOK model, and the override path activates for those who have.
-use super::{resolve_chat_workload, ChatWorkloadResolution, RelayInboundMessageHandler};
+use super::{resolve_chat_workload, ChatWorkloadResolution};
use crate::config::Config;
-use tinychannels::relay::RelayInboundHandler;
fn config_with_chat_provider(s: Option<&str>) -> Config {
let mut config = Config::default();
@@ -58,67 +57,3 @@ fn chat_provider_local_and_byok_strings_resolve_to_workload() {
}
}
-#[tokio::test]
-async fn relay_inbound_handler_forwards_envelopes_to_dispatch_bus() {
- let (tx, mut rx) = tokio::sync::mpsc::channel(1);
- let handler = RelayInboundMessageHandler::new(tx);
- let envelope = tinychannels::ChannelInboundEnvelope {
- channel: tinychannels::channel::ChannelRef {
- id: "telegram".into(),
- account_id: None,
- },
- message_id: "relay-msg-1".into(),
- conversation: tinychannels::channel::ConversationRef {
- id: "chat-1".into(),
- topic_id: Some("topic-1".into()),
- ..Default::default()
- },
- sender: tinychannels::channel::SenderRef {
- id: "alice".into(),
- ..Default::default()
- },
- text: "hello from relay".into(),
- ..Default::default()
- };
-
- handler
- .handle(tinychannels::relay::AuthenticatedRelayInboundEvent {
- event: serde_json::to_value(envelope).expect("relay envelope json"),
- buffer_id: Some("buffer-1".into()),
- delivered_via_authenticated_relay: true,
- })
- .await
- .expect("handle relay inbound");
-
- let runtime_msg = rx.recv().await.expect("forwarded channel message");
- let msg = runtime_msg.message;
- assert_eq!(msg.channel, "telegram");
- assert_eq!(msg.id, "relay-msg-1");
- assert_eq!(msg.reply_target, "chat-1");
- assert_eq!(msg.sender, "alice");
- assert_eq!(msg.content, "hello from relay");
- assert_eq!(msg.topic_id.as_deref(), Some("topic-1"));
- let forwarded = runtime_msg
- .inbound_envelope
- .expect("relay envelope should stay attached for dispatch");
- assert_eq!(forwarded.message_id, "relay-msg-1");
- assert_eq!(forwarded.conversation.id, "chat-1");
- assert_eq!(forwarded.conversation.topic_id.as_deref(), Some("topic-1"));
-}
-
-#[tokio::test]
-async fn relay_inbound_handler_rejects_malformed_envelopes() {
- let (tx, _rx) = tokio::sync::mpsc::channel(1);
- let handler = RelayInboundMessageHandler::new(tx);
-
- let error = handler
- .handle(tinychannels::relay::AuthenticatedRelayInboundEvent {
- event: serde_json::json!("not an envelope"),
- buffer_id: None,
- delivered_via_authenticated_relay: true,
- })
- .await
- .expect_err("malformed relay payload should fail");
-
- assert!(error.to_string().contains("invalid inbound envelope"));
-}
diff --git a/crates/openhuman-core/src/channels/runtime/startup_yuanbao_secret_tests_tests.rs b/crates/openhuman-core/src/channels/runtime/startup_yuanbao_secret_tests_tests.rs
index eb646e999a..235a8c4ad8 100644
--- a/crates/openhuman-core/src/channels/runtime/startup_yuanbao_secret_tests_tests.rs
+++ b/crates/openhuman-core/src/channels/runtime/startup_yuanbao_secret_tests_tests.rs
@@ -2,7 +2,7 @@ use super::*;
use crate::security::credentials::AuthService;
use std::collections::HashMap;
use tempfile::tempdir;
-use tinychannels::providers::yuanbao::YuanbaoConfig;
+use tinychannels_bus::config::YuanbaoConfig;
fn isolated_config() -> (tempfile::TempDir, Config) {
let tmp = tempdir().expect("tempdir");