update(HTTP): cURL -> SteamHTTP

Author: skuzzis

.vscode/c_cpp_properties.json

@@ -15,7 +15,6 @@
                 "${workspaceFolder}/vendor/msgpack/include/**",
                 "${workspaceFolder}/vendor/funchook/include/**",
                 "${workspaceFolder}/vendor/texttable/**",
-                "${workspaceFolder}/vendor/curl/win64/include/**",
                 "${workspaceFolder}/vendor/mysql/win64/include/**",
                 "${workspaceFolder}/vendor/asmjit/src/**",
                 "${workspaceFolder}/vendor/dynohook/win64/include/**",
@@ -29,7 +28,6 @@
                 "WIN32",
                 "COMPILER_GCC",
                 "CPPHTTPLIB_OPENSSL_SUPPORT",
-                "CURL_STATICLIB",
                 "MSGPACK_NO_BOOST"
             ],
             "cStandard": "c17",
@@ -51,7 +49,6 @@
                 "${workspaceFolder}/vendor/msgpack/include/**",
                 "${workspaceFolder}/vendor/funchook/include/**",
                 "${workspaceFolder}/vendor/texttable/**",
-                "${workspaceFolder}/vendor/curl/linuxsteamrt64/include/**",
                 "${workspaceFolder}/vendor/mysql/linuxsteamrt64/include/**",
                 "${workspaceFolder}/vendor/asmjit/src/**",
                 "${workspaceFolder}/vendor/dynohook/linuxsteamrt64/include/**",
@@ -64,8 +61,7 @@
                 "_UNICODE",
                 "POSIX",
                 "COMPILER_GCC",
-                "CPPHTTPLIB_OPENSSL_SUPPORT",
-                "CURL_STATICLIB"
+                "CPPHTTPLIB_OPENSSL_SUPPORT"
             ],
             "cStandard": "c17",
             "cppStandard": "c++17",

AMBuilder

@@ -66,7 +66,6 @@ for sdk_target in MMSPlugin.sdk_targets:
 		binary.compiler.postlink += [
 			os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'libfunchook.a'),
       		os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'libdistorm.a'),
-      		os.path.join(builder.sourcePath, 'vendor', 'curl', 'linuxsteamrt64', 'lib', 'libcurl.a'),
       		os.path.join(builder.sourcePath, 'vendor', 'mysql', 'linuxsteamrt64', 'lib', 'libmysqlclient.a'),
       		os.path.join(builder.sourcePath, 'vendor', 'dynohook', 'linuxsteamrt64', 'lib', 'libdynohook.a'),
       		os.path.join(builder.sourcePath, 'vendor', 'zydis', 'linuxsteamrt64', 'libZydis.a'),
@@ -117,7 +116,6 @@ for sdk_target in MMSPlugin.sdk_targets:
 		binary.compiler.postlink += [
 			os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'funchook.lib'),
 		    os.path.join(builder.sourcePath, 'vendor', 'funchook', 'lib', 'distorm.lib'),
-      		os.path.join(builder.sourcePath, 'vendor', 'curl', 'win64', 'lib', 'libcurl_a.lib'),
       		os.path.join(builder.sourcePath, 'vendor', 'mysql', 'win64', 'lib', 'mysqlclient.lib'),
       		os.path.join(builder.sourcePath, 'vendor', 'dynohook', 'win64', 'lib', 'dynohook.lib'),
       		os.path.join(builder.sourcePath, 'vendor', 'zydis', 'win64', 'Zydis.lib'),
@@ -172,7 +170,6 @@ for sdk_target in MMSPlugin.sdk_targets:
 		"GITHUB_SHA=\"" + (os.getenv('GITHUB_SHA') == None and "LOCAL" or os.getenv('GITHUB_SHA')) + "\"",
 		"HAVE_STRUCT_TIMESPEC",
 		"BUILDING",
-		"CURL_STATICLIB",
 		"MSGPACK_NO_BOOST",
 	]
 
