Phase 4: sync
CI / Test (ubuntu-latest) (push) Canceled after 0s
CI / Test (windows-latest) (push) Canceled after 0s
CI / Storage tests on PostgreSQL (push) Canceled after 0s
CI / Complement (federation off) (push) Canceled after 0s
CI / golangci-lint (push) Canceled after 0s
CI / Smoke test the binary (push) Canceled after 0s

Implements PLAN.md Phase 4: the read model. /sync, /messages and /context,
the filters that narrow them, and the streams a response carries that are
not room events — typing, receipts, presence and to-device messages. With
this a client can be used against Warp, which is milestone M1.

The one architectural choice is that the syncapi has no copy of the rooms:
it reads them through the roomserver. Dendrite gives its syncapi its own
tables and feeds them from the output stream, which is right for a design
where the two can be separate processes, and Dendrite's could be. Warp is
one process by decision, and there the copy buys nothing and costs the
hardest class of bug a homeserver has — a read model that disagrees with
the room, where a client is shown a message that was rejected and the only
way to find out is to compare two tables. So the roomserver grew a read
model (stream.go, roomsync.go, visibility.go) rather than exporting its
store: reading an event means parsing it under its room's version, and a
second copy of the version registry, the parser and the client projection
would be a second place for them to disagree.

syncapi: stream tokens naming a position in each of five independent
streams, so a client that has seen receipt 7 but only event 4 can say so in
one opaque string. A token with fewer positions than this build writes is
accepted and the rest read as zero, which is what lets a token stored
before a stream existed go on working. The PDU position comes from
MAX(stream_ordering) and not from the counter row the other four use: the
counter is advanced inside the writing transaction, so a token taken from
it would name a position whose event no reader can see yet, and the event
would be skipped for good once that transaction committed.

Long polling goes through a notifier that wakes by room and by user rather
than globally — an event wakes the listeners of its room, a membership
event also wakes the user it names, so an invite reaches a client that is
not in the room yet. A wake-up is only ever a hint: the listener re-reads
the streams and decides for itself what changed, which is what makes it
safe for the notifier to hold no state about what each client has seen. The
listener registers before the read, so an event landing in between leaves
the channel signalled and the sync reads again rather than blocking on a
change it just missed. EventPersisted must not block, because it is called
with the room's write lock still held.

"Something happened" is not "a token moved". A stream can move without this
user being concerned by it, and returning on every such move would turn a
long poll back into a busy loop. The same trap caught presence twice over:
a client says it is still online by syncing, so ?set_presence= makes every
sync a presence write, and a stream that moved each time would wake every
peer, which would sync, which would move it again. SetPresence therefore
reports whether anything a peer would notice actually changed, and a write
that only refreshes the last-active timestamp leaves the stream alone.

Timeline windows are named by their two ends and a direction, Low exclusive
and High inclusive in both directions, rather than by "from" and "to" as
the wire format spells them. Each of those would otherwise be the low bound
in one direction and the high bound in the other, which is exactly the
off-by-one every pagination bug is made of; the handlers translate once and
nothing below them thinks about it again. A sync's timeline is read
backwards and reported forwards, because a client wants the newest events
of the window it missed — a forward read with a limit hands it the oldest
and then calls the rest a gap.

visibility: history visibility is now a span rather than a yes or no, which
is what Phase 3 deferred here. A user who has left a room is served the
room as it was when they left — their state reads, their members and their
timeline — instead of being refused, and is bounded above at their own
membership event so a kicked client cannot go on streaming. Their span is
found from their own member events, so a user who joined, left and rejoined
sees their latest span. ?at= on /members is honoured for the same reason.
What is left is that the span is computed from the room's current
history_visibility where the spec judges each event by the one in force
when it was sent; that is a state read per event and belongs with open
question 1.

Typing is held in memory and nowhere else: notifications expire in seconds,
are worthless across a restart, and arrive one per keystroke-burst per
room, so persisting them would be the busiest table in the database holding
the least valuable data in it. Receipts only ever advance, compared on the
position of the event acknowledged rather than on arrival, because two of a
user's clients read at different speeds and the slower one must not drag
the marker backwards. To-device queues are per device and drained by the
next sync rather than by the one that delivered them, so a client that
crashes in between gets the batch again — the right way round, since a lost
key share leaves a message permanently undecryptable and a duplicate is
ignored. A wildcard addressee is expanded when sent, not stored, because
"every device" means the ones that existed then.

