remove raw libcurl use

Author: Dr.Abc

ABCEnchance.vcxproj

@@ -246,7 +246,6 @@ $(FreeImageCheckRequirements)</Command>
     <ClCompile Include="src\Source\steamrichpresence.cpp" />
     <ClCompile Include="src\Source\Utility\client_steam_context.cpp" />
     <ClCompile Include="src\Source\Utility\config.cpp" />
-    <ClCompile Include="src\Source\Utility\curl.cpp" />
     <ClCompile Include="src\Source\Utility\httpclient.cpp" />
     <ClCompile Include="src\Source\Utility\liblrc.cpp" />
     <ClCompile Include="src\Source\Utility\mymathlib.cpp" />
@@ -493,7 +492,6 @@ $(FreeImageCheckRequirements)</Command>
     <ClInclude Include="src\Header\Utility\client_steam_context.h" />
     <ClInclude Include="src\Header\Utility\config.h" />
     <ClInclude Include="src\Header\Utility\crypto.h" />
-    <ClInclude Include="src\Header\Utility\curl.h" />
     <ClInclude Include="src\Header\Utility\httpclient.h" />
     <ClInclude Include="src\Header\Utility\liblrc.h" />
     <ClInclude Include="src\Header\Utility\mymathlib.h" />

ABCEnchance.vcxproj.filters

@@ -638,9 +638,6 @@
     <ClCompile Include="VGUI2\GameUI\GameConsole.cpp">
       <Filter>vgui2</Filter>
     </ClCompile>
-    <ClCompile Include="src\Source\Utility\curl.cpp">
-      <Filter>Public\Source\LIb</Filter>
-    </ClCompile>
     <ClCompile Include="src\Source\Utility\win32helper.cpp">
       <Filter>Public\Source\Utility</Filter>
     </ClCompile>
@@ -1423,9 +1420,6 @@
     <ClInclude Include="vgui2\VGUI2ExtensionImport.h">
       <Filter>vgui2</Filter>
     </ClInclude>
-    <ClInclude Include="src\Header\Utility\curl.h">
-      <Filter>Public\Header\LIb</Filter>
-    </ClInclude>
     <ClInclude Include="src\Header\Utility\win32helper.h">
       <Filter>Public\Header\Utility</Filter>
     </ClInclude>

src/Header/Utility/curl.h

@@ -1,5 +1,6 @@
 #include <string>
 #include <vector>
+#include <cstddef>
 #include <functional>
 
 #include <IUtilHTTPClient.h>
@@ -35,6 +36,7 @@ class CHttpCookieJar {
 typedef struct httpContext_s {
 	std::string url;
 	UtilHTTPMethod method;
+	bool async;
 	CHttpCookieJar* cookie;
 } httpContext_t;
 
@@ -68,12 +70,12 @@ class CHttpClientItem : IUtilHTTPCallbacks {
 		return this;
 	}
 
-	CHttpClientItem* Create(bool async);
-
 	CHttpClientItem* Start();
 	IUtilHTTPResponse* StartSync();
 
 	CHttpClientItem* SetFeild(const char* key, const char* var);
+	CHttpClientItem* SetPostBody(const char* contentType, const char* payload, size_t payloadSize);
+	CHttpClientItem* SetCookieJar(CHttpCookieJar* jar);
 	HTTPCLIENT_STATE GetState() const;
 	bool Interrupt();
 protected:
@@ -90,7 +92,7 @@ class CHttpClientItem : IUtilHTTPCallbacks {
 
 	CHttpCookieJar* m_pCookieJar = nullptr;
 
-	std::vector<byte> m_aryReciveData = {};
+	std::vector<std::byte> m_aryReciveData = {};
 
 	bool m_bAsync = false;
 	IUtilHTTPRequest* m_pRequest = nullptr;
@@ -107,7 +109,7 @@ class CHttpClient {
 
 	void CheckAll();
 	void ClearAll();
-	CHttpClientItem* Fetch(const char* url, UtilHTTPMethod method);
+	CHttpClientItem* Fetch(const char* url, UtilHTTPMethod method, bool async = true);
 	CHttpClientItem* Fetch(httpContext_s* ctx);
 	bool Interrupt(CHttpClientItem* pDestory);
 private:

src/Header/Utility/httpclient.h

@@ -387,10 +387,6 @@ CNeteasePanel::CNeteasePanel()
 	m_pSuppressMusic = CREATE_CVAR("cl_netease_suppressmusic", "1", FCVAR_VALUE, nullptr);
 
 	s_pNeteaseApi = new netease::CNeteaseMusicAPI();
-	char buf[MAX_PATH];
-	vgui::filesystem()->GetLocalPath("abcenchance/", buf, MAX_PATH);
-	V_snprintf(buf, "%sneteasecookie", buf);
-	netease::CNeteaseMusicAPI::SetCookie(buf);
 
 	LoadControlSettings(VGUI2_ROOT_DIR "NeteasePanel.res");
 	SetVisible(false);
@@ -516,8 +512,7 @@ void CNeteasePanel::Think() {
 }
 static std::vector<byte> DownLoad(const std::string& url) {
 	std::vector<byte> retdata;
-	auto rep = GetHttpClient()->Fetch(url.c_str(), UtilHTTPMethod::Get)->
-	Create(false)->
+	auto rep = GetHttpClient()->Fetch(url.c_str(), UtilHTTPMethod::Get, false)->
 	StartSync();
 	const char* bytes = rep->GetPayload()->GetBytes();
 	size_t len = rep->GetPayload()->GetLength();

src/Source/HUD/vgui/neteasemusic.cpp

@@ -189,7 +189,7 @@ class CPlayerImage : public IImage
 							gifdata.reset();
 						}, pthis)->Start();
 							pthis->m_pRequest = nullptr;
-						}, this)->Create(true)->Start();
+						}, this)->Start();
 					m_bIsAnimate = true;
 				}
 				m_bRequsetedAnimatedAvatars = true;

