Some lobby stuff

Author: V-rtualized

.github/workflows/strip-dev.yml

@@ -0,0 +1,29 @@
+name: Strip dev files for release
+
+on:
+  push:
+    branches:
+      - mqtt-main
+
+jobs:
+  strip-dev:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: mqtt-main
+
+      - name: Strip dev/ directory
+        run: |
+          if [ -d "dev" ]; then
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git rm -r dev/
+            git commit -m "Strip dev/ directory for main"
+            git push
+          else
+            echo "No dev/ directory found, nothing to strip"
+          fi

api/lobby.lua

@@ -5,6 +5,8 @@ local subscribe_all
 local handle_event
 local handle_metadata
 local handle_own_state
+local handle_player_info
+local populate_initial_players
 local cleanup_lobby
 
 -----------------------------
@@ -71,8 +73,8 @@ MPAPI.join_lobby = function(mod_id, code, opts)
 	})
 
 	_current_lobby = lobby
-	
-	conn.api:join_lobby(conn.jwt_token, code, )
+
+	conn.api:join_lobby(conn.jwt_token, code, join_lobby_callback)
 
 	return lobby
 end
@@ -97,13 +99,15 @@ MPAPI._internal.create_reconnected_lobby = function(lobby_data)
 		code = lobby_data.code,
 		mod_id = lobby_data.modId,
 		is_host = lobby_data.isHost or false,
+		max_players = lobby_data.maxPlayers,
 		player_id = conn.player_id,
 		mqtt = mqtt,
 		api = conn.api,
 		connection = conn,
 		metadata = lobby_data.metadata or {},
 	})
 
+	populate_initial_players(lobby, lobby_data.players)
 	subscribe_all(lobby)
 	_current_lobby = lobby
 	lobby:_fire('connected')
@@ -119,12 +123,14 @@ join_lobby_callback = function(err, data)
 		return
 	end
 
-	conn.jwt_token = data.token
+	_current_lobby._connection.jwt_token = data.token
 
 	_current_lobby.code = data.lobby.code
 	_current_lobby.is_host = data.lobby.isHost or false
-	lo_current_lobbybby._metadata = data.lobby.metadata or {}
+	_current_lobby.max_players = data.lobby.maxPlayers or 16
+	_current_lobby._metadata = data.lobby.metadata or {}
 
+	populate_initial_players(_current_lobby, data.lobby.players)
 	subscribe_all(_current_lobby)
 	_current_lobby:_fire('connected')
 end
@@ -135,12 +141,14 @@ create_lobby_callback = function(err, data)
 		return
 	end
 
-	conn.jwt_token = data.token
+	_current_lobby._connection.jwt_token = data.token
 
 	_current_lobby.code = data.lobby.code
 	_current_lobby.is_host = true
+	_current_lobby.max_players = data.lobby.maxPlayers or 16
 	_current_lobby._metadata = data.lobby.metadata or {}
 
+	populate_initial_players(_current_lobby, data.lobby.players)
 	subscribe_all(_current_lobby)
 	_current_lobby:_fire('connected')
 end
@@ -150,6 +158,7 @@ create_lobby_object = function(opts)
 		code = opts.code,
 		mod_id = opts.mod_id,
 		is_host = opts.is_host or false,
+		max_players = opts.max_players or 16,
 		player_id = opts.player_id,
 		_mqtt = opts.mqtt,
 		_api = opts.api,
@@ -265,6 +274,11 @@ subscribe_all = function(lobby)
 	lobby._mqtt:subscribe(state_topic, 1, function(topic, payload)
 		handle_own_state(lobby, payload)
 	end)
+
+	local info_topic = lobby._mqtt:lobby_topic(lobby.code, 'players/+/info')
+	lobby._mqtt:subscribe(info_topic, 1, function(topic, payload)
+		handle_player_info(lobby, topic, payload)
+	end)
 end
 
 handle_event = function(lobby, payload)
@@ -281,11 +295,10 @@ handle_event = function(lobby, payload)
 
 	if event_type == 'player_joined' then
 		if data.playerId then
-			lobby._players[data.playerId] = {
-				id = data.playerId,
-				displayName = data.displayName,
-				is_away = false,
-			}
+			lobby._players[data.playerId] = lobby._players[data.playerId] or {}
+			lobby._players[data.playerId].id = data.playerId
+			lobby._players[data.playerId].displayName = data.displayName
+			lobby._players[data.playerId].is_away = false
 		end
 		lobby:_fire('player_joined', data.playerId)
 	elseif event_type == 'player_left' then
@@ -346,6 +359,57 @@ handle_own_state = function(lobby, payload)
 	lobby._player_state = data
 end
 
