Send the play queue ID to the server
Build / test (push) Successful in 45s
Build / build (push) Successful in 1m12s

The server keeps a play queue per client, identified by the X-Queue-Id
header. The client sends the ID it has for the selected server with every
request and keeps the one in each response, which is new after a reset or a
sync. The IDs are saved per server in the [queues] section of settings.cfg,
so the game goes on with the same queue after a restart.

HttpTransport now passes the response headers on to the client.
This commit is contained in:
Sansan committed 2026-10-07 21:23:37 +02:00
1 parent d21b3e2ce0
commit 4a45e8516d
8 files changed
+212 -16

No files matched your search

+107 -1
View File
@@ -542,6 +542,111 @@ func _call_every_statistics_endpoint(on_done: Callable, on_failed: Callable) ->
MusicServerClient.fetch_least_played_songs(3, on_done, on_failed)
# Queue IDs
func test_no_queue_id_is_sent_before_the_server_sends_one() -> void:
_server.respond_json("/music/list", [])
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
assert_array(_server.requested_headers[0]) \
.contains_exactly(["Authorization: Bearer fake-token-1"])
func test_queue_id_from_a_response_is_sent_with_the_next_requests() -> void:
_server.respond_json("/music/list", [])
_server.respond_bytes("/music/addQue", PackedByteArray())
_server.queue_id = "queue-1"
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
MusicServerClient.add_to_queue(func() -> void: pass)
assert_str(MusicServerClient.queue_id()).is_equal("queue-1")
assert_array(_server.requested_headers[1]) \
.contains_exactly(["Authorization: Bearer fake-token-1", "X-Queue-Id: queue-1"])
DirAccess.remove_absolute(Settings.saved_settings_path())
func test_new_queue_id_replaces_the_old_one() -> void:
_server.respond_bytes("/music/reset", PackedByteArray())
_server.respond_json("/music/list", [])
_server.queue_id = "queue-1"
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
_server.queue_id = "queue-2"
MusicServerClient.reset_playlist(func() -> void: pass)
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
assert_array(_server.requested_headers[1]).contains(["X-Queue-Id: queue-1"])
assert_array(_server.requested_headers[2]).contains(["X-Queue-Id: queue-2"])
DirAccess.remove_absolute(Settings.saved_settings_path())
func test_queue_id_is_kept_per_server() -> void:
var previous_path: String = Settings.default_path
_server.respond_json("/music/list", [])
_server.queue_id = "queue-1"
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
_server.queue_id = ""
Settings.default_path = "http://another-server:8080"
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
var other_server_id: String = MusicServerClient.queue_id()
Settings.default_path = previous_path
assert_str(other_server_id).is_empty()
assert_array(_server.requested_headers[1]) \
.not_contains(["X-Queue-Id: queue-1"])
assert_str(MusicServerClient.queue_id()).is_equal("queue-1")
DirAccess.remove_absolute(Settings.saved_settings_path())
func test_queue_id_is_saved_for_the_next_start() -> void:
_server.respond_json("/music/list", [])
_server.queue_id = "queue-1"
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
Settings.queue_ids.clear()
assert_str(MusicServerClient.queue_id()).is_empty()
Settings.load_saved_settings()
assert_str(MusicServerClient.queue_id()).is_equal("queue-1")
DirAccess.remove_absolute(Settings.saved_settings_path())
func test_queue_id_header_name_is_case_insensitive() -> void:
var transport: _HeaderTransport = _HeaderTransport.new(["x-queue-id: lower-case"])
var previous_transport: HttpTransport = MusicServerClient.transport
MusicServerClient.transport = transport
MusicServerClient.fetch_song_list(func(_data: Array[SongInfo]) -> void: pass)
MusicServerClient.transport = previous_transport
assert_str(MusicServerClient.queue_id()).is_equal("lower-case")
DirAccess.remove_absolute(Settings.saved_settings_path())
# Answers every request with 200, an empty JSON list and the given headers
class _HeaderTransport:
extends HttpTransport
var _headers: PackedStringArray
func _init(headers: PackedStringArray) -> void:
super(null)
_headers = headers
func request(
_url: String,
_method: int,
on_complete: Callable,
_request_headers: PackedStringArray = PackedStringArray(),
_body: String = "",
) -> void:
on_complete.call(200, JSON.stringify({"token": "t"} if _url.ends_with("/token") else [])
.to_utf8_buffer(), _headers)
class _RecordingTransport:
extends HttpTransport
@@ -560,4 +665,5 @@ class _RecordingTransport:
) -> void:
_urls.append(url)
if url.ends_with("/token"):
on_complete.call(200, JSON.stringify({"token": "t"}).to_utf8_buffer())
on_complete.call(200, JSON.stringify({"token": "t"}).to_utf8_buffer(),
PackedStringArray())