fix multiplayer commands and disconnect recovery
This commit is contained in:
parent
5d7c3d7459
commit
65967816f5
8 changed files with 292 additions and 61 deletions
|
|
@ -23,13 +23,12 @@ func _run() -> void:
|
|||
func _run_host() -> void:
|
||||
var main: Node = await _create_initialized_main()
|
||||
var session := main.get_node("%NetworkSession") as NetworkSession
|
||||
var save_manager := main.get("_save_manager") as PlayerSaveManager
|
||||
var jobs := main.get_node("%PlayerJobService") as PlayerJobService
|
||||
assert(session.start_private_host(TEST_PORT))
|
||||
assert(save_manager.initialize_new_game())
|
||||
main.call("_enter_gameplay")
|
||||
assert(session.start_dedicated_host(TEST_PORT, 8, "127.0.0.1"))
|
||||
jobs.begin_progression_session()
|
||||
await process_frame
|
||||
assert(session.set_host_open(true))
|
||||
assert(session.is_dedicated_host())
|
||||
var host_board: Dictionary = jobs.get_host_board_network_data()
|
||||
assert(PlayerJobService.validate_board(host_board))
|
||||
|
||||
|
|
|
|||
|
|
@ -88,6 +88,11 @@ func _run_host() -> void:
|
|||
entry.revision,
|
||||
))
|
||||
assert(not session.is_peer_operator(remote_peer_id))
|
||||
await create_timer(2.0).timeout
|
||||
assert(session.kick_authenticated_peer(
|
||||
remote_peer_id,
|
||||
remote_record.identity_fingerprint,
|
||||
))
|
||||
|
||||
var disconnect_deadline: int = Time.get_ticks_msec() + 8000
|
||||
while (
|
||||
|
|
@ -173,9 +178,25 @@ func _run_client() -> void:
|
|||
assert(not (tabs.get_child(2) as Button).visible)
|
||||
assert(int(players_page.get("_current_tab")) == 0)
|
||||
service.request_unban.rpc_id(1, SECOND_BANNED_FINGERPRINT)
|
||||
await create_timer(1.0).timeout
|
||||
var disconnect_deadline: int = Time.get_ticks_msec() + 10000
|
||||
while (
|
||||
Time.get_ticks_msec() < disconnect_deadline
|
||||
and session.state != NetworkSession.State.SERVER_LOST
|
||||
):
|
||||
await process_frame
|
||||
assert(session.state == NetworkSession.State.SERVER_LOST)
|
||||
assert(not bool(main.get("_gameplay_started")))
|
||||
var game_ui := main.get_node("%GameUI") as GameUI
|
||||
var title_screen := game_ui.get_title_screen()
|
||||
assert(title_screen.visible)
|
||||
assert(not title_screen.is_awaiting_start_input())
|
||||
assert((title_screen.get_node("%Center") as Control).visible)
|
||||
assert((title_screen.get_node("%ButtonCenter") as Control).visible)
|
||||
assert(not (title_screen.get_node("%JoinGamePage") as Control).visible)
|
||||
var feedback := title_screen.get_node("%FeedbackLabel") as RichTextLabel
|
||||
assert(feedback.visible)
|
||||
assert("removed by the host" in feedback.text.to_lower())
|
||||
print("Operator multiplayer client validation: PASS")
|
||||
session.disconnect_session("")
|
||||
main.queue_free()
|
||||
for _frame: int in 4:
|
||||
await process_frame
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ extends SceneTree
|
|||
const MainScene = preload("res://main/main.tscn")
|
||||
const TEST_PORT: int = 17983
|
||||
const INITIAL_HOST_TIME: float = 19.75
|
||||
const UPDATED_HOST_TIME: float = 20.75
|
||||
const UPDATED_HOST_TIME: float = WorldTimeService.DUSK_END_HOUR
|
||||
const TIME_TOLERANCE_HOURS: float = 0.05
|
||||
|
||||
|
||||
|
|
@ -61,14 +61,31 @@ func _run_host() -> void:
|
|||
assert(session.peer_supports_capability(
|
||||
remote_peer_id, NetworkProtocol.WORLD_WEATHER_CAPABILITY
|
||||
))
|
||||
var remote_record: PeerRegistry.PeerRecord = session.get_peer_record(
|
||||
remote_peer_id
|
||||
)
|
||||
assert(remote_record != null and remote_record.identity_authenticated)
|
||||
assert(session.set_peer_operator(
|
||||
remote_peer_id,
|
||||
remote_record.identity_fingerprint,
|
||||
true,
|
||||
))
|
||||
assert(world_time.get_phase() == WorldTimeService.Phase.DUSK)
|
||||
|
||||
await create_timer(1.0).timeout
|
||||
world_time.synchronize_time(UPDATED_HOST_TIME)
|
||||
var command_deadline: int = Time.get_ticks_msec() + 10000
|
||||
while (
|
||||
Time.get_ticks_msec() < command_deadline
|
||||
and _wrapped_time_difference(
|
||||
world_time.get_time_hours(), UPDATED_HOST_TIME
|
||||
) > TIME_TOLERANCE_HOURS
|
||||
):
|
||||
await process_frame
|
||||
assert(is_equal_approx(
|
||||
world_time.get_persistent_time_hours(), UPDATED_HOST_TIME
|
||||
))
|
||||
assert(chat_ui.call("_handle_chat_command", "/weather foggy"))
|
||||
var fog_deadline: int = Time.get_ticks_msec() + 10000
|
||||
while Time.get_ticks_msec() < fog_deadline and not world_weather.is_foggy():
|
||||
await process_frame
|
||||
assert(
|
||||
world_weather.get_persistent_weather()
|
||||
== WorldWeatherService.Weather.FOGGY
|
||||
|
|
@ -153,6 +170,11 @@ func _run_client() -> void:
|
|||
assert(is_equal_approx(clock_panel.position.y, 10.0))
|
||||
assert(is_equal_approx(weather_icon.position.y, 10.0))
|
||||
assert(clock_panel.position.y + clock_panel.size.y < chat_panel.position.y)
|
||||
var operator_deadline: int = Time.get_ticks_msec() + 10000
|
||||
while Time.get_ticks_msec() < operator_deadline and not session.is_local_operator():
|
||||
await process_frame
|
||||
assert(session.is_local_operator())
|
||||
assert(chat_ui.call("_handle_chat_command", "/time night"))
|
||||
|
||||
var update_deadline: int = Time.get_ticks_msec() + 10000
|
||||
while (
|
||||
|
|
@ -168,6 +190,8 @@ func _run_client() -> void:
|
|||
assert(world_time.get_phase() == WorldTimeService.Phase.NIGHT)
|
||||
assert(is_equal_approx(world_time.get_persistent_time_hours(), 15.25))
|
||||
assert(clock_label.text == world_time.get_clock_text())
|
||||
await create_timer(0.6).timeout
|
||||
assert(chat_ui.call("_handle_chat_command", "/weather foggy"))
|
||||
var fog_deadline: int = Time.get_ticks_msec() + 8000
|
||||
while (
|
||||
Time.get_ticks_msec() < fog_deadline
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue