feat(spectator): support spectate solo player

app/models/metadata_hub.py

@@ -28,8 +28,7 @@ class _UserActivity(BaseModel):
 
 
 class ChoosingBeatmap(_UserActivity):
-    type: Literal["ChoosingBeatmap"] = "ChoosingBeatmap"
-    value: Literal[None] = None
+    type: Literal["ChoosingBeatmap"] = Field(alias="$dtype")
 
 
 class InGameValue(BaseModel):
@@ -44,19 +43,19 @@ class _InGame(_UserActivity):
 
 
 class InSoloGame(_InGame):
-    type: Literal["InSoloGame"] = "InSoloGame"
+    type: Literal["InSoloGame"] = Field(alias="$dtype")
 
 
 class InMultiplayerGame(_InGame):
-    type: Literal["InMultiplayerGame"] = "InMultiplayerGame"
+    type: Literal["InMultiplayerGame"] = Field(alias="$dtype")
 
 
 class SpectatingMultiplayerGame(_InGame):
-    type: Literal["SpectatingMultiplayerGame"] = "SpectatingMultiplayerGame"
+    type: Literal["SpectatingMultiplayerGame"] = Field(alias="$dtype")
 
 
 class InPlaylistGame(_InGame):
-    type: Literal["InPlaylistGame"] = "InPlaylistGame"
+    type: Literal["InPlaylistGame"] = Field(alias="$dtype")
 
 
 class EditingBeatmapValue(BaseModel):
@@ -65,16 +64,16 @@ class EditingBeatmapValue(BaseModel):
 
 
 class EditingBeatmap(_UserActivity):
-    type: Literal["EditingBeatmap"] = "EditingBeatmap"
+    type: Literal["EditingBeatmap"] = Field(alias="$dtype")
     value: EditingBeatmapValue = Field(alias="$value")
 
 
 class TestingBeatmap(_UserActivity):
-    type: Literal["TestingBeatmap"] = "TestingBeatmap"
+    type: Literal["TestingBeatmap"] = Field(alias="$dtype")
 
 
 class ModdingBeatmap(_UserActivity):
-    type: Literal["ModdingBeatmap"] = "ModdingBeatmap"
+    type: Literal["ModdingBeatmap"] = Field(alias="$dtype")
 
 
 class WatchingReplayValue(BaseModel):
@@ -85,17 +84,16 @@ class WatchingReplayValue(BaseModel):
 
 
 class WatchingReplay(_UserActivity):
-    type: Literal["WatchingReplay"] = "WatchingReplay"
+    type: Literal["WatchingReplay"] = Field(alias="$dtype")
     value: int | None = Field(alias="$value")  # Replay ID
 
 
 class SpectatingUser(WatchingReplay):
-    type: Literal["SpectatingUser"] = "SpectatingUser"
+    type: Literal["SpectatingUser"] = Field(alias="$dtype")
 
 
 class SearchingForLobby(_UserActivity):
-    type: Literal["SearchingForLobby"] = "SearchingForLobby"
-    value: None = Field(alias="$value")
+    type: Literal["SearchingForLobby"] = Field(alias="$dtype")
 
 
 class InLobbyValue(BaseModel):
@@ -105,12 +103,10 @@ class InLobbyValue(BaseModel):
 
 class InLobby(_UserActivity):
     type: Literal["InLobby"] = "InLobby"
-    value: None = Field(alias="$value")
 
 
 class InDailyChallengeLobby(_UserActivity):
-    type: Literal["InDailyChallengeLobby"] = "InDailyChallengeLobby"
-    value: None = Field(alias="$value")
+    type: Literal["InDailyChallengeLobby"] = Field(alias="$dtype")
 
 
 UserActivity = (

app/models/signalr.py

@@ -1,11 +1,42 @@
 from __future__ import annotations
 
-from typing import Any
+import datetime
+from typing import Any, get_origin
 
-from pydantic import BaseModel, Field, model_validator
+import msgpack
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    TypeAdapter,
+    model_serializer,
+    model_validator,
+)
+
+
+def serialize_to_list(value: BaseModel) -> list[Any]:
+    data = []
+    for field, info in value.__class__.model_fields.items():
+        v = getattr(value, field)
+        anno = get_origin(info.annotation)
+        if anno and issubclass(anno, BaseModel):
+            data.append(serialize_to_list(v))
+        elif anno and issubclass(anno, list):
+            data.append(
+                TypeAdapter(
+                    info.annotation,
+                ).dump_python(v)
+            )
+        elif isinstance(v, datetime.datetime):
+            data.append([msgpack.ext.Timestamp.from_datetime(v), 0])
+        else:
+            data.append(v)
+    return data
 
 
 class MessagePackArrayModel(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     @model_validator(mode="before")
     @classmethod
     def unpack(cls, v: Any) -> Any:
@@ -16,6 +47,10 @@ class MessagePackArrayModel(BaseModel):
             return dict(zip(fields, v))
         return v
 
+    @model_serializer
+    def serialize(self) -> list[Any]:
+        return serialize_to_list(self)
+
 
 class Transport(BaseModel):
     transport: str

app/models/spectator_hub.py

@@ -12,7 +12,7 @@ from .score import (
 from .signalr import MessagePackArrayModel
 
 import msgpack
-from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
+from pydantic import BaseModel, Field, field_validator
 
 
 class APIMod(MessagePackArrayModel):
@@ -58,8 +58,6 @@ class ScoreProcessorStatistics(MessagePackArrayModel):
 
 
 class FrameHeader(MessagePackArrayModel):
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
     total_score: int
     acc: float
     combo: int
@@ -84,25 +82,21 @@ class FrameHeader(MessagePackArrayModel):
             return datetime.datetime.fromisoformat(v)
         raise ValueError(f"Cannot convert {type(v)} to datetime")
 
-    @field_serializer("received_time")
-    def serialize_received_time(self, v: datetime.datetime) -> msgpack.ext.Timestamp:
-        return msgpack.ext.Timestamp.from_datetime(v)
 
-
-class ReplayButtonState(IntEnum):
-    NONE = 0
-    LEFT1 = 1
-    RIGHT1 = 2
-    LEFT2 = 4
-    RIGHT2 = 8
-    SMOKE = 16
+# class ReplayButtonState(IntEnum):
+#     NONE = 0
+#     LEFT1 = 1
+#     RIGHT1 = 2
+#     LEFT2 = 4
+#     RIGHT2 = 8
+#     SMOKE = 16
 
 
 class LegacyReplayFrame(MessagePackArrayModel):
     time: float  # from ReplayFrame,the parent of LegacyReplayFrame
     x: float | None = None
     y: float | None = None
-    button_state: ReplayButtonState
+    button_state: int
 
 
 class FrameDataBundle(MessagePackArrayModel):
@@ -135,10 +129,10 @@ class StoreScore(BaseModel):
 
 
 class StoreClientState(BaseModel):
-    state: SpectatorState | None
-    beatmap_status: BeatmapRankStatus
-    checksum: str
-    ruleset_id: int
-    score_token: int
-    watched_user: set[int]
-    score: StoreScore
+    state: SpectatorState | None = None
+    beatmap_status: BeatmapRankStatus | None = None
+    checksum: str | None = None
+    ruleset_id: int | None = None
+    score_token: int | None = None
+    watched_user: set[int] = Field(default_factory=set)
+    score: StoreScore | None = None