@@ -195,7 +192,6 @@ for sdk_target in MMSPlugin.sdk_targets:
 		os.path.join(builder.sourcePath, 'vendor', 'json', 'include'),
 		os.path.join(builder.sourcePath, 'vendor', 'funchook', 'include'),
 		os.path.join(builder.sourcePath, 'vendor', 'texttable'),
-		os.path.join(builder.sourcePath, 'vendor', 'curl', ('win64' if binary.compiler.target.platform == 'windows' else 'linuxsteamrt64'), 'include'),
 		os.path.join(builder.sourcePath, 'vendor', 'mysql', ('win64' if binary.compiler.target.platform == 'windows' else 'linuxsteamrt64'), 'include'),
 		os.path.join(builder.sourcePath, 'vendor', 'asmjit', 'src'),
 		os.path.join(builder.sourcePath, 'vendor', 'dynohook', ('win64' if binary.compiler.target.platform == 'windows' else 'linuxsteamrt64'), 'include'),

src/entrypoint.cpp

@@ -11,6 +11,7 @@
 #include "addons/addons.h"
 #include "encoders/msgpack.h"
 #include "addons/clients.h"
+#include "http/HTTPManager.h"
 #include "configuration/Configuration.h"
 #include "commands/CommandsManager.h"
 #include "crashreporter/CallStack.h"
@@ -41,6 +42,7 @@ SH_DECL_HOOK6_void(IServerGameClients, OnClientConnected, SH_NOATTRIB, 0, CPlaye
 SH_DECL_HOOK6(IServerGameClients, ClientConnect, SH_NOATTRIB, 0, bool, CPlayerSlot, const char*, uint64, const char*, bool, CBufferString*);
 SH_DECL_HOOK3_void(ICvar, DispatchConCommand, SH_NOATTRIB, 0, ConCommandHandle, const CCommandContext&, const CCommand&);
 SH_DECL_HOOK0_void(IServerGameDLL, GameServerSteamAPIActivated, SH_NOATTRIB, 0);
+SH_DECL_HOOK0_void(IServerGameDLL, GameServerSteamAPIDeactivated, SH_NOATTRIB, 0);
 SH_DECL_HOOK2_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, CPlayerSlot, const CCommand&);
 
 #ifdef _WIN32
@@ -69,6 +71,7 @@ IGameEventManager2* g_gameEventManager = nullptr;
 IGameEventSystem* g_pGameEventSystem = nullptr;
 CEntityListener g_entityListener;
 CSteamGameServerAPIContext g_SteamAPI;
+ISteamHTTP* g_http = nullptr;
 CSchemaSystem* g_pSchemaSystem2 = nullptr;
 CCSGameRules* gameRules = nullptr;
 
@@ -109,6 +112,7 @@ ResourceMonitor* g_ResourceMonitor = nullptr;
 Patches* g_Patches = nullptr;
 CallStack* g_callStack = nullptr;
 EventManager* eventManager = nullptr;
+HTTPManager* g_httpManager = nullptr;
 VoiceManager g_voiceManager;
 
 //////////////////////////////////////////////////////////////
@@ -143,6 +147,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
     SH_ADD_HOOK_MEMFUNC(INetworkServerService, StartupServer, g_pNetworkServerService, this, &Swiftly::Hook_StartupServer, true);
     SH_ADD_HOOK_MEMFUNC(ICvar, DispatchConCommand, icvar, this, &Swiftly::Hook_DispatchConCommand, false);
     SH_ADD_HOOK_MEMFUNC(IServerGameDLL, GameServerSteamAPIActivated, server, this, &Swiftly::Hook_GameServerSteamAPIActivated, false);
+    SH_ADD_HOOK_MEMFUNC(IServerGameDLL, GameServerSteamAPIDeactivated, server, this, &Swiftly::Hook_GameServerSteamAPIDeactivated, false);
 
     g_pCVar = icvar;
 
@@ -151,6 +156,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
     if (!BeginCrashListener())
         PRINTRET("Crash Reporter failed to initialize.\n", false);
 
