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
|
|
|
// Copyright 2017 Vector Creations Ltd
|
|
|
|
// Copyright 2017-2018 New Vector Ltd
|
|
|
|
// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
|
|
|
|
//
|
2018-08-02 17:22:44 +00:00
|
|
|
// 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 input
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"encoding/json"
|
|
|
|
"time"
|
|
|
|
|
2020-04-22 14:26:56 +00:00
|
|
|
"github.com/Shopify/sarama"
|
2020-03-30 14:02:20 +00:00
|
|
|
"github.com/matrix-org/dendrite/eduserver/api"
|
|
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
2021-08-17 12:44:30 +00:00
|
|
|
keyapi "github.com/matrix-org/dendrite/keyserver/api"
|
2020-06-16 16:39:56 +00:00
|
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
2018-08-02 17:22:44 +00:00
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
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
|
|
|
"github.com/sirupsen/logrus"
|
2018-08-02 17:22:44 +00:00
|
|
|
)
|
|
|
|
|
2020-03-30 14:02:20 +00:00
|
|
|
// EDUServerInputAPI implements api.EDUServerInputAPI
|
|
|
|
type EDUServerInputAPI struct {
|
2018-08-02 17:22:44 +00:00
|
|
|
// Cache to store the current typing members in each room.
|
2020-03-30 14:02:20 +00:00
|
|
|
Cache *cache.EDUCache
|
2018-08-02 17:22:44 +00:00
|
|
|
// The kafka topic to output new typing events to.
|
|
|
|
OutputTypingEventTopic 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
|
|
|
// The kafka topic to output new send to device events to.
|
|
|
|
OutputSendToDeviceEventTopic string
|
2020-11-09 18:46:11 +00:00
|
|
|
// The kafka topic to output new receipt events to
|
|
|
|
OutputReceiptEventTopic string
|
2021-08-17 12:44:30 +00:00
|
|
|
// The kafka topic to output new key change events to
|
|
|
|
OutputKeyChangeEventTopic string
|
2018-08-02 17:22:44 +00:00
|
|
|
// kafka producer
|
|
|
|
Producer sarama.SyncProducer
|
2020-06-16 16:39:56 +00:00
|
|
|
// Internal user query API
|
|
|
|
UserAPI userapi.UserInternalAPI
|
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
|
|
|
// our server name
|
|
|
|
ServerName gomatrixserverlib.ServerName
|
2018-08-02 17:22:44 +00:00
|
|
|
}
|
|
|
|
|
2020-03-30 14:02:20 +00:00
|
|
|
// InputTypingEvent implements api.EDUServerInputAPI
|
|
|
|
func (t *EDUServerInputAPI) InputTypingEvent(
|
2018-08-02 17:22:44 +00:00
|
|
|
ctx context.Context,
|
|
|
|
request *api.InputTypingEventRequest,
|
|
|
|
response *api.InputTypingEventResponse,
|
|
|
|
) error {
|
|
|
|
ite := &request.InputTypingEvent
|
|
|
|
if ite.Typing {
|
|
|
|
// user is typing, update our current state of users typing.
|
|
|
|
expireTime := ite.OriginServerTS.Time().Add(
|
2020-03-30 15:40:28 +00:00
|
|
|
time.Duration(ite.TimeoutMS) * time.Millisecond,
|
2018-08-02 17:22:44 +00:00
|
|
|
)
|
|
|
|
t.Cache.AddTypingUser(ite.UserID, ite.RoomID, &expireTime)
|
|
|
|
} else {
|
|
|
|
t.Cache.RemoveUser(ite.UserID, ite.RoomID)
|
|
|
|
}
|
|
|
|
|
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
|
|
|
return t.sendTypingEvent(ite)
|
|
|
|
}
|
|
|
|
|
|
|
|
// InputTypingEvent implements api.EDUServerInputAPI
|
|
|
|
func (t *EDUServerInputAPI) InputSendToDeviceEvent(
|
|
|
|
ctx context.Context,
|
|
|
|
request *api.InputSendToDeviceEventRequest,
|
|
|
|
response *api.InputSendToDeviceEventResponse,
|
|
|
|
) error {
|
|
|
|
ise := &request.InputSendToDeviceEvent
|
|
|
|
return t.sendToDeviceEvent(ise)
|
2018-08-02 17:22:44 +00:00
|
|
|
}
|
|
|
|
|
2021-08-17 12:44:30 +00:00
|
|
|
// InputCrossSigningKeyUpdate implements api.EDUServerInputAPI
|
|
|
|
func (t *EDUServerInputAPI) InputCrossSigningKeyUpdate(
|
|
|
|
ctx context.Context,
|
|
|
|
request *api.InputCrossSigningKeyUpdateRequest,
|
|
|
|
response *api.InputCrossSigningKeyUpdateResponse,
|
|
|
|
) error {
|
|
|
|
eventJSON, err := json.Marshal(&keyapi.DeviceMessage{
|
|
|
|
Type: keyapi.TypeCrossSigningUpdate,
|
|
|
|
OutputCrossSigningKeyUpdate: &api.OutputCrossSigningKeyUpdate{
|
|
|
|
CrossSigningKeyUpdate: request.CrossSigningKeyUpdate,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
logrus.WithFields(logrus.Fields{
|
|
|
|
"user_id": request.UserID,
|
|
|
|
}).Infof("Producing to topic '%s'", t.OutputKeyChangeEventTopic)
|
|
|
|
|
|
|
|
m := &sarama.ProducerMessage{
|
|
|
|
Topic: string(t.OutputKeyChangeEventTopic),
|
|
|
|
Key: sarama.StringEncoder(request.UserID),
|
|
|
|
Value: sarama.ByteEncoder(eventJSON),
|
|
|
|
}
|
|
|
|
|
|
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
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 (t *EDUServerInputAPI) sendTypingEvent(ite *api.InputTypingEvent) error {
|
2018-08-10 15:26:57 +00:00
|
|
|
ev := &api.TypingEvent{
|
|
|
|
Type: gomatrixserverlib.MTyping,
|
|
|
|
RoomID: ite.RoomID,
|
|
|
|
UserID: ite.UserID,
|
2019-07-12 14:59:53 +00:00
|
|
|
Typing: ite.Typing,
|
2018-08-02 17:22:44 +00:00
|
|
|
}
|
2018-08-10 15:26:57 +00:00
|
|
|
ote := &api.OutputTypingEvent{
|
2019-07-12 14:59:53 +00:00
|
|
|
Event: *ev,
|
|
|
|
}
|
|
|
|
|
|
|
|
if ev.Typing {
|
|
|
|
expireTime := ite.OriginServerTS.Time().Add(
|
2020-03-30 15:40:28 +00:00
|
|
|
time.Duration(ite.TimeoutMS) * time.Millisecond,
|
2019-07-12 14:59:53 +00:00
|
|
|
)
|
|
|
|
ote.ExpireTime = &expireTime
|
2018-08-10 15:26:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
eventJSON, err := json.Marshal(ote)
|
2018-08-02 17:22:44 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-12 11:10:08 +00:00
|
|
|
logrus.WithFields(logrus.Fields{
|
|
|
|
"room_id": ite.RoomID,
|
|
|
|
"user_id": ite.UserID,
|
|
|
|
"typing": ite.Typing,
|
|
|
|
}).Infof("Producing to topic '%s'", t.OutputTypingEventTopic)
|
2018-08-02 17:22:44 +00:00
|
|
|
|
|
|
|
m := &sarama.ProducerMessage{
|
|
|
|
Topic: string(t.OutputTypingEventTopic),
|
2018-08-10 15:26:57 +00:00
|
|
|
Key: sarama.StringEncoder(ite.RoomID),
|
2018-08-02 17:22:44 +00:00
|
|
|
Value: sarama.ByteEncoder(eventJSON),
|
|
|
|
}
|
|
|
|
|
|
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
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 (t *EDUServerInputAPI) sendToDeviceEvent(ise *api.InputSendToDeviceEvent) error {
|
|
|
|
devices := []string{}
|
2020-06-16 16:39:56 +00:00
|
|
|
_, domain, err := gomatrixserverlib.SplitID('@', ise.UserID)
|
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
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the event is targeted locally then we want to expand the wildcard
|
|
|
|
// out into individual device IDs so that we can send them to each respective
|
|
|
|
// device. If the event isn't targeted locally then we can't expand the
|
|
|
|
// wildcard as we don't know about the remote devices, so instead we leave it
|
|
|
|
// as-is, so that the federation sender can send it on with the wildcard intact.
|
|
|
|
if domain == t.ServerName && ise.DeviceID == "*" {
|
2020-06-16 16:39:56 +00:00
|
|
|
var res userapi.QueryDevicesResponse
|
|
|
|
err = t.UserAPI.QueryDevices(context.TODO(), &userapi.QueryDevicesRequest{
|
|
|
|
UserID: ise.UserID,
|
|
|
|
}, &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
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-16 16:39:56 +00:00
|
|
|
for _, dev := range res.Devices {
|
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
|
|
|
devices = append(devices, dev.ID)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
devices = append(devices, ise.DeviceID)
|
|
|
|
}
|
|
|
|
|
2020-06-12 11:10:08 +00:00
|
|
|
logrus.WithFields(logrus.Fields{
|
|
|
|
"user_id": ise.UserID,
|
|
|
|
"num_devices": len(devices),
|
|
|
|
"type": ise.Type,
|
|
|
|
}).Infof("Producing to topic '%s'", t.OutputSendToDeviceEventTopic)
|
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
|
|
|
for _, device := range devices {
|
|
|
|
ote := &api.OutputSendToDeviceEvent{
|
|
|
|
UserID: ise.UserID,
|
|
|
|
DeviceID: device,
|
|
|
|
SendToDeviceEvent: ise.SendToDeviceEvent,
|
|
|
|
}
|
|
|
|
|
|
|
|
eventJSON, err := json.Marshal(ote)
|
|
|
|
if err != nil {
|
|
|
|
logrus.WithError(err).Error("sendToDevice failed json.Marshal")
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
m := &sarama.ProducerMessage{
|
|
|
|
Topic: string(t.OutputSendToDeviceEventTopic),
|
|
|
|
Key: sarama.StringEncoder(ote.UserID),
|
|
|
|
Value: sarama.ByteEncoder(eventJSON),
|
|
|
|
}
|
|
|
|
|
|
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
|
|
if err != nil {
|
|
|
|
logrus.WithError(err).Error("sendToDevice failed t.Producer.SendMessage")
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2020-11-09 18:46:11 +00:00
|
|
|
|
|
|
|
// InputReceiptEvent implements api.EDUServerInputAPI
|
|
|
|
// TODO: Intelligently batch requests sent by the same user (e.g wait a few milliseconds before emitting output events)
|
|
|
|
func (t *EDUServerInputAPI) InputReceiptEvent(
|
|
|
|
ctx context.Context,
|
|
|
|
request *api.InputReceiptEventRequest,
|
|
|
|
response *api.InputReceiptEventResponse,
|
|
|
|
) error {
|
|
|
|
logrus.WithFields(logrus.Fields{}).Infof("Producing to topic '%s'", t.OutputReceiptEventTopic)
|
|
|
|
output := &api.OutputReceiptEvent{
|
|
|
|
UserID: request.InputReceiptEvent.UserID,
|
|
|
|
RoomID: request.InputReceiptEvent.RoomID,
|
|
|
|
EventID: request.InputReceiptEvent.EventID,
|
|
|
|
Type: request.InputReceiptEvent.Type,
|
|
|
|
Timestamp: request.InputReceiptEvent.Timestamp,
|
|
|
|
}
|
|
|
|
js, err := json.Marshal(output)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
m := &sarama.ProducerMessage{
|
|
|
|
Topic: t.OutputReceiptEventTopic,
|
|
|
|
Key: sarama.StringEncoder(request.InputReceiptEvent.RoomID + ":" + request.InputReceiptEvent.UserID),
|
|
|
|
Value: sarama.ByteEncoder(js),
|
|
|
|
}
|
|
|
|
_, _, err = t.Producer.SendMessage(m)
|
|
|
|
return err
|
|
|
|
}
|