ci: reuse sm.branch as the image tag directly

Extension/extension.cpp

@@ -72,7 +72,6 @@ void SteamWorks::SDK_OnUnload()
 	delete this->pSWHTTPNatives;
 	
 	delete this->pSWHTTP;
-	this->pSWHTTP = NULL; /* Requests freed via frame actions may outlive us; let their dtor detect this. */
 	delete this->pSWGameServer;
 	delete this->pSWGameData;
 }

Extension/gsnatives.cpp

@@ -190,19 +190,6 @@ static cell_t sm_ClearRules(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
-static cell_t sm_SetAdvertiseServerActive(IPluginContext *pContext, const cell_t *params)
-{
-	ISteamGameServer *pServer = GetGSPointer();
-
-	if (pServer == NULL)
-	{
-		return 0;
-	}
-
-	pServer->SetAdvertiseServerActive(!!params[1]);
-	return 1;
-}
-
 static cell_t sm_ForceHeartbeat(IPluginContext *pContext, const cell_t *params)
 {
 	/* Deprecated no-op: newer Steamworks SDKs removed ISteamGameServer::ForceHeartbeat();
@@ -219,16 +206,11 @@ static cell_t sm_UserHasLicenseForApp(IPluginContext *pContext, const cell_t *pa
 		return k_EUserHasLicenseResultNoAuth;
 	}
 	
-	int client = params[1];
+	int client = gamehelpers->ReferenceToIndex(params[1]);
-	if (client < 1 || client > playerhelpers->GetMaxClients())
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client); /* Man, including GameHelpers and PlayerHelpers for this native :(. */
+	if (pPlayer == NULL || pPlayer->IsConnected() == false)
 	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
-	}
-
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
-	if (pPlayer == NULL || !pPlayer->IsConnected())
-	{
-		return pContext->ThrowNativeError("Client index %d is not connected", client);
 	}
 	
 	CSteamID checkid = CreateCommonCSteamID(pPlayer, params, 3, 4);
@@ -250,16 +232,12 @@ static cell_t sm_UserHasLicenseForAppId(IPluginContext *pContext, const cell_t *
 
 static cell_t sm_GetClientSteamID(IPluginContext *pContext, const cell_t *params)
 {
-	int client = params[1];
+	int client = gamehelpers->ReferenceToIndex(params[1]);
-	if (client < 1 || client > playerhelpers->GetMaxClients())
-	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
-	}
-
 	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
-	if (pPlayer == NULL || !pPlayer->IsConnected())
+
+	if (pPlayer == NULL || pPlayer->IsConnected() == false)
 	{
-		return pContext->ThrowNativeError("Client index %d is not connected", client);
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
 	}
 
 	CSteamID steamId = CreateCommonCSteamID(pPlayer, params, 4, 5);
@@ -279,19 +257,14 @@ static cell_t sm_GetUserGroupStatus(IPluginContext *pContext, const cell_t *para
 
 	if (pServer == NULL)
 	{
-		return 0;
+		return false;
 	}
 
-	int client = params[1];
+	int client = gamehelpers->ReferenceToIndex(params[1]);
-	if (client < 1 || client > playerhelpers->GetMaxClients())
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client); /* Man, including GameHelpers and PlayerHelpers for this native :(. */
+	if (pPlayer == NULL || pPlayer->IsConnected() == false)
 	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
-	}
-
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
-	if (pPlayer == NULL || !pPlayer->IsConnected())
-	{
-		return pContext->ThrowNativeError("Client index %d is not connected", client);
 	}
 
 	CSteamID checkid = CreateCommonCSteamID(pPlayer, params, 3, 4);
@@ -322,7 +295,6 @@ static sp_nativeinfo_t gsnatives[] = {
 	{"SteamWorks_IsConnected",				sm_IsConnected},
 	{"SteamWorks_SetRule",						sm_SetRule},
 	{"SteamWorks_ClearRules",						sm_ClearRules},
-	{"SteamWorks_SetAdvertiseServerActive",	sm_SetAdvertiseServerActive},
 	{"SteamWorks_ForceHeartbeat",				sm_ForceHeartbeat},
 	{"SteamWorks_HasLicenseForApp",			sm_UserHasLicenseForApp},
 	{"SteamWorks_HasLicenseForAppId",			sm_UserHasLicenseForAppId},

Extension/sdk/smsdk_config.h

@@ -41,8 +41,8 @@
 #define SMEXT_CONF_NAME			"SteamWorks Extension"
 #define SMEXT_CONF_DESCRIPTION	"Exposes SteamWorks functions to Developers"
 #define SMEXT_CONF_VERSION		"1.2.3"
-#define SMEXT_CONF_AUTHOR		"Kyle Sanderson, AlliedModders"
+#define SMEXT_CONF_AUTHOR		"Kyle Sanderson"
-#define SMEXT_CONF_URL			"https://github.com/alliedmodders/SM-SteamWorks"
+#define SMEXT_CONF_URL			"http://AlliedMods.net"
 #define SMEXT_CONF_LOGTAG		"STEAMWORKS"
 #define SMEXT_CONF_LICENSE		"GPLv3"
 #define SMEXT_CONF_DATESTRING	__DATE__

Extension/ssnatives.cpp

@@ -60,16 +60,11 @@ static cell_t sm_RequestUserStats(IPluginContext *pContext, const cell_t *params
 		return 0;
 	}
 
-	int client = params[1];
+	int client = gamehelpers->ReferenceToIndex(params[1]);
-	if (client < 1 || client > playerhelpers->GetMaxClients())
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client); /* Man, including GameHelpers and PlayerHelpers for this native :(. */
+	if (pPlayer == NULL || pPlayer->IsConnected() == false)
 	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
-	}
-
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
-	if (pPlayer == NULL || !pPlayer->IsConnected())
-	{
-		return pContext->ThrowNativeError("Client index %d is not connected", client);
 	}
 
 	CSteamID checkid = CreateCommonCSteamID(pPlayer, params);
