Merge pull request #75 from nttcom/refactoring/remove_message_suffix

messagesフォルダ配下のファイル名から_message suffixを削除

moqt-client-sample/src/lib.rs

@@ -9,8 +9,8 @@ use moqt_core::{
     message_handler::StreamType,
     message_type::MessageType,
     messages::{
-        announce_message::Announce,
-        client_setup_message::ClientSetup,
+        announce::Announce,
+        client_setup::ClientSetup,
         moqt_payload::MOQTPayload,
         setup_parameters::{RoleCase, RoleParameter, SetupParameter},
         version_specific_parameters::{AuthorizationInfo, VersionSpecificParameter},
@@ -218,16 +218,15 @@ impl MOQTClient {
             let auth_info =
                 VersionSpecificParameter::AuthorizationInfo(AuthorizationInfo::new(auth_info));
             let version_specific_parameters = vec![auth_info];
-            let subscribe_message =
-                moqt_core::messages::subscribe_request_message::SubscribeRequest::new(
-                    track_namespace,
-                    track_name,
-                    moqt_core::messages::subscribe_request_message::Location::RelativePrevious(0),
-                    moqt_core::messages::subscribe_request_message::Location::Absolute(0),
-                    moqt_core::messages::subscribe_request_message::Location::None,
-                    moqt_core::messages::subscribe_request_message::Location::None,
-                    version_specific_parameters,
-                );
+            let subscribe_message = moqt_core::messages::subscribe_request::SubscribeRequest::new(
+                track_namespace,
+                track_name,
+                moqt_core::messages::subscribe_request::Location::RelativePrevious(0),
+                moqt_core::messages::subscribe_request::Location::Absolute(0),
+                moqt_core::messages::subscribe_request::Location::None,
+                moqt_core::messages::subscribe_request::Location::None,
+                version_specific_parameters,
+            );
             let mut subscribe_message_buf = BytesMut::new();
             subscribe_message.packetize(&mut subscribe_message_buf);
 
@@ -255,7 +254,7 @@ impl MOQTClient {
         expires: u64,
     ) -> Result<JsValue, JsValue> {
         if let Some(writer) = &*self.control_stream_writer.borrow() {
-            let subscribe_ok_message = moqt_core::messages::subscribe_ok_message::SubscribeOk::new(
+            let subscribe_ok_message = moqt_core::messages::subscribe_ok::SubscribeOk::new(
                 track_namespace,
                 track_name,
                 track_id,
@@ -288,13 +287,12 @@ impl MOQTClient {
         reason_phrase: String,
     ) -> Result<JsValue, JsValue> {
         if let Some(writer) = &*self.control_stream_writer.borrow() {
-            let subscribe_error_message =
-                moqt_core::messages::subscribe_error_message::SubscribeError::new(
-                    track_namespace,
-                    track_name,
-                    error_code,
-                    reason_phrase,
-                );
+            let subscribe_error_message = moqt_core::messages::subscribe_error::SubscribeError::new(
+                track_namespace,
+                track_name,
+                error_code,
+                reason_phrase,
+            );
             let mut subscribe_error_message_buf = BytesMut::new();
             subscribe_error_message.packetize(&mut subscribe_error_message_buf);
 
@@ -320,10 +318,8 @@ impl MOQTClient {
         track_name: String,
     ) -> Result<JsValue, JsValue> {
         if let Some(writer) = &*self.control_stream_writer.borrow() {
-            let unsubscribe_message = moqt_core::messages::unsubscribe_message::Unsubscribe::new(
-                track_namespace,
-                track_name,
-            );
+            let unsubscribe_message =
+                moqt_core::messages::unsubscribe::Unsubscribe::new(track_namespace, track_name);
             let mut unsubscribe_message_buf = BytesMut::new();
             unsubscribe_message.packetize(&mut unsubscribe_message_buf);
 
@@ -365,7 +361,7 @@ impl MOQTClient {
             );
             let writer = uni_stream.get_writer()?;
 
-            let object_message = moqt_core::messages::object_message::ObjectWithPayloadLength::new(
+            let object_message = moqt_core::messages::object::ObjectWithPayloadLength::new(
                 track_id,
                 group_sequence,
                 object_sequence,
@@ -416,14 +412,13 @@ impl MOQTClient {
             );
             let writer = uni_stream.get_writer()?;
 
-            let object_message =
-                moqt_core::messages::object_message::ObjectWithoutPayloadLength::new(
-                    track_id,
-                    group_sequence,
-                    object_sequence,
-                    object_send_order,
-                    object_payload,
-                );
+            let object_message = moqt_core::messages::object::ObjectWithoutPayloadLength::new(
+                track_id,
+                group_sequence,
+                object_sequence,
+                object_send_order,
+                object_payload,
+            );
             let mut object_message_buf = BytesMut::new();
             object_message.packetize(&mut object_message_buf);
 
@@ -578,7 +573,7 @@ async fn message_handler(
     _stream_type: StreamType, // TODO: Not implemented yet
     mut buf: &mut BytesMut,
 ) -> Result<()> {
-    use moqt_core::messages::announce_ok_message;
+    use moqt_core::messages::announce_ok;
 
     let message_type_value = read_variable_integer_from_buffer(&mut buf);
 
@@ -592,9 +587,7 @@ async fn message_handler(
             match message_type {
                 MessageType::ServerSetup => {
                     let server_setup_message =
-                        moqt_core::messages::server_setup_message::ServerSetup::depacketize(
-                            &mut buf,
-                        )?;
+                        moqt_core::messages::server_setup::ServerSetup::depacketize(&mut buf)?;
 
                     log(
                         std::format!("server_setup_message: {:#x?}", server_setup_message).as_str(),
@@ -609,8 +602,7 @@ async fn message_handler(
                     }
                 }
                 MessageType::AnnounceOk => {
-                    let announce_ok_message =
-                        announce_ok_message::AnnounceOk::depacketize(&mut buf)?;
+                    let announce_ok_message = announce_ok::AnnounceOk::depacketize(&mut buf)?;
                     log(std::format!("announce_ok_message: {:#x?}", announce_ok_message).as_str());
 
                     if let Some(callback) = callbacks.borrow().announce_callback() {
@@ -620,9 +612,7 @@ async fn message_handler(
                 }
                 MessageType::AnnounceError => {
                     let announce_error_message =
-                        moqt_core::messages::announce_error_message::AnnounceError::depacketize(
-                            &mut buf,
-                        )?;
+                        moqt_core::messages::announce_error::AnnounceError::depacketize(&mut buf)?;
                     log(
                         std::format!("announce_error_message: {:#x?}", announce_error_message)
                             .as_str(),
@@ -635,7 +625,7 @@ async fn message_handler(
                 }
                 MessageType::Subscribe => {
                     let subscribe_message =
-                        moqt_core::messages::subscribe_request_message::SubscribeRequest::depacketize(
+                        moqt_core::messages::subscribe_request::SubscribeRequest::depacketize(
                             &mut buf,
                         )?;
                     log(std::format!("subscribe_message: {:#x?}", subscribe_message).as_str());
@@ -647,9 +637,7 @@ async fn message_handler(
                 }
                 MessageType::SubscribeOk => {
                     let subscribe_ok_message =
-                        moqt_core::messages::subscribe_ok_message::SubscribeOk::depacketize(
-                            &mut buf,
-                        )?;
+                        moqt_core::messages::subscribe_ok::SubscribeOk::depacketize(&mut buf)?;
                     log(
                         std::format!("subscribe_ok_message: {:#x?}", subscribe_ok_message).as_str(),
                     );
@@ -661,7 +649,7 @@ async fn message_handler(
                 }
                 MessageType::SubscribeError => {
                     let subscribe_error_message =
-                        moqt_core::messages::subscribe_error_message::SubscribeError::depacketize(
+                        moqt_core::messages::subscribe_error::SubscribeError::depacketize(
                             &mut buf,
                         )?;
                     log(
@@ -676,7 +664,7 @@ async fn message_handler(
                 }
                 MessageType::ObjectWithPayloadLength => {
                     let object_with_length_message =
-                        moqt_core::messages::object_message::ObjectWithPayloadLength::depacketize(
+                        moqt_core::messages::object::ObjectWithPayloadLength::depacketize(
                             &mut buf,
                         )?;
                     log(std::format!(
@@ -693,7 +681,7 @@ async fn message_handler(
                 }
                 MessageType::ObjectWithoutPayloadLength => {
                     let object_without_length_message =
-                        moqt_core::messages::object_message::ObjectWithoutPayloadLength::depacketize(
+                        moqt_core::messages::object::ObjectWithoutPayloadLength::depacketize(
                             &mut buf,
                         )?;
                     log(std::format!(

moqt-core/src/modules/handlers/announce_handler.rs

@@ -2,10 +2,7 @@ use anyhow::Result;
 
 use crate::{
     modules::{
-        messages::{
-            announce_error_message::AnnounceError, announce_message::Announce,
-            announce_ok_message::AnnounceOk,
-        },
+        messages::{announce::Announce, announce_error::AnnounceError, announce_ok::AnnounceOk},
         track_namespace_manager_repository::TrackNamespaceManagerRepository,
     },
     MOQTClient,

moqt-core/src/modules/handlers/object_handler.rs

@@ -4,7 +4,7 @@ use crate::{
     message_handler::StreamType,
     messages::moqt_payload::MOQTPayload,
     modules::{
-        messages::object_message::{ObjectWithPayloadLength, ObjectWithoutPayloadLength},
+        messages::object::{ObjectWithPayloadLength, ObjectWithoutPayloadLength},
         track_namespace_manager_repository::TrackNamespaceManagerRepository,
     },
     SendStreamDispatcherRepository,

moqt-core/src/modules/handlers/server_setup_handler.rs

@@ -9,7 +9,7 @@ use crate::{
 use anyhow::{bail, Result};
 
 use crate::modules::{
-    messages::client_setup_message::ClientSetup, messages::server_setup_message::ServerSetup,
+    messages::client_setup::ClientSetup, messages::server_setup::ServerSetup,
     moqt_client::MOQTClient,
 };
 
@@ -76,7 +76,7 @@ mod success {
         modules::{
             handlers::server_setup_handler::setup_handler,
             messages::{
-                client_setup_message::ClientSetup,
+                client_setup::ClientSetup,
                 setup_parameters::{PathParameter, RoleCase, RoleParameter, SetupParameter},
             },
             moqt_client::MOQTClient,
@@ -126,7 +126,7 @@ mod failure {
         modules::{
             handlers::server_setup_handler::setup_handler,
             messages::{
-                client_setup_message::ClientSetup,
+                client_setup::ClientSetup,
                 setup_parameters::{PathParameter, SetupParameter},
             },
             moqt_client::MOQTClient,

moqt-core/src/modules/handlers/subscribe_handler.rs

@@ -4,7 +4,7 @@ use crate::{
     message_handler::StreamType,
     messages::moqt_payload::MOQTPayload,
     modules::{
-        messages::subscribe_request_message::SubscribeRequest,
+        messages::subscribe_request::SubscribeRequest,
         track_namespace_manager_repository::TrackNamespaceManagerRepository,
     },
     MOQTClient, SendStreamDispatcherRepository,

moqt-core/src/modules/handlers/subscribe_ok_handler.rs

@@ -4,7 +4,7 @@ use crate::{
     message_handler::StreamType,
     messages::moqt_payload::MOQTPayload,
     modules::{
-        messages::subscribe_ok_message::SubscribeOk,
+        messages::subscribe_ok::SubscribeOk,
         track_namespace_manager_repository::TrackNamespaceManagerRepository,
     },
     SendStreamDispatcherRepository,

moqt-core/src/modules/handlers/unannounce_handler.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 
 use crate::{
     modules::{
-        messages::unannounce_message::UnAnnounce,
+        messages::unannounce::UnAnnounce,
         track_namespace_manager_repository::TrackNamespaceManagerRepository,
     },
     MOQTClient,

moqt-core/src/modules/handlers/unsubscribe_handler.rs

@@ -1,8 +1,7 @@
 use anyhow::Result;
 
 use crate::{
-    modules::messages::unsubscribe_message::Unsubscribe, MOQTClient,
-    TrackNamespaceManagerRepository,
+    modules::messages::unsubscribe::Unsubscribe, MOQTClient, TrackNamespaceManagerRepository,
 };
 
 // TODO: Not implemented yet

moqt-core/src/modules/message_handler.rs

@@ -3,7 +3,7 @@ use std::io::Cursor;
 use crate::constants::TerminationErrorCode;
 use crate::handlers::announce_handler::AnnounceResponse;
 use crate::modules::handlers::unannounce_handler::unannounce_handler;
-use crate::modules::messages::unannounce_message::UnAnnounce;
+use crate::modules::messages::unannounce::UnAnnounce;
 use crate::server_processes::announce_message::process_announce_message;
 use crate::server_processes::client_setup_message::process_client_setup_message;
 use crate::server_processes::object_message::{

moqt-core/src/modules/messages.rs

@@ -1,15 +1,15 @@
-pub mod announce_error_message;
-pub mod announce_message;
-pub mod announce_ok_message;
-pub mod client_setup_message;
-pub mod go_away_message;
+pub mod announce;
+pub mod announce_error;
+pub mod announce_ok;
+pub mod client_setup;
+pub mod go_away;
 pub mod moqt_payload;
-pub mod object_message;
-pub mod server_setup_message;
+pub mod object;
+pub mod server_setup;
 pub mod setup_parameters;
-pub mod subscribe_error_message;
-pub mod subscribe_ok_message;
-pub mod subscribe_request_message;
-pub mod unannounce_message;
-pub mod unsubscribe_message;
+pub mod subscribe_error;
+pub mod subscribe_ok;
+pub mod subscribe_request;
+pub mod unannounce;
+pub mod unsubscribe;
 pub mod version_specific_parameters;

moqt-core/src/modules/messages/announce_message.rs → moqt-core/src/modules/messages/announce.rs

@@ -91,7 +91,7 @@ impl MOQTPayload for Announce {
 mod success {
     use crate::messages::moqt_payload::MOQTPayload;
     use crate::messages::version_specific_parameters::AuthorizationInfo;
-    use crate::modules::messages::announce_message::Announce;
+    use crate::modules::messages::announce::Announce;
     use crate::modules::messages::version_specific_parameters::{
         VersionSpecificParameter, VersionSpecificParameterType,
     };

moqt-core/src/modules/messages/announce_error_message.rs → moqt-core/src/modules/messages/announce_error.rs

@@ -76,8 +76,7 @@ impl MOQTPayload for AnnounceError {
 #[cfg(test)]
 mod success {
     use crate::{
-        messages::moqt_payload::MOQTPayload,
-        modules::messages::announce_error_message::AnnounceError,
+        messages::moqt_payload::MOQTPayload, modules::messages::announce_error::AnnounceError,
     };
     #[test]
     fn packetize_announce_error() {

moqt-core/src/modules/messages/announce_ok_message.rs → moqt-core/src/modules/messages/announce_ok.rs

@@ -42,7 +42,7 @@ impl MOQTPayload for AnnounceOk {
 #[cfg(test)]
 mod success {
     use crate::messages::moqt_payload::MOQTPayload;
-    use crate::modules::messages::announce_ok_message::AnnounceOk;
+    use crate::modules::messages::announce_ok::AnnounceOk;
     use bytes::BytesMut;
 
     #[test]

moqt-core/src/modules/messages/client_setup_message.rs → moqt-core/src/modules/messages/client_setup.rs

@@ -102,7 +102,7 @@ mod success {
         constants::MOQ_TRANSPORT_VERSION,
         messages::moqt_payload::MOQTPayload,
         modules::messages::{
-            client_setup_message::ClientSetup,
+            client_setup::ClientSetup,
             setup_parameters::{RoleCase, RoleParameter, SetupParameter},
         },
     };

moqt-core/src/modules/messages/object_message.rs → moqt-core/src/modules/messages/object.rs

@@ -162,7 +162,7 @@ impl MOQTPayload for ObjectWithoutPayloadLength {
 #[cfg(test)]
 mod success {
     use crate::messages::moqt_payload::MOQTPayload;
-    use crate::messages::object_message::{ObjectWithPayloadLength, ObjectWithoutPayloadLength};
+    use crate::messages::object::{ObjectWithPayloadLength, ObjectWithoutPayloadLength};
     use crate::modules::{
         variable_bytes::write_variable_bytes, variable_integer::write_variable_integer,
     };

moqt-core/src/modules/messages/server_setup_message.rs → moqt-core/src/modules/messages/server_setup.rs

@@ -70,7 +70,7 @@ mod success {
         constants::MOQ_TRANSPORT_VERSION,
         messages::moqt_payload::MOQTPayload,
         modules::messages::{
-            server_setup_message::ServerSetup,
+            server_setup::ServerSetup,
             setup_parameters::{RoleCase, RoleParameter, SetupParameter},
         },
     };

moqt-core/src/modules/server_processes/announce_message.rs

@@ -1,6 +1,6 @@
 use crate::{
     handlers::announce_handler::{announce_handler, AnnounceResponse},
-    messages::{announce_message::Announce, moqt_payload::MOQTPayload},
+    messages::{announce::Announce, moqt_payload::MOQTPayload},
     moqt_client::MOQTClientStatus,
     MOQTClient, TrackNamespaceManagerRepository,
 };

moqt-core/src/modules/server_processes/client_setup_message.rs

@@ -3,7 +3,7 @@ use bytes::BytesMut;
 use crate::{
     constants::UnderlayType,
     handlers::server_setup_handler::setup_handler,
-    messages::{client_setup_message::ClientSetup, moqt_payload::MOQTPayload},
+    messages::{client_setup::ClientSetup, moqt_payload::MOQTPayload},
     moqt_client::MOQTClientStatus,
     MOQTClient,
 };