matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Merge pull request #1148 from matrix-org/erikj/per_user_device_messages

Browse Source 
Send device messages for the same user in same API call.
This commit is contained in:
Hubert Chathi
2020-01-14 21:33:46 -05:00
committed by GitHub
parent 6a583d2ba6 b4a93d2dc3
commit ea3ee9bea5
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/crypto/algorithms/megolm.js
View File

@@ -330,6 +330,10 @@ MegolmEncryption.prototype._prepareNewSession = async function() {
}; };
/** /**
* Splits the user device map into multiple chunks to reduce the number of
* devices we encrypt to per API call. Also filters out devices we don't have
* a session with.
*
* @private * @private
* *
* @param {module:crypto/algorithms/megolm.OutboundSessionInfo} session * @param {module:crypto/algorithms/megolm.OutboundSessionInfo} session
@@ -347,7 +351,7 @@ MegolmEncryption.prototype._prepareNewSession = async function() {
MegolmEncryption.prototype._splitUserDeviceMap = function( MegolmEncryption.prototype._splitUserDeviceMap = function(
session, chainIndex, devicemap, devicesByUser, session, chainIndex, devicemap, devicesByUser,
) { ) {
const maxToDeviceMessagesPerRequest = 20; const maxUsersPerRequest = 20;
// use an array where the slices of a content map gets stored // use an array where the slices of a content map gets stored
const mapSlices = []; const mapSlices = [];
@@ -386,11 +390,6 @@ MegolmEncryption.prototype._splitUserDeviceMap = function(
"share keys with device " + userId + ":" + deviceId, "share keys with device " + userId + ":" + deviceId,
); );
if (entriesInCurrentSlice > maxToDeviceMessagesPerRequest) {
// the current slice is filled up. Start inserting into the next slice
entriesInCurrentSlice = 0;
currentSliceId++;
}
if (!mapSlices[currentSliceId]) { if (!mapSlices[currentSliceId]) {
mapSlices[currentSliceId] = []; mapSlices[currentSliceId] = [];
} }
@@ -402,11 +401,25 @@ MegolmEncryption.prototype._splitUserDeviceMap = function(
entriesInCurrentSlice++; entriesInCurrentSlice++;
} }
// We do this in the per-user loop as we prefer that all messages to the
// same user end up in the same API call to make it easier for the
// server (e.g. only have to send one EDU if a remote user, etc). This
// does mean that if a user has many devices we may go over the desired
// limit, but its not a hard limit so that is fine.
if (entriesInCurrentSlice > maxUsersPerRequest) {
// the current slice is filled up. Start inserting into the next slice
entriesInCurrentSlice = 0;
currentSliceId++;
}
} }
return mapSlices; return mapSlices;
}; };
/** /**
* Splits the user device map into multiple chunks to reduce the number of
* devices we encrypt to per API call.
*
* @private * @private
* *
* @param {object} devicesByUser map from userid to list of devices * @param {object} devicesByUser map from userid to list of devices
@@ -414,7 +427,7 @@ MegolmEncryption.prototype._splitUserDeviceMap = function(
* @return {array<array<object>>} the blocked devices, split into chunks * @return {array<array<object>>} the blocked devices, split into chunks
*/ */
MegolmEncryption.prototype._splitBlockedDevices = function(devicesByUser) { MegolmEncryption.prototype._splitBlockedDevices = function(devicesByUser) {
const maxToDeviceMessagesPerRequest = 20; const maxUsersPerRequest = 20;
// use an array where the slices of a content map gets stored // use an array where the slices of a content map gets stored
let currentSlice = []; let currentSlice = [];
@@ -424,17 +437,22 @@ MegolmEncryption.prototype._splitBlockedDevices = function(devicesByUser) {
const userBlockedDevicesToShareWith = devicesByUser[userId]; const userBlockedDevicesToShareWith = devicesByUser[userId];
for (const blockedInfo of userBlockedDevicesToShareWith) { for (const blockedInfo of userBlockedDevicesToShareWith) {
if (currentSlice.length > maxToDeviceMessagesPerRequest) {
// the current slice is filled up. Start inserting into the next slice
currentSlice = [];
mapSlices.push(currentSlice);
}
currentSlice.push({ currentSlice.push({
userId: userId, userId: userId,
blockedInfo: blockedInfo, blockedInfo: blockedInfo,
}); });
} }
// We do this in the per-user loop as we prefer that all messages to the
// same user end up in the same API call to make it easier for the
// server (e.g. only have to send one EDU if a remote user, etc). This
// does mean that if a user has many devices we may go over the desired
// limit, but its not a hard limit so that is fine.
if (currentSlice.length > maxUsersPerRequest) {
// the current slice is filled up. Start inserting into the next slice
currentSlice = [];
mapSlices.push(currentSlice);
}
} }
if (currentSlice.length === 0) { if (currentSlice.length === 0) {
mapSlices.pop(); mapSlices.pop();