@@ -85,16 +80,11 @@ static cell_t sm_GetStatCell(IPluginContext *pContext, const cell_t *params)
 		return 0;
 	}
 
-	int client = params[1];
+	int client = gamehelpers->ReferenceToIndex(params[1]);
-	if (client < 1 || client > playerhelpers->GetMaxClients())
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client); /* Man, including GameHelpers and PlayerHelpers for this native :(. */
+	if (pPlayer == NULL || pPlayer->IsConnected() == false)
 	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
-	}
-
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
-	if (pPlayer == NULL || !pPlayer->IsConnected())
-	{
-		return pContext->ThrowNativeError("Client index %d is not connected", client);
 	}
 	
 	char *pName;
@@ -133,16 +123,11 @@ static cell_t sm_GetStatFloat(IPluginContext *pContext, const cell_t *params)
 		return 0;
 	}
 
-	int client = params[1];
+	int client = gamehelpers->ReferenceToIndex(params[1]);
-	if (client < 1 || client > playerhelpers->GetMaxClients())
+	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client); /* Man, including GameHelpers and PlayerHelpers for this native :(. */
+	if (pPlayer == NULL || pPlayer->IsConnected() == false)
 	{
-		return pContext->ThrowNativeError("Client index %d is invalid", client);
+		return pContext->ThrowNativeError("Client index %d is invalid", params[1]);
-	}
-
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
-	if (pPlayer == NULL || !pPlayer->IsConnected())
-	{
-		return pContext->ThrowNativeError("Client index %d is not connected", client);
 	}
 	
 	char *pName;

Extension/swhttp.cpp

@@ -23,9 +23,7 @@ static ISteamHTTP *GetHTTPPointer()
 	return g_SteamWorks.pSWGameServer->GetHTTP();
 }
 
-SteamWorksHTTP::SteamWorksHTTP() :
+SteamWorksHTTP::SteamWorksHTTP()
-	m_CallbackHeadersReceived(this, &SteamWorksHTTP::OnHTTPHeadersReceived),
-	m_CallbackDataReceived(this, &SteamWorksHTTP::OnHTTPDataReceived)
 {
 	this->typeHTTP = handlesys->CreateType("HTTPHandle", this, 0, NULL, NULL, myself->GetIdentity(), NULL);
 }
@@ -40,46 +38,6 @@ HandleType_t SteamWorksHTTP::GetHTTPHandle(void)
 	return this->typeHTTP;
 }
 
