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 17:50:19 +01: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 15:49:49 +01: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 api provides the types that are used to communicate with the typing server.
|
|
|
|
package api
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-04-03 11:40:50 +01:00
|
|
|
"errors"
|
2018-07-24 15:49:49 +01:00
|
|
|
"net/http"
|
|
|
|
|
2020-05-21 14:40:13 +01:00
|
|
|
internalHTTP "github.com/matrix-org/dendrite/internal/http"
|
2018-07-24 15:49:49 +01:00
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
opentracing "github.com/opentracing/opentracing-go"
|
|
|
|
)
|
|
|
|
|
|
|
|
// InputTypingEvent is an event for notifying the typing server about typing updates.
|
|
|
|
type InputTypingEvent struct {
|
|
|
|
// UserID of the user to update typing status.
|
|
|
|
UserID string `json:"user_id"`
|
|
|
|
// RoomID of the room the user is typing (or has stopped).
|
|
|
|
RoomID string `json:"room_id"`
|
|
|
|
// Typing is true if the user is typing, false if they have stopped.
|
|
|
|
Typing bool `json:"typing"`
|
2020-03-30 16:40:28 +01:00
|
|
|
// Timeout is the interval in milliseconds for which the user should be marked as typing.
|
|
|
|
TimeoutMS int64 `json:"timeout"`
|
2018-07-24 15:49:49 +01:00
|
|
|
// OriginServerTS when the server received the update.
|
|
|
|
OriginServerTS gomatrixserverlib.Timestamp `json:"origin_server_ts"`
|
|
|
|
}
|
|
|
|
|
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 17:50:19 +01:00
|
|
|
type InputSendToDeviceEvent struct {
|
|
|
|
UserID string `json:"user_id"`
|
|
|
|
DeviceID string `json:"device_id"`
|
|
|
|
gomatrixserverlib.SendToDeviceEvent
|
|
|
|
}
|
|
|
|
|
2020-03-30 15:02:20 +01:00
|
|
|
// InputTypingEventRequest is a request to EDUServerInputAPI
|
2018-07-24 15:49:49 +01:00
|
|
|
type InputTypingEventRequest struct {
|
|
|
|
InputTypingEvent InputTypingEvent `json:"input_typing_event"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// InputTypingEventResponse is a response to InputTypingEvents
|
|
|
|
type InputTypingEventResponse struct{}
|
|
|
|
|
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 17:50:19 +01:00
|
|
|
// InputSendToDeviceEventRequest is a request to EDUServerInputAPI
|
|
|
|
type InputSendToDeviceEventRequest struct {
|
|
|
|
InputSendToDeviceEvent InputSendToDeviceEvent `json:"input_send_to_device_event"`
|
|
|
|
}
|
|
|
|
|
|
|
|
// InputSendToDeviceEventResponse is a response to InputSendToDeviceEventRequest
|
|
|
|
type InputSendToDeviceEventResponse struct{}
|
|
|
|
|
2020-03-30 15:02:20 +01:00
|
|
|
// EDUServerInputAPI is used to write events to the typing server.
|
|
|
|
type EDUServerInputAPI interface {
|
2018-07-24 15:49:49 +01:00
|
|
|
InputTypingEvent(
|
|
|
|
ctx context.Context,
|
|
|
|
request *InputTypingEventRequest,
|
|
|
|
response *InputTypingEventResponse,
|
|
|
|
) error
|
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 17:50:19 +01:00
|
|
|
|
|
|
|
InputSendToDeviceEvent(
|
|
|
|
ctx context.Context,
|
|
|
|
request *InputSendToDeviceEventRequest,
|
|
|
|
response *InputSendToDeviceEventResponse,
|
|
|
|
) error
|
2018-07-24 15:49:49 +01:00
|
|
|
}
|
|
|
|
|
2020-03-30 15:02:20 +01:00
|
|
|
// EDUServerInputTypingEventPath is the HTTP path for the InputTypingEvent API.
|
2020-05-22 14:14:39 +01:00
|
|
|
const EDUServerInputTypingEventPath = "/eduserver/input"
|
2018-07-24 15:49:49 +01:00
|
|
|
|
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 17:50:19 +01:00
|
|
|
// EDUServerInputSendToDeviceEventPath is the HTTP path for the InputSendToDeviceEvent API.
|
|
|
|
const EDUServerInputSendToDeviceEventPath = "/eduserver/sendToDevice"
|
|
|
|
|
2020-03-30 15:02:20 +01:00
|
|
|
// NewEDUServerInputAPIHTTP creates a EDUServerInputAPI implemented by talking to a HTTP POST API.
|
2020-04-03 11:40:50 +01:00
|
|
|
func NewEDUServerInputAPIHTTP(eduServerURL string, httpClient *http.Client) (EDUServerInputAPI, error) {
|
2018-07-24 15:49:49 +01:00
|
|
|
if httpClient == nil {
|
2020-04-03 11:40:50 +01:00
|
|
|
return nil, errors.New("NewTypingServerInputAPIHTTP: httpClient is <nil>")
|
2018-07-24 15:49:49 +01:00
|
|
|
}
|
2020-04-03 11:40:50 +01:00
|
|
|
return &httpEDUServerInputAPI{eduServerURL, httpClient}, nil
|
2018-07-24 15:49:49 +01:00
|
|
|
}
|
|
|
|
|
2020-03-30 15:02:20 +01:00
|
|
|
type httpEDUServerInputAPI struct {
|
|
|
|
eduServerURL string
|
|
|
|
httpClient *http.Client
|
2018-07-24 15:49:49 +01:00
|
|
|
}
|
|
|
|
|
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 17:50:19 +01:00
|
|
|
// InputTypingEvent implements EDUServerInputAPI
|
2020-03-30 15:02:20 +01:00
|
|
|
func (h *httpEDUServerInputAPI) InputTypingEvent(
|
2018-07-24 15:49:49 +01:00
|
|
|
ctx context.Context,
|
|
|
|
request *InputTypingEventRequest,
|
|
|
|
response *InputTypingEventResponse,
|
|
|
|
) error {
|
|
|
|
span, ctx := opentracing.StartSpanFromContext(ctx, "InputTypingEvent")
|
|
|
|
defer span.Finish()
|
|
|
|
|
2020-03-30 15:02:20 +01:00
|
|
|
apiURL := h.eduServerURL + EDUServerInputTypingEventPath
|
2020-05-21 14:40:13 +01:00
|
|
|
return internalHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response)
|
2018-07-24 15:49:49 +01:00
|
|
|
}
|
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 17:50:19 +01:00
|
|
|
|
|
|
|
// InputSendToDeviceEvent implements EDUServerInputAPI
|
|
|
|
func (h *httpEDUServerInputAPI) InputSendToDeviceEvent(
|
|
|
|
ctx context.Context,
|
|
|
|
request *InputSendToDeviceEventRequest,
|
|
|
|
response *InputSendToDeviceEventResponse,
|
|
|
|
) error {
|
|
|
|
span, ctx := opentracing.StartSpanFromContext(ctx, "InputSendToDeviceEvent")
|
|
|
|
defer span.Finish()
|
|
|
|
|
|
|
|
apiURL := h.eduServerURL + EDUServerInputSendToDeviceEventPath
|
|
|
|
return internalHTTP.PostJSON(ctx, span, h.httpClient, apiURL, request, response)
|
|
|
|
}
|