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
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:
1 parent
c96f88e994
commit
d187ad0d17
60 files changed
+10196
-264
No files matched your search
@@ -0,0 +1,210 @@
|
||||
package syncapi
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/dariuszjaniak/warp/server/internal/roomserver"
|
||||
"github.com/dariuszjaniak/warp/server/internal/storage"
|
||||
)
|
||||
|
||||
// GET /rooms/{roomID}/messages: a room's history, a page at a time.
|
||||
//
|
||||
// It is the other half of /sync. A sync hands a client the live stream and,
|
||||
// when a client has been away, a `limited` timeline with a gap in it;
|
||||
// /messages is how the client closes that gap, and how it scrolls back
|
||||
// through a room it has just opened. The tokens are the same ones — a sync's
|
||||
// prev_batch is a valid ?from= here, and an ?end= from here is a valid
|
||||
// ?since= for /sync — which is what makes the two compose.
|
||||
|
||||
// MessagesRequest is one page of a room's history.
|
||||
type MessagesRequest struct {
|
||||
RoomID string
|
||||
|
||||
// User is the full user ID asking, and Localpart is their localpart,
|
||||
// for resolving a filter ID.
|
||||
User string
|
||||
Localpart string
|
||||
|
||||
// From is where to page from. Empty means the end of the room for a
|
||||
// backwards page and the start of it for a forwards one, which is what
|
||||
// a client opening a room sends.
|
||||
From string
|
||||
|
||||
// To bounds the far end of the page. Empty is unbounded.
|
||||
To string
|
||||
|
||||
// Direction is "b" to page backwards, which is what scrolling up does,
|
||||
// or "f" to page forwards. The spec requires it.
|
||||
Direction storage.TimelineDirection
|
||||
|
||||
// Limit caps the events returned.
|
||||
Limit int
|
||||
|
||||
// Filter is the ?filter= parameter: a filter ID or an inline
|
||||
// RoomEventFilter as JSON.
|
||||
Filter string
|
||||
}
|
||||
|
||||
// MessagesResponse is one page.
|
||||
type MessagesResponse struct {
|
||||
// Start is the token this page began at, which is the ?from= the
|
||||
// client sent back to it.
|
||||
Start string `json:"start"`
|
||||
|
||||
// End is the token for the next page. It is left out when the page
|
||||
// reached the end of what the client may see, which is how a client
|
||||
// knows to stop scrolling.
|
||||
End string `json:"end,omitempty"`
|
||||
|
||||
Chunk []roomserver.ClientEvent `json:"chunk"`
|
||||
|
||||
// State is the state of the events in the chunk: the member events of
|
||||
// their senders, when the filter asked for lazy loading. A client
|
||||
// needs them to render a name against a message from somebody who is
|
||||
// no longer in the room.
|
||||
State []roomserver.ClientEvent `json:"state,omitempty"`
|
||||
}
|
||||
|
||||
// Messages answers one page of a room's history.
|
||||
func (s *API) Messages(ctx context.Context, req MessagesRequest) (MessagesResponse, error) {
|
||||
from, err := ParseToken(req.From)
|
||||
if err != nil {
|
||||
return MessagesResponse{}, errInvalidTokenf("from: %v", err)
|
||||
}
|
||||
to, err := ParseToken(req.To)
|
||||
if err != nil {
|
||||
return MessagesResponse{}, errInvalidTokenf("to: %v", err)
|
||||
}
|
||||
|
||||
filter, err := s.messageFilter(ctx, req.Localpart, req.Filter)
|
||||
if err != nil {
|
||||
return MessagesResponse{}, err
|
||||
}
|
||||
|
||||
direction := req.Direction
|
||||
if direction != storage.DirectionForward {
|
||||
// Backwards is the default: the spec makes `dir` required, but
|
||||
// every client that leaves it out means "scroll up".
|
||||
direction = storage.DirectionBackward
|
||||
}
|
||||
|
||||
limit := req.Limit
|
||||
if limit <= 0 {
|
||||
limit = DefaultTimelineLimit
|
||||
}
|
||||
limit = min(limit, MaxTimelineLimit)
|
||||
|
||||
// Which end of the window the client's two tokens are depends on which
|
||||
// way it is paging: scrolling up, `from` is the ceiling and `to` the
|
||||
// floor, and scrolling down it is the other way round. An unset bound
|
||||
// is zero, which the read already takes as "unbounded at that end" —
|
||||
// so paging backwards from the end of the room needs nothing special.
|
||||
low, high := from.PDU, to.PDU
|
||||
if direction == storage.DirectionBackward {
|
||||
low, high = to.PDU, from.PDU
|
||||
}
|
||||
|
||||
timeline, err := s.rooms.Timeline(ctx, roomserver.TimelineRequest{
|
||||
RoomID: req.RoomID,
|
||||
User: req.User,
|
||||
Low: low,
|
||||
High: high,
|
||||
Direction: direction,
|
||||
Limit: limit,
|
||||
Filter: filter.TimelineFilter(),
|
||||
})
|
||||
if err != nil {
|
||||
return MessagesResponse{}, err
|
||||
}
|
||||
|
||||
// The chunk is in the direction asked for: the spec says a backwards
|
||||
// page is in reverse chronological order, because that is the order a
|
||||
// client scrolling up consumes it in. The read returns events oldest
|
||||
// first — which is what /sync wants — so a backwards page is turned
|
||||
// round here.
|
||||
chunk := timeline.Events
|
||||
if direction == storage.DirectionBackward {
|
||||
chunk = reversed(chunk)
|
||||
}
|
||||
if chunk == nil {
|
||||
chunk = []roomserver.ClientEvent{}
|
||||
}
|
||||
|
||||
out := MessagesResponse{
|
||||
Start: pduToken(from.PDU).String(),
|
||||
Chunk: chunk,
|
||||
}
|
||||
// `from` is optional, and without it `start` has to name the end of
|
||||
// the room the page actually began at rather than position zero: a
|
||||
// client that paged backwards from the end and then used `start` to
|
||||
// page forwards again would otherwise be handed the whole room.
|
||||
if req.From == "" {
|
||||
if direction == storage.DirectionBackward {
|
||||
out.Start = pduToken(timeline.End).String()
|
||||
} else {
|
||||
out.Start = pduToken(timeline.Start).String()
|
||||
}
|
||||
}
|
||||
|
||||
// `end` is left out at the end of the room, which is how a client
|
||||
// knows to stop asking. Reading backwards the far end is Start, the
|
||||
// position below the oldest event; reading forwards it is End.
|
||||
//
|
||||
// The read fetches one more row than the limit, so `Limited` is the
|
||||
// whole answer to "is there more": a page that came back exactly full
|
||||
// and happened to be the last one still correctly has no `end`.
|
||||
if timeline.Limited {
|
||||
if direction == storage.DirectionBackward {
|
||||
out.End = pduToken(timeline.Start).String()
|
||||
} else {
|
||||
out.End = pduToken(timeline.End).String()
|
||||
}
|
||||
}
|
||||
|
||||
if filter.LazyLoadMembers() {
|
||||
state, err := s.rooms.MemberEvents(ctx, req.RoomID, sendersOf(chunk))
|
||||
if err != nil {
|
||||
return MessagesResponse{}, err
|
||||
}
|
||||
out.State = state
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// messageFilter resolves the ?filter= of /messages.
|
||||
//
|
||||
// The parameter is a RoomEventFilter here rather than the whole filter that
|
||||
// /sync takes — the spec defines it that way, because a filter about
|
||||
// presence or account data would mean nothing to a room's history. A filter
|
||||
// ID, though, names a full filter, so both shapes have to be accepted: an
|
||||
// inline one is wrapped into the room's timeline slot, and a stored one is
|
||||
// used as it stands.
|
||||
func (s *API) messageFilter(ctx context.Context, localpart, raw string) (Filter, error) {
|
||||
if raw == "" {
|
||||
return Filter{}, nil
|
||||
}
|
||||
if raw[0] != '{' {
|
||||
return s.filterFor(ctx, localpart, raw)
|
||||
}
|
||||
|
||||
var roomEvents RoomEventFilter
|
||||
if err := unmarshalStrict([]byte(raw), &roomEvents); err != nil {
|
||||
return Filter{}, errInvalidParamf("filter: %v", err)
|
||||
}
|
||||
return Filter{Room: &RoomFilter{Timeline: &roomEvents}}, nil
|
||||
}
|
||||
|
||||
// sendersOf lists the distinct senders of a chunk, in the order they first
|
||||
// appear.
|
||||
func sendersOf(events []roomserver.ClientEvent) []string {
|
||||
seen := make(map[string]struct{}, len(events))
|
||||
out := make([]string, 0, len(events))
|
||||
for _, e := range events {
|
||||
if _, dup := seen[e.Sender]; dup {
|
||||
continue
|
||||
}
|
||||
seen[e.Sender] = struct{}{}
|
||||
out = append(out, e.Sender)
|
||||
}
|
||||
return out
|
||||
}
|
||||
Reference in new issue
Block a user