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: Don't get Pad object multiple times

Browse source
This commit is contained in:
Richard Hansen 2022-02-22 23:55:48 -05:00
parent b276eb0a23
commit b4d9252bfe
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1079,7 +1079,8 @@ const handleChangesetRequest = async (socket, {data: {granularity, start, reques
if (requestID == null) throw new Error('mising requestID'); if (requestID == null) throw new Error('mising requestID');
const end = start + (100 * granularity); const end = start + (100 * granularity);
const {padId} = sessioninfos[socket.id]; const {padId} = sessioninfos[socket.id];
const data = await getChangesetInfo(padId, start, end, granularity); const pad = await padManager.getPad(padId);
const data = await getChangesetInfo(pad, start, end, granularity);
data.requestID = requestID; data.requestID = requestID;
socket.json.send({type: 'CHANGESET_REQ', data}); socket.json.send({type: 'CHANGESET_REQ', data});
}; };
@ -1088,8 +1089,7 @@ const handleChangesetRequest = async (socket, {data: {granularity, start, reques
* Tries to rebuild the getChangestInfo function of the original Etherpad * Tries to rebuild the getChangestInfo function of the original Etherpad
* https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L144 * https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L144
*/ */
const getChangesetInfo = async (padId, startNum, endNum, granularity) => { const getChangesetInfo = async (pad, startNum, endNum, granularity) => {
const pad = await padManager.getPad(padId);
const headRevision = pad.getHeadRevisionNumber(); const headRevision = pad.getHeadRevisionNumber();
// calculate the last full endnum // calculate the last full endnum
@ -1117,10 +1117,10 @@ const getChangesetInfo = async (padId, startNum, endNum, granularity) => {
const composedChangesets = {}; const composedChangesets = {};
const revisionDate = []; const revisionDate = [];
const [lines] = await Promise.all([ const [lines] = await Promise.all([
getPadLines(padId, startNum - 1), getPadLines(pad, startNum - 1),
// Get all needed composite Changesets. // Get all needed composite Changesets.
...compositesChangesetNeeded.map(async (item) => { ...compositesChangesetNeeded.map(async (item) => {
const changeset = await composePadChangesets(padId, item.start, item.end); const changeset = await composePadChangesets(pad, item.start, item.end);
composedChangesets[`${item.start}/${item.end}`] = changeset; composedChangesets[`${item.start}/${item.end}`] = changeset;
}), }),
// Get all needed revision Dates. // Get all needed revision Dates.
@ -1166,9 +1166,7 @@ const getChangesetInfo = async (padId, startNum, endNum, granularity) => {
* Tries to rebuild the getPadLines function of the original Etherpad * Tries to rebuild the getPadLines function of the original Etherpad
* https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L263 * https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L263
*/ */
const getPadLines = async (padId, revNum) => { const getPadLines = async (pad, revNum) => {
const pad = await padManager.getPad(padId);
// get the atext // get the atext
let atext; let atext;
@ -1188,9 +1186,7 @@ const getPadLines = async (padId, revNum) => {
* Tries to rebuild the composePadChangeset function of the original Etherpad * Tries to rebuild the composePadChangeset function of the original Etherpad
* https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L241 * https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L241
*/ */
const composePadChangesets = async (padId, startNum, endNum) => { const composePadChangesets = async (pad, startNum, endNum) => {
const pad = await padManager.getPad(padId);
// fetch all changesets we need // fetch all changesets we need
const headNum = pad.getHeadRevisionNumber(); const headNum = pad.getHeadRevisionNumber();
endNum = Math.min(endNum, headNum + 1); endNum = Math.min(endNum, headNum + 1);
@ -1223,7 +1219,7 @@ const composePadChangesets = async (padId, startNum, endNum) => {
} catch (e) { } catch (e) {
// r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3 // r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3
messageLogger.warn( messageLogger.warn(
`failed to compose cs in pad: ${padId} startrev: ${startNum} current rev: ${r}`); `failed to compose cs in pad: ${pad.id} startrev: ${startNum} current rev: ${r}`);
throw e; throw e;
} }
}; };