Skip to content

NGMP: Use shared_ptr for WebSocket to manage its lifecycle #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 2 commits into from
Oct 10, 2025
Merged

NGMP: Use shared_ptr for WebSocket to manage its lifecycle #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
523c908
NGMP: Use shared_ptr for WebSocket to manage its lifecycle
seer-by-sentry[bot] Oct 5, 2025
22f5321
Merge branch 'main' into seer/ngmp-websocket-shared-ptr
x64-dev Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "NGMP_include.h"

#include <thread>
#include <memory>

class HTTPManager;

Expand Down Expand Up @@ -334,7 +335,7 @@ class NGMP_OnlineServicesManager
return m_pOnlineServicesManager;
}

static WebSocket* GetWebSocket()
static std::shared_ptr<WebSocket> GetWebSocket()
{
if (m_pOnlineServicesManager != nullptr)
{
Expand Down Expand Up @@ -417,16 +418,13 @@ class NGMP_OnlineServicesManager
m_pHTTPManager = nullptr;
}

if (m_pWebSocket != nullptr)
{
delete m_pWebSocket;
m_pWebSocket = nullptr;
}
// Reset shared_ptr, which will delete WebSocket only when all references are released
m_pWebSocket.reset();
}

void StartVersionCheck(std::function<void(bool bSuccess, bool bNeedsUpdate)> fnCallback);

WebSocket* Internal_GetWebSocket() const { return m_pWebSocket; }
std::shared_ptr<WebSocket> Internal_GetWebSocket() const { return m_pWebSocket; }
HTTPManager* GetHTTPManager() const { return m_pHTTPManager; }

void CancelUpdate();
Expand Down Expand Up @@ -500,7 +498,7 @@ class NGMP_OnlineServicesManager

HTTPManager* m_pHTTPManager = nullptr;

WebSocket* m_pWebSocket = nullptr;
std::shared_ptr<WebSocket> m_pWebSocket;

std::string m_strMOTD;

Expand Down
12 changes: 6 additions & 6 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ void OnSteamNetConnectionStatusChanged(SteamNetConnectionStatusChangedCallback_t
if (bShouldRetry)
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[STEAM NETWORKING][DISCONNECT HANDLER] Retrying...");
WebSocket* pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS != nullptr)
std::shared_ptr<WebSocket> pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS)
{
NGMP_OnlineServices_AuthInterface* pAuthInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_AuthInterface>();
NGMP_OnlineServices_LobbyInterface* pLobbyInterface = NGMP_OnlineServicesManager::GetInterface<NGMP_OnlineServices_LobbyInterface>();
Expand Down Expand Up @@ -369,8 +369,8 @@ class CSignalingClient : public ISignalingClient
// Send the signal.
void Send(int64_t target_user_id, std::vector<uint8_t>& vecPayload)
{
WebSocket* pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS != nullptr)
std::shared_ptr<WebSocket> pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS)
{
if (!pWS->AcquireLock())
{
Expand Down Expand Up @@ -425,8 +425,8 @@ class CSignalingClient : public ISignalingClient

virtual void Poll() override
{
WebSocket* pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS != nullptr)
std::shared_ptr<WebSocket> pWS = NGMP_OnlineServicesManager::GetWebSocket();
if (pWS)
{
if (!pWS->AcquireLock())
{
Expand Down
16 changes: 4 additions & 12 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,19 +261,11 @@ void NGMP_OnlineServicesManager::WaitForScreenshotThreads()
NetworkLog(ELogVerbosity::LOG_RELEASE, "[NGMP] All screenshot threads completed");
}

void NGMP_OnlineServicesManager::Shutdown()
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[NGMP] OnlineServicesManager shutdown initiated");

// CRITICAL: Wait for all screenshot threads to complete first
// This prevents threads from accessing destroyed objects
WaitForScreenshotThreads();

// Now shutdown network components in safe order
// Shutdown WebSocket first to stop incoming messages
if (m_pWebSocket != nullptr)
if (m_pWebSocket)
{
m_pWebSocket->Shutdown();
// Reset shared_ptr, which will delete WebSocket only when all references are released
m_pWebSocket.reset();
}

// Then shutdown HTTP manager to complete any pending requests
Expand Down Expand Up @@ -661,7 +653,7 @@ void NGMP_OnlineServicesManager::OnLogin(bool bSuccess, const char* szWSAddr)
{
// connect to WS
// TODO_NGMP: Handle WS conn failure
m_pWebSocket = new WebSocket();
m_pWebSocket = std::make_shared<WebSocket>();

m_pWebSocket->Connect(szWSAddr);

Expand Down
Loading