dst-server 0.2.0__tar.gz → 0.2.2__tar.gz

{dst_server-0.2.0 → dst_server-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dst-server
-Version: 0.2.0
+Version: 0.2.2
 Summary: Start and control a Don't Starve Together server process.
 License-Expression: MIT
 License-File: LICENSE
@@ -383,7 +383,7 @@ The master Agent registers in-process; secondary Agents register through the Pod
 
 | Channel | Purpose |
 | --- | --- |
-| `/cluster/.dst-server.sock` | Public Cap'n Proto RPC; connections check a schema fingerprint, so the client and daemon should use matching versions. |
+| `/cluster/.dst-server.sock` | Public Cap'n Proto RPC. |
 | Game FD 3 | Lua command input. |
 | Game FD 4 | Command text output; raw Lua must explicitly `print`. |
 | Game FD 5 | Native lifecycle events such as Ready, Session, Saved, and Stopping. |
@@ -582,8 +582,6 @@ Each endpoint accepts only its declared command scope.
 Game clients handle game operations; controllers own process lifecycle and cluster coordination.
 
 Cap'n Proto carries commands through `call` and observations through subscription capabilities.
-The handshake fingerprint covers the capability schema and Pydantic request, result, event, and error schemas.
-Use matching client and daemon versions.
 Configuration payloads preserve omitted fields, explicit `False`, world override types, and secrets needed for saving.
 
 Import cluster results, statuses, and observation cursors from [models.cluster](src/dst_server/models/cluster.py).
@@ -773,7 +771,9 @@ if catalog.has_more and catalog.snapshots:
 The Agent rejects path escapes, symlinks, invalid metadata, and session changes during a query.
 For standalone reads, use `WorldSnapshotMetadata.load(path)` / `PlayerSnapshotMetadata.load(path)` from [models.snapshot](src/dst_server/models/snapshot.py).
 The loaders parse only UTF-8 Lua literals and support native text headers and trailing NULs.
-They reject unknown fields, wrong types, and dynamic expressions.
+Additional fields in `clock` and `seasons` written by Mods are ignored; known fields retain strict validation.
+Unknown fields elsewhere, wrong types, and dynamic expressions are rejected.
+The day uses the standard `clock.cycles + 1`, without interpreting Mod calendars.
 The world model covers `clock`, `seasons`, and nested fields.
 The player model exposes `character`, including Mod character identifiers.
 
@@ -838,22 +838,21 @@ Export detects file changes but cannot guarantee an atomic snapshot of an online
 The input must remain unchanged.
 Exports and uploads are available; there is no import API yet.
 
-Before uploading to R2, set [obstore's S3 environment variables](https://developmentseed.org/obstore/latest/api/store/aws/#obstore.store.S3Config) in the calling process:
-
-```shell
-export AWS_ENDPOINT='https://<account-id>.r2.cloudflarestorage.com'
-export AWS_BUCKET='your-bucket'
-export AWS_ACCESS_KEY_ID='your-access-key-id'
-export AWS_SECRET_ACCESS_KEY='your-secret-access-key'
-```
+Pass S3 connection settings and credentials directly when uploading to R2:
 
 ```python
 from pathlib import Path
 
+from pydantic import SecretStr
+
 from dst_server.archive import export_cluster
 
 with export_cluster(Path("/srv/dst/000")) as archive:
     result = archive.upload(
+        endpoint="https://<account-id>.r2.cloudflarestorage.com",
+        bucket="your-bucket",
+        access_key_id=SecretStr("your-access-key-id"),
+        secret_access_key=SecretStr("your-secret-access-key"),
         object_prefix="rooms/exports/",
         url_prefix="https://downloads.example.com/",
     )
@@ -862,6 +861,25 @@ print(result.key)
 print(result.url)
 ```
 
+| Upload argument | Type | Default | Environment fallback |
+| --- | --- | --- | --- |
+| `bucket` | `str \| None` | `None` | `AWS_BUCKET` |
+| `endpoint` | `str \| None` | `None` | `AWS_ENDPOINT_URL_S3`, then `AWS_ENDPOINT` |
+| `region` | `str` | `"auto"` | None; the argument overrides `AWS_REGION` |
+| `access_key_id` | `SecretStr \| None` | `None` | `AWS_ACCESS_KEY_ID` |
+| `secret_access_key` | `SecretStr \| None` | `None` | `AWS_SECRET_ACCESS_KEY` |
+| `session_token` | `SecretStr \| None` | `None` | `AWS_SESSION_TOKEN` |
+| `object_prefix` | `str` | `""` | None |
+| `url_prefix` | `str \| None` | `None` | None |
+
+The three credential arguments require `SecretStr` instances; plain strings are rejected.
+Secrets are unwrapped only when creating `S3Store` and are never written to the archive.
+Explicit values override the corresponding environment settings, including `AWS_ENDPOINT_URL_S3` for `endpoint`.
+`None` leaves that field to [obstore's environment configuration](https://developmentseed.org/obstore/latest/api/store/aws/#obstore.store.S3Config).
+This fallback applies per field: an omitted `session_token` can still come from the environment when both keys are explicit.
+Other obstore options retain their environment behavior.
+Calling `upload()` without connection or credential arguments continues to use AWS environment variables.
+
 `upload()` reads from the start of the stream and returns `ArchiveUploadResult` with `key` and `url` fields.
 The object key is `object_prefix + archive.filename`; `object_prefix` defaults to an empty string.
 The filename remains `DST-<room-id>-<UTC timestamp>.7z`, with the timestamp precise to seconds.
@@ -871,8 +889,9 @@ Both prefixes are explicit SDK arguments and are concatenated literally.
 `object_prefix` must not begin with `/`, which the storage backend would otherwise strip from the key.
 Supply any required separators, such as `/` or `?file=`, yourself.
 Query prefixes and trailing separators are preserved, and the URL is never inferred from the bucket or S3 endpoint.
-S3 configuration still uses the AWS environment variables above; there are no environment variables for these prefixes.
-`S3Store(region="auto")` uses [R2's `auto` region](https://developers.cloudflare.com/r2/api/s3/api/#bucket-region), so `AWS_REGION` is unnecessary.
+The two prefixes are ordinary strings and have no corresponding environment variables.
+The default `region="auto"` uses [R2's `auto` region](https://developers.cloudflare.com/r2/api/s3/api/#bucket-region).
+Pass `region` explicitly when uploading to a different S3 region.
 [obstore handles multipart uploads](https://developmentseed.org/obstore/latest/api/put/); errors propagate to the caller, and local temporary files are still cleaned up.
 Remote parts from failed uploads may remain; R2 removes them after seven days by default.
 Configure this through [lifecycle rules](https://developers.cloudflare.com/r2/buckets/object-lifecycles/).

{dst_server-0.2.0 → dst_server-0.2.2}/README.md

@@ -360,7 +360,7 @@ The master Agent registers in-process; secondary Agents register through the Pod
 
 | Channel | Purpose |
 | --- | --- |
-| `/cluster/.dst-server.sock` | Public Cap'n Proto RPC; connections check a schema fingerprint, so the client and daemon should use matching versions. |
+| `/cluster/.dst-server.sock` | Public Cap'n Proto RPC. |
 | Game FD 3 | Lua command input. |
 | Game FD 4 | Command text output; raw Lua must explicitly `print`. |
 | Game FD 5 | Native lifecycle events such as Ready, Session, Saved, and Stopping. |
@@ -559,8 +559,6 @@ Each endpoint accepts only its declared command scope.
 Game clients handle game operations; controllers own process lifecycle and cluster coordination.
 
 Cap'n Proto carries commands through `call` and observations through subscription capabilities.
-The handshake fingerprint covers the capability schema and Pydantic request, result, event, and error schemas.
-Use matching client and daemon versions.
 Configuration payloads preserve omitted fields, explicit `False`, world override types, and secrets needed for saving.
 
 Import cluster results, statuses, and observation cursors from [models.cluster](src/dst_server/models/cluster.py).
@@ -750,7 +748,9 @@ if catalog.has_more and catalog.snapshots:
 The Agent rejects path escapes, symlinks, invalid metadata, and session changes during a query.
 For standalone reads, use `WorldSnapshotMetadata.load(path)` / `PlayerSnapshotMetadata.load(path)` from [models.snapshot](src/dst_server/models/snapshot.py).
 The loaders parse only UTF-8 Lua literals and support native text headers and trailing NULs.
-They reject unknown fields, wrong types, and dynamic expressions.
+Additional fields in `clock` and `seasons` written by Mods are ignored; known fields retain strict validation.
+Unknown fields elsewhere, wrong types, and dynamic expressions are rejected.
+The day uses the standard `clock.cycles + 1`, without interpreting Mod calendars.
 The world model covers `clock`, `seasons`, and nested fields.
 The player model exposes `character`, including Mod character identifiers.
 
@@ -815,22 +815,21 @@ Export detects file changes but cannot guarantee an atomic snapshot of an online
 The input must remain unchanged.
 Exports and uploads are available; there is no import API yet.
 
-Before uploading to R2, set [obstore's S3 environment variables](https://developmentseed.org/obstore/latest/api/store/aws/#obstore.store.S3Config) in the calling process:
-
-```shell
-export AWS_ENDPOINT='https://<account-id>.r2.cloudflarestorage.com'
-export AWS_BUCKET='your-bucket'
-export AWS_ACCESS_KEY_ID='your-access-key-id'
-export AWS_SECRET_ACCESS_KEY='your-secret-access-key'
-```
+Pass S3 connection settings and credentials directly when uploading to R2:
 
 ```python
 from pathlib import Path
 
+from pydantic import SecretStr
+
 from dst_server.archive import export_cluster
 
 with export_cluster(Path("/srv/dst/000")) as archive:
     result = archive.upload(
+        endpoint="https://<account-id>.r2.cloudflarestorage.com",
+        bucket="your-bucket",
+        access_key_id=SecretStr("your-access-key-id"),
+        secret_access_key=SecretStr("your-secret-access-key"),
         object_prefix="rooms/exports/",
         url_prefix="https://downloads.example.com/",
     )
@@ -839,6 +838,25 @@ print(result.key)
 print(result.url)
 ```
 
+| Upload argument | Type | Default | Environment fallback |
+| --- | --- | --- | --- |
+| `bucket` | `str \| None` | `None` | `AWS_BUCKET` |
+| `endpoint` | `str \| None` | `None` | `AWS_ENDPOINT_URL_S3`, then `AWS_ENDPOINT` |
+| `region` | `str` | `"auto"` | None; the argument overrides `AWS_REGION` |
+| `access_key_id` | `SecretStr \| None` | `None` | `AWS_ACCESS_KEY_ID` |
+| `secret_access_key` | `SecretStr \| None` | `None` | `AWS_SECRET_ACCESS_KEY` |
+| `session_token` | `SecretStr \| None` | `None` | `AWS_SESSION_TOKEN` |
+| `object_prefix` | `str` | `""` | None |
+| `url_prefix` | `str \| None` | `None` | None |
+
+The three credential arguments require `SecretStr` instances; plain strings are rejected.
+Secrets are unwrapped only when creating `S3Store` and are never written to the archive.
+Explicit values override the corresponding environment settings, including `AWS_ENDPOINT_URL_S3` for `endpoint`.
+`None` leaves that field to [obstore's environment configuration](https://developmentseed.org/obstore/latest/api/store/aws/#obstore.store.S3Config).
+This fallback applies per field: an omitted `session_token` can still come from the environment when both keys are explicit.
+Other obstore options retain their environment behavior.
+Calling `upload()` without connection or credential arguments continues to use AWS environment variables.
+
 `upload()` reads from the start of the stream and returns `ArchiveUploadResult` with `key` and `url` fields.
 The object key is `object_prefix + archive.filename`; `object_prefix` defaults to an empty string.
 The filename remains `DST-<room-id>-<UTC timestamp>.7z`, with the timestamp precise to seconds.
@@ -848,8 +866,9 @@ Both prefixes are explicit SDK arguments and are concatenated literally.
 `object_prefix` must not begin with `/`, which the storage backend would otherwise strip from the key.
 Supply any required separators, such as `/` or `?file=`, yourself.
 Query prefixes and trailing separators are preserved, and the URL is never inferred from the bucket or S3 endpoint.
-S3 configuration still uses the AWS environment variables above; there are no environment variables for these prefixes.
-`S3Store(region="auto")` uses [R2's `auto` region](https://developers.cloudflare.com/r2/api/s3/api/#bucket-region), so `AWS_REGION` is unnecessary.
+The two prefixes are ordinary strings and have no corresponding environment variables.
+The default `region="auto"` uses [R2's `auto` region](https://developers.cloudflare.com/r2/api/s3/api/#bucket-region).
+Pass `region` explicitly when uploading to a different S3 region.
 [obstore handles multipart uploads](https://developmentseed.org/obstore/latest/api/put/); errors propagate to the caller, and local temporary files are still cleaned up.
 Remote parts from failed uploads may remain; R2 removes them after seven days by default.
 Configure this through [lifecycle rules](https://developers.cloudflare.com/r2/buckets/object-lifecycles/).

{dst_server-0.2.0 → dst_server-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dst-server"
-version = "0.2.0"
+version = "0.2.2"
 description = "Start and control a Don't Starve Together server process."
 readme = "README.md"
 license = "MIT"

{dst_server-0.2.0 → dst_server-0.2.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "dst-server"
-version = "0.2.0"
+version = "0.2.2"
 description = "Start and control a Don't Starve Together server process."
 readme = "README.md"
 license = "MIT"

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/archive.py

@@ -10,7 +10,7 @@ from pathlib import Path
 from tempfile import TemporaryFile
 from typing import Annotated, BinaryIO
 
-from pydantic import ConfigDict, Field, validate_call
+from pydantic import ConfigDict, Field, InstanceOf, SecretStr, validate_call
 
 from dst_server.klei_id import encode_klei_id
 
@@ -33,17 +33,39 @@ class ClusterArchive:
     filename: str
     stream: BinaryIO
 
-    @validate_call(config=ConfigDict(strict=True))
+    @validate_call(config=ConfigDict(strict=True, hide_input_in_errors=True))
     def upload(
         self,
         *,
+        bucket: str | None = None,
+        endpoint: str | None = None,
+        region: str = "auto",
+        access_key_id: InstanceOf[SecretStr] | None = None,
+        secret_access_key: InstanceOf[SecretStr] | None = None,
+        session_token: InstanceOf[SecretStr] | None = None,
         object_prefix: Annotated[str, Field(pattern=r"^(?:[^/]|$)")] = "",
         url_prefix: str | None = None,
     ) -> ArchiveUploadResult:
-        """Upload using AWS environment variables and literal key/URL prefixes."""
+        """Upload with explicit S3 settings overriding AWS environment variables."""
         from obstore.store import S3Store
 
-        store = S3Store(region="auto")
+        settings = {
+            "aws_endpoint_url_s3": endpoint,
+            "access_key_id": access_key_id,
+            "secret_access_key": secret_access_key,
+            "session_token": session_token,
+        }
+        store = S3Store(
+            bucket,
+            region=region,
+            **{
+                name: value.get_secret_value()
+                if isinstance(value, SecretStr)
+                else value
+                for name, value in settings.items()
+                if value is not None
+            },
+        )
         key = f"{object_prefix}{self.filename}"
         self.stream.seek(0)
         store.put(
@@ -154,6 +176,7 @@ def export_cluster(  # ruff: ignore[complex-structure, too-many-branches]
         if saves != _save_files(directory, configuration, encode_user_path):
             msg = "saves changed during export; use a quiescent copy or stop the games"
             raise RuntimeError(msg)
+        del saves, files, exported, configuration
         stream.seek(0)
         yield ClusterArchive(filename, stream)
 

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/cluster/agent.py

@@ -86,7 +86,7 @@ class ShardAgent:
         self._fatal = asyncio.Event()
         self._failure_id: ULID | None = None
         self._started_at_ns: int | None = None
-        self.failures: asyncio.Queue[ShardSupervisorStatus] = asyncio.Queue()
+        self.failures: asyncio.Queue[ShardSupervisorStatus] = asyncio.Queue(maxsize=1)
         self.supervisor = ShardSupervisor(
             shard.name,
             self._new_server,
@@ -474,6 +474,9 @@ class ShardAgent:
 
     async def _failed(self, status: ShardSupervisorStatus) -> None:
         self._failure_id = ULID()
+        # Failure reports wake reconciliation, which reads the current status.
+        if self.failures.full():
+            self.failures.get_nowait()
         self.failures.put_nowait(status)
 
     def _background_done(
@@ -536,6 +539,7 @@ class ShardAgent:
                 if isinstance(event, SessionEvent):
                     self._generation_sequence += 1
                 self._event_changed.notify_all()
+            del observed, event
 
     async def _drain_game_events(self, server: Server) -> None:
         attempt = ULID.from_str(server.game_events.nonce)
@@ -560,6 +564,7 @@ class ShardAgent:
                     event=observed.record,
                 )
             )
+            del observed
 
     async def _drain_operational(self, server: Server) -> None:
         while (record := await server.read_operational_event()) is not None:
@@ -582,3 +587,4 @@ class ShardAgent:
                     event=record.event_name,
                     body=record.body,
                 )
+            del record

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/cluster/controller.py

@@ -1141,8 +1141,9 @@ class ClusterController(ClusterAPI):
         )
         self._reconcile_task.add_done_callback(self._consume_task_result)
 
-    @staticmethod
-    def _consume_task_result(task: asyncio.Task[None]) -> None:
+    def _consume_task_result(self, task: asyncio.Task[None]) -> None:
+        if self._reconcile_task is task:
+            self._reconcile_task = None
         if not task.cancelled():
             task.exception()
 
@@ -1175,6 +1176,7 @@ class ClusterController(ClusterAPI):
                         for item in batch:
                             for target in targets:
                                 target.publish(item)
+                        del batch, item
                 except SubscriptionOverflowError:
                     logger.warning(
                         "internal shard relay overflowed; resubscribing: {shard}",

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/cluster/daemon.py

@@ -16,7 +16,7 @@ from dst_server.configuration.models import ShardName
 from dst_server.configuration.store import ConfigurationStore
 from dst_server.rpc.client import rpc_runtime
 from dst_server.rpc.codec import unwrap_outcome
-from dst_server.rpc.schema import SCHEMA_FINGERPRINT, load_schema
+from dst_server.rpc.schema import load_schema
 from dst_server.rpc.servants import (
     AgentServant,
     BootstrapServant,
@@ -355,10 +355,7 @@ async def _registered_cycle(agent: ShardAgent, internal_address: str) -> None:
             stack.callback(client.close)
             registry = client.bootstrap().cast_as(load_schema().WorkerRegistry)
         async with asyncio.timeout(DEFAULT_LIFECYCLE_TIMEOUT):
-            response = await registry.register(
-                schemaFingerprint=SCHEMA_FINGERPRINT,
-                agent=servant,
-            )
+            response = await registry.register(agent=servant)
         unwrap_outcome(response.result)
         disconnected = asyncio.ensure_future(client.on_disconnect())
         while True:

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/cluster/subscriptions.py

@@ -1,5 +1,6 @@
 import asyncio
 from typing import Annotated
+from weakref import WeakSet
 
 from pydantic import Field, TypeAdapter
 
@@ -11,7 +12,7 @@ BATCH_SIZE = TypeAdapter(Annotated[int, Field(ge=1, le=MAX_BATCH_SIZE)])
 
 class Broadcast[T]:
     def __init__(self) -> None:
-        self._subscriptions: set[Subscription[T]] = set()
+        self._subscriptions: WeakSet[Subscription[T]] = WeakSet()
         self._closed = False
 
     def subscribe(self) -> Subscription[T]:

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/commands.py

@@ -492,18 +492,3 @@ def parse_request(payload: bytes, *, scope: Scope) -> Request[Any]:
     if envelope.timeout is not None:
         arguments |= {"timeout": envelope.timeout}
     return spec.request.model_validate_json(json.dumps(arguments, allow_nan=False))
-
-
-def schema_contract() -> dict[str, dict[str, dict[str, Any]]]:
-    return {
-        scope: {
-            method: {
-                "request": spec.request.model_json_schema(),
-                "result": spec.response.json_schema(),
-                "mutation": spec.mutation,
-            }
-            for (entry_scope, method), spec in sorted(_OPERATIONS.items())
-            if entry_scope == scope
-        }
-        for scope in _ALL
-    }

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/errors.py

@@ -16,7 +16,6 @@ class ErrorCode(StrEnum):
     TIMEOUT = "timeout"
     OVERFLOW = "overflow"
     TOPOLOGY_CHANGE_REQUIRED = "topologyChangeRequired"
-    INCOMPATIBLE_SCHEMA = "incompatibleSchema"
     INTERNAL = "internal"
     INDETERMINATE = "indeterminate"
 

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/klei/client.py

@@ -1,8 +1,8 @@
-from asyncio import Semaphore, TaskGroup
-from collections.abc import Iterable
+from asyncio import TaskGroup
+from collections.abc import Awaitable, Callable, Iterable
 from itertools import chain, product
 from types import TracebackType
-from typing import Self
+from typing import Self, cast
 
 import httpx2
 from logbook import Logger
@@ -111,18 +111,12 @@ class KleiClient:
         regions: Iterable[Region | str] = Region,
         platforms: Iterable[Platform] = Platform,
     ) -> tuple[Lobby, ...]:
-        semaphore = Semaphore(self.lobby_concurrency)
-
-        async def load(region: Region | str, platform: Platform) -> tuple[Lobby, ...]:
-            async with semaphore:
-                return await self.lobby(region, platform)
-
-        async with TaskGroup() as group:
-            tasks = [
-                group.create_task(load(region, platform))
-                for region, platform in product(regions, platforms)
-            ]
-        return tuple(chain.from_iterable(task.result() for task in tasks))
+        batches = await _map(
+            product(regions, platforms),
+            lambda pair: self.lobby(*pair),
+            self.lobby_concurrency,
+        )
+        return tuple(chain.from_iterable(batches))
 
     async def get_rooms(
         self,
@@ -132,17 +126,13 @@ class KleiClient:
             msg = "a Klei access token is required to query room details"
             raise ValueError(msg)
         if rooms is None:
-            lobbies = await self.get_lobbies()
-            rooms = ((lobby.row_id, lobby.region) for lobby in lobbies)
-        semaphore = Semaphore(self.room_concurrency)
-
-        async def load(row_id: str, region: Region | str) -> Room | None:
-            async with semaphore:
-                return await self.room(row_id, region)
-
-        async with TaskGroup() as group:
-            tasks = [group.create_task(load(*room)) for room in rooms]
-        return tuple(room for task in tasks if (room := task.result()) is not None)
+            rooms = tuple(
+                (lobby.row_id, lobby.region) for lobby in await self.get_lobbies()
+            )
+        results = await _map(
+            rooms, lambda pair: self.room(*pair), self.room_concurrency
+        )
+        return tuple(room for room in results if room is not None)
 
     async def lobby(
         self,
@@ -203,6 +193,25 @@ class KleiClient:
         return data.rows[0] if data.rows else None
 
 
+async def _map[ItemT, ResultT](
+    items: Iterable[ItemT],
+    load: Callable[[ItemT], Awaitable[ResultT]],
+    concurrency: int,
+) -> tuple[ResultT, ...]:
+    pending = enumerate(items)
+    results: list[ResultT | None] = []
+
+    async def worker() -> None:
+        for index, item in pending:
+            results.append(None)
+            results[index] = await load(item)
+
+    async with TaskGroup() as group:
+        for _ in range(concurrency):
+            group.create_task(worker())
+    return cast("tuple[ResultT, ...]", tuple(results))
+
+
 def positive(name: str, value: int) -> int:
     if isinstance(value, bool) or not isinstance(value, int) or value < 1:
         msg = f"{name} must be a positive integer"

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/klei/lobby.py

@@ -1,5 +1,6 @@
 from collections.abc import Mapping
 from ipaddress import IPv4Address
+from re import sub
 from typing import Annotated
 
 from pydantic import (
@@ -33,12 +34,12 @@ class DataResponse[DataT](KleiModel):
 
 class Player(KleiModel):
     name: str
-    kuid: str
-    role: Role | str | None = None
-    steam_id: int | None = None
-    ip: IPv4Address | None = None
+    netid: str
+    prefab: Role | str
+    colour: str
+    eventlevel: int
 
-    @field_validator("role", mode="before")
+    @field_validator("prefab", mode="before")
     @classmethod
     def preserve_custom_role(cls, value: object) -> object:
         return Role(value) if isinstance(value, str) and value in Role else value
@@ -118,7 +119,9 @@ class Room(Lobby):
             return ()
         if not isinstance(value, str):
             return value
-        players = parse_literal(value, "Klei room players")
+        players = parse_literal(
+            sub(r"\A\s*return\b", "", value, count=1), "Klei room players"
+        )
         if players == {}:
             return ()
         if not isinstance(players, list):

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/lua/dst_server/telemetry.lua

@@ -30,7 +30,7 @@ local function write(event_name, data)
         monotonic_ms = math.floor(GetTimeReal()),
         cycle = cycle == nil and json.null or cycle,
         data = data,
-    })
+    }, state.max_line_bytes - #state.prefix)
     if type(encoded) ~= "string" then
         error("encoding_failed", 0)
     end
@@ -65,7 +65,7 @@ end
 function telemetry.emit(event_name, data)
     local ok, emitted, failure = pcall(write, event_name, data)
     if not ok then
-        telemetry.report(event_name, "encoding_failed")
+        telemetry.report(event_name, emitted == "response_too_large" and "event_too_large" or "encoding_failed")
     elseif not emitted then
         telemetry.report(event_name, failure)
     end

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/lua/dst_server/wire.lua

@@ -3,6 +3,7 @@ local wire = {}
 local object_marker = {}
 local indeterminate = {}
 local prefix = "DST_SERVER_RESULT|"
+local success_prefix = '{"ok":true,"data":'
 local maximum_line_bytes = 64 * 1024
 local escapes = { ['"'] = '\\"', ["\\"] = "\\\\" }
 
@@ -23,7 +24,9 @@ function wire.indeterminate()
     error(indeterminate, 0)
 end
 
-local function quote(value)
+local function quote(value, remaining)
+    local size = #value + 2
+    if size > remaining then error("response_too_large", 0) end
     local index = 1
     while true do
         index = string.find(value, "[\128-\255]", index)
@@ -59,13 +62,21 @@ local function quote(value)
         end
         index = index + width + 1
     end
-    return '"' .. string.gsub(value, '[%z\1-\31\\"]', escapes) .. '"'
+    return '"' .. string.gsub(value, '[%z\1-\31\\"]', function(character)
+        local escaped = escapes[character]
+        size = size + #escaped - 1
+        if size > remaining then error("response_too_large", 0) end
+        return escaped
+    end) .. '"'
 end
 
-function wire.encode(value)
+function wire.encode(value, limit)
     local parts, seen = {}, {}
+    local remaining = limit or maximum_line_bytes
 
     local function append(text)
+        remaining = remaining - #text
+        if remaining < 0 then error("response_too_large", 0) end
         parts[#parts + 1] = text
     end
 
@@ -76,7 +87,7 @@ function wire.encode(value)
         end
         local kind = type(item)
         if kind == "string" then
-            append(quote(item))
+            append(quote(item, remaining))
             return
         elseif kind == "boolean" then
             append(item and "true" or "false")
@@ -127,7 +138,7 @@ function wire.encode(value)
                     append(",")
                 end
                 first = false
-                append(quote(key))
+                append(quote(key, remaining))
                 append(":")
                 encode(child)
             end
@@ -153,14 +164,15 @@ function wire.reply(callback)
     local ok, data = pcall(callback)
     local payload, failure
     if ok then
-        ok, data = pcall(wire.encode, data)
+        ok, data = pcall(wire.encode, data, maximum_line_bytes - #prefix - #success_prefix - 1)
         if ok then
-            payload = '{"ok":true,"data":' .. data .. "}"
+            payload = success_prefix .. data .. "}"
             if #prefix + #payload > maximum_line_bytes then
                 failure = "response_too_large"
             end
         else
-            failure = data == "invalid_utf8" and "invalid_utf8" or "invalid_json_value"
+            failure = (data == "invalid_utf8" or data == "response_too_large")
+                and data or "invalid_json_value"
         end
     else
         failure = data == indeterminate and "indeterminate" or "lua_error"
@@ -168,6 +180,7 @@ function wire.reply(callback)
     if failure ~= nil then
         payload = '{"ok":false,"error":"' .. failure .. '"}'
     end
+    data = nil
     print(prefix .. payload)
 end
 

{dst_server-0.2.0 → dst_server-0.2.2}/src/dst_server/models/snapshot.py

@@ -78,6 +78,14 @@ class _Metadata(FrozenModel):
             msg = f"unsupported snapshot metadata format: {path}"
             raise ValueError(msg)
         value = parse_literal(source.removeprefix("return"), "snapshot metadata")
+        if isinstance(value, dict):
+            for name, model in (("clock", SnapshotClock), ("seasons", SnapshotSeasons)):
+                if isinstance(fields := value.get(name), dict):
+                    value[name] = {
+                        key: item
+                        for key, item in fields.items()
+                        if key in model.model_fields
+                    }
         return cls.model_validate(value)