Support HEAD method to LLHLS, HLS, API pubs

AirenSoft · Oct 25, 2024 · 80018c8 · 80018c8
1 parent f4b3713
commit 80018c8
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 6 deletions.
diff --git a/src/projects/modules/http/server/http_default_interceptor.cpp b/src/projects/modules/http/server/http_default_interceptor.cpp
@@ -38,6 +38,12 @@ namespace http
 
 			if (error == nullptr)
 			{
+				// if mehotd == GET, set HEAD automatically
+				if (HTTP_CHECK_METHOD(method, Method::Get))
+				{
+					method |= Method::Head;
+				}
+
 				_request_handler_list.push_back((RequestInfo) {
 #if DEBUG
 					.pattern_string = whole_pattern,

diff --git a/src/projects/modules/http/server/http_exchange.cpp b/src/projects/modules/http/server/http_exchange.cpp
@@ -271,6 +271,8 @@ namespace http
 				return InterceptorResult::Error;
 			}
 
+			GetResponse()->SetMethod(GetRequest()->GetMethod());
+
 			return interceptor->OnRequestCompleted(GetSharedPtr());
 		}
 

diff --git a/src/projects/modules/http/server/http_response.cpp b/src/projects/modules/http/server/http_response.cpp
@@ -64,6 +64,16 @@ namespace http
 			return _tls_data;
 		}
 
+		void HttpResponse::SetMethod(Method method)
+		{
+			_method = method;
+		}
+
+		Method HttpResponse::GetMethod() const
+		{
+			return _method;
+		}
+
 		StatusCode HttpResponse::GetStatusCode() const
 		{
 			return _status_code;
@@ -244,6 +254,12 @@ namespace http
 				}
 			}
 
+			if (GetMethod() == Method::Head)
+			{
+				_sent_size += sent_size;
+				return sent_size;
+			}
+
 			auto sent_data_size = SendPayload();
 			if (sent_data_size < 0)
 			{

diff --git a/src/projects/modules/http/server/http_response.h b/src/projects/modules/http/server/http_response.h
@@ -34,6 +34,9 @@ namespace http
 			// Get Reason
 			ov::String GetReason() const;
 
+			void SetMethod(Method method);
+			Method GetMethod() const;
+
 			// reason = default
 			void SetStatusCode(StatusCode status_code);
 			// custom reason
@@ -123,6 +126,8 @@ namespace http
 			// Responsed time
 			std::chrono::system_clock::time_point _response_time;
 			uint32_t _sent_size = 0;
+
+			Method _method = Method::Unknown;
 		};
 	}  // namespace svr
 }  // namespace http
diff --git a/src/projects/publishers/hls/hls_http_interceptor.h b/src/projects/publishers/hls/hls_http_interceptor.h
@@ -27,7 +27,7 @@ class TsHttpInterceptor : public http::svr::DefaultInterceptor
 		auto parsed_uri = request->GetParsedUri();
 		auto file = parsed_uri->File().LowerCaseString();
 
-		if (request->GetMethod() == http::Method::Get || request->GetMethod() == http::Method::Options)
+		if (request->GetMethod() == http::Method::Get || request->GetMethod() == http::Method::Head || request->GetMethod() == http::Method::Options)
 		{
 		 	// ts:*.m3u8 is the master playlist for this HLS Publisher(HLSv3)
 			if (file.HasPrefix("ts:") && file.HasSuffix(".m3u8"))

diff --git a/src/projects/publishers/hls/hls_publisher.cpp b/src/projects/publishers/hls/hls_publisher.cpp
@@ -240,7 +240,7 @@ std::shared_ptr<TsHttpInterceptor> HlsPublisher::CreateInterceptor()
 		auto application = std::static_pointer_cast<HlsApplication>(GetApplicationByName(vhost_app_name));
 		if (application != nullptr)
 		{
-			application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response, {http::Method::Options, http::Method::Get});
+			application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response, {http::Method::Options, http::Method::Get, http::Method::Head});
 		}
 		else
 		{
@@ -510,7 +510,7 @@ std::shared_ptr<TsHttpInterceptor> HlsPublisher::CreateInterceptor()
 		session->UpdateLastRequest(connection->GetId());
 
 		// Cors Setting
-		application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response);
+		application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response, {http::Method::Options, http::Method::Get, http::Method::Head});
 		stream->SendMessage(session, std::make_any<std::shared_ptr<http::svr::HttpExchange>>(exchange));
 
 		return http::svr::NextHandler::DoNotCallAndDoNotResponse;

diff --git a/src/projects/publishers/llhls/llhls_http_interceptor.h b/src/projects/publishers/llhls/llhls_http_interceptor.h
@@ -27,7 +27,7 @@ class LLHlsHttpInterceptor : public http::svr::DefaultInterceptor
 		auto parsed_uri = request->GetParsedUri();
 		auto file = parsed_uri->File().LowerCaseString();
 
-		if (request->GetMethod() == http::Method::Get || request->GetMethod() == http::Method::Options)
+		if (request->GetMethod() == http::Method::Get || request->GetMethod() == http::Method::Head || request->GetMethod() == http::Method::Options)
 		{
 			// ts:*.m3u8 is the master playlist for this HLSv3 Publisher(HLSv3)
 			if (file.HasPrefix("ts:") && file.HasSuffix(".m3u8"))

diff --git a/src/projects/publishers/llhls/llhls_publisher.cpp b/src/projects/publishers/llhls/llhls_publisher.cpp
@@ -247,7 +247,7 @@ std::shared_ptr<LLHlsHttpInterceptor> LLHlsPublisher::CreateInterceptor()
 		auto application = std::static_pointer_cast<LLHlsApplication>(GetApplicationByName(vhost_app_name));
 		if (application != nullptr)
 		{
-			application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response, {http::Method::Options, http::Method::Get});
+			application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response, {http::Method::Options, http::Method::Get, http::Method::Head});
 		}
 		else
 		{
@@ -505,7 +505,7 @@ std::shared_ptr<LLHlsHttpInterceptor> LLHlsPublisher::CreateInterceptor()
 		session->UpdateLastRequest(connection->GetId());
 
 		// Cors Setting
-		application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response);
+		application->GetCorsManager().SetupHttpCorsHeader(vhost_app_name, request, response, {http::Method::Options, http::Method::Get, http::Method::Head});
 		stream->SendMessage(session, std::make_any<std::shared_ptr<http::svr::HttpExchange>>(exchange));
 
 		return http::svr::NextHandler::DoNotCallAndDoNotResponse;
-Original file line number
+Diff line change
@@ Expand Up / @@ -271,6 +271,8 @@ namespace http @@
     				return InterceptorResult::Error;
     			}
+    			GetResponse()->SetMethod(GetRequest()->GetMethod());
     			return interceptor->OnRequestCompleted(GetSharedPtr());
     		}
@@ Expand Down @@