Fix errors when returning tables from subscripts

Author: Wires77

src/Classes/PoEAPI.lua

@@ -80,8 +80,7 @@ function PoEAPIClass:FetchAuthToken(callback)
 	if id then
 		launch.subScripts[id] = {
 			type = "DOWNLOAD",
-			callback = function(response, errMsg)
-				local code, state, port = unpack(response or {})
+			callback = function(code, errMsg, state, port)
 				if not code then
 					ConPrintf("Failed to get code from server: %s", errMsg)
 					self.authToken = nil

src/Launch.lua

@@ -299,18 +299,14 @@ function launch:DownloadPage(url, callback, params)
 			errMsg = "No data returned"
 		end
 		ConPrintf("Download complete. Status: %s", errMsg or "OK")
-		return {responseHeader, responseBody}, errMsg
+		return responseBody, errMsg, responseHeader
 	]]
 	local id = LaunchSubScript(script, "", "ConPrintf", url, params.header, params.body, self.connectionProtocol, self.proxyURL)
 	if id then
 		self.subScripts[id] = {
 			type = "DOWNLOAD",
-			callback = function(response, errMsg)
-				if response then
-					callback({header=response[1], body=response[2]}, errMsg)
-				else
-					callback({}, errMsg)
-				end
+			callback = function(responseBody, errMsg, responseHeader)
+				callback({header=responseHeader, body=responseBody}, errMsg)
 			end
 		}
 	end

src/LaunchServer.lua

@@ -177,6 +177,7 @@ end
 -- IO, so that it can operate concurrently, but hopefully that isn't necessary.
 local attempt = 1
 local stopAt = os.time() + 30
+local errMsg
 local shouldRetry, code, state = true, nil, nil
 while (os.time() < stopAt) and shouldRetry do
 	-- `settimeout`` applies only to individual operations, but we're more concerned with not spending more than 30
@@ -197,4 +198,7 @@ while (os.time() < stopAt) and shouldRetry do
 	attempt = attempt + 1
 end
 server:close()
-return {code, state, port}
+if os.time() >= stopAt then
+	errMsg = "Timeout reached without a response received by the local server"
+end
+return code, errMsg, state, port