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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dst-server
-Version: 0.2.1
+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.1 → 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.1 → dst_server-0.2.2}/pyproject.toml

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

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

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

{dst_server-0.2.1 → 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(

{dst_server-0.2.1 → 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.1 → 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.1 → 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.1 → 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.1 → 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)
 
 

{dst_server-0.2.1 → dst_server-0.2.2}/src/dst_server/rpc/__init__.py

@@ -1,5 +1,5 @@
 from .client import ClusterClient, ShardClient, Subscription, rpc_runtime
-from .schema import SCHEMA_FINGERPRINT, load_schema
+from .schema import load_schema
 from .transport import (
     INTERNAL_RPC_ADDRESS,
     PUBLIC_RPC_SOCKET,
@@ -10,7 +10,6 @@ from .transport import (
 __all__ = [
     "INTERNAL_RPC_ADDRESS",
     "PUBLIC_RPC_SOCKET",
-    "SCHEMA_FINGERPRINT",
     "ClusterClient",
     "ShardClient",
     "Subscription",

{dst_server-0.2.1 → dst_server-0.2.2}/src/dst_server/rpc/client.py

@@ -29,7 +29,7 @@ from dst_server.timeouts import (
 )
 
 from .codec import ERROR, decode, decode_model, unwrap_outcome
-from .schema import SCHEMA_FINGERPRINT, load_schema
+from .schema import load_schema
 
 type StreamKind = Literal["logs", "lifecycle", "events"]
 capnp: Any = import_module("capnp")
@@ -178,10 +178,7 @@ class ClusterClient(RemoteEndpoint, ClusterAPI):
                 stream = await capnp.AsyncIoStream.create_unix_connection(fspath(path))
                 client = capnp.TwoPartyClient(stream)
                 response = (
-                    await client
-                    .bootstrap()
-                    .cast_as(load_schema().Bootstrap)
-                    .connect(schemaFingerprint=SCHEMA_FINGERPRINT)
+                    await client.bootstrap().cast_as(load_schema().Bootstrap).connect()
                 )
                 return cls(stream, client, unwrap_outcome(response.result))
         except BaseException:

{dst_server-0.2.1 → dst_server-0.2.2}/src/dst_server/rpc/schema/rpc.capnp

@@ -34,10 +34,10 @@ interface Cluster extends(Endpoint) {
 interface Agent extends(Endpoint) {}
 
 interface Bootstrap {
-  connect @0 (schemaFingerprint :Text) -> (result :Outcome(Cluster));
+  connect @0 () -> (result :Outcome(Cluster));
 }
 
 interface WorkerRegistry {
-  register @0 (schemaFingerprint :Text, agent :Agent) -> (result :Outcome(Unit));
+  register @0 (agent :Agent) -> (result :Outcome(Unit));
   failed @1 () -> (result :Outcome(Unit));
 }

dst_server-0.2.2/src/dst_server/rpc/schema.py

@@ -0,0 +1,12 @@
+from functools import cache
+from importlib import import_module
+from pathlib import Path
+from typing import Any
+
+capnp: Any = import_module("capnp")
+RPC_SCHEMA_PATH = Path(__file__).with_name("schema") / "rpc.capnp"
+
+
+@cache
+def load_schema() -> Any:
+    return capnp.load(str(RPC_SCHEMA_PATH))

{dst_server-0.2.1 → dst_server-0.2.2}/src/dst_server/rpc/servants.py

@@ -39,7 +39,7 @@ from dst_server.timeouts import (
 from .client import RemoteEndpoint, StreamKind
 from .client import Subscription as RemoteSubscription
 from .codec import ERROR, encode, encode_model, failure, success
-from .schema import SCHEMA_FINGERPRINT, load_schema
+from .schema import load_schema
 
 capnp: Any = import_module("capnp")
 schema = load_schema()
@@ -343,15 +343,8 @@ class BootstrapServant(_Responder, schema.Bootstrap.Server):
         super().__init__()
         self.cluster = ClusterServant(controller, self._owner)
 
-    async def connect(self, schemaFingerprint: str, _context: Any) -> None:
-        if schemaFingerprint != SCHEMA_FINGERPRINT:
-            _context.results.result = failure(
-                ErrorInfo(
-                    ErrorCode.INCOMPATIBLE_SCHEMA, ULID(), "RPC schema is incompatible"
-                )
-            )
-        else:
-            _context.results.result = success(self.cluster)
+    async def connect(self, _context: Any) -> None:
+        _context.results.result = success(self.cluster)
 
 
 class RemoteAgent(RemoteEndpoint):
@@ -544,22 +537,7 @@ class WorkerRegistryServant(_Responder, schema.WorkerRegistry.Server):
         self._closed = False
         self._register_lock = asyncio.Lock()
 
-    async def register(
-        self,
-        schemaFingerprint: str,
-        agent: Any,
-        _context: Any,
-    ) -> None:
-        if schemaFingerprint != SCHEMA_FINGERPRINT:
-            _context.results.result = failure(
-                ErrorInfo(
-                    ErrorCode.INCOMPATIBLE_SCHEMA,
-                    ULID(),
-                    "RPC schema is incompatible",
-                )
-            )
-            return
-
+    async def register(self, agent: Any, _context: Any) -> None:
         async def register() -> None:
             async with self._register_lock:
                 if self._closed or self.remote is not None:

dst_server-0.2.1/src/dst_server/rpc/schema.py

@@ -1,43 +0,0 @@
-import json
-from functools import cache
-from hashlib import sha256
-from importlib import import_module
-from pathlib import Path
-from typing import Any
-
-from pydantic import TypeAdapter
-
-from dst_server.commands import schema_contract
-from dst_server.errors import ErrorInfo
-from dst_server.models.cluster import GameEventRecord, LifecycleRecord, LogRecord
-
-capnp: Any = import_module("capnp")
-RPC_SCHEMA_PATH = Path(__file__).with_name("schema") / "rpc.capnp"
-
-
-def _payload_contract() -> bytes:
-    return json.dumps(
-        {
-            "wireFormat": 2,
-            "commands": schema_contract(),
-            "observations": {
-                model.__name__: model.model_json_schema()
-                for model in (LogRecord, LifecycleRecord, GameEventRecord)
-            },
-            "error": TypeAdapter(ErrorInfo).json_schema(),
-        },
-        sort_keys=True,
-        separators=(",", ":"),
-    ).encode()
-
-
-@cache
-def load_schema() -> Any:
-    return capnp.load(str(RPC_SCHEMA_PATH))
-
-
-def _schema_fingerprint(payload: bytes) -> str:
-    return sha256(RPC_SCHEMA_PATH.read_bytes() + b"\0" + payload).hexdigest()
-
-
-SCHEMA_FINGERPRINT = _schema_fingerprint(_payload_contract())