cleanup

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h

@@ -34,6 +34,11 @@ class WebSocket
 	void Connect(const char* url);
 	void Disconnect();
 
+	bool IsConnected()
+	{
+		return m_bConnected;
+	}
+
 	void Shutdown();
 
 	void SendData_RoomChatMessage(const char* szMessage);
@@ -50,6 +55,9 @@ class WebSocket
 private:
 	CURL* m_pCurl = nullptr;
 	bool m_bConnected = false;
+
+	int64_t m_lastPing = -1;
+	int64_t m_timeBetweenUserPings = 5000;
 };
 
 class NetworkRoom

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp

@@ -830,7 +830,7 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 	comboLobbyGroupRoomsID = TheNameKeyGenerator->nameToKey(AsciiString("WOLCustomLobby.wnd:ComboBoxGroupRooms"));
 	comboLobbyGroupRooms = TheWindowManager->winGetWindowFromId(parent, comboLobbyGroupRoomsID);
 
-	GadgetListBoxAddEntryText(listboxLobbyChat, UnicodeString(L"Welcome to C&C Generals NextGen Multiplayer!"), GameMakeColor(255, 194, 15, 255), -1, -1);
+	GadgetListBoxAddEntryText(listboxLobbyChat, UnicodeString(L"Welcome to Generals Online for Zero Hour!"), GameMakeColor(255, 194, 15, 255), -1, -1);
 
 	GadgetTextEntrySetText(textEntryChat, UnicodeString::TheEmptyString);
 

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -201,6 +201,7 @@ static Waypoint * findNamedWaypoint(AsciiString name)
 // ------------------------------------------------------------------------------------------------
 void setFPMode( void )
 {
+#if !defined(GENERALS_ONLINE)
   // Set floating point round mode to CHOP, which only comes
   // into play when precision is exceeded.  This is necessary
   // for the fast float to int routines used elsewhere in the
@@ -219,6 +220,7 @@ void setFPMode( void )
 	newVal = (newVal & ~_MCW_PC) | (_PC_24   & _MCW_PC);
 
 	_controlfp(newVal, _MCW_PC | _MCW_RC);
+#endif
 }
 
 // ------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Auth.cpp

@@ -57,9 +57,11 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
 {
 	std::string strLoginURI = NGMP_OnlineServicesManager::GetAPIEndpoint("LoginWithToken", false);
 
+#if defined(DEBUG)
 	static HANDLE MPMutex = NULL;
 	MPMutex = CreateMutex(NULL, FALSE, "685EAFF2-3216-4265-FFFF-251C5F4B82F3");
-	if (true)
+
+	if (NGMP_OnlineServicesManager::g_Environment == NGMP_OnlineServicesManager::EEnvironment::DEV)
 	{
 		// use dev account
 		NetworkLog("[NGMP] Secondary instance detected... using dev account for testing purposes");
@@ -106,58 +108,8 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
 			}, nullptr);
 	}
 	else
+#endif
 	{
-		if (NGMP_OnlineServicesManager::g_Environment == NGMP_OnlineServicesManager::EEnvironment::DEV)
-		{
-			// use dev account
-			NetworkLog("[NGMP] Secondary instance detected... using dev account for testing purposes");
-			// login
-			std::string strToken = "ILOVECODE2";
-			
-			
-			std::map<std::string, std::string> mapHeaders;
-
-			nlohmann::json j;
-			j["token"] = strToken.c_str();
-			std::string strPostData = j.dump();
-
-			NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendPOSTRequest(strLoginURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, strPostData.c_str(), [=](bool bSuccess, int statusCode, std::string strBody)
-				{
-					try
-					{
-						nlohmann::json jsonObject = nlohmann::json::parse(strBody);
-						AuthResponse authResp = jsonObject.get<AuthResponse>();
-
-						if (authResp.result == EAuthResponseResult::SUCCEEDED)
-						{
-							NetworkLog("LOGIN: Logged in");
-							m_bWaitingLogin = false;
-
-							SaveCredentials(authResp.al_token.c_str());
-
-							// store data locally
-							m_strToken = authResp.ss_token;
-							m_userID = authResp.user_id;
-							m_strDisplayName = authResp.display_name;
-
-							// trigger callback
-							OnLoginComplete(true, authResp.ws_uri.c_str(), authResp.ws_token.c_str());
-						}
-						else if (authResp.result == EAuthResponseResult::FAILED)
-						{
-							NetworkLog("LOGIN: Login failed, dev account cannot reauth");
-						}
-					}
-					catch (...)
-					{
-
-					}
-					
-
-				}, nullptr);
-		}
-		else
-		{
 			if (DoCredentialsExist())
 			{
 				std::string strToken = GetCredentials();
@@ -222,7 +174,6 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
 
 				ShellExecuteA(NULL, "open", strURI.c_str(), NULL, NULL, SW_SHOWNORMAL);
 			}
-		}
 	}
 }
 
