Remove extra parameters from HTTP handler signature

These parameters are no longer needed since they were only used
by EventsHandler which was refactored in the other commit.

lib/remote/actionshandler.cpp

@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/actions", ActionsHandler);
 
 bool ActionsHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/actionshandler.hpp

@@ -17,11 +17,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/configfileshandler.cpp

@@ -15,11 +15,9 @@ REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);
 
 bool ConfigFilesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/configfileshandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/configpackageshandler.cpp

@@ -12,11 +12,9 @@ REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);
 
 bool ConfigPackagesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/configpackageshandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 
 private:

lib/remote/configstageshandler.cpp

@@ -16,11 +16,9 @@ std::atomic<bool> ConfigStagesHandler::m_RunningPackageUpdates (false);
 
 bool ConfigStagesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/configstageshandler.hpp

@@ -16,11 +16,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 
 private:

lib/remote/consolehandler.cpp

@@ -55,11 +55,9 @@ static void EnsureFrameCleanupTimer()
 
 bool ConsoleHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/consolehandler.hpp

@@ -24,11 +24,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 
 	static std::vector<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame);

lib/remote/createobjecthandler.cpp

@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler);
 
 bool CreateObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/createobjecthandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/deleteobjecthandler.cpp

@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/objects", DeleteObjectHandler);
 
 bool DeleteObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/deleteobjecthandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/eventshandler.cpp

@@ -41,11 +41,9 @@ const String l_ApiQuery ("<API query>");
 
 bool EventsHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace asio = boost::asio;

lib/remote/eventshandler.hpp

@@ -16,11 +16,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/httphandler.cpp

@@ -48,11 +48,9 @@ void HttpHandler::Register(const Url::Ptr& url, const HttpHandler::Ptr& handler)
 
 void HttpHandler::ProcessRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	Dictionary::Ptr node = m_UrlTree;
