tweak(server/http): provide error response headers

citizenfx · Dec 17, 2024 · 6fc82e5 · 6fc82e5
1 parent c970038
commit 6fc82e5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/code/components/citizen-server-impl/src/HttpScriptFunctions.cpp b/code/components/citizen-server-impl/src/HttpScriptFunctions.cpp
@@ -116,44 +116,44 @@ void PerformHttpRequestInternal(fx::ScriptContext& context)
 			// run a HTTP request
 			httpClient->DoMethodRequest(method, url, data, options, [evComponent, token, responseCode, responseHeaders](bool success, const char* data, size_t length)
 			{
-				if (!success)
-				{
-					evComponent->QueueEvent2("__cfx_internal:httpResponse", {}, token, *responseCode, msgpack::type::nil_t{}, std::map<std::string, std::string>(), std::string{ data, length });
-				}
-				else
+				msgpack::zone mz;
+				auto responseHeaderData = std::map<std::string, msgpack::object>();
+				for (auto& [key, value] : *responseHeaders)
 				{
-					msgpack::zone mz;
-					auto responseHeaderData = std::map<std::string, msgpack::object>();
-					for (auto& [key, value] : *responseHeaders)
+					if (auto it = responseHeaderData.find(key); it != responseHeaderData.end())
 					{
-						if (auto it = responseHeaderData.find(key); it != responseHeaderData.end())
+						// inefficient, but trivial
+						std::vector<std::string> newVal;
+
+						if (it->second.type != msgpack::type::ARRAY)
 						{
-							// inefficient, but trivial
-							std::vector<std::string> newVal;
-
-							if (it->second.type != msgpack::type::ARRAY)
-							{
-								newVal = {
-									it->second.as<std::string>(),
-									value
-								};
-							}
-							else
-							{
-								newVal = it->second.as<std::vector<std::string>>();
-								newVal.push_back(value);
-							}
-
-							responseHeaderData.erase(it);
-							responseHeaderData.emplace(key, msgpack::object{ newVal, mz });
+							newVal = {
+								it->second.as<std::string>(),
+								value
+							};
 						}
 						else
 						{
-							responseHeaderData.emplace(key, msgpack::object{ value, mz });
+							newVal = it->second.as<std::vector<std::string>>();
+							newVal.push_back(value);
 						}
+
+						responseHeaderData.erase(it);
+						responseHeaderData.emplace(key, msgpack::object{ newVal, mz });
+					}
+					else
+					{
+						responseHeaderData.emplace(key, msgpack::object{ value, mz });
 					}
+				}
 
-					evComponent->QueueEvent2("__cfx_internal:httpResponse", {}, token, *responseCode, std::string{ data, length }, responseHeaderData, msgpack::type::nil_t{});
+				if (!success)
+				{
+					evComponent->QueueEvent2("__cfx_internal:httpResponse", {}, token, *responseCode, msgpack::type::nil_t{}, std::map<std::string, std::string>(), std::string{ data, length }, responseHeaderData);
+				}
+				else
+				{
+					evComponent->QueueEvent2("__cfx_internal:httpResponse", {}, token, *responseCode, std::string{ data, length }, responseHeaderData, msgpack::type::nil_t{}, std::map<std::string, std::string>());
 				}
 			});
 

diff --git a/data/shared/citizen/scripting/lua/scheduler.lua b/data/shared/citizen/scripting/lua/scheduler.lua
@@ -394,11 +394,11 @@ if isDuplicityVersion then
 	end
 
 	local httpDispatch = {}
-	AddEventHandler('__cfx_internal:httpResponse', function(token, status, body, headers, errorData)
+	AddEventHandler('__cfx_internal:httpResponse', function(token, status, body, headers, errorData, errorHeaders)
 		if httpDispatch[token] then
 			local userCallback = httpDispatch[token]
 			httpDispatch[token] = nil
-			userCallback(status, body, headers, errorData)
+			userCallback(status, body, headers, errorData, errorHeaders)
 		end
 	end)