src/Source/HUD/vgui/scoreboard.cpp

@@ -67,10 +67,11 @@ void CHttpClient::ClearAll(){
 	}
 	m_aryItems.clear();
 }
-CHttpClientItem* CHttpClient::Fetch(const char* url, UtilHTTPMethod method){
+CHttpClientItem* CHttpClient::Fetch(const char* url, UtilHTTPMethod method, bool async){
 	httpContext_t ctx = {
 		url,
 		method,
+		async,
 		nullptr
 	};
 	CHttpClientItem* item = new CHttpClientItem(&ctx);
@@ -103,25 +104,23 @@ CHttpClientItem::CHttpClientItem(httpContext_s* ctx) : IUtilHTTPCallbacks(){
 	m_hContext.url = ctx->url;
 	m_hContext.method = ctx->method;
 	m_pCookieJar = ctx->cookie;
-	m_iStatue = HTTPCLIENT_STATE::INVALID;
-}
-CHttpClientItem* CHttpClientItem::Create(bool async){
 	m_iStatue = HTTPCLIENT_STATE::PENDING;
-	if (async)
+	m_bAsync = ctx->async;
+	if (m_bAsync)
 		m_pRequest = g_pUtilHTTPClient->CreateAsyncRequest(m_hContext.url.c_str(), m_hContext.method, this);
 	else
 		m_pRequest = g_pUtilHTTPClient->CreateSyncRequest(m_hContext.url.c_str(), m_hContext.method, this);
 	if (m_pCookieJar)
 		m_pRequest->SetField("Set-Cookie", m_pCookieJar->Get().c_str());
-	m_bAsync = async;
-	return this;
 }
 CHttpClientItem* CHttpClientItem::Start(){
+	if (!m_pRequest)
+		return nullptr;
 	if (m_bAsync) {
-		if (m_pRequest)
-			m_pRequest->Send();
+		m_pRequest->Send();
+		return this;
 	}
-	return this;
+	return nullptr;
 }
 IUtilHTTPResponse* CHttpClientItem::StartSync(){
 	if (!m_bAsync) {
@@ -130,6 +129,7 @@ IUtilHTTPResponse* CHttpClientItem::StartSync(){
 		auto reb = m_pRequest->GetResponse(); 
 		if (m_pCookieJar) {
 			char cookiebuf[MAX_COOKIE_LENGTH];
+			memset(cookiebuf, 0, MAX_COOKIE_LENGTH);
 			reb->GetHeader("Set-Cookie", cookiebuf, MAX_COOKIE_LENGTH);
 			m_pCookieJar->Set(cookiebuf);
 		}
@@ -138,11 +138,28 @@ IUtilHTTPResponse* CHttpClientItem::StartSync(){
 	return nullptr;
 }
 CHttpClientItem* CHttpClientItem::SetFeild(const char* key, const char* var){
-	if (m_pRequest)
+	if (m_pRequest) {
 		m_pRequest->SetField(key, var);
-	return this;
+		return this;
+	}
+	return nullptr;
 }
 
+CHttpClientItem* CHttpClientItem::SetPostBody(const char* contentType, const char* payload, size_t payloadSize) {
+	if (m_pRequest) {
+		m_pRequest->SetPostBody(contentType, payload, payloadSize);
+		return this;
+	}
+	return nullptr;
+}
+CHttpClientItem* CHttpClientItem::SetCookieJar(CHttpCookieJar* jar)
+{
+	if (m_pRequest) {
+		m_pCookieJar = jar;
+		return this;
+	}
+	return nullptr;
+}
 HTTPCLIENT_STATE CHttpClientItem::GetState() const{
 	return m_iStatue;
 }

src/Source/Utility/curl.cpp

@@ -3,7 +3,6 @@
 #include "exportfuncs.h"
 #include "ClientParticleMan.h"
 #include "httpclient.h"
-#include "curl.h"
 #include "soundengine.h"
 #include "VGUI2ExtensionImport.h"
 #include <vgui_controls/Controls.h>

src/Source/Utility/httpclient.cpp

@@ -179,14 +179,12 @@ class CNeteaseUserInfo : public Frame {
 		};
 		GetHttpClient()->Fetch((myinfo->avatarurl + "?param=130y130").c_str(), UtilHTTPMethod::Get)->
 			OnRespond(decodecallback, m_pAvatar, this)->
-			Create(true)->
 			Start();
 
 		int w, h;
 		GetSize(w, h);
 		GetHttpClient()->Fetch((myinfo->backgroundurl + "?param=" + std::to_string(w) + "y" + std::to_string(h)).c_str(), UtilHTTPMethod::Get)->
 			OnRespond(decodecallback, m_pBackgroud, this)->
-			Create(true)->
 			Start();
 
 		m_pName->SetText(myinfo->name.c_str());