network: HTTPClient+HTTPDownloadClientTest: some improvements(2)

Author: andreasdr

src/tdme/network/httpclient/HTTPClient.cpp

@@ -117,7 +117,7 @@ string HTTPClient::createHTTPRequestHeaders(const string& hostname, const string
 	return request;
 }
 
-void HTTPClient::parseHTTPResponseHeaders(stringstream& rawResponse, int16_t& statusCode, unordered_map<string, string>& responseHeaders) {
+void HTTPClient::parseHTTPResponseHeaders(stringstream& rawResponse) {
 	int headerIdx = 0;
 	string statusHeader;
 	string line;
@@ -182,18 +182,13 @@ void HTTPClient::execute() {
 		auto hostname = relativeUrl;
 		if (slashIdx != -1) hostname = StringTools::substring(relativeUrl, 0, slashIdx);
 		relativeUrl = StringTools::substring(relativeUrl, hostname.size());
-
-		Console::println("HTTPClient::execute(): hostname: " + hostname);
-		Console::println("HTTPClient::execute(): relative url: " + relativeUrl);
-
-		Console::print("HTTPClient::execute(): resolving hostname to IP: " + hostname + ": ");
+		//
 		auto ip = Network::getIpByHostname(hostname);
 		if (ip.empty() == true) {
 			Console::println("HTTPClient::execute(): failed");
 			throw HTTPClientException("Could not resolve host IP by hostname");
 		}
-		Console::println(ip);
-
+		//
 		TCPSocket::create(socket, TCPSocket::determineIpVersion(ip));
 		socket.connect(ip, 80);
 		auto request = createHTTPRequestHeaders(hostname, relativeUrl, body);
@@ -211,7 +206,7 @@ void HTTPClient::execute() {
 		}
 
 		//
-		parseHTTPResponseHeaders(rawResponse, statusCode, responseHeaders);
+		parseHTTPResponseHeaders(rawResponse);
 
 		//
 		socket.shutdown();

src/tdme/network/httpclient/HTTPClient.h

@@ -56,10 +56,8 @@ class tdme::network::httpclient::HTTPClient {
 	/**
 	 * Parse HTTP response headers
 	 * @param rawResponse raw response
-	 * @param statusCode HTTP status code
-	 * @param responseHeaders HTTP response headers
 	 */
-	void parseHTTPResponseHeaders(stringstream& rawResponse, int16_t& statusCode, unordered_map<string, string>& responseHeaders);
+	void parseHTTPResponseHeaders(stringstream& rawResponse);
 
 public:
 	static const constexpr int16_t HTTP_STATUSCODE_OK { 200 };
@@ -135,16 +133,16 @@ class tdme::network::httpclient::HTTPClient {
 	}
 
 	/**
-	 * Get headers
-	 * @return headers
+	 * Get request headers
+	 * @return request headers
 	 */
 	inline const unordered_map<string, string>& getHeaders() {
 		return headers;
 	}
 
 	/**
-	 * Set headers
-	 * @param headers headers
+	 * Set request headers
+	 * @param headers request headers
 	 */
 	inline void setHeaders(const unordered_map<string, string>& headers) {
 		this->headers = headers;

src/tdme/network/httpclient/HTTPDownloadClient.cpp

@@ -113,7 +113,7 @@ string HTTPDownloadClient::createHTTPRequestHeaders(const string& hostName, cons
 	return request;
 }
 
-uint64_t HTTPDownloadClient::parseHTTPResponseHeaders(ifstream& rawResponse, int16_t& statusCode, unordered_map<string, string>& responseHeaders) {
+uint64_t HTTPDownloadClient::parseHTTPResponseHeaders(ifstream& rawResponse) {
 	responseHeaders.clear();
 	auto headerSize = 0ll;
 	auto returnHeaderSize = 0ll;
@@ -194,17 +194,12 @@ void HTTPDownloadClient::start() {
 					auto hostname = relativeUrl;
 					if (slashIdx != -1) hostname = StringTools::substring(relativeUrl, 0, slashIdx);
 					relativeUrl = StringTools::substring(relativeUrl, hostname.size());
-
-					Console::println("HTTPDownloadClient::execute(): hostname: " + hostname);
-					Console::println("HTTPDownloadClient::execute(): relative url: " + relativeUrl);
-					Console::print("HTTPDownloadClient::execute(): resolving hostname to IP: " + hostname + ": ");
+					//
 					auto ip = Network::getIpByHostname(hostname);
 					if (ip.empty() == true) {
 						Console::println("HTTPDownloadClient::execute(): failed");
 						throw HTTPClientException("Could not resolve host IP by hostname");
 					}
-					Console::println(ip);
-
 					// socket
 					TCPSocket::create(socket, TCPSocket::determineIpVersion(ip));
 					socket.connect(ip, 80);
@@ -236,7 +231,7 @@ void HTTPDownloadClient::start() {
 									}
 									// try to read headers
 									downloadClient->responseHeaders.clear();
-									if ((downloadClient->headerSize = downloadClient->parseHTTPResponseHeaders(ifs, downloadClient->statusCode, downloadClient->responseHeaders)) > 0) {
+									if ((downloadClient->headerSize = downloadClient->parseHTTPResponseHeaders(ifs)) > 0) {
 										downloadClient->haveHeaders = true;
 										auto contentLengthHeaderIt = downloadClient->responseHeaders.find("Content-Length");
 										if (contentLengthHeaderIt != downloadClient->responseHeaders.end()) {

src/tdme/network/httpclient/HTTPDownloadClient.h

@@ -67,11 +67,9 @@ class tdme::network::httpclient::HTTPDownloadClient {
 	/**
 	 * Parse HTTP response headers
 	 * @param rawResponse raw response
-	 * @param httpStatusCode HTTP status code
-	 * @param httpHeader HTTP header
 	 * @return http header size or 0 if not yet completely submitted
 	 */
-	uint64_t parseHTTPResponseHeaders(ifstream& rawResponse, int16_t& statusCode, unordered_map<string, string>& responseHeaders);
+	uint64_t parseHTTPResponseHeaders(ifstream& rawResponse);
 
 public:
 
@@ -115,16 +113,16 @@ class tdme::network::httpclient::HTTPDownloadClient {
 	}
 
 	/**
-	 * Get headers
-	 * @return headers
+	 * Get request headers
+	 * @return request headers
 	 */
 	inline const unordered_map<string, string>& getHeaders() {
 		return headers;
 	}
 
 	/**
-	 * Set headers
-	 * @param headers headers
+	 * Set request headers
+	 * @param headers request headers
 	 */
 	inline void setHeaders(const unordered_map<string, string>& headers) {
 		this->headers = headers;

src/tdme/tests/HTTPClientTest-main.cpp

@@ -25,7 +25,7 @@ int main(int argc, char *argv[]) {
 		httpClient.execute();
 		Console::println("HTTP status code: " + to_string(httpClient.getStatusCode()));
 		for (const auto& [headerName, headerValue]: httpClient.getResponseHeaders()) {
-			Console::println("Header: " + headerName + ": " + headerValue);
+			Console::println("Response Header: " + headerName + ": " + headerValue);
 		}
 		Console::println("Response: ");
 		char c;