Merge pull request #6 from ArkServerApi/major-update-8-may

Change messaging manager error for a warn, bump version to 1.16, add …

AsaApi/Core/Private/Ark/ApiUtils.cpp

@@ -169,7 +169,7 @@ namespace AsaApi
 				{
 					TArray<FString> parsedName;
 					it->first.ParseIntoArray(parsedName, L"\\", true);
-					Log::GetLog()->error("Custom messaging error for '{}', using normal messaging. Reason: {}", parsedName.Last().ToString(), error.value());
+					Log::GetLog()->warn("Custom messaging error for '{}', using normal messaging. Reason: {}", parsedName.Last().ToString(), error.value());
 					it = messaging_managers_.erase(it);
 					continue;
 				}

AsaApi/Core/Private/Ark/ArkBaseApi.cpp

@@ -15,7 +15,7 @@
 
 namespace API
 {
-	constexpr float api_version = 1.15f;
+	constexpr float api_version = 1.16f;
 
 	ArkBaseApi::ArkBaseApi()
 		: commands_(std::make_unique<AsaApi::Commands>()),

AsaApi/Core/Private/Ark/ArkBaseApi.h

@@ -23,8 +23,8 @@ namespace API
 		std::unique_ptr<AsaApi::IHooks>& GetHooks() override;
 		std::unique_ptr<AsaApi::IApiUtils>& GetApiUtils() override;
 
-	private:
 		nlohmann::json GetConfig();
+	private:
 		bool DownloadCacheFiles(const std::filesystem::path downloadFile, const std::filesystem::path localFile);
 
 		// Callbacks

AsaApi/Core/Private/Tools/Requests.cpp

@@ -10,6 +10,8 @@
 
 #include <mutex>
 
+#include "json.hpp"
+
 #include "fstream"
 #include "Poco/StreamCopier.h"
 #include "Poco/URI.h"
@@ -29,6 +31,7 @@
 #include "Poco/Net/HTTPSClientSession.h"
 #include "Poco/Net/HTTPRequest.h"
 #include "Poco/Net/HTTPResponse.h"
+#include "../Ark/ArkBaseApi.h"
 
 namespace API
 {
@@ -58,7 +61,9 @@ namespace API
 	Requests::Requests()
 		: pimpl{ std::make_unique<impl>() } 
 	{		
-
+		const nlohmann::json config = dynamic_cast<ArkBaseApi&>(*game_api).GetConfig();
+		suppress_errors = config.value("SuppressHttpErrors", false);
+
 		Poco::Net::initializeSSL();
 		Poco::SharedPtr<Poco::Net::InvalidCertificateHandler> ptrCert = new Poco::Net::RejectCertificateHandler(false);
 
@@ -155,7 +160,8 @@ namespace API
 				}
 				catch (const Poco::Exception& exc)
 				{
-					Log::GetLog()->error(exc.displayText());
+					if (!suppress_errors)
+						Log::GetLog()->error(exc.displayText());
 				}
 
 				const bool success = (int)response.getStatus() >= 200
@@ -193,7 +199,8 @@ namespace API
 				}
 				catch (const Poco::Exception& exc)
 				{
-					Log::GetLog()->error(exc.displayText());
+					if (!suppress_errors)
+						Log::GetLog()->error(exc.displayText());
 				}
 
 				const bool success = (int)response.getStatus() >= 200
@@ -231,7 +238,8 @@ namespace API
 				}
 				catch (const Poco::Exception& exc)
 				{
-					Log::GetLog()->error(exc.displayText());
+					if (!suppress_errors)
+						Log::GetLog()->error(exc.displayText());
 				}
 
 				const bool success = (int)response.getStatus() >= 200
@@ -285,7 +293,8 @@ namespace API
 				}
 				catch (const Poco::Exception& exc)
 				{
-					Log::GetLog()->error(exc.displayText());
+					if (!suppress_errors)
+						Log::GetLog()->error(exc.displayText());
 				}
 
 				const bool success = (int)response.getStatus() >= 200
@@ -323,7 +332,8 @@ namespace API
 			}
 			catch (const Poco::Exception& exc)
 			{
-				Log::GetLog()->error(exc.displayText());
+				if (!suppress_errors)
+					Log::GetLog()->error(exc.displayText());
 			}
 
 			const bool success = (int)response.getStatus() >= 200
@@ -361,7 +371,8 @@ namespace API
 			}
 			catch (const Poco::Exception& exc)
 			{
-				Log::GetLog()->error(exc.displayText());
+				if (!suppress_errors)
+					Log::GetLog()->error(exc.displayText());
 			}
 
 			const bool success = (int)response.getStatus() >= 200
@@ -394,7 +405,8 @@ namespace API
 				}
 				catch (const Poco::Exception& exc)
 				{
-					Log::GetLog()->error(exc.displayText());
+					if (!suppress_errors)
+						Log::GetLog()->error(exc.displayText());
 				}
 
 				const bool success = (int)response.getStatus() >= 200
@@ -426,7 +438,8 @@ namespace API
 		}
 		catch (const Poco::Exception& exc)
 		{
-			Log::GetLog()->error(exc.displayText());
+			if (!suppress_errors)
+				Log::GetLog()->error(exc.displayText());
 		}
 
 		Result.statusCode = (int)response.getStatus();

AsaApi/Core/Public/Requests.h

@@ -124,5 +124,6 @@ namespace API
 	private:
 		class impl;
 		std::unique_ptr<impl> pimpl;
+		bool suppress_errors = false;
 	};
 } // namespace API

Configs/config.json

@@ -12,6 +12,7 @@
     "AutomaticCacheDownload": {
       "Enable": true,
       "DownloadCacheURL": "https://cdn.pelayori.com/cache/"
-    }
+    },
+    "SuppressHttpErrors": false
   }
 }