@@ -105,7 +103,7 @@ void HttpHandler::ProcessRequest(
 	 */
 	try {
 		for (const HttpHandler::Ptr& handler : handlers) {
-			if (handler->HandleRequest(waitGroup, stream, request, response, yc, server)) {
+			if (handler->HandleRequest(waitGroup, request, response, yc)) {
 				processed = true;
 				break;
 			}

lib/remote/httphandler.hpp

@@ -30,21 +30,17 @@ public:
 
 	virtual bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) = 0;
 
 	static void Register(const Url::Ptr& url, const HttpHandler::Ptr& handler);
 	static void ProcessRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	);
 
 private:

lib/remote/httpserverconnection.cpp

@@ -41,8 +41,7 @@ HttpServerConnection::HttpServerConnection(const WaitGroup::Ptr& waitGroup, cons
 }
 
 HttpServerConnection::HttpServerConnection(const WaitGroup::Ptr& waitGroup, const String& identity, bool authenticated, const Shared<AsioTlsStream>::Ptr& stream, boost::asio::io_context& io)
-	: m_WaitGroup(waitGroup), m_Stream(stream), m_Seen(Utility::GetTime()), m_IoStrand(io), m_ShuttingDown(false), m_HasStartedStreaming(false),
+	: m_WaitGroup(waitGroup), m_Stream(stream), m_Seen(Utility::GetTime()), m_IoStrand(io), m_ShuttingDown(false), m_CheckLivenessTimer(io)
-	m_CheckLivenessTimer(io)
 {
 	if (authenticated) {
 		m_ApiUser = ApiUser::GetByClientCN(identity);
@@ -100,29 +99,6 @@ void HttpServerConnection::Disconnect(boost::asio::yield_context yc)
 	}
 }
 
-void HttpServerConnection::StartStreaming()
-{
-	namespace asio = boost::asio;
-
-	m_HasStartedStreaming = true;
-
-	HttpServerConnection::Ptr keepAlive (this);
-
-	IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) {
-		if (!m_ShuttingDown) {
-			char buf[128];
-			asio::mutable_buffer readBuf (buf, 128);
-			boost::system::error_code ec;
-
-			do {
-				m_Stream->async_read_some(readBuf, yc[ec]);
-			} while (!ec);
-
-			Disconnect(yc);
-		}
-	});
-}
-
 bool HttpServerConnection::Disconnected()
 {
 	return m_ShuttingDown;
@@ -388,11 +364,8 @@ bool EnsureValidBody(
 
 static inline
 bool ProcessRequest(
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	HttpServerConnection& server,
-	bool& hasStartedStreaming,
 	const WaitGroup::Ptr& waitGroup,
 	std::chrono::steady_clock::duration& cpuBoundWorkTime,
 	boost::asio::yield_context& yc
@@ -404,7 +377,7 @@ bool ProcessRequest(
 		CpuBoundWork handlingRequest (yc);
 		cpuBoundWorkTime = std::chrono::steady_clock::now() - start;
 
-		HttpHandler::ProcessRequest(waitGroup, stream, request, response, yc, server);
+		HttpHandler::ProcessRequest(waitGroup, request, response, yc);
 	} catch (const std::exception& ex) {
 		response.SendJsonError(request.Params(), 500, "Unhandled exception", DiagnosticInformation(ex));
 		response.Write(yc);
@@ -501,7 +474,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
 
 			m_Seen = std::numeric_limits<decltype(m_Seen)>::max();
 
-			if (!ProcessRequest(*m_Stream, request, response, *this, m_HasStartedStreaming, m_WaitGroup, cpuBoundWorkTime, yc)) {
+			if (!ProcessRequest(request, response, m_WaitGroup, cpuBoundWorkTime, yc)) {
 				break;
 			}
 

lib/remote/httpserverconnection.hpp

@@ -30,7 +30,6 @@ public:
 		const Shared<AsioTlsStream>::Ptr& stream);
 
 	void Start();
-	void StartStreaming();
 	bool Disconnected();
 
 private:
@@ -41,7 +40,6 @@ private:
 	String m_PeerAddress;
 	boost::asio::io_context::strand m_IoStrand;
 	bool m_ShuttingDown;
-	bool m_HasStartedStreaming;
 	boost::asio::deadline_timer m_CheckLivenessTimer;
 
 	HttpServerConnection(const WaitGroup::Ptr& waitGroup, const String& identity, bool authenticated,

lib/remote/infohandler.cpp

@@ -10,11 +10,9 @@ REGISTER_URLHANDLER("/", InfoHandler);
 
 bool InfoHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/infohandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/mallocinfohandler.cpp

@@ -19,11 +19,9 @@ REGISTER_URLHANDLER("/v1/debug/malloc_info", MallocInfoHandler);
 
 bool MallocInfoHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream&,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context&,
+	boost::asio::yield_context&
-	HttpServerConnection&
 )
 {
 	namespace http = boost::beast::http;

lib/remote/mallocinfohandler.hpp

@@ -14,11 +14,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/modifyobjecthandler.cpp

@@ -15,11 +15,9 @@ REGISTER_URLHANDLER("/v1/objects", ModifyObjectHandler);
 
 bool ModifyObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/modifyobjecthandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/objectqueryhandler.cpp

@@ -90,11 +90,9 @@ Dictionary::Ptr ObjectQueryHandler::SerializeObjectAttrs(const Object::Ptr& obje
 
 bool ObjectQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/objectqueryhandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 
 private:

lib/remote/statushandler.cpp

@@ -70,11 +70,9 @@ public:
 
 bool StatusHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/statushandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/templatequeryhandler.cpp

@@ -77,11 +77,9 @@ public:
 
 bool TemplateQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/templatequeryhandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/typequeryhandler.cpp

@@ -48,11 +48,9 @@ public:
 
 bool TypeQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/typequeryhandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };
 

lib/remote/variablequeryhandler.cpp

@@ -58,11 +58,9 @@ public:
 
 bool VariableQueryHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
+	boost::asio::yield_context& yc
-	HttpServerConnection& server
 )
 {
 	namespace http = boost::beast::http;

lib/remote/variablequeryhandler.hpp

@@ -15,11 +15,9 @@ public:
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
+		boost::asio::yield_context& yc
-		HttpServerConnection& server
 	) override;
 };