50963b724b
* Update sync responses * Fix positions, add ApplyUpdates * Fix MarshalText as non-pointer, PrevBatch is optional * Increment by number of read receipts * Merge branch 'master' into neilalexander/devicelist * Tweak typing * Include keyserver position tweak * Fix typing next position in all cases * Tweaks * Fix typo * Tweaks, restore StreamingToken.MarshalText which somehow went missing? * Rely on positions from notifier rather than manually advancing them * Revert "Rely on positions from notifier rather than manually advancing them" This reverts commit 53112a62cc3bfd9989acab518e69eeb27938117a. * Give invites their own position, fix other things * Fix test * Fix invites maybe * Un-whitelist tests that look to be genuinely wrong * Use real receipt positions * Ensure send-to-device uses real positions too
185 lines
5.5 KiB
Go
185 lines
5.5 KiB
Go
// Copyright 2019-2020 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 sqlite3
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"strings"
|
|
|
|
"github.com/matrix-org/dendrite/internal"
|
|
"github.com/matrix-org/dendrite/internal/sqlutil"
|
|
"github.com/matrix-org/dendrite/syncapi/storage/tables"
|
|
"github.com/matrix-org/dendrite/syncapi/types"
|
|
)
|
|
|
|
const sendToDeviceSchema = `
|
|
-- Stores send-to-device messages.
|
|
CREATE TABLE IF NOT EXISTS syncapi_send_to_device (
|
|
-- The ID that uniquely identifies this message.
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
-- The user ID to send the message to.
|
|
user_id TEXT NOT NULL,
|
|
-- The device ID to send the message to.
|
|
device_id TEXT NOT NULL,
|
|
-- The event content JSON.
|
|
content TEXT NOT NULL,
|
|
-- The token that was supplied to the /sync at the time that this
|
|
-- message was included in a sync response, or NULL if we haven't
|
|
-- included it in a /sync response yet.
|
|
sent_by_token TEXT
|
|
);
|
|
`
|
|
|
|
const insertSendToDeviceMessageSQL = `
|
|
INSERT INTO syncapi_send_to_device (user_id, device_id, content)
|
|
VALUES ($1, $2, $3)
|
|
`
|
|
|
|
const countSendToDeviceMessagesSQL = `
|
|
SELECT COUNT(*)
|
|
FROM syncapi_send_to_device
|
|
WHERE user_id = $1 AND device_id = $2
|
|
`
|
|
|
|
const selectSendToDeviceMessagesSQL = `
|
|
SELECT id, user_id, device_id, content, sent_by_token
|
|
FROM syncapi_send_to_device
|
|
WHERE user_id = $1 AND device_id = $2
|
|
ORDER BY id DESC
|
|
`
|
|
|
|
const updateSentSendToDeviceMessagesSQL = `
|
|
UPDATE syncapi_send_to_device SET sent_by_token = $1
|
|
WHERE id IN ($2)
|
|
`
|
|
|
|
const deleteSendToDeviceMessagesSQL = `
|
|
DELETE FROM syncapi_send_to_device WHERE id IN ($1)
|
|
`
|
|
|
|
type sendToDeviceStatements struct {
|
|
db *sql.DB
|
|
insertSendToDeviceMessageStmt *sql.Stmt
|
|
selectSendToDeviceMessagesStmt *sql.Stmt
|
|
countSendToDeviceMessagesStmt *sql.Stmt
|
|
}
|
|
|
|
func NewSqliteSendToDeviceTable(db *sql.DB) (tables.SendToDevice, error) {
|
|
s := &sendToDeviceStatements{
|
|
db: db,
|
|
}
|
|
_, err := db.Exec(sendToDeviceSchema)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if s.countSendToDeviceMessagesStmt, err = db.Prepare(countSendToDeviceMessagesSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.insertSendToDeviceMessageStmt, err = db.Prepare(insertSendToDeviceMessageSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
if s.selectSendToDeviceMessagesStmt, err = db.Prepare(selectSendToDeviceMessagesSQL); err != nil {
|
|
return nil, err
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) InsertSendToDeviceMessage(
|
|
ctx context.Context, txn *sql.Tx, userID, deviceID, content string,
|
|
) (pos types.StreamPosition, err error) {
|
|
var result sql.Result
|
|
result, err = sqlutil.TxStmt(txn, s.insertSendToDeviceMessageStmt).ExecContext(ctx, userID, deviceID, content)
|
|
if p, err := result.LastInsertId(); err != nil {
|
|
return 0, err
|
|
} else {
|
|
pos = types.StreamPosition(p)
|
|
}
|
|
return
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) CountSendToDeviceMessages(
|
|
ctx context.Context, txn *sql.Tx, userID, deviceID string,
|
|
) (count int, err error) {
|
|
row := sqlutil.TxStmt(txn, s.countSendToDeviceMessagesStmt).QueryRowContext(ctx, userID, deviceID)
|
|
if err = row.Scan(&count); err != nil {
|
|
return
|
|
}
|
|
return count, nil
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) SelectSendToDeviceMessages(
|
|
ctx context.Context, txn *sql.Tx, userID, deviceID string,
|
|
) (lastPos types.StreamPosition, events []types.SendToDeviceEvent, err error) {
|
|
rows, err := sqlutil.TxStmt(txn, s.selectSendToDeviceMessagesStmt).QueryContext(ctx, userID, deviceID)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer internal.CloseAndLogIfError(ctx, rows, "SelectSendToDeviceMessages: rows.close() failed")
|
|
|
|
for rows.Next() {
|
|
var id types.SendToDeviceNID
|
|
var userID, deviceID, content string
|
|
var sentByToken *string
|
|
if err = rows.Scan(&id, &userID, &deviceID, &content, &sentByToken); err != nil {
|
|
return
|
|
}
|
|
event := types.SendToDeviceEvent{
|
|
ID: id,
|
|
UserID: userID,
|
|
DeviceID: deviceID,
|
|
}
|
|
if err = json.Unmarshal([]byte(content), &event.SendToDeviceEvent); err != nil {
|
|
return
|
|
}
|
|
if sentByToken != nil {
|
|
if token, err := types.NewStreamTokenFromString(*sentByToken); err == nil {
|
|
event.SentByToken = &token
|
|
}
|
|
}
|
|
events = append(events, event)
|
|
if types.StreamPosition(id) > lastPos {
|
|
lastPos = types.StreamPosition(id)
|
|
}
|
|
}
|
|
|
|
return lastPos, events, rows.Err()
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) UpdateSentSendToDeviceMessages(
|
|
ctx context.Context, txn *sql.Tx, token string, nids []types.SendToDeviceNID,
|
|
) (err error) {
|
|
query := strings.Replace(updateSentSendToDeviceMessagesSQL, "($2)", sqlutil.QueryVariadic(1+len(nids)), 1)
|
|
params := make([]interface{}, 1+len(nids))
|
|
params[0] = token
|
|
for k, v := range nids {
|
|
params[k+1] = v
|
|
}
|
|
_, err = txn.ExecContext(ctx, query, params...)
|
|
return
|
|
}
|
|
|
|
func (s *sendToDeviceStatements) DeleteSendToDeviceMessages(
|
|
ctx context.Context, txn *sql.Tx, nids []types.SendToDeviceNID,
|
|
) (err error) {
|
|
query := strings.Replace(deleteSendToDeviceMessagesSQL, "($1)", sqlutil.QueryVariadic(len(nids)), 1)
|
|
params := make([]interface{}, 1+len(nids))
|
|
for k, v := range nids {
|
|
params[k] = v
|
|
}
|
|
_, err = txn.ExecContext(ctx, query, params...)
|
|
return
|
|
}
|