2018-07-24 09:49:49 -05: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.
|
|
|
|
|
|
|
|
package producers
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
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 11:50:19 -05:00
|
|
|
"encoding/json"
|
2018-07-24 09:49:49 -05:00
|
|
|
"time"
|
|
|
|
|
2020-03-30 09:02:20 -05:00
|
|
|
"github.com/matrix-org/dendrite/eduserver/api"
|
2018-07-24 09:49:49 -05:00
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
)
|
|
|
|
|
2020-03-30 10:40:28 -05:00
|
|
|
// EDUServerProducer produces events for the EDU server to consume
|
2020-03-30 09:02:20 -05:00
|
|
|
type EDUServerProducer struct {
|
|
|
|
InputAPI api.EDUServerInputAPI
|
2018-07-24 09:49:49 -05:00
|
|
|
}
|
|
|
|
|
2020-03-30 09:02:20 -05:00
|
|
|
// NewEDUServerProducer creates a new EDUServerProducer
|
|
|
|
func NewEDUServerProducer(inputAPI api.EDUServerInputAPI) *EDUServerProducer {
|
|
|
|
return &EDUServerProducer{
|
2018-07-24 09:49:49 -05:00
|
|
|
InputAPI: inputAPI,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-30 09:02:20 -05:00
|
|
|
// SendTyping sends a typing event to EDU server
|
|
|
|
func (p *EDUServerProducer) SendTyping(
|
2018-07-24 09:49:49 -05:00
|
|
|
ctx context.Context, userID, roomID string,
|
2020-03-30 10:40:28 -05:00
|
|
|
typing bool, timeoutMS int64,
|
2018-07-24 09:49:49 -05:00
|
|
|
) error {
|
|
|
|
requestData := api.InputTypingEvent{
|
|
|
|
UserID: userID,
|
|
|
|
RoomID: roomID,
|
|
|
|
Typing: typing,
|
2020-03-30 10:40:28 -05:00
|
|
|
TimeoutMS: timeoutMS,
|
2018-07-24 09:49:49 -05:00
|
|
|
OriginServerTS: gomatrixserverlib.AsTimestamp(time.Now()),
|
|
|
|
}
|
|
|
|
|
|
|
|
var response api.InputTypingEventResponse
|
|
|
|
err := p.InputAPI.InputTypingEvent(
|
|
|
|
ctx, &api.InputTypingEventRequest{InputTypingEvent: requestData}, &response,
|
|
|
|
)
|
|
|
|
|
|
|
|
return err
|
|
|
|
}
|
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 11:50:19 -05:00
|
|
|
|
|
|
|
// SendToDevice sends a typing event to EDU server
|
|
|
|
func (p *EDUServerProducer) SendToDevice(
|
|
|
|
ctx context.Context, sender, userID, deviceID, eventType string,
|
|
|
|
message interface{},
|
|
|
|
) error {
|
|
|
|
js, err := json.Marshal(message)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
requestData := api.InputSendToDeviceEvent{
|
|
|
|
UserID: userID,
|
|
|
|
DeviceID: deviceID,
|
|
|
|
SendToDeviceEvent: gomatrixserverlib.SendToDeviceEvent{
|
|
|
|
Sender: sender,
|
|
|
|
Type: eventType,
|
|
|
|
Content: js,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
request := api.InputSendToDeviceEventRequest{
|
|
|
|
InputSendToDeviceEvent: requestData,
|
|
|
|
}
|
|
|
|
response := api.InputSendToDeviceEventResponse{}
|
|
|
|
return p.InputAPI.InputSendToDeviceEvent(ctx, &request, &response)
|
|
|
|
}
|