Merge pull request #723 from FIr3baL/FB_DisconnectFixes

disconnect reworks

LuaMenu/widgets/api_analytics.lua

@@ -739,7 +739,7 @@ function widget:Initialize()
 		-- disconnect
 	end
 
-	local function OnDisconnected(reason, intentional)
+	local function OnDisconnected(listener, reason, intentional)
 		--Spring.Echo("Analytics OnDisconnected")
 		Spring.Echo("Disconnected, reason:", reason, intentional)
 		isConnected = false

LuaMenu/widgets/gui_settings_window.lua

@@ -1105,15 +1105,15 @@ local function GetLobbyTabControls()
 				local oldserveraddress = Configuration:GetServerAddress()
 				local newserveraddress = barservers[num]
 
-				Spring.Echo("Choosing a server in settings:",obj,num, oldserveraddress,newserveraddress)
+				Spring.Echo("Choosing a server in settings:", num, oldserveraddress,newserveraddress)
 
 				if oldserveraddress ~= newserveraddress then
 					Configuration.serverAddress = newserveraddress
 
 					if WG.LibLobby.lobby then -- force set the new one so that lobby:safeupdate doesnt fuck up
 						--Spring.Echo("FORCE SET",obj,num, barservers[num])
 						WG.LibLobby.lobby.host = newserveraddress
-						WG.LibLobby.lobby:Disconnect()
+						WG.LibLobby.lobby:Disconnect("changed lobby server")
 						if WG.LoginWindowHandler then
 							WG.LoginWindowHandler.TryLogin()
 						end

libs/liblobby/lobby/interface.lua

@@ -621,6 +621,12 @@ end
 Interface.commands["DENIED"] = Interface._OnDenied
 Interface.commandPattern["DENIED"] = "(.+)"
 
+function Interface:_OnS_System_Disconnect(reason)
+	self:_OnDisconnected(reason, false)
+end
+Interface.commands["s.system.disconnect"] = Interface._OnDenied
+Interface.commandPattern["s.system.disconnect"] = "(.+)"
+
 function Interface:_OnAgreement(line)
 	self:super("_OnAgreement", line)
 end
@@ -715,6 +721,10 @@ Interface.commands["QUEUED"] = Interface._OnQueued
 function Interface:_OnWhois(id, data)
 	id = tonumber(id)
 	local userData = Spring.Utilities.json.decode(Spring.Utilities.Base64Decode(data))
+	if userData and userData.error then
+		Spring.Log(LOG_SECTION, LOG.ERROR, "_OnWhois error: " .. tostring(userData.error))
+		return self
+	end
 	self:super("_OnWhois", id, userData)
 end
 Interface.commands["s.user.whois"] = Interface._OnWhois

libs/liblobby/lobby/interface_shared.lua

@@ -51,13 +51,13 @@ function Interface:Connect(host, port, user, password, cpu, localIP, lobbyVersio
 	return true
 end
 
-function Interface:Disconnect()
+function Interface:Disconnect(reason)
 	self.status = "offline"
 	self.finishedConnecting = false
 	if self.client then
 		self.client:close()
 	end
-	self:_OnDisconnected(nil, true)
+	self:_OnDisconnected(reason, true)
 end
 
 function Interface:TextEraseNewline(str)
@@ -119,6 +119,11 @@ function Interface:_SendCommand(command, sendMessageCount)
 		--Spring.Echo(command)
 	end
 
+	if errorCode and errorCode == "closed" then
+		self:Disconnect(errorCode)
+		return
+	end
+
 	self:_CallListeners("OnCommandSent", command:sub(1, #command-1))
 	self.lastSentSeconds = Spring.GetTimer()
 end

libs/liblobby/lobby/lobby.lua

@@ -1975,8 +1975,9 @@ function Lobby:_OnDisconnected(reason, intentional)
 	for userName,_ in pairs(self.users) do
 		self:_OnRemoveUser(userName)
 	end
-
-	for battleID, battle in pairs(self.battles) do
+
+	local battles = ShallowCopy(self.battles) -- needs ShallowCopy because _OnBattleClosed is removing isntances of self.battles
+	for battleID, _ in pairs(battles) do
 		self:_OnBattleClosed(battleID)
 	end