2017-04-20 22:40:52 +00:00
|
|
|
// Copyright 2017 Vector Creations Ltd
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2017-04-12 15:06:26 +00:00
|
|
|
package types
|
2017-04-11 10:52:26 +00:00
|
|
|
|
|
|
|
import (
|
2017-09-22 10:34:54 +00:00
|
|
|
"encoding/json"
|
2020-01-23 17:51:10 +00:00
|
|
|
"fmt"
|
2017-04-13 15:56:46 +00:00
|
|
|
"strconv"
|
2020-01-23 17:51:10 +00:00
|
|
|
"strings"
|
2017-04-19 15:04:01 +00:00
|
|
|
|
2020-01-23 17:51:10 +00:00
|
|
|
"github.com/matrix-org/dendrite/roomserver/api"
|
2017-04-19 15:04:01 +00:00
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
2020-04-24 15:30:25 +00:00
|
|
|
"github.com/tidwall/gjson"
|
2017-04-11 10:52:26 +00:00
|
|
|
)
|
|
|
|
|
2020-01-23 17:51:10 +00:00
|
|
|
var (
|
2020-05-13 11:14:50 +00:00
|
|
|
// ErrInvalidSyncTokenType is returned when an attempt at creating a
|
|
|
|
// new instance of SyncToken with an invalid type (i.e. neither "s"
|
2020-01-23 17:51:10 +00:00
|
|
|
// nor "t").
|
2020-05-13 11:14:50 +00:00
|
|
|
ErrInvalidSyncTokenType = fmt.Errorf("Sync token has an unknown prefix (should be either s or t)")
|
|
|
|
// ErrInvalidSyncTokenLen is returned when the pagination token is an
|
2020-01-23 17:51:10 +00:00
|
|
|
// invalid length
|
2020-05-13 11:14:50 +00:00
|
|
|
ErrInvalidSyncTokenLen = fmt.Errorf("Sync token has an invalid length")
|
2020-01-23 17:51:10 +00:00
|
|
|
)
|
|
|
|
|
2021-01-08 16:59:06 +00:00
|
|
|
type StateDelta struct {
|
|
|
|
RoomID string
|
|
|
|
StateEvents []*gomatrixserverlib.HeaderedEvent
|
|
|
|
Membership string
|
|
|
|
// The PDU stream position of the latest membership event for this user, if applicable.
|
|
|
|
// Can be 0 if there is no membership event in this delta.
|
|
|
|
MembershipPos StreamPosition
|
|
|
|
}
|
|
|
|
|
2020-01-23 17:51:10 +00:00
|
|
|
// StreamPosition represents the offset in the sync stream a client is at.
|
|
|
|
type StreamPosition int64
|
|
|
|
|
2020-07-29 18:00:04 +00:00
|
|
|
// LogPosition represents the offset in a Kafka log a client is at.
|
|
|
|
type LogPosition struct {
|
|
|
|
Partition int32
|
|
|
|
Offset int64
|
|
|
|
}
|
|
|
|
|
2020-12-15 15:09:10 +00:00
|
|
|
func (p *LogPosition) IsEmpty() bool {
|
|
|
|
return p.Offset == 0
|
|
|
|
}
|
|
|
|
|
2020-07-29 18:00:04 +00:00
|
|
|
// IsAfter returns true if this position is after `lp`.
|
|
|
|
func (p *LogPosition) IsAfter(lp *LogPosition) bool {
|
|
|
|
if lp == nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if p.Partition != lp.Partition {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
return p.Offset > lp.Offset
|
|
|
|
}
|
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
// StreamEvent is the same as gomatrixserverlib.Event but also has the PDU stream position for this event.
|
2020-01-23 17:51:10 +00:00
|
|
|
type StreamEvent struct {
|
2020-11-16 15:44:53 +00:00
|
|
|
*gomatrixserverlib.HeaderedEvent
|
2020-01-23 17:51:10 +00:00
|
|
|
StreamPosition StreamPosition
|
|
|
|
TransactionID *api.TransactionID
|
|
|
|
ExcludeFromSync bool
|
2019-07-12 14:59:53 +00:00
|
|
|
}
|
2017-04-11 10:52:26 +00:00
|
|
|
|
2020-05-15 08:41:12 +00:00
|
|
|
// Range represents a range between two stream positions.
|
|
|
|
type Range struct {
|
|
|
|
// From is the position the client has already received.
|
|
|
|
From StreamPosition
|
|
|
|
// To is the position the client is going towards.
|
|
|
|
To StreamPosition
|
|
|
|
// True if the client is going backwards
|
|
|
|
Backwards bool
|
|
|
|
}
|
|
|
|
|
|
|
|
// Low returns the low number of the range.
|
|
|
|
// This represents the position the client already has and hence is exclusive.
|
|
|
|
func (r *Range) Low() StreamPosition {
|
|
|
|
if !r.Backwards {
|
|
|
|
return r.From
|
|
|
|
}
|
|
|
|
return r.To
|
|
|
|
}
|
|
|
|
|
|
|
|
// High returns the high number of the range
|
|
|
|
// This represents the position the client is going towards and hence is inclusive.
|
|
|
|
func (r *Range) High() StreamPosition {
|
|
|
|
if !r.Backwards {
|
|
|
|
return r.To
|
|
|
|
}
|
|
|
|
return r.From
|
|
|
|
}
|
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
// SyncTokenType represents the type of a sync token.
|
2020-01-23 17:51:10 +00:00
|
|
|
// It can be either "s" (representing a position in the whole stream of events)
|
|
|
|
// or "t" (representing a position in a room's topology/depth).
|
2020-05-13 11:14:50 +00:00
|
|
|
type SyncTokenType string
|
2020-01-23 17:51:10 +00:00
|
|
|
|
|
|
|
const (
|
2020-05-13 11:14:50 +00:00
|
|
|
// SyncTokenTypeStream represents a position in the server's whole
|
2020-01-23 17:51:10 +00:00
|
|
|
// stream of events
|
2020-05-13 11:14:50 +00:00
|
|
|
SyncTokenTypeStream SyncTokenType = "s"
|
|
|
|
// SyncTokenTypeTopology represents a position in a room's topology.
|
|
|
|
SyncTokenTypeTopology SyncTokenType = "t"
|
2020-01-23 17:51:10 +00:00
|
|
|
)
|
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
type StreamingToken struct {
|
2020-12-10 18:57:10 +00:00
|
|
|
PDUPosition StreamPosition
|
|
|
|
TypingPosition StreamPosition
|
|
|
|
ReceiptPosition StreamPosition
|
|
|
|
SendToDevicePosition StreamPosition
|
2020-12-18 11:11:21 +00:00
|
|
|
InvitePosition StreamPosition
|
2021-01-08 16:59:06 +00:00
|
|
|
AccountDataPosition StreamPosition
|
2020-12-15 15:09:10 +00:00
|
|
|
DeviceListPosition LogPosition
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
|
|
|
|
2020-12-18 11:11:21 +00:00
|
|
|
// This will be used as a fallback by json.Marshal.
|
|
|
|
func (s StreamingToken) MarshalText() ([]byte, error) {
|
|
|
|
return []byte(s.String()), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// This will be used as a fallback by json.Unmarshal.
|
|
|
|
func (s *StreamingToken) UnmarshalText(text []byte) (err error) {
|
|
|
|
*s, err = NewStreamTokenFromString(string(text))
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2020-12-10 18:57:10 +00:00
|
|
|
func (t StreamingToken) String() string {
|
|
|
|
posStr := fmt.Sprintf(
|
2021-01-08 16:59:06 +00:00
|
|
|
"s%d_%d_%d_%d_%d_%d",
|
2020-12-10 18:57:10 +00:00
|
|
|
t.PDUPosition, t.TypingPosition,
|
|
|
|
t.ReceiptPosition, t.SendToDevicePosition,
|
2021-01-08 16:59:06 +00:00
|
|
|
t.InvitePosition, t.AccountDataPosition,
|
2020-12-10 18:57:10 +00:00
|
|
|
)
|
2020-12-15 15:09:10 +00:00
|
|
|
if dl := t.DeviceListPosition; !dl.IsEmpty() {
|
|
|
|
posStr += fmt.Sprintf(".dl-%d-%d", dl.Partition, dl.Offset)
|
2020-07-29 18:00:04 +00:00
|
|
|
}
|
2020-12-15 15:09:10 +00:00
|
|
|
return posStr
|
2020-06-19 12:29:27 +00:00
|
|
|
}
|
2020-05-13 11:14:50 +00:00
|
|
|
|
|
|
|
// IsAfter returns true if ANY position in this token is greater than `other`.
|
|
|
|
func (t *StreamingToken) IsAfter(other StreamingToken) bool {
|
2020-12-10 18:57:10 +00:00
|
|
|
switch {
|
|
|
|
case t.PDUPosition > other.PDUPosition:
|
|
|
|
return true
|
|
|
|
case t.TypingPosition > other.TypingPosition:
|
|
|
|
return true
|
|
|
|
case t.ReceiptPosition > other.ReceiptPosition:
|
|
|
|
return true
|
|
|
|
case t.SendToDevicePosition > other.SendToDevicePosition:
|
|
|
|
return true
|
2020-12-18 11:11:21 +00:00
|
|
|
case t.InvitePosition > other.InvitePosition:
|
|
|
|
return true
|
2021-01-08 16:59:06 +00:00
|
|
|
case t.AccountDataPosition > other.AccountDataPosition:
|
|
|
|
return true
|
2020-12-15 15:09:10 +00:00
|
|
|
case t.DeviceListPosition.IsAfter(&other.DeviceListPosition):
|
|
|
|
return true
|
2020-07-29 18:00:04 +00:00
|
|
|
}
|
2020-05-13 11:14:50 +00:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2020-12-10 18:57:10 +00:00
|
|
|
func (t *StreamingToken) IsEmpty() bool {
|
2021-01-08 16:59:06 +00:00
|
|
|
return t == nil || t.PDUPosition+t.TypingPosition+t.ReceiptPosition+t.SendToDevicePosition+t.InvitePosition+t.AccountDataPosition == 0 && t.DeviceListPosition.IsEmpty()
|
2020-12-10 18:57:10 +00:00
|
|
|
}
|
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
// WithUpdates returns a copy of the StreamingToken with updates applied from another StreamingToken.
|
|
|
|
// If the latter StreamingToken contains a field that is not 0, it is considered an update,
|
|
|
|
// and its value will replace the corresponding value in the StreamingToken on which WithUpdates is called.
|
2020-07-29 18:00:04 +00:00
|
|
|
// If the other token has a log, they will replace any existing log on this token.
|
2020-12-18 11:11:21 +00:00
|
|
|
func (t *StreamingToken) WithUpdates(other StreamingToken) StreamingToken {
|
|
|
|
ret := *t
|
|
|
|
ret.ApplyUpdates(other)
|
2020-05-13 11:14:50 +00:00
|
|
|
return ret
|
|
|
|
}
|
|
|
|
|
2020-12-18 11:11:21 +00:00
|
|
|
// ApplyUpdates applies any changes from the supplied StreamingToken. If the supplied
|
|
|
|
// streaming token contains any positions that are not 0, they are considered updates
|
|
|
|
// and will overwrite the value in the token.
|
|
|
|
func (t *StreamingToken) ApplyUpdates(other StreamingToken) {
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.PDUPosition > t.PDUPosition {
|
2020-12-18 11:11:21 +00:00
|
|
|
t.PDUPosition = other.PDUPosition
|
|
|
|
}
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.TypingPosition > t.TypingPosition {
|
2020-12-18 11:11:21 +00:00
|
|
|
t.TypingPosition = other.TypingPosition
|
|
|
|
}
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.ReceiptPosition > t.ReceiptPosition {
|
2020-12-18 11:11:21 +00:00
|
|
|
t.ReceiptPosition = other.ReceiptPosition
|
|
|
|
}
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.SendToDevicePosition > t.SendToDevicePosition {
|
2020-12-18 11:11:21 +00:00
|
|
|
t.SendToDevicePosition = other.SendToDevicePosition
|
|
|
|
}
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.InvitePosition > t.InvitePosition {
|
2020-12-18 11:11:21 +00:00
|
|
|
t.InvitePosition = other.InvitePosition
|
|
|
|
}
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.AccountDataPosition > t.AccountDataPosition {
|
2021-01-08 16:59:06 +00:00
|
|
|
t.AccountDataPosition = other.AccountDataPosition
|
|
|
|
}
|
2021-01-09 11:25:09 +00:00
|
|
|
if other.DeviceListPosition.IsAfter(&t.DeviceListPosition) {
|
2020-12-18 11:11:21 +00:00
|
|
|
t.DeviceListPosition = other.DeviceListPosition
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
type TopologyToken struct {
|
2020-12-10 18:57:10 +00:00
|
|
|
Depth StreamPosition
|
|
|
|
PDUPosition StreamPosition
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
|
|
|
|
2020-12-18 11:11:21 +00:00
|
|
|
// This will be used as a fallback by json.Marshal.
|
|
|
|
func (t TopologyToken) MarshalText() ([]byte, error) {
|
|
|
|
return []byte(t.String()), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// This will be used as a fallback by json.Unmarshal.
|
|
|
|
func (t *TopologyToken) UnmarshalText(text []byte) (err error) {
|
|
|
|
*t, err = NewTopologyTokenFromString(string(text))
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
func (t *TopologyToken) StreamToken() StreamingToken {
|
2020-12-10 18:57:10 +00:00
|
|
|
return StreamingToken{
|
|
|
|
PDUPosition: t.PDUPosition,
|
|
|
|
}
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
|
|
|
|
func (t TopologyToken) String() string {
|
|
|
|
return fmt.Sprintf("t%d_%d", t.Depth, t.PDUPosition)
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Decrement the topology token to one event earlier.
|
|
|
|
func (t *TopologyToken) Decrement() {
|
2020-12-10 18:57:10 +00:00
|
|
|
depth := t.Depth
|
|
|
|
pduPos := t.PDUPosition
|
2020-05-13 11:14:50 +00:00
|
|
|
if depth-1 <= 0 {
|
2020-05-14 16:30:16 +00:00
|
|
|
// nothing can be lower than this
|
2020-05-13 11:14:50 +00:00
|
|
|
depth = 1
|
|
|
|
} else {
|
2020-05-14 16:30:16 +00:00
|
|
|
// this assumes that we will never have 1000 events all with the same
|
|
|
|
// depth. TODO: work out what the right PDU position is to use, probably needs a db hit.
|
2020-05-13 11:14:50 +00:00
|
|
|
depth--
|
|
|
|
pduPos += 1000
|
|
|
|
}
|
|
|
|
// The lowest token value is 1, therefore we need to manually set it to that
|
|
|
|
// value if we're below it.
|
|
|
|
if depth < 1 {
|
|
|
|
depth = 1
|
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
t.Depth = depth
|
|
|
|
t.PDUPosition = pduPos
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func NewTopologyTokenFromString(tok string) (token TopologyToken, err error) {
|
2020-12-10 18:57:10 +00:00
|
|
|
if len(tok) < 1 {
|
|
|
|
err = fmt.Errorf("empty topology token")
|
2020-05-13 11:14:50 +00:00
|
|
|
return
|
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
if tok[0] != SyncTokenTypeTopology[0] {
|
|
|
|
err = fmt.Errorf("topology token must start with 't'")
|
2020-05-13 11:14:50 +00:00
|
|
|
return
|
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
parts := strings.Split(tok[1:], "_")
|
|
|
|
var positions [2]StreamPosition
|
|
|
|
for i, p := range parts {
|
|
|
|
if i > len(positions) {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
var pos int
|
|
|
|
pos, err = strconv.Atoi(p)
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
positions[i] = StreamPosition(pos)
|
2020-07-29 18:00:04 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
token = TopologyToken{
|
|
|
|
Depth: positions[0],
|
|
|
|
PDUPosition: positions[1],
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
return
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
|
2020-05-13 11:14:50 +00:00
|
|
|
func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
|
2020-12-10 18:57:10 +00:00
|
|
|
if len(tok) < 1 {
|
|
|
|
err = fmt.Errorf("empty stream token")
|
2020-05-13 11:14:50 +00:00
|
|
|
return
|
2019-07-12 14:59:53 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
if tok[0] != SyncTokenTypeStream[0] {
|
|
|
|
err = fmt.Errorf("stream token must start with 's'")
|
2020-05-13 11:14:50 +00:00
|
|
|
return
|
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
categories := strings.Split(tok[1:], ".")
|
|
|
|
parts := strings.Split(categories[0], "_")
|
2021-01-08 16:59:06 +00:00
|
|
|
var positions [6]StreamPosition
|
2020-12-10 18:57:10 +00:00
|
|
|
for i, p := range parts {
|
|
|
|
if i > len(positions) {
|
|
|
|
break
|
2020-07-29 18:00:04 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
var pos int
|
|
|
|
pos, err = strconv.Atoi(p)
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
positions[i] = StreamPosition(pos)
|
2020-07-29 18:00:04 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
token = StreamingToken{
|
|
|
|
PDUPosition: positions[0],
|
|
|
|
TypingPosition: positions[1],
|
|
|
|
ReceiptPosition: positions[2],
|
|
|
|
SendToDevicePosition: positions[3],
|
2020-12-18 11:11:21 +00:00
|
|
|
InvitePosition: positions[4],
|
2021-01-08 16:59:06 +00:00
|
|
|
AccountDataPosition: positions[5],
|
2020-05-13 11:14:50 +00:00
|
|
|
}
|
2020-12-10 18:57:10 +00:00
|
|
|
// dl-0-1234
|
|
|
|
// $log_name-$partition-$offset
|
|
|
|
for _, logStr := range categories[1:] {
|
|
|
|
segments := strings.Split(logStr, "-")
|
|
|
|
if len(segments) != 3 {
|
2020-12-15 15:09:10 +00:00
|
|
|
err = fmt.Errorf("invalid log position %q", logStr)
|
2020-12-10 18:57:10 +00:00
|
|
|
return
|
|
|
|
}
|
2020-12-15 15:09:10 +00:00
|
|
|
switch segments[0] {
|
|
|
|
case "dl":
|
|
|
|
// Device list syncing
|
|
|
|
var partition, offset int
|
|
|
|
if partition, err = strconv.Atoi(segments[1]); err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if offset, err = strconv.Atoi(segments[2]); err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
token.DeviceListPosition.Partition = int32(partition)
|
|
|
|
token.DeviceListPosition.Offset = int64(offset)
|
|
|
|
default:
|
|
|
|
err = fmt.Errorf("unrecognised token type %q", segments[0])
|
2020-12-10 18:57:10 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return token, nil
|
2020-01-23 17:51:10 +00:00
|
|
|
}
|
|
|
|
|
2017-09-22 10:34:54 +00:00
|
|
|
// PrevEventRef represents a reference to a previous event in a state event upgrade
|
|
|
|
type PrevEventRef struct {
|
|
|
|
PrevContent json.RawMessage `json:"prev_content"`
|
|
|
|
ReplacesState string `json:"replaces_state"`
|
|
|
|
PrevSender string `json:"prev_sender"`
|
|
|
|
}
|
|
|
|
|
2017-04-11 10:52:26 +00:00
|
|
|
// Response represents a /sync API response. See https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-client-r0-sync
|
|
|
|
type Response struct {
|
2020-12-18 11:11:21 +00:00
|
|
|
NextBatch StreamingToken `json:"next_batch"`
|
2017-04-11 10:52:26 +00:00
|
|
|
AccountData struct {
|
2021-01-13 14:32:49 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events,omitempty"`
|
|
|
|
} `json:"account_data"`
|
2017-04-11 10:52:26 +00:00
|
|
|
Presence struct {
|
2021-01-13 14:32:49 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events,omitempty"`
|
|
|
|
} `json:"presence"`
|
2017-04-11 10:52:26 +00:00
|
|
|
Rooms struct {
|
|
|
|
Join map[string]JoinResponse `json:"join"`
|
2020-09-10 13:39:18 +00:00
|
|
|
Peek map[string]JoinResponse `json:"peek"`
|
2017-04-11 10:52:26 +00:00
|
|
|
Invite map[string]InviteResponse `json:"invite"`
|
|
|
|
Leave map[string]LeaveResponse `json:"leave"`
|
|
|
|
} `json:"rooms"`
|
Send-to-device support (#1072)
* Groundwork for send-to-device messaging
* Update sample config
* Add unstable routing for now
* Send to device consumer in sync API
* Start the send-to-device consumer
* fix indentation in dendrite-config.yaml
* Create send-to-device database tables, other tweaks
* Add some logic for send-to-device messages, add them into sync stream
* Handle incoming send-to-device messages, count them with EDU stream pos
* Undo changes to test
* pq.Array
* Fix sync
* Logging
* Fix a couple of transaction things, fix client API
* Add send-to-device test, hopefully fix bugs
* Comments
* Refactor a bit
* Fix schema
* Fix queries
* Debug logging
* Fix storing and retrieving of send-to-device messages
* Try to avoid database locks
* Update sync position
* Use latest sync position
* Jiggle about sync a bit
* Fix tests
* Break out the retrieval from the update/delete behaviour
* Comments
* nolint on getResponseWithPDUsForCompleteSync
* Try to line up sync tokens again
* Implement wildcard
* Add all send-to-device tests to whitelist, what could possibly go wrong?
* Only care about wildcard when targeted locally
* Deduplicate transactions
* Handle tokens properly, return immediately if waiting send-to-device messages
* Fix sync
* Update sytest-whitelist
* Fix copyright notice (need to do more of this)
* Comments, copyrights
* Return errors from Do, fix dendritejs
* Review comments
* Comments
* Constructor for TransactionWriter
* defletions
* Update gomatrixserverlib, sytest-blacklist
2020-06-01 16:50:19 +00:00
|
|
|
ToDevice struct {
|
2021-01-22 14:55:08 +00:00
|
|
|
Events []gomatrixserverlib.SendToDeviceEvent `json:"events"`
|
Send-to-device support (#1072)
* Groundwork for send-to-device messaging
* Update sample config
* Add unstable routing for now
* Send to device consumer in sync API
* Start the send-to-device consumer
* fix indentation in dendrite-config.yaml
* Create send-to-device database tables, other tweaks
* Add some logic for send-to-device messages, add them into sync stream
* Handle incoming send-to-device messages, count them with EDU stream pos
* Undo changes to test
* pq.Array
* Fix sync
* Logging
* Fix a couple of transaction things, fix client API
* Add send-to-device test, hopefully fix bugs
* Comments
* Refactor a bit
* Fix schema
* Fix queries
* Debug logging
* Fix storing and retrieving of send-to-device messages
* Try to avoid database locks
* Update sync position
* Use latest sync position
* Jiggle about sync a bit
* Fix tests
* Break out the retrieval from the update/delete behaviour
* Comments
* nolint on getResponseWithPDUsForCompleteSync
* Try to line up sync tokens again
* Implement wildcard
* Add all send-to-device tests to whitelist, what could possibly go wrong?
* Only care about wildcard when targeted locally
* Deduplicate transactions
* Handle tokens properly, return immediately if waiting send-to-device messages
* Fix sync
* Update sytest-whitelist
* Fix copyright notice (need to do more of this)
* Comments, copyrights
* Return errors from Do, fix dendritejs
* Review comments
* Comments
* Constructor for TransactionWriter
* defletions
* Update gomatrixserverlib, sytest-blacklist
2020-06-01 16:50:19 +00:00
|
|
|
} `json:"to_device"`
|
2020-07-27 08:19:55 +00:00
|
|
|
DeviceLists struct {
|
|
|
|
Changed []string `json:"changed,omitempty"`
|
|
|
|
Left []string `json:"left,omitempty"`
|
2021-01-13 14:32:49 +00:00
|
|
|
} `json:"device_lists"`
|
|
|
|
DeviceListsOTKCount map[string]int `json:"device_one_time_keys_count,omitempty"`
|
2017-04-11 10:52:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewResponse creates an empty response with initialised maps.
|
Send-to-device support (#1072)
* Groundwork for send-to-device messaging
* Update sample config
* Add unstable routing for now
* Send to device consumer in sync API
* Start the send-to-device consumer
* fix indentation in dendrite-config.yaml
* Create send-to-device database tables, other tweaks
* Add some logic for send-to-device messages, add them into sync stream
* Handle incoming send-to-device messages, count them with EDU stream pos
* Undo changes to test
* pq.Array
* Fix sync
* Logging
* Fix a couple of transaction things, fix client API
* Add send-to-device test, hopefully fix bugs
* Comments
* Refactor a bit
* Fix schema
* Fix queries
* Debug logging
* Fix storing and retrieving of send-to-device messages
* Try to avoid database locks
* Update sync position
* Use latest sync position
* Jiggle about sync a bit
* Fix tests
* Break out the retrieval from the update/delete behaviour
* Comments
* nolint on getResponseWithPDUsForCompleteSync
* Try to line up sync tokens again
* Implement wildcard
* Add all send-to-device tests to whitelist, what could possibly go wrong?
* Only care about wildcard when targeted locally
* Deduplicate transactions
* Handle tokens properly, return immediately if waiting send-to-device messages
* Fix sync
* Update sytest-whitelist
* Fix copyright notice (need to do more of this)
* Comments, copyrights
* Return errors from Do, fix dendritejs
* Review comments
* Comments
* Constructor for TransactionWriter
* defletions
* Update gomatrixserverlib, sytest-blacklist
2020-06-01 16:50:19 +00:00
|
|
|
func NewResponse() *Response {
|
|
|
|
res := Response{}
|
2017-06-12 17:30:47 +00:00
|
|
|
// Pre-initialise the maps. Synapse will return {} even if there are no rooms under a specific section,
|
2017-04-11 10:52:26 +00:00
|
|
|
// so let's do the same thing. Bonus: this means we can't get dreaded 'assignment to entry in nil map' errors.
|
2021-01-13 14:32:49 +00:00
|
|
|
res.Rooms.Join = map[string]JoinResponse{}
|
|
|
|
res.Rooms.Peek = map[string]JoinResponse{}
|
|
|
|
res.Rooms.Invite = map[string]InviteResponse{}
|
|
|
|
res.Rooms.Leave = map[string]LeaveResponse{}
|
2017-04-11 10:52:26 +00:00
|
|
|
|
|
|
|
// Also pre-intialise empty slices or else we'll insert 'null' instead of '[]' for the value.
|
|
|
|
// TODO: We really shouldn't have to do all this to coerce encoding/json to Do The Right Thing. We should
|
|
|
|
// really be using our own Marshal/Unmarshal implementations otherwise this may prove to be a CPU bottleneck.
|
|
|
|
// This also applies to NewJoinResponse, NewInviteResponse and NewLeaveResponse.
|
2021-01-13 14:32:49 +00:00
|
|
|
res.AccountData.Events = []gomatrixserverlib.ClientEvent{}
|
|
|
|
res.Presence.Events = []gomatrixserverlib.ClientEvent{}
|
|
|
|
res.ToDevice.Events = []gomatrixserverlib.SendToDeviceEvent{}
|
|
|
|
res.DeviceListsOTKCount = map[string]int{}
|
2017-04-11 10:52:26 +00:00
|
|
|
|
|
|
|
return &res
|
|
|
|
}
|
|
|
|
|
2017-10-16 12:34:08 +00:00
|
|
|
// IsEmpty returns true if the response is empty, i.e. used to decided whether
|
|
|
|
// to return the response immediately to the client or to wait for more data.
|
|
|
|
func (r *Response) IsEmpty() bool {
|
|
|
|
return len(r.Rooms.Join) == 0 &&
|
|
|
|
len(r.Rooms.Invite) == 0 &&
|
|
|
|
len(r.Rooms.Leave) == 0 &&
|
|
|
|
len(r.AccountData.Events) == 0 &&
|
Send-to-device support (#1072)
* Groundwork for send-to-device messaging
* Update sample config
* Add unstable routing for now
* Send to device consumer in sync API
* Start the send-to-device consumer
* fix indentation in dendrite-config.yaml
* Create send-to-device database tables, other tweaks
* Add some logic for send-to-device messages, add them into sync stream
* Handle incoming send-to-device messages, count them with EDU stream pos
* Undo changes to test
* pq.Array
* Fix sync
* Logging
* Fix a couple of transaction things, fix client API
* Add send-to-device test, hopefully fix bugs
* Comments
* Refactor a bit
* Fix schema
* Fix queries
* Debug logging
* Fix storing and retrieving of send-to-device messages
* Try to avoid database locks
* Update sync position
* Use latest sync position
* Jiggle about sync a bit
* Fix tests
* Break out the retrieval from the update/delete behaviour
* Comments
* nolint on getResponseWithPDUsForCompleteSync
* Try to line up sync tokens again
* Implement wildcard
* Add all send-to-device tests to whitelist, what could possibly go wrong?
* Only care about wildcard when targeted locally
* Deduplicate transactions
* Handle tokens properly, return immediately if waiting send-to-device messages
* Fix sync
* Update sytest-whitelist
* Fix copyright notice (need to do more of this)
* Comments, copyrights
* Return errors from Do, fix dendritejs
* Review comments
* Comments
* Constructor for TransactionWriter
* defletions
* Update gomatrixserverlib, sytest-blacklist
2020-06-01 16:50:19 +00:00
|
|
|
len(r.Presence.Events) == 0 &&
|
|
|
|
len(r.ToDevice.Events) == 0
|
2017-10-16 12:34:08 +00:00
|
|
|
}
|
|
|
|
|
2020-09-10 13:39:18 +00:00
|
|
|
// JoinResponse represents a /sync response for a room which is under the 'join' or 'peek' key.
|
2017-04-11 10:52:26 +00:00
|
|
|
type JoinResponse struct {
|
|
|
|
State struct {
|
2017-04-13 15:56:46 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"state"`
|
|
|
|
Timeline struct {
|
2017-04-13 15:56:46 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events"`
|
|
|
|
Limited bool `json:"limited"`
|
2020-12-18 11:11:21 +00:00
|
|
|
PrevBatch *TopologyToken `json:"prev_batch,omitempty"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"timeline"`
|
|
|
|
Ephemeral struct {
|
2017-04-13 15:56:46 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"ephemeral"`
|
|
|
|
AccountData struct {
|
2017-04-13 15:56:46 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"account_data"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewJoinResponse creates an empty response with initialised arrays.
|
|
|
|
func NewJoinResponse() *JoinResponse {
|
|
|
|
res := JoinResponse{}
|
2021-01-13 14:32:49 +00:00
|
|
|
res.State.Events = []gomatrixserverlib.ClientEvent{}
|
|
|
|
res.Timeline.Events = []gomatrixserverlib.ClientEvent{}
|
|
|
|
res.Ephemeral.Events = []gomatrixserverlib.ClientEvent{}
|
|
|
|
res.AccountData.Events = []gomatrixserverlib.ClientEvent{}
|
2017-04-11 10:52:26 +00:00
|
|
|
return &res
|
|
|
|
}
|
|
|
|
|
|
|
|
// InviteResponse represents a /sync response for a room which is under the 'invite' key.
|
|
|
|
type InviteResponse struct {
|
|
|
|
InviteState struct {
|
2020-10-08 09:03:37 +00:00
|
|
|
Events []json.RawMessage `json:"events"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"invite_state"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewInviteResponse creates an empty response with initialised arrays.
|
2020-11-16 15:44:53 +00:00
|
|
|
func NewInviteResponse(event *gomatrixserverlib.HeaderedEvent) *InviteResponse {
|
2017-04-11 10:52:26 +00:00
|
|
|
res := InviteResponse{}
|
2020-10-08 09:03:37 +00:00
|
|
|
res.InviteState.Events = []json.RawMessage{}
|
|
|
|
|
|
|
|
// First see if there's invite_room_state in the unsigned key of the invite.
|
|
|
|
// If there is then unmarshal it into the response. This will contain the
|
|
|
|
// partial room state such as join rules, room name etc.
|
2020-04-24 15:30:25 +00:00
|
|
|
if inviteRoomState := gjson.GetBytes(event.Unsigned(), "invite_room_state"); inviteRoomState.Exists() {
|
2020-10-08 09:03:37 +00:00
|
|
|
_ = json.Unmarshal([]byte(inviteRoomState.Raw), &res.InviteState.Events)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Then we'll see if we can create a partial of the invite event itself.
|
|
|
|
// This is needed for clients to work out *who* sent the invite.
|
2020-12-02 15:14:12 +00:00
|
|
|
inviteEvent := gomatrixserverlib.ToClientEvent(event.Unwrap(), gomatrixserverlib.FormatSync)
|
2020-10-08 09:03:37 +00:00
|
|
|
inviteEvent.Unsigned = nil
|
|
|
|
if ev, err := json.Marshal(inviteEvent); err == nil {
|
|
|
|
res.InviteState.Events = append(res.InviteState.Events, ev)
|
2020-04-24 15:30:25 +00:00
|
|
|
}
|
2020-10-08 09:03:37 +00:00
|
|
|
|
2017-04-11 10:52:26 +00:00
|
|
|
return &res
|
|
|
|
}
|
|
|
|
|
|
|
|
// LeaveResponse represents a /sync response for a room which is under the 'leave' key.
|
|
|
|
type LeaveResponse struct {
|
|
|
|
State struct {
|
2017-04-13 15:56:46 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"state"`
|
|
|
|
Timeline struct {
|
2017-04-13 15:56:46 +00:00
|
|
|
Events []gomatrixserverlib.ClientEvent `json:"events"`
|
|
|
|
Limited bool `json:"limited"`
|
2020-12-18 11:11:21 +00:00
|
|
|
PrevBatch *TopologyToken `json:"prev_batch,omitempty"`
|
2017-04-11 10:52:26 +00:00
|
|
|
} `json:"timeline"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewLeaveResponse creates an empty response with initialised arrays.
|
|
|
|
func NewLeaveResponse() *LeaveResponse {
|
|
|
|
res := LeaveResponse{}
|
2021-01-13 14:32:49 +00:00
|
|
|
res.State.Events = []gomatrixserverlib.ClientEvent{}
|
|
|
|
res.Timeline.Events = []gomatrixserverlib.ClientEvent{}
|
2017-04-11 10:52:26 +00:00
|
|
|
return &res
|
|
|
|
}
|
Send-to-device support (#1072)
* Groundwork for send-to-device messaging
* Update sample config
* Add unstable routing for now
* Send to device consumer in sync API
* Start the send-to-device consumer
* fix indentation in dendrite-config.yaml
* Create send-to-device database tables, other tweaks
* Add some logic for send-to-device messages, add them into sync stream
* Handle incoming send-to-device messages, count them with EDU stream pos
* Undo changes to test
* pq.Array
* Fix sync
* Logging
* Fix a couple of transaction things, fix client API
* Add send-to-device test, hopefully fix bugs
* Comments
* Refactor a bit
* Fix schema
* Fix queries
* Debug logging
* Fix storing and retrieving of send-to-device messages
* Try to avoid database locks
* Update sync position
* Use latest sync position
* Jiggle about sync a bit
* Fix tests
* Break out the retrieval from the update/delete behaviour
* Comments
* nolint on getResponseWithPDUsForCompleteSync
* Try to line up sync tokens again
* Implement wildcard
* Add all send-to-device tests to whitelist, what could possibly go wrong?
* Only care about wildcard when targeted locally
* Deduplicate transactions
* Handle tokens properly, return immediately if waiting send-to-device messages
* Fix sync
* Update sytest-whitelist
* Fix copyright notice (need to do more of this)
* Comments, copyrights
* Return errors from Do, fix dendritejs
* Review comments
* Comments
* Constructor for TransactionWriter
* defletions
* Update gomatrixserverlib, sytest-blacklist
2020-06-01 16:50:19 +00:00
|
|
|
|
|
|
|
type SendToDeviceEvent struct {
|
|
|
|
gomatrixserverlib.SendToDeviceEvent
|
2021-01-13 17:29:46 +00:00
|
|
|
ID StreamPosition
|
|
|
|
UserID string
|
|
|
|
DeviceID string
|
Send-to-device support (#1072)
* Groundwork for send-to-device messaging
* Update sample config
* Add unstable routing for now
* Send to device consumer in sync API
* Start the send-to-device consumer
* fix indentation in dendrite-config.yaml
* Create send-to-device database tables, other tweaks
* Add some logic for send-to-device messages, add them into sync stream
* Handle incoming send-to-device messages, count them with EDU stream pos
* Undo changes to test
* pq.Array
* Fix sync
* Logging
* Fix a couple of transaction things, fix client API
* Add send-to-device test, hopefully fix bugs
* Comments
* Refactor a bit
* Fix schema
* Fix queries
* Debug logging
* Fix storing and retrieving of send-to-device messages
* Try to avoid database locks
* Update sync position
* Use latest sync position
* Jiggle about sync a bit
* Fix tests
* Break out the retrieval from the update/delete behaviour
* Comments
* nolint on getResponseWithPDUsForCompleteSync
* Try to line up sync tokens again
* Implement wildcard
* Add all send-to-device tests to whitelist, what could possibly go wrong?
* Only care about wildcard when targeted locally
* Deduplicate transactions
* Handle tokens properly, return immediately if waiting send-to-device messages
* Fix sync
* Update sytest-whitelist
* Fix copyright notice (need to do more of this)
* Comments, copyrights
* Return errors from Do, fix dendritejs
* Review comments
* Comments
* Constructor for TransactionWriter
* defletions
* Update gomatrixserverlib, sytest-blacklist
2020-06-01 16:50:19 +00:00
|
|
|
}
|
2020-09-10 13:39:18 +00:00
|
|
|
|
|
|
|
type PeekingDevice struct {
|
|
|
|
UserID string
|
|
|
|
DeviceID string
|
|
|
|
}
|
|
|
|
|
|
|
|
type Peek struct {
|
|
|
|
RoomID string
|
|
|
|
New bool
|
|
|
|
Deleted bool
|
|
|
|
}
|