2017-05-10 10:42:00 +01: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.
|
|
|
|
|
|
|
|
package sync
|
|
|
|
|
|
|
|
import (
|
2017-09-18 16:52:22 +01:00
|
|
|
"context"
|
2017-05-10 10:42:00 +01:00
|
|
|
"sync"
|
2017-10-26 11:34:54 +01:00
|
|
|
"time"
|
2017-05-10 10:42:00 +01:00
|
|
|
|
2017-05-17 15:38:24 +01:00
|
|
|
"github.com/matrix-org/dendrite/syncapi/storage"
|
2017-05-10 10:42:00 +01:00
|
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
2017-10-26 11:34:54 +01:00
|
|
|
log "github.com/sirupsen/logrus"
|
2017-05-10 10:42:00 +01:00
|
|
|
)
|
|
|
|
|
2017-05-17 15:38:24 +01:00
|
|
|
// Notifier will wake up sleeping requests when there is some new data.
|
2019-07-12 15:59:53 +01:00
|
|
|
// It does not tell requests what that data is, only the sync position which
|
2017-05-17 15:38:24 +01:00
|
|
|
// they can use to get at it. This is done to prevent races whereby we tell the caller
|
|
|
|
// the event, but the token has already advanced by the time they fetch it, resulting
|
|
|
|
// in missed events.
|
2017-05-10 10:42:00 +01:00
|
|
|
type Notifier struct {
|
2017-05-17 15:38:24 +01:00
|
|
|
// A map of RoomID => Set<UserID> : Must only be accessed by the OnNewEvent goroutine
|
2017-05-17 17:29:26 +01:00
|
|
|
roomIDToJoinedUsers map[string]userIDSet
|
2020-09-10 14:39:18 +01:00
|
|
|
// A map of RoomID => Set<UserID> : Must only be accessed by the OnNewEvent goroutine
|
|
|
|
roomIDToPeekingDevices map[string]peekingDeviceSet
|
2017-05-17 15:38:24 +01:00
|
|
|
// Protects currPos and userStreams.
|
|
|
|
streamLock *sync.Mutex
|
2019-07-12 15:59:53 +01:00
|
|
|
// The latest sync position
|
2020-05-13 12:14:50 +01:00
|
|
|
currPos types.StreamingToken
|
2020-05-28 10:05:04 +01:00
|
|
|
// A map of user_id => device_id => UserStream which can be used to wake a given user's /sync request.
|
|
|
|
userDeviceStreams map[string]map[string]*UserDeviceStream
|
2017-10-26 11:34:54 +01:00
|
|
|
// The last time we cleaned out stale entries from the userStreams map
|
|
|
|
lastCleanUpTime time.Time
|
2017-05-10 10:42:00 +01:00
|
|
|
}
|
|
|
|
|
2019-07-12 15:59:53 +01:00
|
|
|
// NewNotifier creates a new notifier set to the given sync position.
|
2017-05-17 15:38:24 +01:00
|
|
|
// In order for this to be of any use, the Notifier needs to be told all rooms and
|
2017-05-17 17:29:26 +01:00
|
|
|
// the joined users within each of them by calling Notifier.Load(*storage.SyncServerDatabase).
|
2020-05-13 12:14:50 +01:00
|
|
|
func NewNotifier(pos types.StreamingToken) *Notifier {
|
2017-05-10 10:42:00 +01:00
|
|
|
return &Notifier{
|
2020-09-10 14:39:18 +01:00
|
|
|
currPos: pos,
|
|
|
|
roomIDToJoinedUsers: make(map[string]userIDSet),
|
|
|
|
roomIDToPeekingDevices: make(map[string]peekingDeviceSet),
|
|
|
|
userDeviceStreams: make(map[string]map[string]*UserDeviceStream),
|
|
|
|
streamLock: &sync.Mutex{},
|
|
|
|
lastCleanUpTime: time.Now(),
|
2017-05-10 10:42:00 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// OnNewEvent is called when a new event is received from the room server. Must only be
|
|
|
|
// called from a single goroutine, to avoid races between updates which could set the
|
2019-07-12 15:59:53 +01:00
|
|
|
// current sync position incorrectly.
|
|
|
|
// Chooses which user sync streams to update by a provided *gomatrixserverlib.Event
|
|
|
|
// (based on the users in the event's room),
|
|
|
|
// a roomID directly, or a list of user IDs, prioritised by parameter ordering.
|
|
|
|
// posUpdate contains the latest position(s) for one or more types of events.
|
|
|
|
// If a position in posUpdate is 0, it means no updates are available of that type.
|
|
|
|
// Typically a consumer supplies a posUpdate with the latest sync position for the
|
|
|
|
// event type it handles, leaving other fields as 0.
|
|
|
|
func (n *Notifier) OnNewEvent(
|
2020-03-19 12:07:01 +00:00
|
|
|
ev *gomatrixserverlib.HeaderedEvent, roomID string, userIDs []string,
|
2020-05-13 12:14:50 +01:00
|
|
|
posUpdate types.StreamingToken,
|
2019-07-12 15:59:53 +01:00
|
|
|
) {
|
2017-05-17 15:38:24 +01:00
|
|
|
// update the current position then notify relevant /sync streams.
|
|
|
|
// This needs to be done PRIOR to waking up users as they will read this value.
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
2017-05-10 10:42:00 +01:00
|
|
|
|
2020-12-18 11:11:21 +00:00
|
|
|
n.currPos.ApplyUpdates(posUpdate)
|
2017-10-26 11:34:54 +01:00
|
|
|
n.removeEmptyUserStreams()
|
|
|
|
|
2017-08-02 16:21:35 +01:00
|
|
|
if ev != nil {
|
|
|
|
// Map this event's room_id to a list of joined users, and wake them up.
|
2019-07-12 15:59:53 +01:00
|
|
|
usersToNotify := n.joinedUsers(ev.RoomID())
|
2020-09-10 14:39:18 +01:00
|
|
|
// Map this event's room_id to a list of peeking devices, and wake them up.
|
|
|
|
peekingDevicesToNotify := n.PeekingDevices(ev.RoomID())
|
2017-08-02 16:21:35 +01:00
|
|
|
// If this is an invite, also add in the invitee to this list.
|
|
|
|
if ev.Type() == "m.room.member" && ev.StateKey() != nil {
|
2017-09-05 17:40:46 +01:00
|
|
|
targetUserID := *ev.StateKey()
|
2017-08-02 16:21:35 +01:00
|
|
|
membership, err := ev.Membership()
|
|
|
|
if err != nil {
|
|
|
|
log.WithError(err).WithField("event_id", ev.EventID()).Errorf(
|
|
|
|
"Notifier.OnNewEvent: Failed to unmarshal member event",
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
// Keep the joined user map up-to-date
|
|
|
|
switch membership {
|
2019-08-06 15:07:36 +01:00
|
|
|
case gomatrixserverlib.Invite:
|
2019-07-12 15:59:53 +01:00
|
|
|
usersToNotify = append(usersToNotify, targetUserID)
|
2019-08-06 15:07:36 +01:00
|
|
|
case gomatrixserverlib.Join:
|
2017-08-22 14:14:37 +01:00
|
|
|
// Manually append the new user's ID so they get notified
|
|
|
|
// along all members in the room
|
2019-07-12 15:59:53 +01:00
|
|
|
usersToNotify = append(usersToNotify, targetUserID)
|
2017-09-05 17:40:46 +01:00
|
|
|
n.addJoinedUser(ev.RoomID(), targetUserID)
|
2019-08-06 15:07:36 +01:00
|
|
|
case gomatrixserverlib.Leave:
|
2017-08-02 16:21:35 +01:00
|
|
|
fallthrough
|
2019-08-06 15:07:36 +01:00
|
|
|
case gomatrixserverlib.Ban:
|
2017-09-05 17:40:46 +01:00
|
|
|
n.removeJoinedUser(ev.RoomID(), targetUserID)
|
2017-08-02 16:21:35 +01:00
|
|
|
}
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-18 11:11:21 +00:00
|
|
|
n.wakeupUsers(usersToNotify, peekingDevicesToNotify, n.currPos)
|
2019-07-12 15:59:53 +01:00
|
|
|
} else if roomID != "" {
|
2020-12-18 11:11:21 +00:00
|
|
|
n.wakeupUsers(n.joinedUsers(roomID), n.PeekingDevices(roomID), n.currPos)
|
2019-07-12 15:59:53 +01:00
|
|
|
} else if len(userIDs) > 0 {
|
2020-12-18 11:11:21 +00:00
|
|
|
n.wakeupUsers(userIDs, nil, n.currPos)
|
2019-07-12 15:59:53 +01:00
|
|
|
} else {
|
|
|
|
log.WithFields(log.Fields{
|
|
|
|
"posUpdate": posUpdate.String,
|
|
|
|
}).Warn("Notifier.OnNewEvent called but caller supplied no user to wake up")
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
2017-05-10 10:42:00 +01:00
|
|
|
}
|
|
|
|
|
2020-09-10 14:39:18 +01:00
|
|
|
func (n *Notifier) OnNewPeek(
|
|
|
|
roomID, userID, deviceID string,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
|
|
|
|
|
|
|
n.addPeekingDevice(roomID, userID, deviceID)
|
|
|
|
|
|
|
|
// we don't wake up devices here given the roomserver consumer will do this shortly afterwards
|
|
|
|
// by calling OnNewEvent.
|
|
|
|
}
|
|
|
|
|
2020-12-03 11:11:46 +00:00
|
|
|
func (n *Notifier) OnRetirePeek(
|
|
|
|
roomID, userID, deviceID string,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
|
|
|
|
|
|
|
n.removePeekingDevice(roomID, userID, deviceID)
|
|
|
|
|
|
|
|
// we don't wake up devices here given the roomserver consumer will do this shortly afterwards
|
|
|
|
// by calling OnRetireEvent.
|
|
|
|
}
|
|
|
|
|
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 17:50:19 +01:00
|
|
|
func (n *Notifier) OnNewSendToDevice(
|
|
|
|
userID string, deviceIDs []string,
|
|
|
|
posUpdate types.StreamingToken,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
|
|
|
|
2020-12-18 11:11:21 +00:00
|
|
|
n.currPos.ApplyUpdates(posUpdate)
|
|
|
|
n.wakeupUserDevice(userID, deviceIDs, n.currPos)
|
|
|
|
}
|
|
|
|
|
|
|
|
// OnNewReceipt updates the current position
|
|
|
|
func (n *Notifier) OnNewTyping(
|
|
|
|
roomID string,
|
|
|
|
posUpdate types.StreamingToken,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
|
|
|
|
|
|
|
n.currPos.ApplyUpdates(posUpdate)
|
|
|
|
n.wakeupUsers(n.joinedUsers(roomID), nil, n.currPos)
|
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 17:50:19 +01:00
|
|
|
}
|
|
|
|
|
2020-11-09 18:46:11 +00:00
|
|
|
// OnNewReceipt updates the current position
|
|
|
|
func (n *Notifier) OnNewReceipt(
|
2020-12-18 11:11:21 +00:00
|
|
|
roomID string,
|
2020-11-09 18:46:11 +00:00
|
|
|
posUpdate types.StreamingToken,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
2020-12-18 11:11:21 +00:00
|
|
|
|
|
|
|
n.currPos.ApplyUpdates(posUpdate)
|
|
|
|
n.wakeupUsers(n.joinedUsers(roomID), nil, n.currPos)
|
2020-11-09 18:46:11 +00:00
|
|
|
}
|
|
|
|
|
2020-07-30 11:15:46 +01:00
|
|
|
func (n *Notifier) OnNewKeyChange(
|
|
|
|
posUpdate types.StreamingToken, wakeUserID, keyChangeUserID string,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
2020-12-18 11:11:21 +00:00
|
|
|
|
|
|
|
n.currPos.ApplyUpdates(posUpdate)
|
|
|
|
n.wakeupUsers([]string{wakeUserID}, nil, n.currPos)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (n *Notifier) OnNewInvite(
|
|
|
|
posUpdate types.StreamingToken, wakeUserID string,
|
|
|
|
) {
|
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
|
|
|
|
|
|
|
n.currPos.ApplyUpdates(posUpdate)
|
|
|
|
n.wakeupUsers([]string{wakeUserID}, nil, n.currPos)
|
2020-07-30 11:15:46 +01:00
|
|
|
}
|
|
|
|
|
2017-10-26 11:34:54 +01:00
|
|
|
// GetListener returns a UserStreamListener that can be used to wait for
|
|
|
|
// updates for a user. Must be closed.
|
|
|
|
// notify for anything before sincePos
|
2020-05-28 10:05:04 +01:00
|
|
|
func (n *Notifier) GetListener(req syncRequest) UserDeviceStreamListener {
|
2017-05-17 15:38:24 +01:00
|
|
|
// Do what synapse does: https://github.com/matrix-org/synapse/blob/v0.20.0/synapse/notifier.py#L298
|
|
|
|
// - Bucket request into a lookup map keyed off a list of joined room IDs and separately a user ID
|
|
|
|
// - Incoming events wake requests for a matching room ID
|
|
|
|
// - Incoming events wake requests for a matching user ID (needed for invites)
|
|
|
|
|
|
|
|
// TODO: v1 /events 'peeking' has an 'explicit room ID' which is also tracked,
|
|
|
|
// but given we don't do /events, let's pretend it doesn't exist.
|
|
|
|
|
|
|
|
n.streamLock.Lock()
|
2017-10-26 11:34:54 +01:00
|
|
|
defer n.streamLock.Unlock()
|
2017-05-17 15:38:24 +01:00
|
|
|
|
2017-10-26 11:34:54 +01:00
|
|
|
n.removeEmptyUserStreams()
|
2017-05-17 15:38:24 +01:00
|
|
|
|
2020-05-28 10:05:04 +01:00
|
|
|
return n.fetchUserDeviceStream(req.device.UserID, req.device.ID, true).GetListener(req.ctx)
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Load the membership states required to notify users correctly.
|
2020-01-03 14:07:05 +00:00
|
|
|
func (n *Notifier) Load(ctx context.Context, db storage.Database) error {
|
2017-09-18 16:52:22 +01:00
|
|
|
roomToUsers, err := db.AllJoinedUsersInRooms(ctx)
|
2017-05-17 15:38:24 +01:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
n.setUsersJoinedToRooms(roomToUsers)
|
2020-09-10 14:39:18 +01:00
|
|
|
|
|
|
|
roomToPeekingDevices, err := db.AllPeekingDevicesInRooms(ctx)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
n.setPeekingDevices(roomToPeekingDevices)
|
|
|
|
|
2017-05-17 15:38:24 +01:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2019-07-12 15:59:53 +01:00
|
|
|
// CurrentPosition returns the current sync position
|
2020-05-13 12:14:50 +01:00
|
|
|
func (n *Notifier) CurrentPosition() types.StreamingToken {
|
2019-07-12 15:59:53 +01:00
|
|
|
n.streamLock.Lock()
|
|
|
|
defer n.streamLock.Unlock()
|
|
|
|
|
2017-10-16 13:34:08 +01:00
|
|
|
return n.currPos
|
|
|
|
}
|
|
|
|
|
2017-05-17 15:38:24 +01:00
|
|
|
// setUsersJoinedToRooms marks the given users as 'joined' to the given rooms, such that new events from
|
|
|
|
// these rooms will wake the given users /sync requests. This should be called prior to ANY calls to
|
|
|
|
// OnNewEvent (eg on startup) to prevent racing.
|
|
|
|
func (n *Notifier) setUsersJoinedToRooms(roomIDToUserIDs map[string][]string) {
|
|
|
|
// This is just the bulk form of addJoinedUser
|
|
|
|
for roomID, userIDs := range roomIDToUserIDs {
|
|
|
|
if _, ok := n.roomIDToJoinedUsers[roomID]; !ok {
|
2017-05-17 17:29:26 +01:00
|
|
|
n.roomIDToJoinedUsers[roomID] = make(userIDSet)
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
for _, userID := range userIDs {
|
|
|
|
n.roomIDToJoinedUsers[roomID].add(userID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-10 14:39:18 +01:00
|
|
|
// setPeekingDevices marks the given devices as peeking in the given rooms, such that new events from
|
|
|
|
// these rooms will wake the given devices' /sync requests. This should be called prior to ANY calls to
|
|
|
|
// OnNewEvent (eg on startup) to prevent racing.
|
|
|
|
func (n *Notifier) setPeekingDevices(roomIDToPeekingDevices map[string][]types.PeekingDevice) {
|
|
|
|
// This is just the bulk form of addPeekingDevice
|
|
|
|
for roomID, peekingDevices := range roomIDToPeekingDevices {
|
|
|
|
if _, ok := n.roomIDToPeekingDevices[roomID]; !ok {
|
|
|
|
n.roomIDToPeekingDevices[roomID] = make(peekingDeviceSet)
|
|
|
|
}
|
|
|
|
for _, peekingDevice := range peekingDevices {
|
|
|
|
n.roomIDToPeekingDevices[roomID].add(peekingDevice)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-28 10:05:04 +01:00
|
|
|
// wakeupUsers will wake up the sync strems for all of the devices for all of the
|
2020-09-10 14:39:18 +01:00
|
|
|
// specified user IDs, and also the specified peekingDevices
|
|
|
|
func (n *Notifier) wakeupUsers(userIDs []string, peekingDevices []types.PeekingDevice, newPos types.StreamingToken) {
|
2019-07-12 15:59:53 +01:00
|
|
|
for _, userID := range userIDs {
|
2020-05-28 10:05:04 +01:00
|
|
|
for _, stream := range n.fetchUserStreams(userID) {
|
|
|
|
if stream == nil {
|
|
|
|
continue
|
|
|
|
}
|
2019-07-12 15:59:53 +01:00
|
|
|
stream.Broadcast(newPos) // wake up all goroutines Wait()ing on this stream
|
|
|
|
}
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
2020-09-10 14:39:18 +01:00
|
|
|
|
|
|
|
for _, peekingDevice := range peekingDevices {
|
|
|
|
// TODO: don't bother waking up for devices whose users we already woke up
|
|
|
|
if stream := n.fetchUserDeviceStream(peekingDevice.UserID, peekingDevice.DeviceID, false); stream != nil {
|
|
|
|
stream.Broadcast(newPos) // wake up all goroutines Wait()ing on this stream
|
|
|
|
}
|
|
|
|
}
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
|
2020-05-28 10:05:04 +01:00
|
|
|
// wakeupUserDevice will wake up the sync stream for a specific user device. Other
|
|
|
|
// device streams will be left alone.
|
|
|
|
// nolint:unused
|
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 17:50:19 +01:00
|
|
|
func (n *Notifier) wakeupUserDevice(userID string, deviceIDs []string, newPos types.StreamingToken) {
|
|
|
|
for _, deviceID := range deviceIDs {
|
2020-05-28 10:05:04 +01:00
|
|
|
if stream := n.fetchUserDeviceStream(userID, deviceID, false); stream != nil {
|
|
|
|
stream.Broadcast(newPos) // wake up all goroutines Wait()ing on this stream
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// fetchUserDeviceStream retrieves a stream unique to the given device. If makeIfNotExists is true,
|
|
|
|
// a stream will be made for this device if one doesn't exist and it will be returned. This
|
2017-05-17 15:38:24 +01:00
|
|
|
// function does not wait for data to be available on the stream.
|
2019-07-25 17:00:22 +01:00
|
|
|
// NB: Callers should have locked the mutex before calling this function.
|
2020-05-28 10:05:04 +01:00
|
|
|
func (n *Notifier) fetchUserDeviceStream(userID, deviceID string, makeIfNotExists bool) *UserDeviceStream {
|
|
|
|
_, ok := n.userDeviceStreams[userID]
|
|
|
|
if !ok {
|
|
|
|
if !makeIfNotExists {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
n.userDeviceStreams[userID] = map[string]*UserDeviceStream{}
|
|
|
|
}
|
|
|
|
stream, ok := n.userDeviceStreams[userID][deviceID]
|
|
|
|
if !ok {
|
|
|
|
if !makeIfNotExists {
|
|
|
|
return nil
|
|
|
|
}
|
2017-05-17 15:38:24 +01:00
|
|
|
// TODO: Unbounded growth of streams (1 per user)
|
2020-05-28 10:05:04 +01:00
|
|
|
if stream = NewUserDeviceStream(userID, deviceID, n.currPos); stream != nil {
|
|
|
|
n.userDeviceStreams[userID][deviceID] = stream
|
|
|
|
}
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
return stream
|
|
|
|
}
|
|
|
|
|
2020-05-28 10:05:04 +01:00
|
|
|
// fetchUserStreams retrieves all streams for the given user. If makeIfNotExists is true,
|
|
|
|
// a stream will be made for this user if one doesn't exist and it will be returned. This
|
|
|
|
// function does not wait for data to be available on the stream.
|
|
|
|
// NB: Callers should have locked the mutex before calling this function.
|
|
|
|
func (n *Notifier) fetchUserStreams(userID string) []*UserDeviceStream {
|
|
|
|
user, ok := n.userDeviceStreams[userID]
|
|
|
|
if !ok {
|
|
|
|
return []*UserDeviceStream{}
|
|
|
|
}
|
|
|
|
streams := []*UserDeviceStream{}
|
|
|
|
for _, stream := range user {
|
|
|
|
streams = append(streams, stream)
|
|
|
|
}
|
|
|
|
return streams
|
|
|
|
}
|
|
|
|
|
2017-05-17 15:38:24 +01:00
|
|
|
// Not thread-safe: must be called on the OnNewEvent goroutine only
|
|
|
|
func (n *Notifier) addJoinedUser(roomID, userID string) {
|
|
|
|
if _, ok := n.roomIDToJoinedUsers[roomID]; !ok {
|
2017-05-17 17:29:26 +01:00
|
|
|
n.roomIDToJoinedUsers[roomID] = make(userIDSet)
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
n.roomIDToJoinedUsers[roomID].add(userID)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Not thread-safe: must be called on the OnNewEvent goroutine only
|
|
|
|
func (n *Notifier) removeJoinedUser(roomID, userID string) {
|
|
|
|
if _, ok := n.roomIDToJoinedUsers[roomID]; !ok {
|
2017-05-17 17:29:26 +01:00
|
|
|
n.roomIDToJoinedUsers[roomID] = make(userIDSet)
|
2017-05-17 15:38:24 +01:00
|
|
|
}
|
|
|
|
n.roomIDToJoinedUsers[roomID].remove(userID)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Not thread-safe: must be called on the OnNewEvent goroutine only
|
|
|
|
func (n *Notifier) joinedUsers(roomID string) (userIDs []string) {
|
|
|
|
if _, ok := n.roomIDToJoinedUsers[roomID]; !ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
return n.roomIDToJoinedUsers[roomID].values()
|
|
|
|
}
|
|
|
|
|
2020-09-10 14:39:18 +01:00
|
|
|
// Not thread-safe: must be called on the OnNewEvent goroutine only
|
|
|
|
func (n *Notifier) addPeekingDevice(roomID, userID, deviceID string) {
|
|
|
|
if _, ok := n.roomIDToPeekingDevices[roomID]; !ok {
|
|
|
|
n.roomIDToPeekingDevices[roomID] = make(peekingDeviceSet)
|
|
|
|
}
|
|
|
|
n.roomIDToPeekingDevices[roomID].add(types.PeekingDevice{UserID: userID, DeviceID: deviceID})
|
|
|
|
}
|
|
|
|
|
|
|
|
// Not thread-safe: must be called on the OnNewEvent goroutine only
|
|
|
|
// nolint:unused
|
|
|
|
func (n *Notifier) removePeekingDevice(roomID, userID, deviceID string) {
|
|
|
|
if _, ok := n.roomIDToPeekingDevices[roomID]; !ok {
|
|
|
|
n.roomIDToPeekingDevices[roomID] = make(peekingDeviceSet)
|
|
|
|
}
|
|
|
|
// XXX: is this going to work as a key?
|
|
|
|
n.roomIDToPeekingDevices[roomID].remove(types.PeekingDevice{UserID: userID, DeviceID: deviceID})
|
|
|
|
}
|
|
|
|
|
|
|
|
// Not thread-safe: must be called on the OnNewEvent goroutine only
|
|
|
|
func (n *Notifier) PeekingDevices(roomID string) (peekingDevices []types.PeekingDevice) {
|
|
|
|
if _, ok := n.roomIDToPeekingDevices[roomID]; !ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
return n.roomIDToPeekingDevices[roomID].values()
|
|
|
|
}
|
|
|
|
|
2017-10-26 11:34:54 +01:00
|
|
|
// removeEmptyUserStreams iterates through the user stream map and removes any
|
|
|
|
// that have been empty for a certain amount of time. This is a crude way of
|
|
|
|
// ensuring that the userStreams map doesn't grow forver.
|
|
|
|
// This should be called when the notifier gets called for whatever reason,
|
|
|
|
// the function itself is responsible for ensuring it doesn't iterate too
|
|
|
|
// often.
|
|
|
|
// NB: Callers should have locked the mutex before calling this function.
|
|
|
|
func (n *Notifier) removeEmptyUserStreams() {
|
|
|
|
// Only clean up now and again
|
|
|
|
now := time.Now()
|
|
|
|
if n.lastCleanUpTime.Add(time.Minute).After(now) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
n.lastCleanUpTime = now
|
|
|
|
|
|
|
|
deleteBefore := now.Add(-5 * time.Minute)
|
2020-05-28 10:05:04 +01:00
|
|
|
for user, byUser := range n.userDeviceStreams {
|
|
|
|
for device, stream := range byUser {
|
|
|
|
if stream.TimeOfLastNonEmpty().Before(deleteBefore) {
|
|
|
|
delete(n.userDeviceStreams[user], device)
|
|
|
|
}
|
|
|
|
if len(n.userDeviceStreams[user]) == 0 {
|
|
|
|
delete(n.userDeviceStreams, user)
|
|
|
|
}
|
2017-10-26 11:34:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-17 15:38:24 +01:00
|
|
|
// A string set, mainly existing for improving clarity of structs in this file.
|
2017-05-17 17:29:26 +01:00
|
|
|
type userIDSet map[string]bool
|
2017-05-17 15:38:24 +01:00
|
|
|
|
2017-05-17 17:29:26 +01:00
|
|
|
func (s userIDSet) add(str string) {
|
2017-05-17 15:38:24 +01:00
|
|
|
s[str] = true
|
|
|
|
}
|
|
|
|
|
2017-05-17 17:29:26 +01:00
|
|
|
func (s userIDSet) remove(str string) {
|
2017-05-17 15:38:24 +01:00
|
|
|
delete(s, str)
|
|
|
|
}
|
|
|
|
|
2017-05-17 17:29:26 +01:00
|
|
|
func (s userIDSet) values() (vals []string) {
|
2017-05-17 15:38:24 +01:00
|
|
|
for str := range s {
|
|
|
|
vals = append(vals, str)
|
2017-05-10 10:42:00 +01:00
|
|
|
}
|
2017-05-17 15:38:24 +01:00
|
|
|
return
|
2017-05-10 10:42:00 +01:00
|
|
|
}
|
2020-09-10 14:39:18 +01:00
|
|
|
|
|
|
|
// A set of PeekingDevices, similar to userIDSet
|
|
|
|
|
|
|
|
type peekingDeviceSet map[types.PeekingDevice]bool
|
|
|
|
|
|
|
|
func (s peekingDeviceSet) add(d types.PeekingDevice) {
|
|
|
|
s[d] = true
|
|
|
|
}
|
|
|
|
|
|
|
|
// nolint:unused
|
|
|
|
func (s peekingDeviceSet) remove(d types.PeekingDevice) {
|
|
|
|
delete(s, d)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (s peekingDeviceSet) values() (vals []types.PeekingDevice) {
|
|
|
|
for d := range s {
|
|
|
|
vals = append(vals, d)
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|