aboutsummaryrefslogtreecommitdiff
path: root/eduserver/eduserver.go
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-06-01 17:50:19 +0100
committerGitHub <noreply@github.com>2020-06-01 17:50:19 +0100
commita5d822004dd93d6f6a7ed73371aeb4bfb163b5ba (patch)
tree76b10a79094415e45cfe5f2db9dfdf58cf0d2837 /eduserver/eduserver.go
parent1f43c24f8602dfbc95620e9d34fac78a7b449c11 (diff)
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
Diffstat (limited to 'eduserver/eduserver.go')
-rw-r--r--eduserver/eduserver.go15
1 files changed, 12 insertions, 3 deletions
diff --git a/eduserver/eduserver.go b/eduserver/eduserver.go
index 14fbd332..6f664eb6 100644
--- a/eduserver/eduserver.go
+++ b/eduserver/eduserver.go
@@ -1,3 +1,7 @@
+// Copyright 2017 Vector Creations Ltd
+// Copyright 2017-2018 New Vector Ltd
+// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
+//
// 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
@@ -13,6 +17,7 @@
package eduserver
import (
+ "github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
"github.com/matrix-org/dendrite/eduserver/api"
"github.com/matrix-org/dendrite/eduserver/cache"
"github.com/matrix-org/dendrite/eduserver/input"
@@ -26,11 +31,15 @@ import (
func SetupEDUServerComponent(
base *basecomponent.BaseDendrite,
eduCache *cache.EDUCache,
+ deviceDB devices.Database,
) api.EDUServerInputAPI {
inputAPI := &input.EDUServerInputAPI{
- Cache: eduCache,
- Producer: base.KafkaProducer,
- OutputTypingEventTopic: string(base.Cfg.Kafka.Topics.OutputTypingEvent),
+ Cache: eduCache,
+ DeviceDB: deviceDB,
+ Producer: base.KafkaProducer,
+ OutputTypingEventTopic: string(base.Cfg.Kafka.Topics.OutputTypingEvent),
+ OutputSendToDeviceEventTopic: string(base.Cfg.Kafka.Topics.OutputSendToDeviceEvent),
+ ServerName: base.Cfg.Matrix.ServerName,
}
inputAPI.SetupHTTP(base.InternalAPIMux)