@@ -329,13 +280,22 @@ void NGMP_OnlineServices_AuthInterface::OnLoginComplete(bool bSuccess, const cha
 
 							NGMP_OnlineServicesManager::GetInstance()->ProcessMOTD(motdResp.MOTD.c_str());
 
+							bool bResult = true;
+
+							// WS should be connected by this point
+							bool bWSConnected = NGMP_OnlineServicesManager::GetInstance()->GetWebSocket()->IsConnected();
+							if (!bWSConnected)
+							{
+								bResult = bWSConnected;
+							}
+
 							// go to next screen
 							ClearGSMessageBoxes();
 
 							for (auto cb : m_vecLogin_PendingCallbacks)
 							{
 								// TODO_NGMP: Support failure
-								cb(true);
+								cb(bResult);
 							}
 							m_vecLogin_PendingCallbacks.clear();
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp

@@ -164,6 +164,14 @@ void WebSocket::Tick()
 		return;
 	}
 
+	// ping?
+	int64_t currTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::utc_clock::now().time_since_epoch()).count();
+	if ((currTime - m_lastPing) > m_timeBetweenUserPings)
+	{
+		m_lastPing = currTime;
+		Ping();
+	};
+
 	// do recv
 	size_t rlen = 0;
 	const struct curl_ws_frame* meta = nullptr;
@@ -172,7 +180,7 @@ void WebSocket::Tick()
 	CURLcode ret = CURL_LAST;
 	ret = curl_ws_recv(m_pCurl, buffer, sizeof(buffer), &rlen, &meta);
 
-	if (ret != CURL_LAST && ret != CURLE_AGAIN && ret != CURLE_GOT_NOTHING)
+	if (ret != CURLE_RECV_ERROR && ret != CURL_LAST && ret != CURLE_AGAIN && ret != CURLE_GOT_NOTHING)
 	{
 		NetworkLog("Got websocket msg: %s", buffer);
 
@@ -183,7 +191,7 @@ void WebSocket::Tick()
 			{
 				NetworkLog("Got websocket pong");
 			}
-			else if (meta->flags & CURLWS_TEXT) // PONG
+			else if (meta->flags & CURLWS_TEXT)
 			{
 				try
 				{
@@ -240,17 +248,20 @@ void WebSocket::Tick()
 
 				}
 			}
-			else if (meta->flags & CURLWS_BINARY) // PONG
+			else if (meta->flags & CURLWS_BINARY)
 			{
 				NetworkLog("Got websocket binary");
 				// noop
 			}
-			else if (meta->flags & CURLWS_CONT) // PONG
+			else if (meta->flags & CURLWS_CONT)
 			{
+				NetworkLog("Got websocket cont");
 				// noop
 			}
 			else if (meta->flags & CURLWS_CLOSE)
 			{
+				NetworkLog("Got websocket close");
+				m_bConnected = false;
 				// TODO_NGMP: Handle this
 			}
 			else if (meta->flags & CURLWS_PING)
@@ -260,6 +271,7 @@ void WebSocket::Tick()
 			}
 			else if (meta->flags & CURLWS_OFFSET)
 			{
+				NetworkLog("Got websocket offset");
 				// noop
 			}
 		}