gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

runOnBackend now does not automatically wait for the maxSyncId since it can easily result in infinite cycle

Browse Source
This commit is contained in:
zadam 2021-02-21 21:28:00 +01:00
parent fbbd51d0b1
commit cc887a00f2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/services/frontend_script_api.js
View File

@ -166,8 +166,9 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
}, "script");
if (ret.success) {
// wait until all the changes done in the script has been synced to frontend before continuing
await ws.waitForEntityChangeId(ret.maxEntityChangeId);
// we used to wait for max entity change here returned from the response
// but it's too easy to end up in infinite cycle when this is triggered as a consequence of
// sync event (typically from custom widget)
return ret.executionResult;
}

8
src/public/app/widgets/component.js
View File

@ -91,7 +91,13 @@ export default class Component {
console.log(`Call to ${fun.name} in ${this.componentId} took ${took}ms`);
}
await utils.timeLimit(promise, 25000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
if (glob.isDev) {
await utils.timeLimit(promise, 3000, `Time limit failed on ${this.constructor.name} with ${fun.name}`);
}
else {
// cheaper and in non-dev the extra reporting is lost anyway through reload
await promise;
}
return true;
}