mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-28 17:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Test

Browse source
This commit is contained in:
Till Faelligen 2021-07-30 21:38:26 +02:00
parent 7347f403dd
commit 9dee04c21a
14 changed files with 175 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clientapi/routing/presence.go
View file

@ -24,6 +24,7 @@ import (
"github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/eduserver/api"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
types2 "github.com/matrix-org/dendrite/syncapi/types"
userapi "github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/types"
"github.com/matrix-org/gomatrixserverlib"
@ -81,12 +82,14 @@ func SetPresence(req *http.Request,
}
}
lastActive := gomatrixserverlib.AsTimestamp(time.Now())
pReq := userapi.InputPresenceRequest{
UserID: userID,
DisplayName: device.DisplayName,
Presence: p,
StatusMsg: r.StatusMsg,
LastActiveTS: int64(gomatrixserverlib.AsTimestamp(time.Now())),
LastActiveTS: int64(lastActive),
}
pRes := userapi.InputPresenceResponse{}
@ -96,7 +99,19 @@ func SetPresence(req *http.Request,
return util.ErrorResponse(err)
}
eduReq := api.InputPresenceRequest{
UserID: userID,
Presence: p,
StatusMsg: r.StatusMsg,
LastActiveTS: lastActive,
StreamPos: types2.StreamPosition(pRes.StreamPos),
}
eduRes := api.InputPresenceResponse{}
// TODO: Inform EDU Server to send new presence to the federationsender/syncapi
if err := eduAPI.InputPresence(req.Context(), &eduReq, &eduRes); err != nil {
logrus.WithError(err).Error("failed to send presence to eduserver")
return util.ErrorResponse(err)
}
return util.JSONResponse{
Code: http.StatusOK,

4
eduserver/api/input.go
View file

@ -20,6 +20,7 @@ package api
import (
"context"
types2 "github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/dendrite/userapi/types"
"github.com/matrix-org/gomatrixserverlib"
)
@ -81,7 +82,8 @@ type InputPresenceRequest struct {
UserID string `json:"user_id"`
Presence types.PresenceStatus `json:"status"`
StatusMsg string `json:"status_msg"`
LastActiveTS gomatrixserverlib.Timestamp `json:"timestamp"`
LastActiveTS gomatrixserverlib.Timestamp `json:"last_active_ts"`
StreamPos types2.StreamPosition `json:"stream_pos"`
}
// InputPresenceResponse is a response to InputPresenceRequest

6
eduserver/api/output.go
View file

@ -19,6 +19,7 @@ package api
import (
"time"
types2 "github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/dendrite/userapi/types"
"github.com/matrix-org/gomatrixserverlib"
)
@ -87,11 +88,12 @@ type FederationReceiptData struct {
EventIDs []string `json:"event_ids"`
}
// OutputPresence is an entry in the presence output kafka log
type OutputPresence struct {
// OutputPresenceData is an entry in the presence output kafka log
type OutputPresenceData struct {
UserID string `json:"user_id"`
Presence types.PresenceStatus `json:"presence"`
StatusMsg string `json:"status_msg,omitempty"`
LastActiveTS gomatrixserverlib.Timestamp `json:"-"`
LastActiveAgo int64 `json:"last_active_ago,omitempty"`
StreamPos types2.StreamPosition
}

3
eduserver/input/input.go
View file

@ -221,11 +221,12 @@ func (t *EDUServerInputAPI) InputPresence(
"status": request.Presence,
"status_msg": request.StatusMsg,
}).Infof("Producing to topic '%s'", t.OutputPresenceTopic)
output := &api.OutputPresence{
output := &api.OutputPresenceData{
UserID: request.UserID,
Presence: request.Presence,
StatusMsg: request.StatusMsg,
LastActiveTS: request.LastActiveTS,
StreamPos: request.StreamPos,
}
js, err := json.Marshal(output)
if err != nil {

91
syncapi/consumers/eduserver_presence.go Normal file
View file

@ -0,0 +1,91 @@
// Copyright 2021 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
//
// 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 consumers
import (
"encoding/json"
"github.com/Shopify/sarama"
"github.com/getsentry/sentry-go"
"github.com/matrix-org/dendrite/eduserver/api"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/setup/process"
"github.com/matrix-org/dendrite/syncapi/notifier"
"github.com/matrix-org/dendrite/syncapi/storage"
"github.com/matrix-org/dendrite/syncapi/types"
log "github.com/sirupsen/logrus"
)
// OutputPresenceDataConsumer consumes events that originated in the EDU server.
type OutputPresenceDataConsumer struct {
presenceConsumer *internal.ContinualConsumer
db storage.Database
stream types.StreamProvider
notifier *notifier.Notifier
}
// NewOutputPresenceDataConsumer creates a new OutputPresenceDataConsumer.
// Call Start() to begin consuming from the EDU server.
func NewOutputPresenceDataConsumer(
process *process.ProcessContext,
cfg *config.SyncAPI,
kafkaConsumer sarama.Consumer,
store storage.Database,
notifier *notifier.Notifier,
stream types.StreamProvider,
) *OutputPresenceDataConsumer {
consumer := internal.ContinualConsumer{
Process: process,
ComponentName: "syncapi/eduserver/presence",
Topic: cfg.Matrix.Kafka.TopicFor(config.TopicOutputPresenceData),
Consumer: kafkaConsumer,
PartitionStore: store,
}
s := &OutputPresenceDataConsumer{
presenceConsumer: &consumer,
db: store,
notifier: notifier,
stream: stream,
}
consumer.ProcessMessage = s.onMessage
return s
}
// Start consuming from EDU api
func (s *OutputPresenceDataConsumer) Start() error {
return s.presenceConsumer.Start()
}
func (s *OutputPresenceDataConsumer) onMessage(msg *sarama.ConsumerMessage) error {
log.Debug("presence received by sync api!")
var output api.OutputPresenceData
if err := json.Unmarshal(msg.Value, &output); err != nil {
// If the message was invalid, log it and move on to the next message in the stream
log.WithError(err).Errorf("EDU server output log: message parse failure")
sentry.CaptureException(err)
return nil
}
log.Debugf("presence received by sync api! %+v", output)
s.stream.Advance(output.StreamPos)
s.notifier.OnNewPresence(types.StreamingToken{PresenceDataPostion: output.StreamPos}, output.UserID)
return nil
}

33
syncapi/notifier/notifier.go
View file

@ -217,6 +217,39 @@ func (n *Notifier) OnNewInvite(
n.wakeupUsers([]string{wakeUserID}, nil, n.currPos)
}
func (n *Notifier) OnNewPresence(
posUpdate types.StreamingToken, userID string,
) {
n.streamLock.Lock()
defer n.streamLock.Unlock()
var wakeUserIDs []string
_, wantDomain, err := gomatrixserverlib.SplitID('@', userID)
if err != nil {
return
}
// determine if users share a room and needs to be woken up
for _, users := range n.roomIDToJoinedUsers {
// user sending presence is not in room
if !users[userID] {
continue
}
// check all users in room
for user := range users {
_, domain, err := gomatrixserverlib.SplitID('@', user)
if err != nil {
return
}
if domain == wantDomain {
wakeUserIDs = append(wakeUserIDs, user)
}
}
}
n.currPos.ApplyUpdates(posUpdate)
n.wakeupUsers(wakeUserIDs, nil, n.currPos)
}
// GetListener returns a UserStreamListener that can be used to wait for
// updates for a user. Must be closed.
// notify for anything before sincePos

1
syncapi/types/types.go
View file

@ -124,6 +124,7 @@ type StreamingToken struct {
SendToDevicePosition StreamPosition
InvitePosition StreamPosition
AccountDataPosition StreamPosition
PresenceDataPostion StreamPosition
DeviceListPosition LogPosition
}

6
syncapi/types/types_test.go
View file

@ -42,9 +42,9 @@ func TestNewSyncTokenWithLogs(t *testing.T) {
func TestSyncTokens(t *testing.T) {
shouldPass := map[string]string{
"s4_0_0_0_0_0": StreamingToken{4, 0, 0, 0, 0, 0, LogPosition{}}.String(),
"s3_1_0_0_0_0.dl-1-2": StreamingToken{3, 1, 0, 0, 0, 0, LogPosition{1, 2}}.String(),
"s3_1_2_3_5_0": StreamingToken{3, 1, 2, 3, 5, 0, LogPosition{}}.String(),
"s4_0_0_0_0_0": StreamingToken{4, 0, 0, 0, 0, 0, 0, LogPosition{}}.String(),
"s3_1_0_0_0_0.dl-1-2": StreamingToken{3, 1, 0, 0, 0, 0, 0, LogPosition{1, 2}}.String(),
"s3_1_2_3_5_0": StreamingToken{3, 1, 2, 3, 5, 0, 0, LogPosition{}}.String(),
"t3_1": TopologyToken{3, 1}.String(),
}

4
userapi/api/api.go
View file

@ -343,7 +343,9 @@ type InputPresenceRequest struct {
}
// InputPresenceResponse is the response for InputPresenceRequest
type InputPresenceResponse struct{}
type InputPresenceResponse struct {
StreamPos int64
}
// QueryPresenceForUserRequest is the request for QueryPresenceForUserRequest
type QueryPresenceForUserRequest struct {

2
userapi/storage/presence/interface.go
View file

@ -33,5 +33,5 @@ type Database interface {
GetPresenceForUser(
ctx context.Context,
userID string,
) (presence api.OutputPresence, err error)
) (presence api.OutputPresenceData, err error)
}

16
userapi/storage/presence/postgres/presence_table.go
View file

@ -20,6 +20,7 @@ import (
"github.com/matrix-org/dendrite/eduserver/api"
"github.com/matrix-org/dendrite/internal/sqlutil"
types2 "github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/dendrite/userapi/types"
)
@ -57,9 +58,13 @@ const selectPresenceForUserSQL = "" +
" FROM presence_presences" +
" WHERE user_id = $1 LIMIT 1"
const selectMaxPresenceSQL = "" +
"SELECT MAX(id) FROM presence_presences"
type presenceStatements struct {
upsertPresenceStmt *sql.Stmt
selectPresenceForUsersStmt *sql.Stmt
selectMaxPresenceStmt *sql.Stmt
}
func (p *presenceStatements) execSchema(db *sql.DB) error {
@ -74,6 +79,9 @@ func (p *presenceStatements) prepare(db *sql.DB) (err error) {
if p.selectPresenceForUsersStmt, err = db.Prepare(selectPresenceForUserSQL); err != nil {
return
}
if p.selectMaxPresenceStmt, err = db.Prepare(selectMaxPresenceSQL); err != nil {
return
}
return
}
@ -100,10 +108,16 @@ func (p *presenceStatements) UpsertPresence(
func (p *presenceStatements) GetPresenceForUser(
ctx context.Context, txn *sql.Tx,
userID string,
) (presence api.OutputPresence, err error) {
) (presence api.OutputPresenceData, err error) {
presence.UserID = userID
stmt := sqlutil.TxStmt(txn, p.selectPresenceForUsersStmt)
err = stmt.QueryRowContext(ctx, userID).Scan(&presence.Presence, &presence.StatusMsg, &presence.LastActiveTS)
return
}
func (p *presenceStatements) GetMaxPresenceID(ctx context.Context, txn *sql.Tx) (pos types2.StreamingToken, err error) {
stmt := sqlutil.TxStmt(txn, p.selectMaxPresenceStmt)
err = stmt.QueryRowContext(ctx).Scan(&pos)
return
}

2
userapi/storage/presence/postgres/storage.go
View file

@ -53,6 +53,6 @@ func (d *Database) UpsertPresence(
return
}
func (d *Database) GetPresenceForUser(ctx context.Context, userID string) (api.OutputPresence, error) {
func (d *Database) GetPresenceForUser(ctx context.Context, userID string) (api.OutputPresenceData, error) {
return d.presence.GetPresenceForUser(ctx, nil, userID)
}

2
userapi/storage/presence/sqlite3/presence_table.go
View file

@ -93,7 +93,7 @@ func (p *presenceStatements) UpsertPresence(
func (p *presenceStatements) GetPresenceForUser(
ctx context.Context, txn *sql.Tx,
userID string,
) (presence api.OutputPresence, err error) {
) (presence api.OutputPresenceData, err error) {
presence.UserID = userID
stmt := sqlutil.TxStmt(txn, p.selectPresenceForUsersStmt)

2
userapi/storage/presence/sqlite3/storage.go
View file

@ -67,6 +67,6 @@ func (d *Database) UpsertPresence(
return
}
func (d *Database) GetPresenceForUser(ctx context.Context, userID string) (api.OutputPresence, error) {
func (d *Database) GetPresenceForUser(ctx context.Context, userID string) (api.OutputPresenceData, error) {
return d.presence.GetPresenceForUser(ctx, nil, userID)
}