+    g_httpManager = new HTTPManager();
     g_pluginManager = new PluginManager();
     g_Config = new Configuration();
     g_conFilter = new ConsoleFilter();
@@ -205,6 +211,8 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
     if (late)
     {
         g_SteamAPI.Init();
+        g_http = g_SteamAPI.SteamHTTP();
+        g_httpManager->ProcessPendingHTTPRequests();
         m_CallbackDownloadItemResult.Register(this, &Swiftly::OnAddonDownloaded);
     }
 
@@ -223,6 +231,8 @@ void Swiftly::Hook_GameServerSteamAPIActivated()
         return;
 
     g_SteamAPI.Init();
+    g_http = g_SteamAPI.SteamHTTP();
+    g_httpManager->ProcessPendingHTTPRequests();
     m_CallbackDownloadItemResult.Register(this, &Swiftly::OnAddonDownloaded);
 
     std::thread([&]() -> void
@@ -236,6 +246,13 @@ void Swiftly::Hook_GameServerSteamAPIActivated()
     RETURN_META(MRES_IGNORED);
 }
 
+void Swiftly::Hook_GameServerSteamAPIDeactivated()
+{
+    g_http = nullptr;
+
+    RETURN_META(MRES_IGNORED);
+}
+
 void Swiftly::OnAddonDownloaded(DownloadItemResult_t* pResult)
 {
     g_addons.OnAddonDownloaded(pResult);
@@ -263,6 +280,7 @@ bool Swiftly::Unload(char* error, size_t maxlen)
     SH_REMOVE_HOOK_MEMFUNC(INetworkServerService, StartupServer, g_pNetworkServerService, this, &Swiftly::Hook_StartupServer, true);
     SH_REMOVE_HOOK_MEMFUNC(ICvar, DispatchConCommand, icvar, this, &Swiftly::Hook_DispatchConCommand, false);
     SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameServerSteamAPIActivated, server, this, &Swiftly::Hook_GameServerSteamAPIActivated, false);
+    SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameServerSteamAPIDeactivated, server, this, &Swiftly::Hook_GameServerSteamAPIDeactivated, false);
 
     g_pGameEntitySystem->RemoveListenerEntity(&g_entityListener);
 

src/entrypoint.h

@@ -65,6 +65,7 @@ class Swiftly : public ISmmPlugin, public IMetamodListener
     bool Hook_ClientConnect(CPlayerSlot slot, const char* pszName, uint64 xuid, const char* pszNetworkID, bool unk1, CBufferString* pRejectReason);
     void Hook_DispatchConCommand(ConCommandHandle cmd, const CCommandContext& ctx, const CCommand& args);
     void Hook_GameServerSteamAPIActivated();
+    void Hook_GameServerSteamAPIDeactivated();
     void Hook_OnClientCommand(CPlayerSlot slot, const CCommand& args);
 
 public:

src/http/HTTPManager.cpp