Presence is off by default, which answers PLAN.md open question 3. It is
the noisiest thing in Matrix and the one genuinely fan-out notification
here; a private homeserver gains little from it. With it off the endpoints
refuse rather than disappearing, because a client that gets a 404 from
/presence concludes the server is too old to have it and stops asking.

storage: one migration per driver adding the receipt, to-device, presence
and filter tables with a counter row each, and a stream position on the
existing account data table rather than a parallel one — there is exactly
one current value per (user, room, type), and a second table would be a
second thing to keep in step. Account data is reported in an event list but
is not an event, so it gets its own response type: a room event with an
empty sender and no timestamp would make a client decide what that meant.

Deliberately missing, each named in docs/sync.md: notification counts (they
need push rules, Phase 8), device lists (the keyserver, Phase 7), anything
remote (Phase 5), threads (Phase 10). device_lists is sent as two empty
lists because a client reads a missing one as malformed; the notification
counts are left out entirely, because a zero there is a claim and an absent
field is not.

Tested through HTTP rather than against the builder, because what is worth
pinning down is the response a client sees — which section a room lands in,
whether a token handed back can be handed in again, whether paging
terminates and loses nothing. The storage tests run against both SQL
drivers; the notifier has its own tests for the concurrent case. A live
server was driven end to end, which is what caught the two bugs the unit
tests had missed: a backwards /messages page must be in reverse
chronological order, and `start` must name where the page began rather than
position zero when ?from= was omitted.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
tajniak81andClaude Opus 5 committed 2026-10-16 11:55:27 +02:00
1 parent c96f88e994
commit d187ad0d17
60 files changed
+10196 -264

No files matched your search