+handle_player_info = function(lobby, topic, payload)
+	if lobby._destroyed then
+		return
+	end
+
+	local player_id = topic:match('/players/([^/]+)/info$')
+	if not player_id then
+		return
+	end
+
+	if not payload or payload == '' then
+		if lobby._players[player_id] then
+			lobby._players[player_id] = nil
+			lobby:_fire('player_left', player_id)
+		end
+		return
+	end
+
+	local ok, data = pcall(MPAPI.json_decode, payload)
+	if not ok or not data then
+		return
+	end
+
+	local is_new = not lobby._players[player_id]
+	lobby._players[player_id] = lobby._players[player_id] or {}
+	lobby._players[player_id].id = player_id
+	lobby._players[player_id].displayName = data.displayName
+	lobby._players[player_id].preferredJoker = data.preferredJoker
+
+	if is_new then
+		lobby:_fire('player_joined', player_id)
+	end
+	lobby:_fire('player_info', player_id, lobby._players[player_id])
+end
+
+populate_initial_players = function(lobby, players)
+	if not players then
+		return
+	end
+	for _, p in ipairs(players) do
+		if p.id then
+			lobby._players[p.id] = {
+				id = p.id,
+				displayName = p.displayName,
+				preferredJoker = p.preferredJoker,
+				is_away = false,
+			}
+		end
+	end
+end
+
 cleanup_lobby = function(lobby)
 	if lobby._destroyed then
 		return
@@ -356,6 +420,7 @@ cleanup_lobby = function(lobby)
 		lobby._mqtt:unsubscribe(lobby._mqtt:lobby_topic(lobby.code, 'events'))
 		lobby._mqtt:unsubscribe(lobby._mqtt:lobby_topic(lobby.code, 'metadata'))
 		lobby._mqtt:unsubscribe(lobby._mqtt:lobby_topic(lobby.code, 'players/' .. lobby.player_id .. '/state'))
+		lobby._mqtt:unsubscribe(lobby._mqtt:lobby_topic(lobby.code, 'players/+/info'))
 	end
 
 	if _current_lobby == lobby then

core.lua

@@ -107,6 +107,12 @@ MPAPI.load_mpapi_dir('lib')
 MPAPI.load_mpapi_dir('api')
 MPAPI.load_mpapi_dir('ui')
 
+-- Load dev overrides if the dev/ directory exists (stripped in release builds)
+local dev_init = MPAPI.load_mpapi_file('dev/init.lua')
+if dev_init then
+	MPAPI.sendDebugMessage('Dev overrides loaded')
+end
+
 G.E_MANAGER:add_event(Event({
 	blockable = false,
 	blocking = false,

dev/init.lua

@@ -0,0 +1,36 @@
+-- Dev overrides: This file (and the dev/ directory) is stripped from release builds by CI.
+local api_client = MPAPI.modules.api_client
+local connection = MPAPI.modules.connection
+
+function api_client.authenticate_impersonate(self, steam_name, callback)
+	if not self.mqtt or not self.mqtt.tx_channel then
+		callback('MQTT thread not running', nil)
+		return
+	end
+
+	self:_setup_http_callback(callback)
+
+	local json_encode = (json and json.encode) and json.encode or require('json').encode
+	local body = json_encode({ steamName = steam_name })
+	self.mqtt:http_post(self.base_url .. '/api/auth/dev/impersonate', body)
+end
+
+function connection._try_impersonate_auth(self, steam_name)
+	self.mqtt:start_thread()
+
+	self.api:authenticate_impersonate(steam_name, function(err, data)
+		if err then
+			MPAPI.sendWarnMessage('Impersonate failed: ' .. tostring(err) .. ', falling back to Steam')
+			self:_try_steam_auth()
+			return
+		end
+
+		self:_handle_auth_success(data)
+	end)
+end
+
+function connection._start_auth(self)
+	self:_try_impersonate_auth('Bean')
+end
+
+MPAPI.sendDebugMessage('Dev auth overrides applied')

localization/en-us.lua

@@ -27,6 +27,9 @@ return {
 			b_by_code_cap = 'BY CODE',
 			b_from_clipboard_cap = 'FROM CLIPBOARD',
 			b_find_game_cap = 'FIND GAME',
+			b_open_lobby_cap = { 'OPEN', 'LOBBY' },
+			b_lobby_options_cap = { 'LOBBY', 'OPTIONS' },
+			b_leave_lobby_cap = { 'LEAVE', 'LOBBY' },
 		},
 	},
 }

networking/connection.lua

@@ -152,14 +152,18 @@ function connection:_try_refresh_auth(steam_error)
 	end)
 end
 
+function connection:_start_auth()
+	self:_try_steam_auth()
+end
+
 function connection:connect()
 	if self.state ~= STATES.DISCONNECTED then
 		fire(self, self.state, { error = 'Already ' .. self.state })
 		return
 	end
 
 	set_state(self, STATES.AUTHENTICATING)
-	self:_try_steam_auth()
+	self:_start_auth()
 end
 
 function connection:_mqtt_connect_with_credentials()