PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

doing wait for /sync request to receive message, doesn't work well

Browse source 
just poll every 200ms, feels way faster as before
we were probably missing /sync requests
This commit is contained in:
Bruno Windels 2019-04-02 15:13:04 +02:00
parent 28bba4952b
commit 34171eab8c
2 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/session.js
View file

@ -161,15 +161,6 @@ module.exports = class RiotSession {
});
}
waitForSyncResponseWith(predicate) {
return this.page.waitForResponse(async (response) => {
if (response.request().url().indexOf("/sync") === -1) {
return false;
}
return predicate(response);
});
}
/** wait for a /sync request started after this call that gets a 200 response */
async waitForNextSuccessfulSync() {
const syncUrls = [];

38
src/usecases/timeline.js
View file

@ -54,31 +54,21 @@ module.exports.receiveMessage = async function(session, expectedMessage) {
let lastMessage = null;
let isExpectedMessage = false;
try {
lastMessage = await getLastMessage();
isExpectedMessage = lastMessage &&
lastMessage.body === expectedMessage.body &&
lastMessage.sender === expectedMessage.sender;
} catch(ex) {}
// first try to see if the message is already the last message in the timeline
if (isExpectedMessage) {
assertMessage(lastMessage, expectedMessage);
} else {
await session.waitForSyncResponseWith(async (response) => {
const body = await response.text();
if (expectedMessage.encrypted) {
return body.indexOf(expectedMessage.sender) !== -1 &&
body.indexOf("m.room.encrypted") !== -1;
} else {
return body.indexOf(expectedMessage.body) !== -1;
}
});
// wait a bit for the incoming event to be rendered
await session.delay(1000);
lastMessage = await getLastMessage();
assertMessage(lastMessage, expectedMessage);
let totalTime = 0;
while (!isExpectedMessage) {
try {
lastMessage = await getLastMessage();
isExpectedMessage = lastMessage &&
lastMessage.body === expectedMessage.body &&
lastMessage.sender === expectedMessage.sender
} catch(err) {}
if (totalTime > 5000) {
throw new Error("timed out after 5000ms");
}
totalTime += 200;
await session.delay(200);
}
assertMessage(lastMessage, expectedMessage);
session.log.done();
}