mirror of
https://github.com/element-hq/synapse.git
synced 2026-07-29 03:20:23 +00:00
Erik JohnstonandGitHub
c430c16df4
Based on #19708. This is on the path to porting the entire event class to Rust, as `event.content` will then return the new Rust class `JsonObject`. This PR adds a pure Rust `JsonObject` class that is a `Mapping` representing a json-style object. It uses `serde_json::Value` as its in-memory representation and `pythonize` for conversion when a field is looked up on the object. I'm not thrilled with the name, but couldn't think of a better one. This also adds `JsonObject` handling to the JSON serialisation functions we use, as well as to the `freeze(..)` function. Reviewable commit-by-commit.
63 lines
2.0 KiB
Python
63 lines
2.0 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright (C) 2025 New Vector, Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# See the GNU Affero General Public License for more details:
|
|
# <https://www.gnu.org/licenses/agpl_3.0.html>.
|
|
#
|
|
#
|
|
|
|
import json
|
|
from typing import (
|
|
Any,
|
|
)
|
|
|
|
from immutabledict import immutabledict
|
|
|
|
from synapse.synapse_rust.events import JsonObject
|
|
|
|
|
|
def _reject_invalid_json(val: Any) -> None:
|
|
"""Do not allow Infinity, -Infinity, or NaN values in JSON."""
|
|
raise ValueError("Invalid JSON value: '%s'" % val)
|
|
|
|
|
|
def _handle_extra_mappings(obj: Any) -> dict[Any, Any]:
|
|
"""Helper for json_encoder. Makes immutabledicts and JsonObjects
|
|
serializable
|
|
"""
|
|
match obj:
|
|
case immutabledict():
|
|
# fishing the protected dict out of the object is a bit nasty,
|
|
# but we don't really want the overhead of copying the dict.
|
|
try:
|
|
# Safety: we catch the AttributeError immediately below.
|
|
return obj._dict
|
|
except AttributeError:
|
|
# If all else fails, resort to making a copy of the immutabledict
|
|
return dict(obj)
|
|
case JsonObject():
|
|
# Just convert to a dict.
|
|
return dict(obj)
|
|
raise TypeError(
|
|
"Object of type %s is not JSON serializable" % obj.__class__.__name__
|
|
)
|
|
|
|
|
|
# A custom JSON encoder which:
|
|
# * handles immutabledicts
|
|
# * produces valid JSON (no NaNs etc)
|
|
# * reduces redundant whitespace
|
|
json_encoder = json.JSONEncoder(
|
|
allow_nan=False, separators=(",", ":"), default=_handle_extra_mappings
|
|
)
|
|
|
|
# Create a custom decoder to reject Python extensions to JSON.
|
|
json_decoder = json.JSONDecoder(parse_constant=_reject_invalid_json)
|