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 18:50:19 +02:00
|
|
|
// Copyright 2017 Vector Creations Ltd
|
|
|
|
// Copyright 2017-2018 New Vector Ltd
|
|
|
|
// Copyright 2019-2020 The Matrix.org Foundation C.I.C.
|
|
|
|
//
|
2018-07-24 16:49:49 +02: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.
|
|
|
|
|
2020-03-30 16:02:20 +02:00
|
|
|
package eduserver
|
2018-07-24 16:49:49 +02:00
|
|
|
|
|
|
|
import (
|
2020-06-08 16:51:07 +02:00
|
|
|
"github.com/gorilla/mux"
|
2020-03-30 16:02:20 +02:00
|
|
|
"github.com/matrix-org/dendrite/eduserver/api"
|
|
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
|
|
|
"github.com/matrix-org/dendrite/eduserver/input"
|
2020-06-04 16:43:07 +02:00
|
|
|
"github.com/matrix-org/dendrite/eduserver/inthttp"
|
2020-08-10 16:18:37 +02:00
|
|
|
"github.com/matrix-org/dendrite/internal/config"
|
2020-06-12 15:55:57 +02:00
|
|
|
"github.com/matrix-org/dendrite/internal/setup"
|
2020-10-15 14:27:13 +02:00
|
|
|
"github.com/matrix-org/dendrite/internal/setup/kafka"
|
2020-06-16 18:39:56 +02:00
|
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
2018-07-24 16:49:49 +02:00
|
|
|
)
|
|
|
|
|
2020-06-08 16:51:07 +02:00
|
|
|
// AddInternalRoutes registers HTTP handlers for the internal API. Invokes functions
|
|
|
|
// on the given input API.
|
|
|
|
func AddInternalRoutes(internalMux *mux.Router, inputAPI api.EDUServerInputAPI) {
|
|
|
|
inthttp.AddRoutes(inputAPI, internalMux)
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewInternalAPI returns a concerete implementation of the internal API. Callers
|
|
|
|
// can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes.
|
|
|
|
func NewInternalAPI(
|
2020-06-12 15:55:57 +02:00
|
|
|
base *setup.BaseDendrite,
|
2020-03-30 16:02:20 +02:00
|
|
|
eduCache *cache.EDUCache,
|
2020-06-16 18:39:56 +02:00
|
|
|
userAPI userapi.UserInternalAPI,
|
2020-03-30 16:02:20 +02:00
|
|
|
) api.EDUServerInputAPI {
|
2020-08-10 15:18:04 +02:00
|
|
|
cfg := &base.Cfg.EDUServer
|
2020-10-15 14:27:13 +02:00
|
|
|
|
|
|
|
_, producer := kafka.SetupConsumerProducer(&cfg.Matrix.Kafka)
|
|
|
|
|
2020-06-08 16:51:07 +02:00
|
|
|
return &input.EDUServerInputAPI{
|
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 18:50:19 +02:00
|
|
|
Cache: eduCache,
|
2020-06-16 18:39:56 +02:00
|
|
|
UserAPI: userAPI,
|
2020-10-15 14:27:13 +02:00
|
|
|
Producer: producer,
|
2020-11-09 19:46:11 +01:00
|
|
|
OutputTypingEventTopic: cfg.Matrix.Kafka.TopicFor(config.TopicOutputTypingEvent),
|
|
|
|
OutputSendToDeviceEventTopic: cfg.Matrix.Kafka.TopicFor(config.TopicOutputSendToDeviceEvent),
|
|
|
|
OutputReceiptEventTopic: cfg.Matrix.Kafka.TopicFor(config.TopicOutputReceiptEvent),
|
2020-08-10 15:18:04 +02:00
|
|
|
ServerName: cfg.Matrix.ServerName,
|
2018-08-02 19:22:44 +02:00
|
|
|
}
|
2018-07-24 16:49:49 +02:00
|
|
|
}
|