-void SteamWorksHTTP::RegisterRequest(SteamWorksHTTPRequest *pRequest)
-{
-	if (pRequest->request != INVALID_HTTPREQUEST_HANDLE)
-	{
-		this->m_Requests[pRequest->request] = pRequest;
-	}
-}
-
-void SteamWorksHTTP::UnregisterRequest(SteamWorksHTTPRequest *pRequest)
-{
-	if (pRequest->request != INVALID_HTTPREQUEST_HANDLE)
-	{
-		this->m_Requests.erase(pRequest->request);
-	}
-}
-
-SteamWorksHTTPRequest *SteamWorksHTTP::FindRequest(HTTPRequestHandle request)
-{
-	auto it = this->m_Requests.find(request);
-	return (it == this->m_Requests.end()) ? NULL : it->second;
-}
-
-void SteamWorksHTTP::OnHTTPHeadersReceived(HTTPRequestHeadersReceived_t *pParam)
-{
-	SteamWorksHTTPRequest *pRequest = this->FindRequest(pParam->m_hRequest);
-	if (pRequest != NULL)
-	{
-		pRequest->OnHTTPHeadersReceived(pParam);
-	}
-}
-
-void SteamWorksHTTP::OnHTTPDataReceived(HTTPRequestDataReceived_t *pParam)
-{
-	SteamWorksHTTPRequest *pRequest = this->FindRequest(pParam->m_hRequest);
-	if (pRequest != NULL)
-	{
-		pRequest->OnHTTPDataReceived(pParam);
-	}
-}
-
 static void DelayedDeleteSteamWorksHTTPRequest(void *object)
 {
 	SteamWorksHTTPRequest *pRequest = reinterpret_cast<SteamWorksHTTPRequest *>(object);

Extension/swhttp.h

@@ -21,10 +21,6 @@
 #include "steam_gameserver.h"
 #include "smsdk_ext.h"
 
-#include <unordered_map>
-
-class SteamWorksHTTPRequest;
-
 class SteamWorksHTTP :
 	public IHandleTypeDispatch
 {
@@ -39,23 +35,8 @@ class SteamWorksHTTP :
 	public:
 		HandleType_t GetHTTPHandle(void);
 
-		/* Streaming responses report progress through HTTPRequestHeadersReceived_t /
-		   HTTPRequestDataReceived_t. Steam delivers those as broadcast gameserver
-		   callbacks (not as call results of the streaming API call), so a single
-		   dispatcher here receives them and routes each one to the owning request by
-		   its handle. Requests add/remove themselves as they are created/destroyed. */
-		void RegisterRequest(SteamWorksHTTPRequest *pRequest);
-		void UnregisterRequest(SteamWorksHTTPRequest *pRequest);
-
-	private:
-		SteamWorksHTTPRequest *FindRequest(HTTPRequestHandle request);
-
-		STEAM_GAMESERVER_CALLBACK(SteamWorksHTTP, OnHTTPHeadersReceived, HTTPRequestHeadersReceived_t, m_CallbackHeadersReceived);
-		STEAM_GAMESERVER_CALLBACK(SteamWorksHTTP, OnHTTPDataReceived, HTTPRequestDataReceived_t, m_CallbackDataReceived);
-
 	private:
 		HandleType_t typeHTTP;
-		std::unordered_map<HTTPRequestHandle, SteamWorksHTTPRequest *> m_Requests;
 };
 
 #include "swhttprequest.h"

Extension/swhttprequest.cpp

@@ -67,14 +67,6 @@ SteamWorksHTTPRequest::SteamWorksHTTPRequest() : request(INVALID_HTTPREQUEST_HAN
 
 SteamWorksHTTPRequest::~SteamWorksHTTPRequest()
 {
-	/* Requests are freed via a frame action, so on extension unload this can run
-	   after the dispatcher itself has been torn down; pSWHTTP is nulled in that
-	   case (see SDK_OnUnload), so guard against it. */
-	if (g_SteamWorks.pSWHTTP != NULL)
-	{
-		g_SteamWorks.pSWHTTP->UnregisterRequest(this);
-	}
-
 	ISteamHTTP *pHTTP = GetHTTPPointer();
 	if (pHTTP != NULL)
 	{
@@ -109,10 +101,7 @@ void SteamWorksHTTPRequest::OnHTTPRequestCompleted(HTTPRequestCompleted_t *pRequ
 	this->pCompletedForward->Execute(NULL);
 }
 
-/* Streaming header/data notifications are success-only callbacks (unlike the
+void SteamWorksHTTPRequest::OnHTTPHeadersReceived(HTTPRequestHeadersReceived_t *pRequest, bool bFailed)
-   completion call result, they carry no IO-failure flag), so bFailure is always
-   false here. Failures still surface through the completion callback. */
-void SteamWorksHTTPRequest::OnHTTPHeadersReceived(HTTPRequestHeadersReceived_t *pRequest)
 {
 	if (this->pHeadersReceivedForward == NULL || this->pHeadersReceivedForward->GetFunctionCount() == 0)
 	{
@@ -120,13 +109,13 @@ void SteamWorksHTTPRequest::OnHTTPHeadersReceived(HTTPRequestHeadersReceived_t *
 	}
 
 	this->pHeadersReceivedForward->PushCell(this->handle);
-	this->pHeadersReceivedForward->PushCell(false);
+	this->pHeadersReceivedForward->PushCell(bFailed);
 	this->pHeadersReceivedForward->PushCell(pRequest->m_ulContextValue >> 32);
 	this->pHeadersReceivedForward->PushCell((pRequest->m_ulContextValue & 0x00000000FFFFFFFF));
 	this->pHeadersReceivedForward->Execute(NULL);
 }
 
-void SteamWorksHTTPRequest::OnHTTPDataReceived(HTTPRequestDataReceived_t *pRequest)
+void SteamWorksHTTPRequest::OnHTTPDataReceived(HTTPRequestDataReceived_t *pRequest, bool bFailed)
 {
 	if (this->pDataReceivedForward == NULL || this->pDataReceivedForward->GetFunctionCount() == 0)
 	{
@@ -134,7 +123,7 @@ void SteamWorksHTTPRequest::OnHTTPDataReceived(HTTPRequestDataReceived_t *pReque
 	}
 
 	this->pDataReceivedForward->PushCell(this->handle);
-	this->pDataReceivedForward->PushCell(false);
+	this->pDataReceivedForward->PushCell(bFailed);
 	this->pDataReceivedForward->PushCell(pRequest->m_cOffset);
 	this->pDataReceivedForward->PushCell(pRequest->m_cBytesReceived);
 	this->pDataReceivedForward->PushCell(pRequest->m_ulContextValue >> 32);
@@ -171,8 +160,6 @@ static cell_t sm_CreateHTTPRequest(IPluginContext *pContext, const cell_t *param
 	pRequest->request = request;
 	pRequest->handle = handle;
 	
-	g_SteamWorks.pSWHTTP->RegisterRequest(pRequest);
-
 	return handle;
 }
 
@@ -309,14 +296,23 @@ static cell_t sm_SetCallbacks(IPluginContext *pContext, const cell_t *params)
 
 static void SetCallbacks(SteamAPICall_t &hCall, SteamWorksHTTPRequest *pRequest)
 {
-	/* Only completion is a call result of this send. Header/data streaming
-	   notifications are delivered as broadcast callbacks and routed to the request
-	   by SteamWorksHTTP's dispatcher, so there is nothing to bind to hCall here. */
 	if (pRequest->pCompletedForward != NULL)
 	{
 		pRequest->CompletedCallResult.SetGameserverFlag();
 		pRequest->CompletedCallResult.Set(hCall, pRequest, &SteamWorksHTTPRequest::OnHTTPRequestCompleted);
 	}
+
+	if (pRequest->pHeadersReceivedForward != NULL)
+	{
+		pRequest->HeadersCallResult.SetGameserverFlag();
+		pRequest->HeadersCallResult.Set(hCall, pRequest, &SteamWorksHTTPRequest::OnHTTPHeadersReceived);
+	}
+
+	if (pRequest->pDataReceivedForward != NULL)
+	{
+		pRequest->DataCallResult.SetGameserverFlag();
+		pRequest->DataCallResult.Set(hCall, pRequest, &SteamWorksHTTPRequest::OnHTTPDataReceived);
+	}
 }
 
 static cell_t sm_SendHTTPRequestAndStreamResponse(IPluginContext *pContext, const cell_t *params)
@@ -504,7 +500,7 @@ static cell_t sm_SetHTTPRequestRawPostBodyFromFile(IPluginContext *pContext, con
 	}
 
 	char *pBuffer = new char[size + 1];
-	size_t itemsRead = fread(pBuffer, sizeof(char), size, pInputFile);
+	uint32_t itemsRead = fread(pBuffer, sizeof(char), size, pInputFile);
 	fclose(pInputFile);
 
 	if (itemsRead != size)
@@ -710,35 +706,6 @@ static sp_nativeinfo_t httpnatives[] = {
 	{"SteamWorks_WriteHTTPResponseBodyToFile",				sm_WriteHTTPResponseBodyToFile},
 	{"SteamWorks_SendHTTPRequestAndStreamResponse",			sm_SendHTTPRequestAndStreamResponse},
 	{"SteamWorks_GetHTTPStreamingResponseBodyData",			sm_GetHTTPStreamingResponseBodyData},
-
-	/* SteamWorksHTTPRequest methodmap. These reuse the functions above; the implicit
-	   `this` handle arrives as params[1], exactly like the hHandle/hRequest first
-	   parameter of the free-function natives (and the constructor maps to the create
-	   native, whose first argument is likewise params[1]). */
-	{"SteamWorksHTTPRequest.SteamWorksHTTPRequest",			sm_CreateHTTPRequest},
-	{"SteamWorksHTTPRequest.SetContextValue",				sm_SetHTTPRequestContextValue},
-	{"SteamWorksHTTPRequest.SetNetworkActivityTimeout",		sm_SetHTTPRequestNetworkActivityTimeout},
-	{"SteamWorksHTTPRequest.SetHeaderValue",				sm_SetHTTPRequestHeaderValue},
-	{"SteamWorksHTTPRequest.SetGetOrPostParameter",			sm_SetHTTPRequestGetOrPostParameter},
-	{"SteamWorksHTTPRequest.SetUserAgentInfo",				sm_SetHTTPRequestUserAgentInfo},
-	{"SteamWorksHTTPRequest.SetRequiresVerifiedCertificate",	sm_SetHTTPRequestRequiresVerifiedCertificate},
-	{"SteamWorksHTTPRequest.SetAbsoluteTimeoutMS",			sm_SetHTTPRequestAbsoluteTimeoutMS},
-	{"SteamWorksHTTPRequest.SetCallbacks",					sm_SetCallbacks},
-	{"SteamWorksHTTPRequest.Send",							sm_SendHTTPRequest},
-	{"SteamWorksHTTPRequest.SendAndStreamResponse",			sm_SendHTTPRequestAndStreamResponse},
-	{"SteamWorksHTTPRequest.Defer",							sm_DeferHTTPRequest},
-	{"SteamWorksHTTPRequest.Prioritize",					sm_PrioritizeHTTPRequest},
-	{"SteamWorksHTTPRequest.GetResponseHeaderSize",			sm_GetHTTPResponseHeaderSize},
-	{"SteamWorksHTTPRequest.GetResponseHeaderValue",		sm_GetHTTPResponseHeaderValue},
-	{"SteamWorksHTTPRequest.GetResponseBodySize",			sm_GetHTTPResponseBodySize},
-	{"SteamWorksHTTPRequest.GetResponseBodyData",			sm_GetHTTPResponseBodyData},
-	{"SteamWorksHTTPRequest.GetStreamingResponseBodyData",	sm_GetHTTPStreamingResponseBodyData},
-	{"SteamWorksHTTPRequest.GetDownloadProgressPct",		sm_GetHTTPDownloadProgressPct},
-	{"SteamWorksHTTPRequest.GetWasTimedOut",				sm_GetHTTPRequestWasTimedOut},
-	{"SteamWorksHTTPRequest.SetRawPostBody",				sm_SetHTTPRequestRawPostBody},
-	{"SteamWorksHTTPRequest.SetRawPostBodyFromFile",		sm_SetHTTPRequestRawPostBodyFromFile},
-	{"SteamWorksHTTPRequest.GetResponseBodyCallback",		sm_GetHTTPResponseBodyCallback},
-	{"SteamWorksHTTPRequest.WriteResponseBodyToFile",		sm_WriteHTTPResponseBodyToFile},
 	{NULL,											NULL}
 };
 

Extension/swhttprequest.h

@@ -32,15 +32,14 @@ class SteamWorksHTTPRequest
 		Handle_t handle;
 
 	public:
-		/* Completion is a genuine call result of the send API call, so it stays a
-		   CCallResult. Headers/data arrive as broadcast callbacks and are routed here
-		   by SteamWorksHTTP's dispatcher, hence no per-request CCallResult for them. */
 		void OnHTTPRequestCompleted(HTTPRequestCompleted_t *pRequest, bool bFailed);
-		void OnHTTPHeadersReceived(HTTPRequestHeadersReceived_t *pRequest);
+		void OnHTTPHeadersReceived(HTTPRequestHeadersReceived_t *pRequest, bool bFailed);
-		void OnHTTPDataReceived(HTTPRequestDataReceived_t *pRequest);
+		void OnHTTPDataReceived(HTTPRequestDataReceived_t *pRequest, bool bFailed);
 
 	public:
 		CCallResult<SteamWorksHTTPRequest, HTTPRequestCompleted_t> CompletedCallResult;
+		CCallResult<SteamWorksHTTPRequest, HTTPRequestHeadersReceived_t> HeadersCallResult;
+		CCallResult<SteamWorksHTTPRequest, HTTPRequestDataReceived_t> DataCallResult;
 
 	public:
 		IChangeableForward *pCompletedForward;