mirror of
https://github.com/matrix-org/dendrite.git
synced 2024-11-26 00:01:55 -06:00
bcb89ada5e
* fix conversion from int to string yields a string of one rune, not a string of digits * Add receipts table to syncapi * Use StreamingToken as the since value * Add required method to testEDUProducer * Make receipt json creation "easier" to read * Add receipts api to the eduserver * Add receipts endpoint * Add eduserver kafka consumer * Add missing kafka config * Add passing tests to whitelist Signed-off-by: Till Faelligen <tfaelligen@gmail.com> * Fix copy & paste error * Fix column count error * Make outbound federation receipts pass * Make "Inbound federation rejects receipts from wrong remote" pass * Don't use errors package * - Add TODO for batching requests - Rename variable * Return a better error message * - Use OutputReceiptEvent instead of InputReceiptEvent as result - Don't use the errors package for errors - Defer CloseAndLogIfError to close rows - Fix Copyright * Better creation/usage of JoinResponse * Query all joined rooms instead of just one * Update gomatrixserverlib * Add sqlite3 migration * Add postgres migration * Ensure required sequence exists before running migrations * Clarification on comment * - Fix a bug when creating client receipts - Use concrete types instead of interface{} * Remove dead code Use key for timestamp * Fix postgres query... * Remove single purpose struct * Use key/value directly * Only apply receipts on initial sync or if edu positions differ, otherwise we'll be sending the same receipts over and over again. * Actually update the id, so it is correctly send in syncs * Set receipt on request to /read_markers * Fix issue with receipts getting overwritten * Use fmt.Errorf instead of pkg/errors * Revert "Add postgres migration" This reverts commit722fe5a046
. * Revert "Add sqlite3 migration" This reverts commitd113b03f64
. * Fix selectRoomReceipts query * Make golangci-lint happy Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
111 lines
3.5 KiB
Go
111 lines
3.5 KiB
Go
// 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 syncapi
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/gorilla/mux"
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/matrix-org/dendrite/internal/config"
|
|
"github.com/matrix-org/dendrite/internal/setup/kafka"
|
|
keyapi "github.com/matrix-org/dendrite/keyserver/api"
|
|
"github.com/matrix-org/dendrite/roomserver/api"
|
|
userapi "github.com/matrix-org/dendrite/userapi/api"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
"github.com/matrix-org/dendrite/syncapi/consumers"
|
|
"github.com/matrix-org/dendrite/syncapi/routing"
|
|
"github.com/matrix-org/dendrite/syncapi/storage"
|
|
"github.com/matrix-org/dendrite/syncapi/sync"
|
|
)
|
|
|
|
// AddPublicRoutes sets up and registers HTTP handlers for the SyncAPI
|
|
// component.
|
|
func AddPublicRoutes(
|
|
router *mux.Router,
|
|
userAPI userapi.UserInternalAPI,
|
|
rsAPI api.RoomserverInternalAPI,
|
|
keyAPI keyapi.KeyInternalAPI,
|
|
federation *gomatrixserverlib.FederationClient,
|
|
cfg *config.SyncAPI,
|
|
) {
|
|
consumer, _ := kafka.SetupConsumerProducer(&cfg.Matrix.Kafka)
|
|
|
|
syncDB, err := storage.NewSyncServerDatasource(&cfg.Database)
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to connect to sync db")
|
|
}
|
|
|
|
pos, err := syncDB.SyncPosition(context.Background())
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to get sync position")
|
|
}
|
|
|
|
notifier := sync.NewNotifier(pos)
|
|
err = notifier.Load(context.Background(), syncDB)
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to start notifier")
|
|
}
|
|
|
|
requestPool := sync.NewRequestPool(syncDB, notifier, userAPI, keyAPI, rsAPI)
|
|
|
|
keyChangeConsumer := consumers.NewOutputKeyChangeEventConsumer(
|
|
cfg.Matrix.ServerName, string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputKeyChangeEvent)),
|
|
consumer, notifier, keyAPI, rsAPI, syncDB,
|
|
)
|
|
if err = keyChangeConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start key change consumer")
|
|
}
|
|
|
|
roomConsumer := consumers.NewOutputRoomEventConsumer(
|
|
cfg, consumer, notifier, syncDB, rsAPI,
|
|
)
|
|
if err = roomConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start room server consumer")
|
|
}
|
|
|
|
clientConsumer := consumers.NewOutputClientDataConsumer(
|
|
cfg, consumer, notifier, syncDB,
|
|
)
|
|
if err = clientConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start client data consumer")
|
|
}
|
|
|
|
typingConsumer := consumers.NewOutputTypingEventConsumer(
|
|
cfg, consumer, notifier, syncDB,
|
|
)
|
|
if err = typingConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start typing consumer")
|
|
}
|
|
|
|
sendToDeviceConsumer := consumers.NewOutputSendToDeviceEventConsumer(
|
|
cfg, consumer, notifier, syncDB,
|
|
)
|
|
if err = sendToDeviceConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start send-to-device consumer")
|
|
}
|
|
|
|
receiptConsumer := consumers.NewOutputReceiptEventConsumer(
|
|
cfg, consumer, notifier, syncDB,
|
|
)
|
|
if err = receiptConsumer.Start(); err != nil {
|
|
logrus.WithError(err).Panicf("failed to start receipts consumer")
|
|
}
|
|
|
|
routing.Setup(router, requestPool, syncDB, userAPI, federation, rsAPI, cfg)
|
|
}
|