mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

PadMessageHandler: Block Promise resolution until message is handled

Browse source 
Benefits:
  * More functions are now async which makes it possible for future
    changes to use await in those functions.
  * This will help keep the server from drowning in too many messages
    if we ever add acknowledgements or if WebSocket backpressure ever
    becomes reality.
  * This might make tests less flaky because changes triggered by a
    message will complete before the Promise resolves.
This commit is contained in:
Richard Hansen 2020-09-04 17:35:42 -04:00 • committed by John McLear
parent 23131a501c
commit 3c9ae57bb3
2 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -259,9 +259,9 @@ exports.handleMessage = async function(client, message)
// Check what type of message we get and delegate to the other methods // Check what type of message we get and delegate to the other methods
if (message.type === "CLIENT_READY") { if (message.type === "CLIENT_READY") {
handleClientReady(client, message); await handleClientReady(client, message);
} else if (message.type === "CHANGESET_REQ") { } else if (message.type === "CHANGESET_REQ") {
handleChangesetRequest(client, message); await handleChangesetRequest(client, message);
} else if(message.type === "COLLABROOM") { } else if(message.type === "COLLABROOM") {
if (thisSession.readonly) { if (thisSession.readonly) {
messageLogger.warn("Dropped message, COLLABROOM for readonly pad"); messageLogger.warn("Dropped message, COLLABROOM for readonly pad");
@ -269,13 +269,13 @@ exports.handleMessage = async function(client, message)
stats.counter('pendingEdits').inc() stats.counter('pendingEdits').inc()
padChannels.emit(message.padId, {client: client, message: message}); // add to pad queue padChannels.emit(message.padId, {client: client, message: message}); // add to pad queue
} else if (message.data.type === "USERINFO_UPDATE") { } else if (message.data.type === "USERINFO_UPDATE") {
handleUserInfoUpdate(client, message); await handleUserInfoUpdate(client, message);
} else if (message.data.type === "CHAT_MESSAGE") { } else if (message.data.type === "CHAT_MESSAGE") {
handleChatMessage(client, message); await handleChatMessage(client, message);
} else if (message.data.type === "GET_CHAT_MESSAGES") { } else if (message.data.type === "GET_CHAT_MESSAGES") {
handleGetChatMessages(client, message); await handleGetChatMessages(client, message);
} else if (message.data.type === "SAVE_REVISION") { } else if (message.data.type === "SAVE_REVISION") {
handleSaveRevisionMessage(client, message); await handleSaveRevisionMessage(client, message);
} else if (message.data.type === "CLIENT_MESSAGE" && } else if (message.data.type === "CLIENT_MESSAGE" &&
message.data.payload != null && message.data.payload != null &&
message.data.payload.type === "suggestUserName") { message.data.payload.type === "suggestUserName") {
@ -284,7 +284,7 @@ exports.handleMessage = async function(client, message)
messageLogger.warn("Dropped message, unknown COLLABROOM Data Type " + message.data.type); messageLogger.warn("Dropped message, unknown COLLABROOM Data Type " + message.data.type);
} }
} else if(message.type === "SWITCH_TO_PAD") { } else if(message.type === "SWITCH_TO_PAD") {
handleSwitchToPad(client, message); await handleSwitchToPad(client, message);
} else { } else {
messageLogger.warn("Dropped message, unknown Message Type " + message.type); messageLogger.warn("Dropped message, unknown Message Type " + message.type);
} }
@ -347,14 +347,14 @@ exports.handleCustomMessage = function(padID, msgString) {
* @param client the client that send this message * @param client the client that send this message
* @param message the message from the client * @param message the message from the client
*/ */
function handleChatMessage(client, message) async function handleChatMessage(client, message)
{ {
var time = Date.now(); var time = Date.now();
var userId = sessioninfos[client.id].author; var userId = sessioninfos[client.id].author;
var text = message.data.text; var text = message.data.text;
var padId = sessioninfos[client.id].padId; var padId = sessioninfos[client.id].padId;
exports.sendChatMessageToPadClients(time, userId, text, padId); await exports.sendChatMessageToPadClients(time, userId, text, padId);
} }
/** /**
@ -463,7 +463,7 @@ function handleSuggestUserName(client, message)
* @param client the client that send this message * @param client the client that send this message
* @param message the message from the client * @param message the message from the client
*/ */
function handleUserInfoUpdate(client, message) async function handleUserInfoUpdate(client, message)
{ {
// check if all ok // check if all ok
if (message.data.userInfo == null) { if (message.data.userInfo == null) {
@ -494,8 +494,10 @@ function handleUserInfoUpdate(client, message)
} }
// Tell the authorManager about the new attributes // Tell the authorManager about the new attributes
authorManager.setAuthorColorId(author, message.data.userInfo.colorId); const p = Promise.all([
authorManager.setAuthorName(author, message.data.userInfo.name); authorManager.setAuthorColorId(author, message.data.userInfo.colorId),
authorManager.setAuthorName(author, message.data.userInfo.name),
]);
var padId = session.padId; var padId = session.padId;
@ -517,6 +519,9 @@ function handleUserInfoUpdate(client, message)
// Send the other clients on the pad the update message // Send the other clients on the pad the update message
client.broadcast.to(padId).json.send(infoMsg); client.broadcast.to(padId).json.send(infoMsg);
// Block until the authorManager has stored the new attributes.
await p;
} }
/** /**
@ -813,7 +818,7 @@ function _correctMarkersInPad(atext, apool) {
return builder.toString(); return builder.toString();
} }
function handleSwitchToPad(client, message) async function handleSwitchToPad(client, message)
{ {
// clear the session and leave the room // clear the session and leave the room
const currentSessionInfo = sessioninfos[client.id]; const currentSessionInfo = sessioninfos[client.id];
@ -830,7 +835,7 @@ function handleSwitchToPad(client, message)
// start up the new pad // start up the new pad
const newSessionInfo = sessioninfos[client.id]; const newSessionInfo = sessioninfos[client.id];
createSessionInfoAuth(newSessionInfo, message); createSessionInfoAuth(newSessionInfo, message);
handleClientReady(client, message); await handleClientReady(client, message);
} }
// Creates/replaces the auth object in the given session info. // Creates/replaces the auth object in the given session info.

8
src/node/handler/SocketIORouter.js
View file

@ -87,7 +87,7 @@ exports.setSocketIO = function(_socket) {
if (clientAuthorized) { if (clientAuthorized) {
// client is authorized, everything ok // client is authorized, everything ok
handleMessage(client, message); await handleMessage(client, message);
} else { } else {
// try to authorize the client // try to authorize the client
if (message.padId !== undefined && message.sessionID !== undefined && message.token !== undefined && message.password !== undefined) { if (message.padId !== undefined && message.sessionID !== undefined && message.token !== undefined && message.password !== undefined) {
@ -104,7 +104,7 @@ exports.setSocketIO = function(_socket) {
if (accessStatus === "grant") { if (accessStatus === "grant") {
// access was granted, mark the client as authorized and handle the message // access was granted, mark the client as authorized and handle the message
clientAuthorized = true; clientAuthorized = true;
handleMessage(client, message); await handleMessage(client, message);
} else { } else {
// no access, send the client a message that tells him why // no access, send the client a message that tells him why
messageLogger.warn("Authentication try failed:" + stringifyWithoutPassword(message)); messageLogger.warn("Authentication try failed:" + stringifyWithoutPassword(message));
@ -127,13 +127,13 @@ exports.setSocketIO = function(_socket) {
} }
// try to handle the message of this client // try to handle the message of this client
function handleMessage(client, message) async function handleMessage(client, message)
{ {
if (message.component && components[message.component]) { if (message.component && components[message.component]) {
// check if component is registered in the components array // check if component is registered in the components array
if (components[message.component]) { if (components[message.component]) {
messageLogger.debug("from " + client.id + ": " + stringifyWithoutPassword(message)); messageLogger.debug("from " + client.id + ": " + stringifyWithoutPassword(message));
components[message.component].handleMessage(client, message); await components[message.component].handleMessage(client, message);
} }
} else { } else {
messageLogger.error("Can't route the message:" + stringifyWithoutPassword(message)); messageLogger.error("Can't route the message:" + stringifyWithoutPassword(message));