was/async/SimpleHandler: move struct SimpleResponse to a separate header

MaxKellermann · MaxKellermann · commit db503d319f55 · 2025-11-29T07:11:51.000+01:00
diff --git a/demo/was/BadRequest.cxx b/demo/was/BadRequest.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "was/async/CoRun.hxx"
+#include "was/async/SimpleResponse.hxx"
 #include "was/ExceptionResponse.hxx"
 #include "event/Loop.hxx"
 #include "uri/MapQueryString.hxx"
diff --git a/demo/was/CoMirror.cxx b/demo/was/CoMirror.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "was/async/CoRun.hxx"
+#include "was/async/SimpleResponse.hxx"
 #include "event/Loop.hxx"
 #include "util/PrintException.hxx"
 #include "DefaultFifoBuffer.hxx"
diff --git a/demo/was/CoSleepMirror.cxx b/demo/was/CoSleepMirror.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "was/async/CoRun.hxx"
+#include "was/async/SimpleResponse.hxx"
 #include "event/co/Sleep.hxx"
 #include "event/Loop.hxx"
 #include "util/PrintException.hxx"
diff --git a/demo/was/Json.cxx b/demo/was/Json.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "was/async/CoRun.hxx"
+#include "was/async/SimpleResponse.hxx"
 #include "was/async/nlohmann_json/Read.hxx"
 #include "was/async/nlohmann_json/Write.hxx"
 #include "lib/nlohmann_json/ToDisposableBuffer.hxx"
diff --git a/demo/was/Mirror.cxx b/demo/was/Mirror.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "was/async/SimpleRun.hxx"
+#include "was/async/SimpleResponse.hxx"
 #include "was/async/SimpleServer.hxx"
 #include "event/Loop.hxx"
 #include "util/PrintException.hxx"
diff --git a/src/was/async/CoHandler.cxx b/src/was/async/CoHandler.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "CoHandler.hxx"
+#include "SimpleResponse.hxx"
 #include "SimpleServer.hxx"
 #include "was/ExceptionResponse.hxx"
 #include "co/InvokeTask.hxx"
diff --git a/src/was/async/CoRun.cxx b/src/was/async/CoRun.cxx
@@ -5,6 +5,7 @@
 #include "CoRun.hxx"
 #include "CoHandler.hxx"
 #include "SimpleRun.hxx"
+#include "SimpleResponse.hxx"
 
 #include <functional>
 
diff --git a/src/was/async/SimpleClient.cxx b/src/was/async/SimpleClient.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "SimpleClient.hxx"
+#include "SimpleHandler.hxx"
 #include "SimpleOutput.hxx"
 #include "Socket.hxx"
 #include "net/SocketProtocolError.hxx"
diff --git a/src/was/async/SimpleClient.hxx b/src/was/async/SimpleClient.hxx
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "SimpleHandler.hxx"
+#include "SimpleResponse.hxx"
 #include "Control.hxx"
 #include "Output.hxx"
 #include "SimpleInput.hxx"
@@ -16,6 +16,8 @@ struct WasSocket;
 
 namespace Was {
 
+struct SimpleRequest;
+
 class SimpleClientHandler {
 public:
 	virtual void OnWasError(std::exception_ptr error) noexcept = 0;
diff --git a/src/was/async/SimpleHandler.hxx b/src/was/async/SimpleHandler.hxx
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "http/Method.hxx"
-#include "http/Status.hxx"
 #include "util/DisposableBuffer.hxx"
 
 #include <map>
@@ -15,6 +14,9 @@ class CancellablePointer;
 
 namespace Was {
 
+struct SimpleResponse;
+class SimpleServer;
+
 struct SimpleRequest {
 	std::string remote_host;
 	std::map<std::string, std::string, std::less<>> parameters;
@@ -32,29 +34,6 @@ struct SimpleRequest {
 	bool IsContentType(const std::string_view expected) const noexcept;
 };
 
-struct SimpleResponse {
-	HttpStatus status = HttpStatus::OK;
-	std::multimap<std::string, std::string, std::less<>> headers;
-	DisposableBuffer body;
-
-	void SetTextPlain(std::string_view _body) noexcept {
-		body = {ToNopPointer(_body.data()), _body.size()};
-		headers.emplace("content-type", "text/plain");
-	}
-
-	static SimpleResponse MethodNotAllowed(std::string allow) noexcept {
-		return {
-			HttpStatus::METHOD_NOT_ALLOWED,
-			std::multimap<std::string, std::string, std::less<>>{
-				{"allow", std::move(allow)},
-			},
-			nullptr,
-		};
-	}
-};
-
-class SimpleServer;
-
 class SimpleRequestHandler {
 public:
 	/**
diff --git a/src/was/async/SimpleResponse.hxx b/src/was/async/SimpleResponse.hxx
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: BSD-2-Clause
+// Copyright CM4all GmbH
+// author: Max Kellermann <max.kellermann@ionos.com>
+
+#pragma once
+
+#include "http/Status.hxx"
+#include "util/DisposableBuffer.hxx"
+
+#include <map>
+#include <string>
+
+class CancellablePointer;
+
+namespace Was {
+
+struct SimpleResponse {
+	HttpStatus status = HttpStatus::OK;
+	std::multimap<std::string, std::string, std::less<>> headers;
+	DisposableBuffer body;
+
+	void SetTextPlain(std::string_view _body) noexcept {
+		body = {ToNopPointer(_body.data()), _body.size()};
+		headers.emplace("content-type", "text/plain");
+	}
+
+	static SimpleResponse MethodNotAllowed(std::string allow) noexcept {
+		return {
+			HttpStatus::METHOD_NOT_ALLOWED,
+			std::multimap<std::string, std::string, std::less<>>{
+				{"allow", std::move(allow)},
+			},
+			nullptr,
+		};
+	}
+};
+
+} // namespace Was
diff --git a/src/was/async/SimpleServer.cxx b/src/was/async/SimpleServer.cxx
@@ -3,6 +3,7 @@
 // author: Max Kellermann <max.kellermann@ionos.com>
 
 #include "SimpleServer.hxx"
+#include "SimpleResponse.hxx"
 #include "SimpleOutput.hxx"
 #include "Socket.hxx"
 #include "net/SocketProtocolError.hxx"
diff --git a/src/was/async/nlohmann_json/Write.cxx b/src/was/async/nlohmann_json/Write.cxx
@@ -5,7 +5,7 @@
 #include "Write.hxx"
 #include "lib/nlohmann_json/ToDisposableBuffer.hxx"
 #include "was/ExceptionResponse.hxx"
-#include "was/async/SimpleHandler.hxx"
+#include "was/async/SimpleResponse.hxx"
 
 #include <nlohmann/json.hpp>
 