+110 -96
View File
@@ -34,8 +34,16 @@ func (r *API) currentState(ctx context.Context, room storage.Room, rules roomver
// is `unsigned`, which is per-server annotation: the age of the event, the
// state it replaced, and the redaction that stripped it.
type ClientEvent struct {
EventID string `json:"event_id"`
RoomID string `json:"room_id"`
EventID string `json:"event_id"`
// RoomID is omitted when empty, because a /sync response carries its
// events without one: they are already nested under the room they
// belong to, and repeating it on every event of a client with a
// thousand rooms is a measurable part of every response. Every other
// endpoint sets it, and the spec has a separate name for the shape
// without it — ClientEventWithoutRoomID — rather than two event types.
RoomID string `json:"room_id,omitempty"`
Type string `json:"type"`
StateKey *string `json:"state_key,omitempty"`
Sender string `json:"sender"`
@@ -98,11 +106,12 @@ func (r *API) unsigned(stored storage.StoredEvent, e *event.Event) json.RawMessa
// Event returns one event of a room, if the user may see it.
func (r *API) Event(ctx context.Context, roomID, userID, eventID string) (ClientEvent, error) {
room, rules, err := r.roomAndRules(ctx, roomID)
_, rules, err := r.roomAndRules(ctx, roomID)
if err != nil {
return ClientEvent{}, err
}
if err := r.requireVisibility(ctx, room, rules, userID); err != nil {
visible, err := r.requireReadable(ctx, roomID, userID)
if err != nil {
return ClientEvent{}, err
}
@@ -110,6 +119,12 @@ func (r *API) Event(ctx context.Context, roomID, userID, eventID string) (Client
if err != nil {
return ClientEvent{}, err
}
// An event outside the user's window is reported as unknown rather
// than as forbidden: whether a particular event ID exists in a room is
// itself something they are not entitled to know.
if !visible.Contains(stored.StreamOrdering) {
return ClientEvent{}, fmt.Errorf("event %q: %w", eventID, ErrNoSuchEvent)
}
e, err := parseEvent(stored, rules)
if err != nil {
return ClientEvent{}, err
@@ -117,29 +132,18 @@ func (r *API) Event(ctx context.Context, roomID, userID, eventID string) (Client
return r.clientEvent(stored, e, roomID), nil
}
// RoomState returns a room's current state in the client shape.
// RoomState returns a room's state in the client shape: the current state
// for a member, and the state as it was when they left for a user who has.
func (r *API) RoomState(ctx context.Context, roomID, userID string) ([]ClientEvent, error) {
room, rules, err := r.roomAndRules(ctx, roomID)
_, rules, err := r.roomAndRules(ctx, roomID)
if err != nil {
return nil, err
}
if err := r.requireVisibility(ctx, room, rules, userID); err != nil {
return nil, err
}
stored, err := r.store.CurrentStateEvents(ctx, roomID)
visible, err := r.requireReadable(ctx, roomID, userID)
if err != nil {
return nil, err
}
out := make([]ClientEvent, 0, len(stored))
for _, s := range stored {
e, err := parseEvent(s, rules)
if err != nil {
return nil, err
}
out = append(out, r.clientEvent(s, e, roomID))
}
return out, nil
return r.stateAt(ctx, roomID, rules, visible.To)
}
// StateEventContent returns the content of one piece of a room's current
@@ -148,23 +152,11 @@ func (r *API) RoomState(ctx context.Context, roomID, userID string) ([]ClientEve
// The endpoint returns the content alone, not the event: a quirk of the
// Client-Server API that predates the rest of it, and one clients depend on.
func (r *API) StateEventContent(ctx context.Context, roomID, userID, eventType, stateKey string) (json.RawMessage, error) {
room, rules, err := r.roomAndRules(ctx, roomID)
e, err := r.StateEvent(ctx, roomID, userID, eventType, stateKey)
if err != nil {
return nil, err
}
if err := r.requireVisibility(ctx, room, rules, userID); err != nil {
return nil, err
}
stored, err := r.store.CurrentStateEvent(ctx, roomID, eventType, stateKey)
if err != nil {
return nil, err
}
e, err := parseEvent(stored, rules)
if err != nil {
return nil, err
}
return e.Content(), nil
return e.Content, nil
}
// StateEvent returns one piece of a room's current state as a whole event.
@@ -172,14 +164,33 @@ func (r *API) StateEventContent(ctx context.Context, roomID, userID, eventType,
// It is what ?format=event asks for on the state endpoint, and the only way
// a client can see who set a piece of state and when.
func (r *API) StateEvent(ctx context.Context, roomID, userID, eventType, stateKey string) (ClientEvent, error) {
room, rules, err := r.roomAndRules(ctx, roomID)
_, rules, err := r.roomAndRules(ctx, roomID)
if err != nil {
return ClientEvent{}, err
}
if err := r.requireVisibility(ctx, room, rules, userID); err != nil {
visible, err := r.requireReadable(ctx, roomID, userID)
if err != nil {
return ClientEvent{}, err
}
// A member reads the one row they asked for. A user who has left has to
// be served from the state as of their departure, which means reading
// the snapshot and picking the tuple out of it — the room has moved on
// since, and the current row is not theirs to see.
if visible.To != 0 {
state, err := r.stateAt(ctx, roomID, rules, visible.To)
if err != nil {
return ClientEvent{}, err
}
for _, e := range state {
if e.Type == eventType && e.StateKey != nil && *e.StateKey == stateKey {
return e, nil
}
}
return ClientEvent{}, fmt.Errorf("state %s/%s of %q: %w",
eventType, stateKey, roomID, ErrNoSuchEvent)
}
stored, err := r.store.CurrentStateEvent(ctx, roomID, eventType, stateKey)
if err != nil {
return ClientEvent{}, err
@@ -201,44 +212,88 @@ type MembersRequest struct {
// Membership and NotMembership filter the result; either may be empty.
Membership string
NotMembership string
// At is the stream position to report the membership as of, or 0 for
// the current one.
//
// It is what ?at= asks for, and what a client that is rendering an
// older part of a room's timeline needs: the names and avatars to show
// against those messages are the ones their senders had then, not now.
At int64
}
// Members returns a room's m.room.member events.
func (r *API) Members(ctx context.Context, req MembersRequest) ([]ClientEvent, error) {
room, rules, err := r.roomAndRules(ctx, req.RoomID)
_, rules, err := r.roomAndRules(ctx, req.RoomID)
if err != nil {
return nil, err
}
if err := r.requireVisibility(ctx, room, rules, req.User); err != nil {
return nil, err
}
var filter []string
if req.Membership != "" {
filter = append(filter, req.Membership)
}
stored, err := r.store.Members(ctx, req.RoomID, filter)
visible, err := r.requireReadable(ctx, req.RoomID, req.User)
if err != nil {
return nil, err
}
out := make([]ClientEvent, 0, len(stored))
for _, s := range stored {
e, err := parseEvent(s, rules)
// The position to report as of: the one asked for, held inside what
// the user may see. A user who has left is pinned to their departure
// whatever they asked for — the room has moved on since, and the
// current membership is not theirs to read.
at := req.At
if visible.To != 0 && (at == 0 || at > visible.To) {
at = visible.To
}
if at != 0 && at <= visible.From {
return nil, fmt.Errorf("%w: %s may not see %s as it was at %d",
ErrForbidden, req.User, req.RoomID, req.At)
}
var members []ClientEvent
if at != 0 {
state, err := r.stateAt(ctx, req.RoomID, rules, at)
if err != nil {
return nil, err
}
if req.NotMembership != "" {
membership, err := e.Membership()
if err == nil && membership == req.NotMembership {
continue
}
members = filterClientEvents(state, storage.TimelineFilter{Types: []string{event.TypeMember}})
} else {
var filter []string
if req.Membership != "" {
filter = append(filter, req.Membership)
}
out = append(out, r.clientEvent(s, e, req.RoomID))
stored, err := r.store.Members(ctx, req.RoomID, filter)
if err != nil {
return nil, err
}
if members, err = r.clientEvents(stored, rules, req.RoomID); err != nil {
return nil, err
}
}
out := make([]ClientEvent, 0, len(members))
for _, e := range members {
membership := membershipOf(e)
if req.Membership != "" && membership != req.Membership {
continue
}
if req.NotMembership != "" && membership == req.NotMembership {
continue
}
out = append(out, e)
}
return out, nil
}
// membershipOf reads content.membership out of a projected member event.
//
// A member event that reached a room always has one — the authorisation
// rules refuse one that does not — so an empty answer means the event is
// not a member event at all.
func membershipOf(e ClientEvent) string {
var content struct {
Membership string `json:"membership"`
}
_ = json.Unmarshal(e.Content, &content)
return content.Membership
}
// RoomMember is one joined member, as /joined_members reports them.
type RoomMember struct {
DisplayName string `json:"display_name,omitempty"`
@@ -333,47 +388,6 @@ func (r *API) requireJoined(ctx context.Context, roomID, userID string) error {
return nil
}
// requireVisibility refuses a caller who may not see a room's state.
//
// This is a room-level test, not the per-event history visibility the spec
// defines. A member sees the room; so does anyone at all when the room's
// history is world_readable; a user who has left sees the state as it was
// when they left, which is their own membership event's snapshot and which
// this returns the current state for instead.
//
// That last case is the gap, and it is deliberate. Serving a departed
// member the state as of their leave event means answering every state read
// from a historical snapshot and filtering each event by the visibility in
// force when it was sent — which is the same machinery /messages and
// /context need, and so belongs with them in Phase 4 rather than being
// built twice. Until then a user who has left a room is refused, which errs
// towards showing them too little.
func (r *API) requireVisibility(ctx context.Context, room storage.Room, rules roomversion.Rules, userID string) error {
entry, err := r.store.Membership(ctx, room.ID, userID)
if err != nil {
return err
}
if entry.Membership == event.MembershipJoin {
return nil
}
summary, err := r.store.RoomSummary(ctx, room.ID)
if err != nil {
return err
}
if summary.HistoryVisibility == HistoryVisibilityWorldReadable {
return nil
}
// An invited user can see enough of the room to decide, which the spec
// delivers as stripped state on the invite rather than as a state read.
if entry.Membership == event.MembershipInvite {
return fmt.Errorf("%w: %s has been invited to %s but has not joined it",
ErrForbidden, userID, room.ID)
}
return fmt.Errorf("%w: %s is not in %s", ErrForbidden, userID, room.ID)
}
// CanSendStateEvent reports whether a user may send a state event of a type
// into a room.
//