b5a8935042
* It's half-alive * Wakeups largely working * Other tweaks, typing works * Fix bugs, add receipt stream * Delete notifier, other tweaks * Dedupe a bit, add a template for the invite stream * Clean up, add templates for other streams * Don't leak channels * Bring forward some more PDU logic, clean up other places * Add some more wakeups * Use addRoomDeltaToResponse * Log tweaks, typing fixed? * Fix timed out syncs * Don't reset next batch position on timeout * Add account data stream/position * End of day * Fix complete sync for receipt, typing * Streams package * Clean up a bit * Complete sync send-to-device * Don't drop errors * More lightweight notifications * Fix typing positions * Don't advance position on remove again unless needed * Device list updates * Advance account data position * Use limit for incremental sync * Limit fixes, amongst other things * Remove some fmt.Println * Tweaks * Re-add notifier * Fix invite position * Fixes * Notify account data without advancing PDU position in notifier * Apply account data position * Get initial position for account data * Fix position update * Fix complete sync positions * Review comments @Kegsay * Room consumer parameters
108 lines
3.4 KiB
Go
108 lines
3.4 KiB
Go
// Copyright 2019 Alex Chen
|
|
//
|
|
// 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/matrix-org/dendrite/eduserver/api"
|
|
"github.com/matrix-org/dendrite/eduserver/cache"
|
|
"github.com/matrix-org/dendrite/internal"
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"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"
|
|
)
|
|
|
|
// OutputTypingEventConsumer consumes events that originated in the EDU server.
|
|
type OutputTypingEventConsumer struct {
|
|
typingConsumer *internal.ContinualConsumer
|
|
eduCache *cache.EDUCache
|
|
stream types.StreamProvider
|
|
notifier *notifier.Notifier
|
|
}
|
|
|
|
// NewOutputTypingEventConsumer creates a new OutputTypingEventConsumer.
|
|
// Call Start() to begin consuming from the EDU server.
|
|
func NewOutputTypingEventConsumer(
|
|
cfg *config.SyncAPI,
|
|
kafkaConsumer sarama.Consumer,
|
|
store storage.Database,
|
|
eduCache *cache.EDUCache,
|
|
notifier *notifier.Notifier,
|
|
stream types.StreamProvider,
|
|
) *OutputTypingEventConsumer {
|
|
|
|
consumer := internal.ContinualConsumer{
|
|
ComponentName: "syncapi/eduserver/typing",
|
|
Topic: string(cfg.Matrix.Kafka.TopicFor(config.TopicOutputTypingEvent)),
|
|
Consumer: kafkaConsumer,
|
|
PartitionStore: store,
|
|
}
|
|
|
|
s := &OutputTypingEventConsumer{
|
|
typingConsumer: &consumer,
|
|
eduCache: eduCache,
|
|
notifier: notifier,
|
|
stream: stream,
|
|
}
|
|
|
|
consumer.ProcessMessage = s.onMessage
|
|
|
|
return s
|
|
}
|
|
|
|
// Start consuming from EDU api
|
|
func (s *OutputTypingEventConsumer) Start() error {
|
|
s.eduCache.SetTimeoutCallback(func(userID, roomID string, latestSyncPosition int64) {
|
|
pos := types.StreamPosition(latestSyncPosition)
|
|
s.notifier.OnNewTyping(roomID, types.StreamingToken{TypingPosition: pos})
|
|
})
|
|
return s.typingConsumer.Start()
|
|
}
|
|
|
|
func (s *OutputTypingEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
|
|
var output api.OutputTypingEvent
|
|
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")
|
|
return nil
|
|
}
|
|
|
|
log.WithFields(log.Fields{
|
|
"room_id": output.Event.RoomID,
|
|
"user_id": output.Event.UserID,
|
|
"typing": output.Event.Typing,
|
|
}).Debug("received data from EDU server")
|
|
|
|
var typingPos types.StreamPosition
|
|
typingEvent := output.Event
|
|
if typingEvent.Typing {
|
|
typingPos = types.StreamPosition(
|
|
s.eduCache.AddTypingUser(typingEvent.UserID, typingEvent.RoomID, output.ExpireTime),
|
|
)
|
|
} else {
|
|
typingPos = types.StreamPosition(
|
|
s.eduCache.RemoveUser(typingEvent.UserID, typingEvent.RoomID),
|
|
)
|
|
}
|
|
|
|
s.stream.Advance(typingPos)
|
|
s.notifier.OnNewTyping(output.Event.RoomID, types.StreamingToken{TypingPosition: typingPos})
|
|
|
|
return nil
|
|
}
|