@@ -0,0 +1,72 @@
+#include "HTTPManager.h"
+#include "../plugins/core/scripting.h"
+
+extern ISteamHTTP* g_http;
+
+TrackedRequest::TrackedRequest(HTTPRequestHandle hndl, SteamAPICall_t hCall, std::string requestID, RequestCB callback)
+{
+    m_hHTTPReq = hndl;
+    m_CallResult.SetGameserverFlag();
+    m_CallResult.Set(hCall, this, &TrackedRequest::OnHTTPRequestCompleted);
+
+    m_callback = callback;
+    m_requestID = requestID;
+
+    g_httpManager->m_PendingRequests.push_back(this);
+}
+
+TrackedRequest::~TrackedRequest()
+{
+    for (auto e = g_httpManager->m_PendingRequests.begin(); e != g_httpManager->m_PendingRequests.end(); ++e)
+    {
+        if (*e == this)
+        {
+            g_httpManager->m_PendingRequests.erase(e);
+            break;
+        }
+    }
+}
+
+void TrackedRequest::OnHTTPRequestCompleted(HTTPRequestCompleted_t* arg, bool bFailed)
+{
+    int status = (bFailed ? 0 : arg->m_eStatusCode);
+    std::string body = "";
+    std::string error = "";
+    uint8* response = nullptr;
+
+    if (bFailed) error = "Failed to create request.";
+    else if (status < 200 || status > 299) error = std::to_string(arg->m_eStatusCode);
+    else error = "Success (no errors)";
+
+    if (status >= 200 && status <= 299) {
+        uint32_t bodySize;
+        g_http->GetHTTPResponseBodySize(arg->m_hRequest, &bodySize);
+
+        response = new uint8[bodySize + 1];
+        g_http->GetHTTPResponseBodyData(arg->m_hRequest, response, bodySize);
+        response[bodySize] = 0;
+
+        body = (char*)response;
+    }
+
+    this->m_callback(arg->m_hRequest, status, body, "[]", error, this->m_requestID);
+
+    if (response != nullptr) delete[] response;
+    if (g_http) g_http->ReleaseHTTPRequest(arg->m_hRequest);
+
+    delete this;
+}
+
+void HTTPManager::ProcessPendingHTTPRequests()
+{
+    for (auto it = m_PendingHTTPRequests.begin(); it != m_PendingHTTPRequests.end(); ++it)
+    {
+        if (it->second.size() == 0) continue;
+
+        PluginHTTP h(it->first);
+        for (auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
+            h.PerformHTTPWithRequestID(it2->second, it2->first);
+    }
+
+    m_PendingHTTPRequests.clear();
+}

src/http/HTTPManager.h

@@ -0,0 +1,42 @@
+#ifndef _http_manager_h
+#define _http_manager_h
+
+#include <steam/steam_gameserver.h>
+#include <vector>
+#include <map>
+#include <string>
+#include <functional>
+
+#define RequestCB std::function<void(HTTPRequestHandle, int, std::string, std::string, std::string, std::string)>
+
+class TrackedRequest
+{
+public:
+    TrackedRequest(const TrackedRequest& req) = delete;
+    TrackedRequest(HTTPRequestHandle hndl, SteamAPICall_t hCall, std::string requestID, RequestCB callback);
+    ~TrackedRequest();
+private:
+    void OnHTTPRequestCompleted(HTTPRequestCompleted_t* arg, bool bFailed);
+
+    HTTPRequestHandle m_hHTTPReq;
+    CCallResult<TrackedRequest, HTTPRequestCompleted_t> m_CallResult;
+    std::string m_requestID;
+
+    RequestCB m_callback;
+};
+
+class HTTPManager
+{
+public:
+    HTTPManager() = default;
+    ~HTTPManager() = default;
+
+    void ProcessPendingHTTPRequests();
+
+    std::vector<TrackedRequest*> m_PendingRequests;
+    std::map<std::string, std::map<std::string, std::string>> m_PendingHTTPRequests;
+};
+
+extern HTTPManager* g_httpManager;
+
+#endif

src/plugins/core/scripting.h

@@ -99,6 +99,21 @@ class PluginPlayerManager
 /////////////////         HTTP Client          //////////////
 ////////////////////////////////////////////////////////////
 
+class HTTPHeader
+{
+public:
+    HTTPHeader(std::string strName, std::string strValue)
+    {
+        m_strName = strName;
+        m_strValue = strValue;
+    }
+    const char* GetName() { return m_strName.c_str(); }
+    const char* GetValue() { return m_strValue.c_str(); }
+private:
+    std::string m_strName;
+    std::string m_strValue;
+};
+
 class PluginHTTP
 {
 private:
@@ -108,6 +123,7 @@ class PluginHTTP
     PluginHTTP(std::string m_plugin_name);
 
     std::string PerformHTTP(std::string receivedData);
+    std::string PerformHTTPWithRequestID(std::string receivedData, std::string requestID);
 };
 
 //////////////////////////////////////////////////////////////