Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 21:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

add time limit to frontend update

Browse Source
This commit is contained in:
zadam 2020-06-11 00:13:56 +02:00
parent 910bda860c
commit d09b021487
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/public/app/services/utils.js
View File

@ -316,6 +316,24 @@ function dynamicRequire(moduleName) {
}
}
function timeLimit(cb, limitMs) {
return new Promise((res, rej) => {
let resolved = false;
cb().then(() => {
resolved = true;
res();
});
setTimeout(() => {
if (!resolved) {
rej('Process exceeded time limit ' + limitMs);
}
}, limitMs);
});
}
export default {
reloadApp,
parseDate,
@ -355,5 +373,6 @@ export default {
normalizeShortcut,
copySelectionToClipboard,
isCKEditorInitialized,
dynamicRequire
dynamicRequire,
timeLimit
};

2
src/public/app/services/ws.js
View File

@ -157,7 +157,7 @@ async function consumeSyncData() {
const nonProcessedSyncRows = allSyncRows.filter(sync => !processedSyncIds.has(sync.id));
try {
await processSyncRows(nonProcessedSyncRows);
await utils.timeLimit(async () => await processSyncRows(nonProcessedSyncRows), 5000);
}
catch (e) {
logError(`Encountered error ${e.message}: ${e.stack}, reloading frontend.`);