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

refactor(utils): add safeExtractMessageAndStackFromError util to remove code duplication

Browse Source
This commit is contained in:
Panagiotis Papadopoulos
2025-03-08 17:07:25 +01:00
parent e20b662ea7
commit ecf1a0e4ad
9 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/custom.ts
View File

@@ -5,6 +5,7 @@ import cls from "../services/cls.js";
import sql from "../services/sql.js";
import becca from "../becca/becca.js";
import type { Request, Response, Router } from "express";
import { safeExtractMessageAndStackFromError } from "../services/utils.js";
function handleRequest(req: Request, res: Response) {
// express puts content after first slash into 0 index element
@@ -26,7 +27,7 @@ function handleRequest(req: Request, res: Response) {
try {
match = path.match(regex);
} catch (e: unknown) {
const [errMessage, errStack] = e instanceof Error ? [e.message, e.stack] : ["Unknown Error", undefined];
const [errMessage, errStack] = safeExtractMessageAndStackFromError(e);
log.error(`Testing path for label '${attr.attributeId}', regex '${attr.value}' failed with error: ${errMessage}, stack: ${errStack}`);
continue;
}
@@ -47,10 +48,8 @@ function handleRequest(req: Request, res: Response) {
res
});
} catch (e: unknown) {
const [errMessage, errStack] = e instanceof Error ? [e.message, e.stack] : ["Unknown Error", undefined];
const [errMessage, errStack] = safeExtractMessageAndStackFromError(e);
log.error(`Custom handler '${note.noteId}' failed with: ${errMessage}, ${errStack}`);
res.setHeader("Content-Type", "text/plain").status(500).send(errMessage);
}
} else if (attr.name === "customResourceProvider") {