Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-06 13:26:01 +01:00
Code Issues Packages Projects Releases Activity

better logging and notifications on script errors for easier debugging

Browse Source
This commit is contained in:
azivner
2018-08-17 11:31:42 +02:00
parent 513748836e
commit 145efe67c3
5 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/javascripts/services/bundle.js
View File

@@ -1,5 +1,6 @@
import ScriptContext from "./script_context.js";
import server from "./server.js";
import infoService from "./info.js";
async function getAndExecuteBundle(noteId, originEntity = null) {
const bundle = await server.get('script/bundle/' + noteId);
@@ -10,9 +11,14 @@ async function getAndExecuteBundle(noteId, originEntity = null) {
async function executeBundle(bundle, originEntity) {
const apiContext = ScriptContext(bundle.note, bundle.allNotes, originEntity);
return await (function () {
return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
}.call(apiContext));
try {
return await (function () {
return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
}.call(apiContext));
}
catch (e) {
infoService.showAndLogError(`Execution of script "${bundle.note.title}" (${bundle.note.noteId}) failed with error: ${e.message}`);
}
}
async function executeStartupBundles() {