mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

async-ify more functions, and await completion

Browse source 
Where feasible I put the await at the end of the function to
minimize the impact on latency.

My motivation for this change: Eliminate a race condition in tests I
am writing.
This commit is contained in:
Richard Hansen 2020-09-16 21:06:15 -04:00 • committed by John McLear
parent 45ec8326f0
commit 3365e944bf
8 changed files with 78 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/handler/ImportHandler.js
View file

@ -226,12 +226,12 @@ async function doImport(req, res, padId)
if (!req.directDatabaseAccess) {
if (importHandledByPlugin || useConvertor || fileIsHTML) {
try {
importHtml.setPadHTML(pad, text);
await importHtml.setPadHTML(pad, text);
} catch (e) {
apiLogger.warn("Error importing, possibly caused by malformed HTML");
}
} else {
pad.setText(text);
await pad.setText(text);
}
}

12
src/node/handler/PadMessageHandler.js
View file

@ -294,7 +294,7 @@ async function handleSaveRevisionMessage(client, message)
var userId = sessioninfos[client.id].author;
let pad = await padManager.getPad(padId);
pad.addSavedRevision(pad.head, userId);
await pad.addSavedRevision(pad.head, userId);
}
/**
@ -365,7 +365,7 @@ exports.sendChatMessageToPadClients = async function(time, userId, text, padId)
let userName = await authorManager.getAuthorName(userId);
// save the chat message
pad.appendChatMessage(text, userId, time);
const promise = pad.appendChatMessage(text, userId, time);
let msg = {
type: "COLLABROOM",
@ -374,6 +374,8 @@ exports.sendChatMessageToPadClients = async function(time, userId, text, padId)
// broadcast the chat message to everyone on the pad
socketio.sockets.in(padId).json.send(msg);
await promise;
}
/**
@ -664,7 +666,7 @@ async function handleUserChanges(data)
}
try {
pad.appendRevision(changeset, thisSession.author);
await pad.appendRevision(changeset, thisSession.author);
} catch(e) {
client.json.send({ disconnect: "badChangeset" });
stats.meter('failedChangesets').mark();
@ -673,13 +675,13 @@ async function handleUserChanges(data)
let correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool);
if (correctionChangeset) {
pad.appendRevision(correctionChangeset);
await pad.appendRevision(correctionChangeset);
}
// Make sure the pad always ends with an empty line.
if (pad.text().lastIndexOf("\n") !== pad.text().length-1) {
var nlChangeset = Changeset.makeSplice(pad.text(), pad.text().length - 1, 0, "\n");
pad.appendRevision(nlChangeset);
await pad.appendRevision(nlChangeset);
}
await exports.updatePadClients(pad);