cyberarm/w3dhub_linux_launcher
1
0
Fork 0
mirror of https://github.com/cyberarm/w3d_hub_linux_launcher.git synced 2025-12-16 17:22:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix some weird scoping issues with ServerListUpdater lambdas

Browse Source
This commit is contained in:
Cyberarm
2024-03-11 19:17:38 -05:00
parent d84c8321c5
commit f55924596d
5 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/api/server_list_server.rb
View File

@@ -14,10 +14,10 @@ class W3DHub
@channel = @data[:channel] || "release"
@ping = -1
@status = @data[:status] ? Status.new(@data[:status]) : nil
@status = Status.new(@data[:status])
@ping_interval = 30_000
@last_pinged = Gosu.milliseconds + @ping_interval + 1
@last_pinged = Gosu.milliseconds + @ping_interval + 1_000
end
def update(hash)
@@ -34,11 +34,11 @@ class W3DHub
@status.players = hash[:players]&.select { |t| t[:nick] != "Nod" && t[:nick] != "GDI" }&.map { |t| Player.new(t) } if hash[:players]
send_ping
return true
else
@status = Status.new(hash)
end
false
true
end
def send_ping(force_ping = false)
@@ -70,18 +70,18 @@ class W3DHub
attr_accessor :name, :password, :map, :max_players, :player_count, :started, :remaining, :teams, :players
def initialize(hash)
@data = hash
@data = hash || {}
@teams = @data[:teams]&.map { |t| Team.new(t) }
@players = @data[:players]&.select { |t| t[:nick] != "Nod" && t[:nick] != "GDI" }&.map { |t| Player.new(t) }
@teams = @data[:teams]&.map { |t| Team.new(t) } || []
@players = @data[:players]&.select { |t| t[:nick] != "Nod" && t[:nick] != "GDI" }&.map { |t| Player.new(t) } || []
@name = @data[:name]
@name = @data[:name] || ""
@password = @data[:password] || false
@map = @data[:map]
@max_players = @data[:maxplayers]
@map = @data[:map] || ""
@max_players = @data[:maxplayers] || 0
@player_count = @players.size || @data[:numplayers].to_i
@started = @data[:started]
@remaining = @data[:remaining]
@started = @data[:started] || Time.now
@remaining = @data[:remaining] || "00.00.00"
end
end

34
lib/api/server_list_updater.rb
View File

@@ -49,6 +49,7 @@ class W3DHub
response = Excon.post("https://gsh.w3dhub.com/listings/push/v2/negotiate?negotiateVersion=1", headers: Api::DEFAULT_HEADERS, body: "")
data = JSON.parse(response.body, symbolize_names: true)
invocation_id = 0
id = data[:connectionToken]
endpoint = "https://gsh.w3dhub.com/listings/push/v2?id=#{id}"
@@ -60,10 +61,10 @@ class W3DHub
ws.send({ protocol: "json", version: 1 }.to_json + "\x1e")
logger.debug(LOG_TAG) { "Subscribing to server changes..." }
Store.server_list.each_with_index do |server, i|
i += 1
Store.server_list.each do |server|
invocation_id += 1
mode = 1 # 2 full details, 1 basic details
out = { "type": 1, "invocationId": "#{i}", "target": "SubscribeToServerStatusUpdates", "arguments": [server.id, mode] }
out = { "type": 1, "invocationId": "#{invocation_id}", "target": "SubscribeToServerStatusUpdates", "arguments": [server.id, mode] }
ws.send(out.to_json + "\x1e")
end
end
@@ -84,15 +85,34 @@ class W3DHub
case hash[:target]
when "ServerRegistered"
data = hash[:arguments].first
server = ServerListServer.new(data)
Store.server_list.push(server)
invocation_id += 1
out = { "type": 1, "invocationId": "#{invocation_id}", "target": "SubscribeToServerStatusUpdates", "arguments": [data[:id], 1] }
ws.send(out.to_json + "\x1e")
BackgroundWorker.foreground_job(
->(data) { [Api.server_details(data[:id], 2), data] },
->(array) do
server_data, data = array
next unless server_data
data[:status] = server_data
server = ServerListServer.new(data)
Store.server_list.push(server)
States::Interface.instance&.update_server_browser(server, :update)
end,
nil,
data
)
when "ServerStatusChanged"
id, data = hash[:arguments]
server = Store.server_list.find { |s| s.id == id }
server_updated = server&.update(data)
BackgroundWorker.foreground_job(-> {}, ->(result){ States::Interface.instance&.update_server_browser(server, :update) }) if server_updated
BackgroundWorker.foreground_job(->(server) { server }, ->(server) { States::Interface.instance&.update_server_browser(server, :update) }, nil, server) if server_updated
when "ServerUnregistered"
id = hash[:arguments].first
@@ -100,7 +120,7 @@ class W3DHub
if server
Store.server_list.delete(server)
BackgroundWorker.foreground_job(-> {}, ->(result){ States::Interface.instance&.update_server_browser(server, :remove) })
BackgroundWorker.foreground_job(->(server) { server }, ->(server) { States::Interface.instance&.update_server_browser(server, :remove) }, nil, server)
end
end
end