Skip to content

Build your personal knowledge base with Trilium Notes

fix(print): read the print window's console messages from the event

Elian Doran200ef6d63c0e
diff --git a/apps/desktop/src/services/printing.spec.ts b/apps/desktop/src/services/printing.spec.ts
index b14c59de72..ae8cb22293 100644
--- a/apps/desktop/src/services/printing.spec.ts
+++ b/apps/desktop/src/services/printing.spec.ts
@@ -6,7 +6,8 @@ const h = vi.hoisted(() => ({
on: new Map<string, Handler>(),
handle: new Map<string, Handler>(),
off: [] as Array<[string, unknown]>,
- consoleHandlers: [] as Array<(event: { level: string }, message: string, line: number, sourceId: string) => void>,
+ consoleHandlers: [] as Array<(event: { level: string; message: string; lineNumber: number; sourceId: string }) => void>,
+ log: { info: vi.fn(), error: vi.fn() },
loadURL: vi.fn((..._a: unknown[]) => Promise.resolve()),
executeJavaScript: vi.fn((..._a: unknown[]): Promise<unknown> => Promise.resolve("REPORT")),
print: vi.fn((_opts: unknown, cb: (success: boolean, reason?: string) => void) => cb(true)),
@@ -61,7 +62,7 @@ vi.mock("@triliumnext/core", async (importOriginal) => {
const actual = await importOriginal<typeof import("@triliumnext/core")>();
return {
...actual,
- getLog: () => ({ info: vi.fn(), error: vi.fn() }),
+ getLog: () => h.log,
utils: { ...actual.utils, isDev: () => h.isDev }
};
});
@@ -159,6 +160,8 @@ describe("setupPrintingHandlers", () => {
h.print.mockReset().mockImplementation((_opts, cb) => cb(true));
h.printToPDF.mockReset().mockResolvedValue(Buffer.from("pdf-bytes"));
h.destroy.mockReset();
+ h.log.info.mockReset();
+ h.log.error.mockReset();
h.getPrintersAsync.mockReset().mockResolvedValue([]);
h.showSaveDialogSync.mockReset().mockReturnValue("/out.pdf");
h.showErrorBox.mockReset();
@@ -206,9 +209,12 @@ describe("setupPrintingHandlers", () => {
// Exercise the captured console-message handler at each log level.
const consoleHandler = h.consoleHandlers[0];
expect(consoleHandler).toBeDefined();
- consoleHandler({ level: "debug" }, "dbg", 1, "s");
- consoleHandler({ level: "error" }, "err", 2, "s");
- consoleHandler({ level: "info" }, "info", 3, "s");
+ consoleHandler({ level: "debug", message: "dbg", lineNumber: 1, sourceId: "s" });
+ consoleHandler({ level: "error", message: "err", lineNumber: 2, sourceId: "s" });
+ consoleHandler({ level: "info", message: "info", lineNumber: 3, sourceId: "s" });
+ expect(h.log.error).toHaveBeenCalledWith("[Print Window s:2] err");
+ expect(h.log.info).toHaveBeenCalledWith("[Print Window s:3] info");
+ expect(h.log.info).not.toHaveBeenCalledWith(expect.stringContaining("dbg"));
// Exercise the print-progress relay callback registered for this window.
const progress = h.on.get("print-progress");
diff --git a/apps/desktop/src/services/printing.ts b/apps/desktop/src/services/printing.ts
index 5ed1a88c26..40d4dfbe86 100644
--- a/apps/desktop/src/services/printing.ts
+++ b/apps/desktop/src/services/printing.ts
@@ -127,13 +127,13 @@ async function getBrowserWindowForPrinting(e: IpcMainEvent, notePath: string, ac
});
// Capture ALL console output (including errors) for debugging
- browserWindow.webContents.on("console-message", (event, message, line, sourceId) => {
- if (event.level === "debug") return;
- if (event.level === "error") {
- getLog().error(`[Print Window ${sourceId}:${line}] ${message}`);
+ browserWindow.webContents.on("console-message", ({ level, message, lineNumber, sourceId }) => {
+ if (level === "debug") return;
+ if (level === "error") {
+ getLog().error(`[Print Window ${sourceId}:${lineNumber}] ${message}`);
return;
}
- getLog().info(`[Print Window ${sourceId}:${line}] ${message}`);
+ getLog().info(`[Print Window ${sourceId}:${lineNumber}] ${message}`);
});
// Collections report progress while they render, so only a render that stops advancing times out.