diff --git a/moqt-server/src/lib.rs b/moqt-server/src/lib.rs index 70396a5..6921a38 100644 --- a/moqt-server/src/lib.rs +++ b/moqt-server/src/lib.rs @@ -13,14 +13,17 @@ use wtransport::{ mod modules; use modules::{ buffer_manager::{buffer_manager, request_buffer, BufferCommand}, - control_message_handler::{control_message_handler, MessageProcessResult}, logging, + message_handlers::{ + control_message::{control_message_handler, MessageProcessResult}, + object_stream::{object_stream_handler, ObjectStreamProcessResult}, + stream_header::{stream_header_handler, StreamHeaderProcessResult}, + }, moqt_client::MOQTClient, object_cache_storage::{ object_cache_storage, CacheHeader, CacheObject, ObjectCacheStorageCommand, ObjectCacheStorageWrapper, }, - object_stream_handler::{object_stream_handler, ObjectStreamProcessResult}, pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, @@ -28,7 +31,6 @@ use modules::{ send_stream_dispatcher::{ send_stream_dispatcher, SendStreamDispatchCommand, SendStreamDispatcher, }, - stream_header_handler::{stream_header_handler, StreamHeaderProcessResult}, }; pub use moqt_core::constants; use moqt_core::{ diff --git a/moqt-server/src/modules.rs b/moqt-server/src/modules.rs index 1c7363a..4d585ca 100644 --- a/moqt-server/src/modules.rs +++ b/moqt-server/src/modules.rs @@ -1,11 +1,7 @@ pub mod buffer_manager; -pub(crate) mod control_message_handler; -pub(crate) mod handlers; pub(crate) mod logging; +pub(crate) mod message_handlers; pub(crate) mod moqt_client; pub(crate) mod object_cache_storage; -pub(crate) mod object_stream_handler; pub(crate) mod pubsub_relation_manager; pub(crate) mod send_stream_dispatcher; -pub(crate) mod server_processes; -pub(crate) mod stream_header_handler; diff --git a/moqt-server/src/modules/message_handlers.rs b/moqt-server/src/modules/message_handlers.rs new file mode 100644 index 0000000..1ac29f5 --- /dev/null +++ b/moqt-server/src/modules/message_handlers.rs @@ -0,0 +1,3 @@ +pub(crate) mod control_message; +pub(crate) mod object_stream; +pub(crate) mod stream_header; diff --git a/moqt-server/src/modules/control_message_handler.rs b/moqt-server/src/modules/message_handlers/control_message.rs similarity index 96% rename from moqt-server/src/modules/control_message_handler.rs rename to moqt-server/src/modules/message_handlers/control_message.rs index 87eb5cd..f30fb9b 100644 --- a/moqt-server/src/modules/control_message_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message.rs @@ -1,18 +1,24 @@ +pub(crate) mod handlers; +pub(crate) mod server_processes; + use crate::constants::TerminationErrorCode; +use crate::modules::moqt_client::MOQTClient; use crate::modules::{ - handlers::unannounce_handler::unannounce_handler, + message_handlers::control_message::{ + handlers::unannounce_handler::unannounce_handler, + server_processes::{ + announce_error_message::process_announce_error_message, + announce_message::process_announce_message, + announce_ok_message::process_announce_ok_message, + client_setup_message::process_client_setup_message, + subscribe_error_message::process_subscribe_error_message, + subscribe_message::process_subscribe_message, + subscribe_namespace_message::process_subscribe_namespace_message, + subscribe_ok_message::process_subscribe_ok_message, + }, + }, moqt_client::MOQTClientStatus, object_cache_storage::ObjectCacheStorageWrapper, - server_processes::{ - announce_error_message::process_announce_error_message, - announce_message::process_announce_message, - announce_ok_message::process_announce_ok_message, - client_setup_message::process_client_setup_message, - subscribe_error_message::process_subscribe_error_message, - subscribe_message::process_subscribe_message, - subscribe_namespace_message::process_subscribe_namespace_message, - subscribe_ok_message::process_subscribe_ok_message, - }, }; use crate::SenderToOpenSubscription; use anyhow::{bail, Result}; @@ -28,8 +34,6 @@ use moqt_core::{ use std::{collections::HashMap, io::Cursor, sync::Arc}; use tokio::sync::Mutex; -use super::moqt_client::MOQTClient; - #[derive(Debug, PartialEq)] pub enum MessageProcessResult { Success(BytesMut), @@ -345,7 +349,7 @@ pub async fn control_message_handler( #[cfg(test)] pub(crate) mod test_helper_fn { use crate::modules::{ - control_message_handler::{control_message_handler, MessageProcessResult}, + message_handlers::control_message::{control_message_handler, MessageProcessResult}, moqt_client::{MOQTClient, MOQTClientStatus}, object_cache_storage::{ object_cache_storage, ObjectCacheStorageCommand, ObjectCacheStorageWrapper, @@ -421,7 +425,7 @@ pub(crate) mod test_helper_fn { #[cfg(test)] mod success { use crate::modules::{ - control_message_handler::{test_helper_fn, MessageProcessResult}, + message_handlers::control_message::{test_helper_fn, MessageProcessResult}, moqt_client::MOQTClientStatus, }; use moqt_core::control_message_type::ControlMessageType; @@ -484,7 +488,7 @@ mod success { #[cfg(test)] mod failure { use crate::modules::{ - control_message_handler::{test_helper_fn, MessageProcessResult}, + message_handlers::control_message::{test_helper_fn, MessageProcessResult}, moqt_client::MOQTClientStatus, }; use moqt_core::{constants::TerminationErrorCode, control_message_type::ControlMessageType}; diff --git a/moqt-server/src/modules/handlers.rs b/moqt-server/src/modules/message_handlers/control_message/handlers.rs similarity index 78% rename from moqt-server/src/modules/handlers.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers.rs index 9a7326f..be22dfa 100644 --- a/moqt-server/src/modules/handlers.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers.rs @@ -1,8 +1,6 @@ pub(crate) mod announce_handler; pub(crate) mod announce_ok_handler; pub(crate) mod server_setup_handler; -pub(crate) mod stream_subgroup_header_handler; -pub(crate) mod stream_track_header_handler; pub(crate) mod subscribe_error_handler; pub(crate) mod subscribe_handler; pub(crate) mod subscribe_namespace_handler; diff --git a/moqt-server/src/modules/handlers/announce_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/announce_handler.rs similarity index 99% rename from moqt-server/src/modules/handlers/announce_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/announce_handler.rs index 324c966..9ac49b8 100644 --- a/moqt-server/src/modules/handlers/announce_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/announce_handler.rs @@ -111,7 +111,7 @@ pub(crate) async fn announce_handler( mod success { use std::sync::Arc; - use crate::modules::handlers::announce_handler::announce_handler; + use super::announce_handler; use crate::modules::moqt_client::MOQTClient; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, @@ -289,7 +289,7 @@ mod success { mod failure { use std::sync::Arc; - use crate::modules::handlers::announce_handler::announce_handler; + use super::announce_handler; use crate::modules::moqt_client::MOQTClient; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, diff --git a/moqt-server/src/modules/handlers/announce_ok_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/announce_ok_handler.rs similarity index 97% rename from moqt-server/src/modules/handlers/announce_ok_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/announce_ok_handler.rs index 348147f..091b951 100644 --- a/moqt-server/src/modules/handlers/announce_ok_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/announce_ok_handler.rs @@ -27,7 +27,7 @@ pub(crate) async fn announce_ok_handler( #[cfg(test)] mod success { - use crate::modules::handlers::announce_ok_handler::announce_ok_handler; + use super::announce_ok_handler; use crate::modules::moqt_client::MOQTClient; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, diff --git a/moqt-server/src/modules/handlers/server_setup_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/server_setup_handler.rs similarity index 98% rename from moqt-server/src/modules/handlers/server_setup_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/server_setup_handler.rs index 9573d7f..d798fc9 100644 --- a/moqt-server/src/modules/handlers/server_setup_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/server_setup_handler.rs @@ -158,7 +158,10 @@ mod success { commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, }; - use crate::{constants, modules::handlers::server_setup_handler::setup_handler}; + use crate::{ + constants, + modules::message_handlers::control_message::handlers::server_setup_handler::setup_handler, + }; use moqt_core::messages::control_messages::{ client_setup::ClientSetup, setup_parameters::{Path, Role, RoleCase, SetupParameter}, @@ -226,12 +229,13 @@ mod success { #[cfg(test)] mod failure { + use super::setup_handler; + use crate::constants; use crate::modules::moqt_client::MOQTClient; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, }; - use crate::{constants, modules::handlers::server_setup_handler::setup_handler}; use moqt_core::messages::control_messages::{ client_setup::ClientSetup, setup_parameters::{Path, Role, RoleCase, SetupParameter}, diff --git a/moqt-server/src/modules/handlers/subscribe_error_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_error_handler.rs similarity index 94% rename from moqt-server/src/modules/handlers/subscribe_error_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_error_handler.rs index a447ae1..8e1f008 100644 --- a/moqt-server/src/modules/handlers/subscribe_error_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_error_handler.rs @@ -115,7 +115,7 @@ async fn delete_downstream_and_upstream_subscription( #[cfg(test)] mod success { - use crate::modules::handlers::subscribe_error_handler::subscribe_error_handler; + use super::subscribe_error_handler; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, @@ -124,13 +124,15 @@ mod success { send_stream_dispatcher, SendStreamDispatchCommand, SendStreamDispatcher, }; use crate::MOQTClient; - use moqt_core::constants::StreamDirection; - use moqt_core::messages::control_messages::subscribe::{FilterType, GroupOrder}; - use moqt_core::messages::{ - control_messages::subscribe_error::{SubscribeError, SubscribeErrorCode}, - moqt_payload::MOQTPayload, - }; use moqt_core::pubsub_relation_manager_repository::PubSubRelationManagerRepository; + use moqt_core::{ + constants::StreamDirection, + messages::{ + control_messages::subscribe::{FilterType, GroupOrder}, + control_messages::subscribe_error::{SubscribeError, SubscribeErrorCode}, + moqt_payload::MOQTPayload, + }, + }; use std::sync::Arc; use tokio::sync::mpsc; @@ -255,7 +257,7 @@ mod success { #[cfg(test)] mod failure { - use crate::modules::handlers::subscribe_error_handler::subscribe_error_handler; + use super::subscribe_error_handler; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, @@ -264,11 +266,13 @@ mod failure { send_stream_dispatcher, SendStreamDispatchCommand, SendStreamDispatcher, }; use crate::MOQTClient; - use moqt_core::messages::control_messages::subscribe::{FilterType, GroupOrder}; - use moqt_core::messages::control_messages::subscribe_error::{ - SubscribeError, SubscribeErrorCode, + use moqt_core::{ + messages::control_messages::{ + subscribe::{FilterType, GroupOrder}, + subscribe_error::{SubscribeError, SubscribeErrorCode}, + }, + pubsub_relation_manager_repository::PubSubRelationManagerRepository, }; - use moqt_core::pubsub_relation_manager_repository::PubSubRelationManagerRepository; use tokio::sync::mpsc; #[tokio::test] diff --git a/moqt-server/src/modules/handlers/subscribe_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_handler.rs similarity index 99% rename from moqt-server/src/modules/handlers/subscribe_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_handler.rs index 05fc3d6..e2a3ba0 100644 --- a/moqt-server/src/modules/handlers/subscribe_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_handler.rs @@ -239,7 +239,7 @@ pub(crate) async fn subscribe_handler( Ok(None) } - // TODO: Check if “publisher not found” should turn into closing connection + // TODO: Check if “publisher not found” should turn into closing session None => { let reason_phrase = "publisher not found".to_string(); let subscribe_error = SubscribeError::new( @@ -507,8 +507,8 @@ async fn set_downstream_and_upstream_subscription( #[cfg(test)] mod success { + use super::subscribe_handler; use crate::modules::{ - handlers::subscribe_handler::subscribe_handler, moqt_client::MOQTClient, object_cache_storage::{ object_cache_storage, CacheHeader, CacheObject, ObjectCacheStorageCommand, @@ -985,8 +985,8 @@ mod success { #[cfg(test)] mod failure { + use super::subscribe_handler; use crate::modules::{ - handlers::subscribe_handler::subscribe_handler, moqt_client::MOQTClient, object_cache_storage::{ object_cache_storage, ObjectCacheStorageCommand, ObjectCacheStorageWrapper, diff --git a/moqt-server/src/modules/handlers/subscribe_namespace_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_namespace_handler.rs similarity index 99% rename from moqt-server/src/modules/handlers/subscribe_namespace_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_namespace_handler.rs index b351670..2dd5e93 100644 --- a/moqt-server/src/modules/handlers/subscribe_namespace_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_namespace_handler.rs @@ -103,8 +103,8 @@ pub(crate) async fn subscribe_namespace_handler( #[cfg(test)] mod success { + use super::subscribe_namespace_handler; use crate::modules::{ - handlers::subscribe_namespace_handler::subscribe_namespace_handler, moqt_client::MOQTClient, pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, @@ -199,8 +199,8 @@ mod success { #[cfg(test)] mod failure { + use super::subscribe_namespace_handler; use crate::modules::{ - handlers::subscribe_namespace_handler::subscribe_namespace_handler, moqt_client::MOQTClient, pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, diff --git a/moqt-server/src/modules/handlers/subscribe_ok_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_ok_handler.rs similarity index 99% rename from moqt-server/src/modules/handlers/subscribe_ok_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_ok_handler.rs index c28fa4a..5198509 100644 --- a/moqt-server/src/modules/handlers/subscribe_ok_handler.rs +++ b/moqt-server/src/modules/message_handlers/control_message/handlers/subscribe_ok_handler.rs @@ -90,7 +90,7 @@ pub(crate) async fn subscribe_ok_handler( #[cfg(test)] mod success { - use crate::modules::handlers::subscribe_ok_handler::subscribe_ok_handler; + use super::subscribe_ok_handler; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, @@ -240,7 +240,7 @@ mod success { #[cfg(test)] mod failure { - use crate::modules::handlers::subscribe_ok_handler::subscribe_ok_handler; + use crate::modules::message_handlers::control_message::handlers::subscribe_ok_handler::subscribe_ok_handler; use crate::modules::pubsub_relation_manager::{ commands::PubSubRelationCommand, manager::pubsub_relation_manager, wrapper::PubSubRelationManagerWrapper, diff --git a/moqt-server/src/modules/handlers/unannounce_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/unannounce_handler.rs similarity index 100% rename from moqt-server/src/modules/handlers/unannounce_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/unannounce_handler.rs diff --git a/moqt-server/src/modules/handlers/unsubscribe_handler.rs b/moqt-server/src/modules/message_handlers/control_message/handlers/unsubscribe_handler.rs similarity index 100% rename from moqt-server/src/modules/handlers/unsubscribe_handler.rs rename to moqt-server/src/modules/message_handlers/control_message/handlers/unsubscribe_handler.rs diff --git a/moqt-server/src/modules/server_processes.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes.rs similarity index 80% rename from moqt-server/src/modules/server_processes.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes.rs index d55bbae..d5847eb 100644 --- a/moqt-server/src/modules/server_processes.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes.rs @@ -2,8 +2,6 @@ pub(crate) mod announce_error_message; pub(crate) mod announce_message; pub(crate) mod announce_ok_message; pub(crate) mod client_setup_message; -pub(crate) mod stream_track_header; -pub(crate) mod stream_track_subgroup; pub(crate) mod subscribe_error_message; pub(crate) mod subscribe_message; pub(crate) mod subscribe_namespace_message; diff --git a/moqt-server/src/modules/server_processes/announce_error_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/announce_error_message.rs similarity index 100% rename from moqt-server/src/modules/server_processes/announce_error_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/announce_error_message.rs diff --git a/moqt-server/src/modules/server_processes/announce_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/announce_message.rs similarity index 91% rename from moqt-server/src/modules/server_processes/announce_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/announce_message.rs index f5ad9ed..a9fe7d7 100644 --- a/moqt-server/src/modules/server_processes/announce_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/announce_message.rs @@ -10,7 +10,10 @@ use moqt_core::{ send_stream_dispatcher_repository::SendStreamDispatcherRepository, }; -use crate::modules::{handlers::announce_handler::announce_handler, moqt_client::MOQTClient}; +use crate::modules::{ + message_handlers::control_message::handlers::announce_handler::announce_handler, + moqt_client::MOQTClient, +}; pub(crate) async fn process_announce_message( payload_buf: &mut BytesMut, diff --git a/moqt-server/src/modules/server_processes/announce_ok_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/announce_ok_message.rs similarity index 84% rename from moqt-server/src/modules/server_processes/announce_ok_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/announce_ok_message.rs index 2203017..93e29a5 100644 --- a/moqt-server/src/modules/server_processes/announce_ok_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/announce_ok_message.rs @@ -6,7 +6,10 @@ use moqt_core::{ pubsub_relation_manager_repository::PubSubRelationManagerRepository, }; -use crate::modules::{handlers::announce_ok_handler::announce_ok_handler, moqt_client::MOQTClient}; +use crate::modules::{ + message_handlers::control_message::handlers::announce_ok_handler::announce_ok_handler, + moqt_client::MOQTClient, +}; pub(crate) async fn process_announce_ok_message( payload_buf: &mut BytesMut, diff --git a/moqt-server/src/modules/server_processes/client_setup_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/client_setup_message.rs similarity index 88% rename from moqt-server/src/modules/server_processes/client_setup_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/client_setup_message.rs index 960c008..d517cbd 100644 --- a/moqt-server/src/modules/server_processes/client_setup_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/client_setup_message.rs @@ -7,7 +7,10 @@ use moqt_core::{ pubsub_relation_manager_repository::PubSubRelationManagerRepository, }; -use crate::modules::{handlers::server_setup_handler::setup_handler, moqt_client::MOQTClient}; +use crate::modules::{ + message_handlers::control_message::handlers::server_setup_handler::setup_handler, + moqt_client::MOQTClient, +}; pub(crate) async fn process_client_setup_message( payload_buf: &mut BytesMut, diff --git a/moqt-server/src/modules/server_processes/subscribe_error_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_error_message.rs similarity index 89% rename from moqt-server/src/modules/server_processes/subscribe_error_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_error_message.rs index d1e7f48..de8356f 100644 --- a/moqt-server/src/modules/server_processes/subscribe_error_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_error_message.rs @@ -8,7 +8,8 @@ use moqt_core::{ }; use crate::modules::{ - handlers::subscribe_error_handler::subscribe_error_handler, moqt_client::MOQTClient, + message_handlers::control_message::handlers::subscribe_error_handler::subscribe_error_handler, + moqt_client::MOQTClient, }; pub(crate) async fn process_subscribe_error_message( diff --git a/moqt-server/src/modules/server_processes/subscribe_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_message.rs similarity index 92% rename from moqt-server/src/modules/server_processes/subscribe_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_message.rs index ee513e9..65d7259 100644 --- a/moqt-server/src/modules/server_processes/subscribe_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_message.rs @@ -1,6 +1,7 @@ use crate::modules::moqt_client::MOQTClient; use crate::modules::{ - handlers::subscribe_handler::subscribe_handler, object_cache_storage::ObjectCacheStorageWrapper, + message_handlers::control_message::handlers::subscribe_handler::subscribe_handler, + object_cache_storage::ObjectCacheStorageWrapper, }; use crate::SenderToOpenSubscription; use anyhow::{bail, Result}; diff --git a/moqt-server/src/modules/server_processes/subscribe_namespace_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_namespace_message.rs similarity index 92% rename from moqt-server/src/modules/server_processes/subscribe_namespace_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_namespace_message.rs index 7a4c786..16eedc0 100644 --- a/moqt-server/src/modules/server_processes/subscribe_namespace_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_namespace_message.rs @@ -14,7 +14,8 @@ use moqt_core::{ }; use crate::modules::{ - handlers::subscribe_namespace_handler::subscribe_namespace_handler, moqt_client::MOQTClient, + message_handlers::control_message::handlers::subscribe_namespace_handler::subscribe_namespace_handler, + moqt_client::MOQTClient, }; pub(crate) async fn process_subscribe_namespace_message( diff --git a/moqt-server/src/modules/server_processes/subscribe_ok_message.rs b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_ok_message.rs similarity index 89% rename from moqt-server/src/modules/server_processes/subscribe_ok_message.rs rename to moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_ok_message.rs index ad249e7..57c70e3 100644 --- a/moqt-server/src/modules/server_processes/subscribe_ok_message.rs +++ b/moqt-server/src/modules/message_handlers/control_message/server_processes/subscribe_ok_message.rs @@ -8,7 +8,8 @@ use moqt_core::{ }; use crate::modules::{ - handlers::subscribe_ok_handler::subscribe_ok_handler, moqt_client::MOQTClient, + message_handlers::control_message::handlers::subscribe_ok_handler::subscribe_ok_handler, + moqt_client::MOQTClient, }; pub(crate) async fn process_subscribe_ok_message( diff --git a/moqt-server/src/modules/object_stream_handler.rs b/moqt-server/src/modules/message_handlers/object_stream.rs similarity index 100% rename from moqt-server/src/modules/object_stream_handler.rs rename to moqt-server/src/modules/message_handlers/object_stream.rs diff --git a/moqt-server/src/modules/stream_header_handler.rs b/moqt-server/src/modules/message_handlers/stream_header.rs similarity index 97% rename from moqt-server/src/modules/stream_header_handler.rs rename to moqt-server/src/modules/message_handlers/stream_header.rs index 1fba60d..714b5d8 100644 --- a/moqt-server/src/modules/stream_header_handler.rs +++ b/moqt-server/src/modules/message_handlers/stream_header.rs @@ -1,12 +1,15 @@ +pub(crate) mod handlers; +pub(crate) mod server_processes; + use crate::{ constants::TerminationErrorCode, modules::{ - moqt_client::{MOQTClient, MOQTClientStatus}, - object_cache_storage::ObjectCacheStorageWrapper, - server_processes::{ + message_handlers::stream_header::server_processes::{ stream_track_header::process_stream_header_track, stream_track_subgroup::process_stream_header_subgroup, }, + moqt_client::{MOQTClient, MOQTClientStatus}, + object_cache_storage::ObjectCacheStorageWrapper, }, }; use anyhow::{bail, Result}; diff --git a/moqt-server/src/modules/message_handlers/stream_header/handlers.rs b/moqt-server/src/modules/message_handlers/stream_header/handlers.rs new file mode 100644 index 0000000..df89374 --- /dev/null +++ b/moqt-server/src/modules/message_handlers/stream_header/handlers.rs @@ -0,0 +1,2 @@ +pub(crate) mod stream_subgroup_header_handler; +pub(crate) mod stream_track_header_handler; diff --git a/moqt-server/src/modules/handlers/stream_subgroup_header_handler.rs b/moqt-server/src/modules/message_handlers/stream_header/handlers/stream_subgroup_header_handler.rs similarity index 100% rename from moqt-server/src/modules/handlers/stream_subgroup_header_handler.rs rename to moqt-server/src/modules/message_handlers/stream_header/handlers/stream_subgroup_header_handler.rs diff --git a/moqt-server/src/modules/handlers/stream_track_header_handler.rs b/moqt-server/src/modules/message_handlers/stream_header/handlers/stream_track_header_handler.rs similarity index 100% rename from moqt-server/src/modules/handlers/stream_track_header_handler.rs rename to moqt-server/src/modules/message_handlers/stream_header/handlers/stream_track_header_handler.rs diff --git a/moqt-server/src/modules/message_handlers/stream_header/server_processes.rs b/moqt-server/src/modules/message_handlers/stream_header/server_processes.rs new file mode 100644 index 0000000..e8abc24 --- /dev/null +++ b/moqt-server/src/modules/message_handlers/stream_header/server_processes.rs @@ -0,0 +1,2 @@ +pub(crate) mod stream_track_header; +pub(crate) mod stream_track_subgroup; diff --git a/moqt-server/src/modules/server_processes/stream_track_header.rs b/moqt-server/src/modules/message_handlers/stream_header/server_processes/stream_track_header.rs similarity index 83% rename from moqt-server/src/modules/server_processes/stream_track_header.rs rename to moqt-server/src/modules/message_handlers/stream_header/server_processes/stream_track_header.rs index f791eff..215c0e8 100644 --- a/moqt-server/src/modules/server_processes/stream_track_header.rs +++ b/moqt-server/src/modules/message_handlers/stream_header/server_processes/stream_track_header.rs @@ -6,8 +6,8 @@ use moqt_core::{ }; use crate::modules::{ - handlers::stream_track_header_handler::stream_header_track_handler, moqt_client::MOQTClient, - object_cache_storage::ObjectCacheStorageWrapper, + message_handlers::stream_header::handlers::stream_track_header_handler::stream_header_track_handler, + moqt_client::MOQTClient, object_cache_storage::ObjectCacheStorageWrapper, }; pub(crate) async fn process_stream_header_track( diff --git a/moqt-server/src/modules/server_processes/stream_track_subgroup.rs b/moqt-server/src/modules/message_handlers/stream_header/server_processes/stream_track_subgroup.rs similarity index 90% rename from moqt-server/src/modules/server_processes/stream_track_subgroup.rs rename to moqt-server/src/modules/message_handlers/stream_header/server_processes/stream_track_subgroup.rs index 4352c30..b39760c 100644 --- a/moqt-server/src/modules/server_processes/stream_track_subgroup.rs +++ b/moqt-server/src/modules/message_handlers/stream_header/server_processes/stream_track_subgroup.rs @@ -6,7 +6,7 @@ use moqt_core::{ }; use crate::modules::{ - handlers::stream_subgroup_header_handler::stream_header_subgroup_handler, + message_handlers::stream_header::handlers::stream_subgroup_header_handler::stream_header_subgroup_handler, moqt_client::MOQTClient, object_cache_storage::ObjectCacheStorageWrapper, };