public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PadMessageHandler: Move USER_CHANGES processing inside `try` 

This improves the accuracy of the timing stats, and it simplifies
error handling.
pull/5285/head
Richard Hansen 2021-11-16 16:05:28 -05:00
parent b1c1501e1e
commit 97e382e5d2
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/node/handler/PadMessageHandler.js
View File

@ -560,24 +560,6 @@ const handleUserChanges = async (socket, message) => {
// This one's no longer pending, as we're gonna process it now // This one's no longer pending, as we're gonna process it now
stats.counter('pendingEdits').dec(); stats.counter('pendingEdits').dec();
const {data: {baseRev, apool, changeset}} = message;
// Make sure all required fields are present
if (baseRev == null) {
messageLogger.warn('Dropped message, USER_CHANGES Message has no baseRev!');
return;
}
if (apool == null) {
messageLogger.warn('Dropped message, USER_CHANGES Message has no apool!');
return;
}
if (changeset == null) {
messageLogger.warn('Dropped message, USER_CHANGES Message has no changeset!');
return;
}
// The client might disconnect between our callbacks. We should still // The client might disconnect between our callbacks. We should still
// finish processing the changeset, so keep a reference to the session. // finish processing the changeset, so keep a reference to the session.
const thisSession = sessioninfos[socket.id]; const thisSession = sessioninfos[socket.id];
@ -590,16 +572,16 @@ const handleUserChanges = async (socket, message) => {
return; return;
} }
const wireApool = (new AttributePool()).fromJsonable(apool);
// Measure time to process edit // Measure time to process edit
const stopWatch = stats.timer('edits').start(); const stopWatch = stats.timer('edits').start();
// get the pad
const pad = await padManager.getPad(thisSession.padId);
// create the changeset
try { try {
const {data: {baseRev, apool, changeset}} = message;
if (baseRev == null) throw new Error('missing baseRev');
if (apool == null) throw new Error('missing apool');
if (changeset == null) throw new Error('missing changeset');
const wireApool = (new AttributePool()).fromJsonable(apool);
const pad = await padManager.getPad(thisSession.padId);
// Verify that the changeset has valid syntax and is in canonical form // Verify that the changeset has valid syntax and is in canonical form
Changeset.checkRep(changeset); Changeset.checkRep(changeset);